Merge branch 'main' into dependabot/pip/types-requests-approx-eq-2.29

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.0a1
+current_version = 1.7.0a1
 parse = (?P<major>[\d]+) # major version number
 	\.(?P<minor>[\d]+) # minor version number
 	\.(?P<patch>[\d]+) # patch version number

.changes/0.0.0.md

@@ -1,5 +1,7 @@
 ## Previous Releases
 For information on prior major and minor releases, see their changelogs:
+- [1.6](https://github.com/dbt-labs/dbt-spark/blob/1.6.latest/CHANGELOG.md)
+- [1.5](https://github.com/dbt-labs/dbt-spark/blob/1.5.latest/CHANGELOG.md)
 - [1.4](https://github.com/dbt-labs/dbt-spark/blob/1.4.latest/CHANGELOG.md)
 - [1.3](https://github.com/dbt-labs/dbt-spark/blob/1.3.latest/CHANGELOG.md)
 - [1.2](https://github.com/dbt-labs/dbt-spark/blob/1.2.latest/CHANGELOG.md)

.changes/unreleased/Dependencies-20230501-231003.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Update pre-commit requirement from ~=2.21 to ~=3.3"
+time: 2023-05-01T23:10:03.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 748

.changes/unreleased/Dependencies-20230510-230725.yaml

@@ -0,0 +1,6 @@
+kind: "Dependencies"
+body: "Bump mypy from 1.2.0 to 1.3.0"
+time: 2023-05-10T23:07:25.00000Z
+custom:
+  Author: dependabot[bot]
+  PR: 768

.changes/unreleased/Features-20230707-104150.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Support server_side_parameters for Spark session connection method
+time: 2023-07-07T10:41:50.01541+02:00
+custom:
+  Author: alarocca-apixio
+  Issue: "690"

.changes/unreleased/Features-20230707-113337.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Add server_side_parameters to HTTP connection method
+time: 2023-07-07T11:33:37.794112+02:00
+custom:
+  Author: Fokko,JCZuurmond
+  Issue: "824"

.changes/unreleased/Features-20230707-114650.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Enforce server side parameters keys and values to be strings
+time: 2023-07-07T11:46:50.390918+02:00
+custom:
+  Author: Fokko,JCZuurmond
+  Issue: "826"

.changes/unreleased/Under the Hood-20230724-165508.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Update stale workflow to use centralized version
+time: 2023-07-24T16:55:08.096947-04:00
+custom:
+  Author: mikealfare
+  Issue: "842"

.circleci/config.yml

@@ -10,23 +10,24 @@ jobs:
       - checkout
       - run: tox -e flake8,unit
 
-  integration-spark-session:
-    environment:
-      DBT_INVOCATION_ENV: circle
-    docker:
-      - image: godatadriven/pyspark:3.1
-    steps:
-      - checkout
-      - run: apt-get update
-      - run: python3 -m pip install --upgrade pip
-      - run: apt-get install -y git gcc g++ unixodbc-dev libsasl2-dev
-      - run: python3 -m pip install tox
-      - run:
-          name: Run integration tests
-          command: tox -e integration-spark-session
-          no_output_timeout: 1h
-      - store_artifacts:
-          path: ./logs
+# Turning off for now due to flaky runs of tests will turn back on at later date.
+  # integration-spark-session:
+  #   environment:
+  #     DBT_INVOCATION_ENV: circle
+  #   docker:
+  #     - image: godatadriven/pyspark:3.1
+  #   steps:
+  #     - checkout
+  #     - run: apt-get update
+  #     - run: python3 -m pip install --upgrade pip
+  #     - run: apt-get install -y git gcc g++ unixodbc-dev libsasl2-dev
+  #     - run: python3 -m pip install tox
+  #     - run:
+  #         name: Run integration tests
+  #         command: tox -e integration-spark-session
+  #         no_output_timeout: 1h
+  #     - store_artifacts:
+  #         path: ./logs
 
   integration-spark-thrift:
     environment:
@@ -115,9 +116,9 @@ workflows:
   test-everything:
     jobs:
       - unit
-      - integration-spark-session:
-          requires:
-            - unit
+      # - integration-spark-session:
+      #     requires:
+      #       - unit
       - integration-spark-thrift:
           requires:
             - unit

.github/pull_request_template.md

@@ -1,26 +1,35 @@
 resolves #
+[docs](https://github.com/dbt-labs/docs.getdbt.com/issues/new/choose) dbt-labs/docs.getdbt.com/#
 
 <!---
   Include the number of the issue addressed by this PR above if applicable.
   PRs for code changes without an associated issue *will not be merged*.
   See CONTRIBUTING.md for more information.
 
-  Example:
-    resolves #1234
+  Include the number of the docs issue that was opened for this PR. If
+  this change has no user-facing implications, "N/A" suffices instead. New
+  docs tickets can be created by clicking the link above or by going to
+  https://github.com/dbt-labs/docs.getdbt.com/issues/new/choose.
 -->
 
-### Description
+### Problem
 
 <!---
-  Describe the Pull Request here. Add any references and info to help reviewers
-  understand your changes. Include any tradeoffs you considered.
+  Describe the problem this PR is solving. What is the application state
+  before this PR is merged?
+-->
+
+### Solution
+
+<!---
+  Describe the way this PR solves the above problem. Add as much detail as you
+  can to help reviewers understand your changes. Include any alternatives and
+  tradeoffs you considered.
 -->
 
 ### Checklist
 
-- [ ] I have read [the contributing guide](https://github.com/dbt-labs/dbt-spark/blob/main/CONTRIBUTING.md) and understand what's expected of me
-- [ ] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
+- [ ] I have read [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md) and understand what's expected of me
 - [ ] I have run this code in development and it appears to resolve the stated issue
 - [ ] This PR includes tests, or tests are not required/relevant for this PR
-- [ ] I have [opened an issue to add/update docs](https://github.com/dbt-labs/docs.getdbt.com/issues/new/choose), or docs changes are not required/relevant for this PR
-- [ ] I have run `changie new` to [create a changelog entry](https://github.com/dbt-labs/dbt-spark/blob/main/CONTRIBUTING.md#Adding-CHANGELOG-Entry)
+- [ ] This PR has no interface changes (e.g. macros, cli, logs, json artifacts, config files, adapter interface, etc) or this PR has already received feedback and approval from Product or DX

.github/workflows/backport.yml

@@ -37,6 +37,6 @@ jobs:
       github.event.pull_request.merged
       && contains(github.event.label.name, 'backport')
     steps:
-      - uses: tibdex/backport@v2.0.2
+      - uses: tibdex/backport@v2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/bot-changelog.yml

@@ -49,12 +49,12 @@ jobs:
     - name: Create and commit changelog on bot PR
       if: ${{ contains(github.event.pull_request.labels.*.name, matrix.label) }}
       id: bot_changelog
-      uses: emmyoop/changie_bot@v1.0.1
+      uses: emmyoop/changie_bot@v1
       with:
         GITHUB_TOKEN: ${{ secrets.FISHTOWN_BOT_PAT }}
         commit_author_name: "Github Build Bot"
         commit_author_email: "<[email protected]>"
         commit_message: "Add automated changelog yaml from template for bot PR"
         changie_kind: ${{ matrix.changie_kind }}
         label: ${{ matrix.label }}
-        custom_changelog_string: "custom:\n  Author: ${{ github.event.pull_request.user.login }}\n  PR: ${{ github.event.pull_request.number }}"
+        custom_changelog_string: "custom:\n  Author: ${{ github.event.pull_request.user.login }}\n  PR: ${{ github.event.pull_request.number }}\n"

.github/workflows/main.yml

@@ -43,12 +43,12 @@ jobs:
 
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           persist-credentials: false
 
       - name: Set up Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: '3.8'
 
@@ -79,18 +79,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
 
     env:
       TOXENV: "unit"
       PYTEST_ADDOPTS: "-v --color=yes --csv unit_results.csv"
 
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -108,9 +108,9 @@ jobs:
       - name: Get current date
         if: always()
         id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H_%M_%S')" #no colons allowed for artifacts
+        run: echo "date=$(date +'%Y-%m-%dT%H_%M_%S')" >> $GITHUB_OUTPUT #no colons allowed for artifacts
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: unit_results_${{ matrix.python-version }}-${{ steps.date.outputs.date }}.csv
@@ -126,10 +126,10 @@ jobs:
 
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: '3.8'
 
@@ -157,9 +157,9 @@ jobs:
         run: |
           export is_alpha=0
           if [[ "$(ls -lh dist/)" == *"a1"* ]]; then export is_alpha=1; fi
-          echo "::set-output name=is_alpha::$is_alpha"
+          echo "is_alpha=$is_alpha" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist/
@@ -177,11 +177,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -190,7 +190,7 @@ jobs:
           python -m pip install --user --upgrade pip
           python -m pip install --upgrade wheel
           python -m pip --version
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist/

.github/workflows/stale.yml

@@ -1,15 +1,12 @@
-name: 'Close stale issues and PRs'
+name: "Close stale issues and PRs"
 on:
   schedule:
     - cron: "30 1 * * *"
+
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   stale:
-    runs-on: ubuntu-latest
-    steps:
-      # pinned at v4 (https://github.com/actions/stale/releases/tag/v4.0.0)
-      - uses: actions/stale@cdf15f641adb27a71842045a94023bef6945e3aa
-        with:
-          stale-issue-message: "This issue has been marked as Stale because it has been open for 180 days with no activity. If you would like the issue to remain open, please remove the stale label or comment on the issue, or it will be closed in 7 days."
-          stale-pr-message: "This PR has been marked as Stale because it has been open for 180 days with no activity. If you would like the PR to remain open, please remove the stale label or comment on the PR, or it will be closed in 7 days."
-          # mark issues/PRs stale when they haven't seen activity in 180 days
-          days-before-stale: 180
+    uses: dbt-labs/actions/.github/workflows/stale-bot-matrix.yml@main

.github/workflows/triage-labels.yml

@@ -24,10 +24,8 @@ permissions:
 jobs:
   triage_label:
     if: contains(github.event.issue.labels.*.name, 'awaiting_response')
-    runs-on: ubuntu-latest
-    steps:
-      - name: initial labeling
-        uses: andymckay/labeler@master
-        with:
-          add-labels: "triage"
-          remove-labels: "awaiting_response"
+    uses: dbt-labs/actions/.github/workflows/swap-labels.yml@main
+    with:
+      add_label: "triage"
+      remove_label: "awaiting_response"
+    secrets: inherit # this is only acceptable because we own the action we're calling