Set the templater option to dbt (#4)

* Set the templater option to dbt * Modify tests * Fix * Remove the input for working directory * Fix * Test * Update
yu-iskw · Dec 23, 2021 · b0cb2cf · b0cb2cf
1 parent bd5886c
commit b0cb2cf
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 28 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,13 +18,13 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - uses: ./
-        id: list-sql
+        id: lint-sql
         with:
           github_token: ${{ secrets.github_token }}
-          working-directory: "${{ github.workspace }}/testdata/test_failed_dbt"
           reporter: github-check
+          templater: jinja
           config: "${{ github.workspace }}/testdata/test_failed_dbt/.sqlfluff"
-          paths: 'models'
+          paths: '${{ github.workspace }}/testdata/test_failed_dbt/models'
       - name: "Test outputs"
         shell: bash
         run: |
@@ -46,13 +46,13 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - uses: ./
-        id: list-sql
+        id: lint-sql
         with:
           github_token: ${{ secrets.github_token }}
-          working-directory: "${{ github.workspace }}/testdata/test_failed_dbt"
           reporter: github-pr-check
+          templater: jinja
           config: "${{ github.workspace }}/testdata/test_failed_dbt/.sqlfluff"
-          paths: 'models'
+          paths: '${{ github.workspace }}/testdata/test_failed_dbt/models'
       - name: "Test outputs"
         shell: bash
         run: |
@@ -74,14 +74,14 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - uses: ./
-        id: list-sql
+        id: lint-sql
         continue-on-error: true
         with:
           github_token: ${{ secrets.github_token }}
-          working-directory: "${{ github.workspace }}/testdata/test_failed_dbt"
           reporter: github-pr-review
+          templater: jinja
           config: "${{ github.workspace }}/testdata/test_failed_dbt/.sqlfluff"
-          paths: 'models'
+          paths: '${{ github.workspace }}/testdata/test_failed_dbt/models'
       - name: "Test outputs"
         shell: bash
         run: |

diff --git a/README.md b/README.md
@@ -25,9 +25,6 @@ inputs:
   github_token:
     description: 'GITHUB_TOKEN'
     default: '${{ github.token }}'
-  working-directory:
-    description: 'Working directory relative to the root directory.'
-    default: '.'
   ### Flags for reviewdog ###
   level:
     description: 'Report level for reviewdog [info,warning,error]'
@@ -55,7 +52,7 @@ inputs:
     default: ''
   paths:
     description: |
-      PATH is the path to a sql file or directory to lint based on the working directory.
+      PATH is the path to a sql file or directory to lint.
       This can be either a file ('path/to/file.sql'), a path ('directory/of/sql/files'), a single ('-') character to indicate reading from *stdin* or a dot/blank ('.'/' ') which will be interpreted like passing the current working directory as a path argument.
     required: true
   encoding:
@@ -156,10 +153,15 @@ jobs:
         id: lint-sql
         with:
           github_token: ${{ secrets.github_token }}
-          working-directory: "${{ github.workspace }}/testdata/test_failed_dbt"
-          reporter: github-check
-          config: "${{ github.workspace }}/testdata/test_failed_dbt/.sqlfluff"
-          paths: 'models'
+          reporter: github-pr-review
+          templater: jinja
+          config: "${{ github.workspace }}/.sqlfluff"
+          paths: '${{ github.workspace }}/models'
+      - name: 'Show outputs (Optional)'
+        shell: bash
+        run: |
+          echo '${{ steps.lint-sql.outputs.sqlfluff-results }}' | jq -r '.'
+          echo '${{ steps.lint-sql.outputs.sqlfluff-results-rdjson }}' | jq -r '.'
 ```
 
 ## Development

diff --git a/action.yml b/action.yml
@@ -6,10 +6,6 @@ inputs:
     description: 'GITHUB_TOKEN'
     required: true
     default: '${{ github.token }}'
-  working-directory:
-    description: 'Working directory relative to the root directory.'
-    required: false
-    default: '.'
   ### Flags for reviewdog ###
   level:
     description: 'Report level for reviewdog [info,warning,error]'
@@ -42,7 +38,7 @@ inputs:
     default: ''
   paths:
     description: |
-      PATH is the path to a sql file or directory to lint based on the working directory.
+      PATH is the path to a sql file or directory to lint.
       This can be either a file ('path/to/file.sql'), a path ('directory/of/sql/files'), a single ('-') character to indicate reading from *stdin* or a dot/blank ('.'/' ') which will be interpreted like passing the current working directory as a path argument.
     required: true
   encoding:
@@ -139,7 +135,6 @@ runs:
         REVIEWDOG_FAIL_ON_ERROR: ${{ inputs.fail_on_error }}
         REVIEWDOG_REVIEWDOG_FLAGS: ${{ inputs.reviewdog_flags }}
         REVIEWDOG_ESLINT_FLAGS: ${{ inputs.eslint_flags }}
-        REVIEWDOG_WORKDIR: ${{ inputs.working-directory }}
         REVIEWDOG_TOOL_NAME: ${{ inputs.tool_name }}
         SQLFLUFF_VERSION: ${{ inputs.sqlfluff_version }}
         SQLFLUFF_CONFIG: ${{ inputs.config }}

diff --git a/script.sh b/script.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 set -e
 
-if [ -n "${GITHUB_WORKSPACE}" ]; then
-  cd "${GITHUB_WORKSPACE}/${INPUT_WORKDIR}" || exit
-fi
-
 export REVIEWDOG_GITHUB_API_TOKEN="${INPUT_GITHUB_TOKEN:?}"
 
 echo '::group::🐶 Installing sqlfluff ... https://github.com/sqlfluff/sqlfluff'

diff --git a/testdata/test_failed_dbt/models/staging/staging_02.sql b/testdata/test_failed_dbt/models/staging/staging_02.sql
@@ -1,5 +1,7 @@
 {{
-    config(enabled=true)
+  config(
+    enabled=true
+  )
 }}
 
 SELECT

diff --git a/testdata/test_failed_dbt/models/staging/staging_03.sql b/testdata/test_failed_dbt/models/staging/staging_03.sql
@@ -0,0 +1,8 @@
+{{
+  config(
+    enabled=true
+  )
+}}
+
+SELECT
+    1 2 3