Skip to content

Commit 62e1ad4

Browse files
jackwotherspoonjackwotherspoon
committed
chore: Merge branch 'main' into dns
2 parents ce9c5ff + ef7d8fe commit 62e1ad4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+483
-230
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @GoogleCloudPlatform/infra-db-sdk
1+
* @GoogleCloudPlatform/cloud-sql-connectors

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
45+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
49+
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
5050
with:
5151
languages: ${{ matrix.language }}
5252

5353
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
5454
# If this step fails, then you should remove it and run the build manually
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
56+
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
5757

5858
- name: Perform CodeQL Analysis
59-
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
59+
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6060
with:
6161
category: "/language:${{matrix.language}}"

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Setup Python
27-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
27+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
2828
with:
2929
python-version: "3.10"
3030

3131
- run: pip install nox coverage
3232

3333
- name: Checkout base branch
34-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
34+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
3535
with:
3636
ref: ${{ github.base_ref }}
3737

@@ -44,7 +44,7 @@ jobs:
4444
coverage erase
4545
4646
- name: Checkout PR branch
47-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
47+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
4848
with:
4949
ref: ${{ github.event.pull_request.head.sha }}
5050
repository: ${{ github.event.pull_request.head.repo.full_name }}

‎.github/workflows/labels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
issues: write
2929
pull-requests: write
3030
steps:
31-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
31+
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
3232
- uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Setup Python
28-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
28+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
2929
with:
3030
python-version: "3.12"
3131

3232
- name: Install nox
3333
run: pip install nox
3434

3535
- name: Checkout code
36-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
36+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
3737

3838
- name: Run nox lint session
3939
run: nox --sessions lint

‎.github/workflows/scorecard.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: "Checkout code"
38-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
38+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
3939
with:
4040
persist-credentials: false
4141

@@ -57,14 +57,14 @@ jobs:
5757
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5858
# format to the repository Actions tab.
5959
- name: "Upload artifact"
60-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
60+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
6161
with:
6262
name: SARIF file
6363
path: results.sarif
6464
retention-days: 5
6565

6666
# Upload the results to GitHub's code scanning dashboard.
6767
- name: "Upload to code-scanning"
68-
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
68+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6969
with:
7070
sarif_file: resultsFiltered.sarif

‎.github/workflows/tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
matrix:
3737
os: [macos-latest, windows-latest, ubuntu-latest]
38-
python-version: ["3.8", "3.12"]
38+
python-version: ["3.9", "3.13"]
3939
fail-fast: false
4040
permissions:
4141
contents: read
@@ -44,10 +44,10 @@ jobs:
4444
pull-requests: write
4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
47+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
4848

4949
- name: Setup Python ${{ matrix.python-version }}
50-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
50+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
5151
with:
5252
python-version: ${{ matrix.python-version }}
5353

@@ -56,7 +56,7 @@ jobs:
5656

5757
- id: auth
5858
name: Authenticate to Google Cloud
59-
uses: google-github-actions/auth@62cf5bd3e4211a0a0b51f2c6d6a37129d828611d # v2.1.5
59+
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
6060
with:
6161
workload_identity_provider: ${{ vars.PROVIDER_NAME }}
6262
service_account: ${{ vars.SERVICE_ACCOUNT }}
@@ -134,7 +134,7 @@ jobs:
134134
runs-on: ubuntu-latest
135135
strategy:
136136
matrix:
137-
python-version: ["3.8", "3.12"]
137+
python-version: ["3.9", "3.13"]
138138
fail-fast: false
139139
permissions:
140140
contents: read
@@ -143,10 +143,10 @@ jobs:
143143
pull-requests: write
144144
steps:
145145
- name: Checkout code
146-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
146+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
147147

148148
- name: Setup Python ${{ matrix.python-version }}
149-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
149+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
150150
with:
151151
python-version: ${{ matrix.python-version }}
152152

@@ -157,7 +157,7 @@ jobs:
157157
name: Authenticate to Google Cloud
158158
# only needed for Flakybot on periodic (schedule) and continuous (push) events
159159
if: ${{ github.event_name == 'schedule' || github.event_name == 'push' }}
160-
uses: google-github-actions/auth@62cf5bd3e4211a0a0b51f2c6d6a37129d828611d # v2.1.5
160+
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
161161
with:
162162
workload_identity_provider: ${{ vars.PROVIDER_NAME }}
163163
service_account: ${{ vars.SERVICE_ACCOUNT }}

‎.kokoro/release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /
2323
export PYTHONUNBUFFERED=1
2424

2525
# Move into the package, build the distribution and upload.
26-
TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
26+
TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-3")
2727
cd github/cloud-sql-python-connector
2828
python3 setup.py sdist bdist_wheel
2929
twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*

‎.kokoro/release/common.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ before_action {
4646
fetch_keystore {
4747
keystore_resource {
4848
keystore_config_id: 73713
49-
keyname: "google-cloud-pypi-token-keystore-1"
49+
keyname: "google-cloud-pypi-token-keystore-3"
5050
}
5151
}
5252
}

‎.mypy.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[mypy]
2-
python_version = 3.8
2+
python_version = 3.9
33
warn_unused_configs = True
44
namespace_packages = True
55

0 commit comments

Comments
 (0)