Skip to content

Commit 5d139d4

Browse files
sfc-gh-astachowskisfc-gh-astachowski
committed
Merge branch 'master' into SNOW-1437655-set-auth-timeout-to-0-in-not-auth-endpoint-calls
# Conflicts: # src/main/java/net/snowflake/client/core/SFBaseSession.java
2 parents e4ca44c + 722137c commit 5d139d4

File tree

667 files changed

+32828
-13924
lines changed

Some content is hidden

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

667 files changed

+32828
-13924
lines changed

‎.github/ISSUE_TEMPLATE/BUG_REPORT.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ In order to accurately debug the issue this information is required. Thanks!
3737

3838
https://community.snowflake.com/s/article/How-to-generate-log-file-on-Snowflake-connectors
3939

40-
7. What is your Snowflake account identifier, if any? (Optional)
40+
Before sharing any information, please be sure to review the log and remove any sensitive
41+
information.

‎.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ otherwise continue here.
1717
## How would this improve `snowflake-jdbc`?
1818

1919
## References, Other Background
20-
21-
## What is your Snowflake account identifier, if any?
2220

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SNOW-XXXXX
1313

1414
1. What GitHub issue is this PR addressing? Make sure that there is an accompanying issue to your PR.
1515

16-
Fixes #NNNN
16+
Issue: #NNNN
1717

1818

1919
2. Fill out the following pre-review checklist:

‎.github/workflows/build-test.yml‎

Lines changed: 85 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,56 +27,129 @@ concurrency:
2727
jobs:
2828
build:
2929
name: Build
30-
runs-on: ubuntu-20.04
30+
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v1
32+
- uses: actions/checkout@v4
3333
- name: Build
3434
shell: bash
3535
env:
3636
WHITESOURCE_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
3737
run: ./ci/build.sh
3838

39+
test-windows:
40+
needs: build
41+
name: ${{ matrix.runConfig.cloud }} Windows java ${{ matrix.runConfig.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category.name }}
42+
runs-on: windows-latest
43+
strategy:
44+
fail-fast: false
45+
matrix:
46+
runConfig: [ {cloud: 'AWS', javaVersion: '8'}, {cloud: 'GCP', javaVersion: '11'}, {cloud: 'AZURE', javaVersion: '17'}, {cloud: 'AWS', javaVersion: '21'}]
47+
category: [{suites: 'ResultSetTestSuite,StatementTestSuite,LoaderTestSuite', name: 'TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader'},
48+
{suites: 'OthersTestSuite', name: 'TestCategoryOthers'},
49+
{suites: 'ArrowTestSuite,ConnectionTestSuite,CoreTestSuite,DiagnosticTestSuite', name: 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic'},
50+
{suites: 'FipsTestSuite', name: "TestCategoryFips"}]
51+
additionalMavenProfile: ['']
52+
steps:
53+
- uses: actions/checkout@v4
54+
- uses: actions/setup-java@v4
55+
with:
56+
java-version: ${{ matrix.runConfig.javaVersion }}
57+
distribution: 'temurin'
58+
cache: maven
59+
- uses: actions/setup-python@v5
60+
with:
61+
python-version: '3.7'
62+
architecture: 'x64'
63+
- name: Tests
64+
shell: cmd
65+
env:
66+
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
67+
CLOUD_PROVIDER: ${{ matrix.runConfig.cloud }}
68+
JDBC_TEST_SUITES: ${{ matrix.category.suites }}
69+
ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
70+
run: ci\\test_windows.bat
71+
72+
test-mac:
73+
needs: build
74+
name: ${{ matrix.runConfig.cloud }} Mac java ${{ matrix.runConfig.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category.name }}
75+
runs-on: macos-13
76+
strategy:
77+
fail-fast: false
78+
matrix:
79+
runConfig: [ {cloud: 'AWS', javaVersion: '8'}, {cloud: 'GCP', javaVersion: '11'}, {cloud: 'AZURE', javaVersion: '17'}, {cloud: 'AWS', javaVersion: '21'}]
80+
category: [{suites: 'ResultSetTestSuite,StatementTestSuite,LoaderTestSuite', name: 'TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader'},
81+
{suites: 'OthersTestSuite', name: 'TestCategoryOthers'},
82+
{suites: 'ArrowTestSuite,ConnectionTestSuite,CoreTestSuite,DiagnosticTestSuite', name: 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic'},
83+
{suites: 'FipsTestSuite', name: "TestCategoryFips"}]
84+
additionalMavenProfile: ['']
85+
steps:
86+
- uses: actions/checkout@v4
87+
- uses: actions/setup-java@v4
88+
with:
89+
java-version: ${{ matrix.runConfig.javaVersion }}
90+
distribution: 'temurin'
91+
cache: maven
92+
- uses: actions/setup-python@v5
93+
with:
94+
python-version: '3.7'
95+
- name: Install Homebrew Bash
96+
shell: bash
97+
run: brew install bash
98+
- name: Tests
99+
shell: bash
100+
env:
101+
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
102+
CLOUD_PROVIDER: ${{ matrix.runConfig.cloud }}
103+
JDBC_TEST_SUITES: ${{ matrix.category.suites }}
104+
ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
105+
run: /usr/local/bin/bash ./ci/test_mac.sh
106+
39107
test-linux:
40108
needs: build
41-
name: ${{ matrix.cloud }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }} on ${{ matrix.image }}
109+
name: ${{ matrix.cloud }} Linux java on ${{ matrix.image }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category.name }}
42110
runs-on: ubuntu-latest
43111
strategy:
44112
fail-fast: false
45113
matrix:
46-
image: [ 'jdbc-centos7-openjdk8', 'jdbc-centos7-openjdk11', 'jdbc-centos7-openjdk17' ]
47-
cloud: [ 'AWS' ]
48-
category: ['TestCategoryResultSet,TestCategoryOthers,TestCategoryLoader', 'TestCategoryConnection,TestCategoryStatement', 'TestCategoryArrow,TestCategoryCore', 'TestCategoryFips']
114+
image: [ 'jdbc-centos7-openjdk8', 'jdbc-centos7-openjdk11', 'jdbc-centos7-openjdk17', 'jdbc-centos7-openjdk21' ]
115+
cloud: [ 'AWS', 'AZURE', 'GCP' ]
116+
category: [{suites: 'ResultSetTestSuite,StatementTestSuite,LoaderTestSuite', name: 'TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader'},
117+
{suites: 'OthersTestSuite', name: 'TestCategoryOthers'},
118+
{suites: 'ArrowTestSuite,ConnectionTestSuite,CoreTestSuite,DiagnosticTestSuite', name: 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic'},
119+
{suites: 'FipsTestSuite', name: "TestCategoryFips"}]
49120
additionalMavenProfile: ['', '-Dthin-jar']
50121
steps:
51-
- uses: actions/checkout@v1
122+
- uses: actions/checkout@v4
52123
- name: Tests
53124
shell: bash
54125
env:
55126
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
56127
CLOUD_PROVIDER: ${{ matrix.cloud }}
57128
TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
58-
JDBC_TEST_CATEGORY: ${{ matrix.category }}
129+
JDBC_TEST_SUITES: ${{ matrix.category.suites }}
59130
ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
60131
run: ./ci/test.sh
61132

62133
test-linux-old-driver:
63-
name: Old JDBC ${{ matrix.category }} on ${{ matrix.image }}
134+
name: Old JDBC ${{ matrix.category.name }} on ${{ matrix.image }}
64135
runs-on: ubuntu-latest
65136
strategy:
66137
fail-fast: false
67138
matrix:
68139
image: [ 'jdbc-centos7-openjdk8' ]
69140
cloud: [ 'AWS' ]
70-
category: ['TestCategoryResultSet,TestCategoryOthers', 'TestCategoryConnection,TestCategoryStatement', 'TestCategoryCore,TestCategoryLoader']
141+
category: [{suites: 'OthersOldDriverTestSuite', name: 'TestCategoryOthers'},
142+
{suites: 'ConnectionOldDriverTestSuite,StatementOldDriverTestSuite', name: 'TestCategoryConnection,TestCategoryStatement'},
143+
{suites: 'LoaderOldDriverTestSuite,ResultSetOldDriverTestSuite', name: 'TestCategoryLoader,TestCategoryResultSet'}]
71144
is_old_driver: ['true']
72145
steps:
73-
- uses: actions/checkout@v1
146+
- uses: actions/checkout@v4
74147
- name: Tests
75148
shell: bash
76149
env:
77150
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
78151
CLOUD_PROVIDER: ${{ matrix.cloud }}
79152
TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
80-
JDBC_TEST_CATEGORY: ${{ matrix.category }}
153+
JDBC_TEST_SUITES: ${{ matrix.category.suites }}
81154
is_old_driver: ${{ matrix.is_old_driver }}
82155
run: ./ci/test.sh

‎.github/workflows/check-style.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77
jobs:
88
check-style:
99
name: Check Style
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v1
12+
- uses: actions/checkout@v4
1313
- name: Check Style
1414
shell: bash
1515
run: mvn clean validate --batch-mode --show-version -P check-style

‎.github/workflows/jira_close.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v4
1313
with:
1414
repository: snowflakedb/gh-actions
1515
ref: jira_v1

‎.github/workflows/jira_issue.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: ((github.event_name == 'issue_comment' && github.event.comment.body == 'recreate jira' && github.event.comment.user.login == 'sfc-gh-mkeller') || (github.event_name == 'issues' && github.event.pull_request.user.login != 'whitesource-for-github-com[bot]'))
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
repository: snowflakedb/gh-actions
2020
ref: jira_v1
@@ -37,7 +37,7 @@ jobs:
3737
summary: '${{ github.event.issue.title }}'
3838
description: |
3939
${{ github.event.issue.body }} \\ \\ _Created from GitHub Action_ for ${{ github.event.issue.html_url }}
40-
fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:3c0352b5-63f7-4e26-9afe-38f6f9f0f4c5"}, "components":[{"id":"19281"}] }'
40+
fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:e1f41916-da57-4fe8-b317-116d5229aa51"}, "components":[{"id":"19281"}], "labels": ["oss"], "priority": {"id": "10001"} }'
4141

4242
- name: Update GitHub Issue
4343
uses: ./jira/gajira-issue-update

‎.github/workflows/parameters_aws_auth_tests.json.gpg‎

906 Bytes
Binary file not shown.

‎.github/workflows/parameters_azure.json.gpg‎

408 Bytes
Binary file not shown.

‎.github/workflows/snyk-issue.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Snyk Issue
33
on:
44
schedule:
55
- cron: '* */12 * * *'
6+
workflow_dispatch:
67

78
permissions:
89
contents: read
@@ -16,7 +17,7 @@ jobs:
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: checkout action
19-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2021
with:
2122
repository: snowflakedb/whitesource-actions
2223
token: ${{ secrets.WHITESOURCE_ACTION_TOKEN }}

0 commit comments

Comments
 (0)