From c462e27e1a4cc7d2c72e0ec85101821daafbe024 Mon Sep 17 00:00:00 2001
From: RoyZhang2022 <104782736+RoyZhang2022@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:35:23 -0700
Subject: [PATCH] Fix floating intergration test issue, document update and
 github automation improvement (#4)

* fix occasional test failure

* document update

* add check for credentials leak
---
 .../.github/workflows/win-build.yml           | 26 +++++++++++++++++++
 .../setup/linux-installation-guide.md         | 10 +++++++
 .../src/api_robustness_test.cpp               |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/amazon-timestream-odbc-driver/.github/workflows/win-build.yml b/amazon-timestream-odbc-driver/.github/workflows/win-build.yml
index 0c5deb3732d04..4e11e208ac988 100644
--- a/amazon-timestream-odbc-driver/.github/workflows/win-build.yml
+++ b/amazon-timestream-odbc-driver/.github/workflows/win-build.yml
@@ -40,8 +40,32 @@ env:
   # OKTA_IDP_ARN: ${{secrets.OKTA_IDP_ARN}}  
 
 jobs:
+  trufflehog-git-secrets-scan:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: TruffleHog OSS
+        uses: trufflesecurity/trufflehog@main
+        with:
+          path: ./
+          base: ${{ github.event.repository.default_branch }}
+          head: HEAD
+          extra_args: --debug --only-verified
+      - name: git secrets
+        run: |
+          git clone https://github.com/awslabs/git-secrets.git
+          cd git-secrets
+          sudo make install
+          cd ..
+          git secrets --register-aws
+          git secrets --scan-history
+
   build-windows32:
     runs-on: windows-2022
+    needs: trufflehog-git-secrets-scan
     steps:
     - uses: actions/checkout@v2
 
@@ -182,6 +206,7 @@ jobs:
 
   build-windows64:
     runs-on: windows-2022
+    needs: trufflehog-git-secrets-scan
     steps:
     - uses: actions/checkout@v2
 
@@ -322,6 +347,7 @@ jobs:
 
   build-windows64_coverage:
     runs-on: windows-2022
+    needs: trufflehog-git-secrets-scan
     steps:
     - uses: actions/checkout@v2
 
diff --git a/amazon-timestream-odbc-driver/docs/markdown/setup/linux-installation-guide.md b/amazon-timestream-odbc-driver/docs/markdown/setup/linux-installation-guide.md
index 23a22c8742b45..e7041e3a07230 100644
--- a/amazon-timestream-odbc-driver/docs/markdown/setup/linux-installation-guide.md
+++ b/amazon-timestream-odbc-driver/docs/markdown/setup/linux-installation-guide.md
@@ -78,11 +78,21 @@ There is no automatical way to uninstall it. It has to be done manually.
     ```
     sudo zypper remove amazontimestreamodbc_2.0.0_release_x86_64
     ```
+    or
+
+    ```
+    sudo yum remove amazontimestreamodbc_2.0.0_release_x86_64
+    ```
 
     #### Command for RPM based 32 bit
     ```
     sudo zypper remove amazontimestreamodbc_2.0.0_release_i386
     ```
+    or
+
+    ```
+    sudo yum remove amazontimestreamodbc_2.0.0_release_i386
+    ```
 
     #### Command for Debian 64 bit
     ```
diff --git a/amazon-timestream-odbc-driver/src/tests/integration-test/src/api_robustness_test.cpp b/amazon-timestream-odbc-driver/src/tests/integration-test/src/api_robustness_test.cpp
index 86ba4bf0e9b42..6be32cc49a1e1 100644
--- a/amazon-timestream-odbc-driver/src/tests/integration-test/src/api_robustness_test.cpp
+++ b/amazon-timestream-odbc-driver/src/tests/integration-test/src/api_robustness_test.cpp
@@ -73,7 +73,7 @@ struct ApiRobustnessTestSuiteFixture : public timestream::odbc::OdbcTestSuite {
       BOOST_FAIL(GetOdbcErrorMessage(SQL_HANDLE_STMT, stmt));
 
     std::vector< SQLWCHAR > request = MakeSqlBuffer(
-        "select * from data_queries_test_db.TestComplexTypes order by time");
+        "select * from data_queries_test_db.TestComplexTypes order by time, measure_value::double");
 
     ret = SQLExecDirect(stmt, request.data(), SQL_NTS);
     if (!SQL_SUCCEEDED(ret))