Merge pull request #591 from splitgraph/bugfix/sgr-cloud-generation

Fix various issues from e2e testing:

Author: mildbyte

splitgraph/cloud/project/generation.py

@@ -235,9 +235,11 @@ def generate_splitgraph_yml(
                     "metadata": CM(
                         {
                             "description": "Sample dbt model",
-                            "readme": "## Sample dbt model\n\n"
-                            "This is an autogenerated model referencing data from:\n\n"
-                            + "\n".join(f"  * [/{r}](/{r})" for r in repository_names),
+                            "readme": {
+                                "text": "## Sample dbt model\n\n"
+                                "This is an autogenerated model referencing data from:\n\n"
+                                + "\n".join(f"  * [/{r}](/{r})" for r in repository_names)
+                            },
                         }
                     ),
                 }

splitgraph/cloud/project/github_actions.py

@@ -29,8 +29,10 @@ def generate_job(
         steps.append(
             {
                 "name": "Set up dbt Git URL",
-                "run": 'echo "$CREDENTIALS_YML" > splitgraph.credentials.yml'
-                + '\nsed -i "s|\\$THIS_REPO_URL|https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY|g" splitgraph.credentials.yml',
+                "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',
+                ],
                 "shell": "bash",
                 "env": {
                     "CREDENTIALS_YML": "${{secrets.SPLITGRAPH_CREDENTIALS_YML}}",

splitgraph/cloud/project/templates.py

@@ -52,16 +52,6 @@
 # if you are running a local Splitgraph engine and are developing this dbt model against it.
 profile: 'splitgraph_template'
 
-# These configurations specify where dbt should look for different types of files.
-# The `model-paths` config, for example, states that models in this project can be
-# found in the "models/" directory. You probably won't need to change these!
-model-paths: ["models"]
-analysis-paths: ["analyses"]
-test-paths: ["tests"]
-seed-paths: ["seeds"]
-macro-paths: ["macros"]
-snapshot-paths: ["snapshots"]
-
 target-path: "target"  # directory which will store compiled SQL files
 clean-targets:         # directories to be removed by `dbt clean`
   - "target"

test/splitgraph/cloud/project/snapshots/test_dbt/test_generate_dbt_project/splitgraph_template/dbt_project.yml

@@ -15,16 +15,6 @@ config-version: 2
 # if you are running a local Splitgraph engine and are developing this dbt model against it.
 profile: 'splitgraph_template'
 
-# These configurations specify where dbt should look for different types of files.
-# The `model-paths` config, for example, states that models in this project can be
-# found in the "models/" directory. You probably won't need to change these!
-model-paths: ["models"]
-analysis-paths: ["analyses"]
-test-paths: ["tests"]
-seed-paths: ["seeds"]
-macro-paths: ["macros"]
-snapshot-paths: ["snapshots"]
-
 target-path: "target"  # directory which will store compiled SQL files
 clean-targets:         # directories to be removed by `dbt clean`
   - "target"

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

@@ -57,9 +57,10 @@ jobs:
         splitgraph_api_key: ${{ secrets.SPLITGRAPH_API_KEY }}
         splitgraph_api_secret: ${{ secrets.SPLITGRAPH_API_SECRET }}
     - name: Set up dbt Git URL
-      run: "echo \"$CREDENTIALS_YML\" > splitgraph.credentials.yml\nsed -i \"s|\\\
-        $THIS_REPO_URL|https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY|g\"\
-        \ splitgraph.credentials.yml"
+      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
       shell: bash
       env:
         CREDENTIALS_YML: ${{secrets.SPLITGRAPH_CREDENTIALS_YML}}

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

@@ -15,16 +15,6 @@ config-version: 2
 # if you are running a local Splitgraph engine and are developing this dbt model against it.
 profile: 'splitgraph_template'
 
-# These configurations specify where dbt should look for different types of files.
-# The `model-paths` config, for example, states that models in this project can be
-# found in the "models/" directory. You probably won't need to change these!
-model-paths: ["models"]
-analysis-paths: ["analyses"]
-test-paths: ["tests"]
-seed-paths: ["seeds"]
-macro-paths: ["macros"]
-snapshot-paths: ["snapshots"]
-
 target-path: "target"  # directory which will store compiled SQL files
 clean-targets:         # directories to be removed by `dbt clean`
   - "target"

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

@@ -100,5 +100,6 @@ repositories:
     tables: {}
   metadata:
     description: Sample dbt model
-    readme: "## Sample dbt model\n\nThis is an autogenerated model referencing data\
-      \ from:\n\n  * [/myns/postgres_fdw](/myns/postgres_fdw)\n  * [/myns/airbyte-postgres](/myns/airbyte-postgres)"
+    readme:
+      text: "## Sample dbt model\n\nThis is an autogenerated model referencing data\
+        \ from:\n\n  * [/myns/postgres_fdw](/myns/postgres_fdw)\n  * [/myns/airbyte-postgres](/myns/airbyte-postgres)"