Merge branch 'master' into SNOW-1640968_dispose_disposable_objects

snowflakedb · Sep 3, 2024 · 8527933 · 8527933
2 parents 4e35ac9 + 8a22adb
commit 8527933
Show file tree

Hide file tree

Showing 20 changed files with 129 additions and 110 deletions.
diff --git a/.github/workflows/jira_close.yml b/.github/workflows/jira_close.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: snowflakedb/gh-actions
           ref: jira_v1

diff --git a/.github/workflows/jira_issue.yml b/.github/workflows/jira_issue.yml
@@ -14,7 +14,7 @@ jobs:
     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]'))
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: snowflakedb/gh-actions
           ref: jira_v1

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -25,9 +25,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
           dotnet-quality: 'ga'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
         cloud_env: ['AZURE', 'GCP', 'AWS']
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Dotnet
         uses: actions/setup-dotnet@v4
         with:
@@ -44,7 +44,7 @@ jobs:
             8.0.x
           dotnet-quality: 'ga'
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Setup dotnet-coverage
@@ -69,17 +69,18 @@ jobs:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
       - name: Upload Code Coverage Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: code-coverage-report
+          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@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: tests-performance
+          name: tests-performance_windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests\windows_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           # without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
           token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
@@ -95,7 +96,7 @@ jobs:
         dotnet: ['net6.0', 'net7.0', 'net8.0']
         cloud_env: ['AZURE', 'GCP', 'AWS']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Dotnet
         uses: actions/setup-dotnet@v4
         with:
@@ -104,7 +105,7 @@ jobs:
             8.0.x
           dotnet-quality: 'ga'
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Setup dotnet-coverage
@@ -128,17 +129,17 @@ jobs:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
       - name: Upload Code Coverage Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: code-coverage-report
+          name: code-coverage-report_linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
       - name: Upload Test Performance Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: tests-performance
+          name: tests-performance_linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests/linux_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           # without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
           token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}
@@ -163,7 +164,7 @@ jobs:
             8.0.x
           dotnet-quality: 'ga'
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Setup dotnet-coverage
@@ -187,17 +188,17 @@ jobs:
           snowflake_cloud_env: ${{ matrix.cloud_env }}
           net_version: ${{ matrix.dotnet }}
       - name: Upload Code Coverage Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: code-coverage-report
+          name: code-coverage-report_macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_coverage.xml
       - name: Upload Test Performance Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: tests-performance
+          name: tests-performance_macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}
           path: Snowflake.Data.Tests/macos_${{ matrix.dotnet }}_${{ matrix.cloud_env }}_performance.csv
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           # without the token code cov may fail because of Github limits https://github.com/codecov/codecov-action/issues/557
           token: ${{ secrets.CODE_COV_UPLOAD_TOKEN }}

diff --git a/.github/workflows/snyk-issue.yml b/.github/workflows/snyk-issue.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout action
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: snowflakedb/whitesource-actions
         token: ${{ secrets.WHITESOURCE_ACTION_TOKEN }}

diff --git a/.github/workflows/snyk-pr.yml b/.github/workflows/snyk-pr.yml
@@ -16,13 +16,13 @@ jobs:
     if: ${{ github.event.pull_request.user.login == 'sfc-gh-snyk-sca-sa' }}
     steps:
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.ref }}
         fetch-depth: 0
 
     - name: checkout action
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: snowflakedb/whitesource-actions
         token: ${{ secrets.WHITESOURCE_ACTION_TOKEN }}

diff --git a/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs b/Snowflake.Data.Tests/IntegrationTests/ConnectionSinglePoolCacheAsyncIT.cs
@@ -205,7 +205,9 @@ static async Task InvalidConnectionTaskAsync(string connectionString, int times)
                 {
                     // intentionally not using await so the connection
                     // will be disposed with invalid underlying session
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
                     conn.OpenAsync();
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
                 };
                 // wait 100ms each time so the invalid sessions are generated
                 // roughly at the same speed as connections for query tasks

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbAdaptorIT.cs
@@ -16,7 +16,7 @@ class SFDbAdaptorIT : SFBaseTest
         private SnowflakeDbCommand _command;
 
         [SetUp]
-        public void BeforeTest()
+        public new void BeforeTest()
         {
             _adapter = new SnowflakeDbDataAdapter();
             _command = new SnowflakeDbCommand();

diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbFactoryIT.cs
@@ -16,7 +16,7 @@ class SFDbFactoryIT : SFBaseTest
         DbConnection _connection;
 
         [SetUp]
-        public void BeforeTest()
+        public new void BeforeTest()
         {
 #if NETFRAMEWORK
             _factory = DbProviderFactories.GetFactory("Snowflake.Data");
@@ -35,7 +35,7 @@ public void BeforeTest()
         }
 
         [TearDown]
-        public void AfterTest()
+        public new void AfterTest()
         {
             _connection.Close();
         }

diff --git a/Snowflake.Data.Tests/Mock/MockRetryUntilRestTimeout.cs b/Snowflake.Data.Tests/Mock/MockRetryUntilRestTimeout.cs
@@ -36,7 +36,11 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 _forceTimeoutForNonLoginRequestsOnly && !message.RequestUri.AbsolutePath.Equals(RestPath.SF_LOGIN_PATH))
             {
                 // Override the http timeout and set to 1ms to force all http request to timeout and retry
+                // Disable warning as this is the way to be compliant with netstandard2.0
+                // API reference: https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httprequestmessage?view=netstandard-2.0
+#pragma warning disable CS0618 // Type or member is obsolete
                 message.Properties[BaseRestRequest.HTTP_REQUEST_TIMEOUT_KEY] = TimeSpan.FromTicks(0);
+#pragma warning restore CS0618 // Type or member is obsolete
             }
 
             return await (base.SendAsync(message, restTimeout, externalCancellationToken).ConfigureAwait(false));