Use the current Git SHA for the dbt project

Author: mildbyte

splitgraph/cloud/project/dbt.py

@@ -78,6 +78,7 @@ def generate_dbt_plugin_params(repositories: List[str]) -> Tuple[Dict[str, Any],
     # the Git pull URL at action runtime (using GITHUB_TOKEN).
     credentials = {"git_url": "$THIS_REPO_URL"}
 
-    params = {"sources": [_make_source(r) for r in repositories]}
+    # Same with the branch: we want to inject the current SHA we're running the action for.
+    params = {"sources": [_make_source(r) for r in repositories], "git_branch": "$THIS_SHA"}
 
     return params, credentials

splitgraph/cloud/project/github_actions.py

@@ -30,7 +30,8 @@ def generate_job(
             {
                 "name": "Set up dbt Git URL",
                 "run": 'echo "$CREDENTIALS_YML" > splitgraph.credentials.yml && '
-                'sed -i "s|\\$THIS_REPO_URL|https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY|g" splitgraph.credentials.yml',
+                'sed -i "s|\\$THIS_REPO_URL|https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY|g" splitgraph.credentials.yml && '
+                'sed -i "s|\\$THIS_SHA|$GITHUB_SHA|g" splitgraph.yml',
                 "shell": "bash",
                 "env": {
                     "CREDENTIALS_YML": "${{secrets.SPLITGRAPH_CREDENTIALS_YML}}",

test/splitgraph/cloud/project/snapshots/test_generation/test_generate_project_with_dbt/generate_project_dbt/.github/workflows/build.yml

@@ -58,7 +58,7 @@ jobs:
         splitgraph_api_secret: ${{ secrets.SPLITGRAPH_API_SECRET }}
     - name: Set up dbt Git URL
       run: echo "$CREDENTIALS_YML" > splitgraph.credentials.yml && sed -i "s|\$THIS_REPO_URL|https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY|g"
-        splitgraph.credentials.yml
+        splitgraph.credentials.yml && sed -i "s|\$THIS_SHA|$GITHUB_SHA|g" splitgraph.yml
       shell: bash
       env:
         CREDENTIALS_YML: ${{secrets.SPLITGRAPH_CREDENTIALS_YML}}

test/splitgraph/cloud/project/snapshots/test_generation/test_generate_project_with_dbt/generate_project_dbt/splitgraph.yml

@@ -96,6 +96,7 @@ repositories:
         namespace: myns
         repository: airbyte-postgres
         hash_or_tag: latest
+      git_branch: $THIS_SHA
     is_live: false
     tables: {}
   metadata:

test/splitgraph/cloud/project/test_dbt.py

@@ -12,6 +12,7 @@ def test_generate_dbt_plugin_params():
         ["some-data/source", "some-other/data-raw", "and-third/data"]
     ) == (
         {
+            "git_branch": "$THIS_SHA",
             "sources": [
                 {
                     "dbt_source_name": "some_data_source",
@@ -31,7 +32,7 @@ def test_generate_dbt_plugin_params():
                     "repository": "data",
                     "hash_or_tag": "latest",
                 },
-            ]
+            ],
         },
         {"git_url": "$THIS_REPO_URL"},
     )