Merge branch 'master' of https://github.com/snowflakedb/snowflake-connector-net into SNOW-2038030-Fix-Session-Close

# Conflicts:
#	Snowflake.Data.Tests/UnitTests/SFStatementTest.cs

Author: sfc-gh-ext-simba-lf

.github/workflows/jira_issue.yml

@@ -37,7 +37,7 @@ jobs:
           summary: '${{ github.event.issue.title }}'
           description: |
             ${{ github.event.issue.body }} \\ \\ _Created from GitHub Action_ for ${{ github.event.issue.html_url }}
-          fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:e1f41916-da57-4fe8-b317-116d5229aa51"}, "components":[{"id":"19287"}], "labels": ["oss"], "priority": {"id": "10001"} }'
+          fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:e527ae71-55cc-4e02-9217-1ca4ca8028a2"}, "components":[{"id":"19287"}], "labels": ["oss"], "priority": {"id": "10001"} }'
 
       - name: Update GitHub Issue
         uses: ./jira/gajira-issue-update

.github/workflows/main.yml

@@ -3,9 +3,9 @@ name: DotNet Build and Test
 # Triggers the workflow on push or pull request events but only for the master branch
 on:
   push:
-    branches: [ master ]
+    branches: [ master, oauth_flows ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, oauth_flows ]
   workflow_dispatch:
     inputs:
       logLevel:
@@ -36,6 +36,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+            distribution: 'temurin'
+            java-version: 17
+            java-package: 'jre'
       - name: Setup Dotnet
         uses: actions/setup-dotnet@v4
         with:
@@ -66,7 +72,7 @@ jobs:
       - name: Run Tests
         run: |
           cd Snowflake.Data.Tests
-          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
+          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build --logger junit;LogFilePath=windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_results.junit.xml --verbosity normal" --output windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
         env:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
@@ -75,12 +81,16 @@ jobs:
         with:
           name: code-coverage-report_windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
-
       - name: Upload Test Performance Report
         uses: actions/upload-artifact@v4
         with:
           name: tests-performance_windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
+      - name: Upload test results to Codecov
+        if: ${{!cancelled()}}
+        uses: codecov/test-results-action@v1
+        with:
+            token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         with:
@@ -99,6 +109,12 @@ jobs:
         cloud_env: ['AZURE', 'GCP', 'AWS']
     steps:
       - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+            distribution: 'temurin'
+            java-version: 17
+            java-package: 'jre'
       - name: Setup Dotnet
         uses: actions/setup-dotnet@v4
         with:
@@ -128,7 +144,7 @@ jobs:
       - name: Run Tests
         run: |
           cd Snowflake.Data.Tests
-          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
+          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build --logger junit;LogFilePath=linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_results.junit.xml --verbosity normal" --output linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
         env:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
@@ -142,6 +158,11 @@ jobs:
         with:
           name: tests-performance_linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
+      - name: Upload test results to Codecov
+        if: ${{!cancelled()}}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         with:
@@ -160,6 +181,12 @@ jobs:
         cloud_env: ['AZURE', 'GCP', 'AWS']
     steps:
       - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+            distribution: 'temurin'
+            java-version: 17
+            java-package: 'jre'
       - name: Setup Dotnet
         uses: actions/setup-dotnet@v4
         with:
@@ -189,7 +216,7 @@ jobs:
       - name: Run Tests
         run: |
           cd Snowflake.Data.Tests
-          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build -l console;verbosity=normal" --output macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
+          dotnet-coverage collect "dotnet test --framework ${{ matrix.dotnet }} --no-build --logger junit;LogFilePath=windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_results.junit.xml --verbosity normal" --output macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml --output-format cobertura --settings coverage.config
         env:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
@@ -203,6 +230,11 @@ jobs:
         with:
           name: tests-performance_macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
+      - name: Upload test results to Codecov
+        if: ${{!cancelled()}}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         with:

.github/workflows/parameters/parameters_aws_auth_tests.json.gpg

@@ -316,4 +316,5 @@ Snowflake.Data.Tests/unix_*_performance.csv
 /parameters.json
 parameters*.json
 Snowflake.Data.Tests/toml_config_folder
-*.toml
+*.toml
+*.p8

.github/workflows/parameters/rsa_keys/rsa_key.p8.gpg

@@ -1,6 +1,5 @@
 import groovy.json.JsonOutput
 
-
 timestamps {
   node('regular-memory-node') {
     stage('checkout') {
@@ -13,8 +12,8 @@ timestamps {
     stage('Build') {
       withCredentials([
         usernamePassword(credentialsId: '063fc85b-62a6-4181-9d72-873b43488411', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'),
-        string(credentialsId: 'a791118f-a1ea-46cd-b876-56da1b9bc71c',variable: 'NEXUS_PASSWORD')
-        ]) {
+        string(credentialsId: 'a791118f-a1ea-46cd-b876-56da1b9bc71c', variable: 'NEXUS_PASSWORD')
+      ]) {
         sh '''\
         |#!/bin/bash -e
         |export GIT_BRANCH=${GIT_BRANCH}
@@ -23,32 +22,47 @@ timestamps {
         '''.stripMargin()
       }
     }
-    params = [
-      string(name: 'svn_revision', value: 'bptp-built'),
+
+    def params = [
+      string(name: 'svn_revision', value: 'bptp-stable'),
       string(name: 'branch', value: 'main'),
       string(name: 'client_git_commit', value: scmInfo.GIT_COMMIT),
       string(name: 'client_git_branch', value: scmInfo.GIT_BRANCH),
       string(name: 'TARGET_DOCKER_TEST_IMAGE', value: 'dotnet-ubuntu204-net9'),
       string(name: 'parent_job', value: env.JOB_NAME),
       string(name: 'parent_build_number', value: env.BUILD_NUMBER)
     ]
+
     stage('Test') {
-      build job: 'RT-LanguageDotnet-PC',parameters: params
+      parallel(
+        'Test': {
+          stage('Test') {
+            build job: 'RT-LanguageDotnet-PC', parameters: params
+          }
+        },
+        'Test Authentication': {
+          stage('Test Authentication') {
+            withCredentials([
+              string(credentialsId: 'a791118f-a1ea-46cd-b876-56da1b9bc71c', variable: 'NEXUS_PASSWORD'),
+              string(credentialsId: 'sfctest0-parameters-secret', variable: 'PARAMETERS_SECRET')
+            ]) {
+              sh '''\
+              |#!/bin/bash -e
+              |$WORKSPACE/ci/test_authentication.sh
+              '''.stripMargin()
+            }
+          }
+        }
+      )
     }
   }
 }
 
-
 pipeline {
   agent { label 'regular-memory-node' }
   options { timestamps() }
   environment {
-    COMMIT_SHA_LONG = sh(returnStdout: true, script: "echo \$(git rev-parse " + "HEAD)").trim()
-
-    // environment variables for semgrep_agent (for findings / analytics page)
-    // remove .git at the end
-    // remove SCM URL + .git at the end
-
+    COMMIT_SHA_LONG = sh(returnStdout: true, script: "echo \$(git rev-parse HEAD)").trim()
     BASELINE_BRANCH = "${env.CHANGE_TARGET}"
   }
   stages {
@@ -61,7 +75,7 @@ pipeline {
 }
 
 def wgetUpdateGithub(String state, String folder, String targetUrl, String seconds) {
-    def ghURL = "https://api.github.com/repos/snowflakedb/snowflake-connector-net/statuses/$COMMIT_SHA_LONG"
-    def data = JsonOutput.toJson([state: "${state}", context: "jenkins/${folder}",target_url: "${targetUrl}"])
-    sh "wget ${ghURL} --spider -q --header='Authorization: token $GIT_PASSWORD' --post-data='${data}'"
-}
+  def ghURL = "https://api.github.com/repos/snowflakedb/snowflake-connector-net/statuses/$COMMIT_SHA_LONG"
+  def data = JsonOutput.toJson([state: "${state}", context: "jenkins/${folder}", target_url: "${targetUrl}"])
+  sh "wget ${ghURL} --spider -q --header='Authorization: token $GIT_PASSWORD' --post-data='${data}'"
+}

.github/workflows/parameters/rsa_keys/rsa_key_invalid.p8.gpg

@@ -143,6 +143,12 @@ Logging description and configuration:
 Method of validating the connection's certificates in the .NET driver differs from the rest of the Snowflake drivers.
 Read more in [certificate validation](doc/CertficateValidation.md) docs.
 
+## Cache
+
+Storing tokens in cache for SSO/MFA authentication.
+
+Read more in [cache](doc/Cache.md) docs.
+
 ---------------
 
 ## Notice
@@ -185,5 +191,4 @@ Note that the driver is now targeting .NET Standard 2.0. When upgrading, you mig
 
 See more:
 * [Security Policy](SECURITY.md)
-* [Security Advisories](/security/advisories)
-
+* [Security Advisories](../../security/advisories)

.gitignore

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!--
-Copyright (c) 2012-2017 Snowflake Computing Inc. All rights reserved.
--->
 <configuration>
   <configSections>
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />