From 657f5e6b68f4b73d574160ff5b5ed6f179a91f7f Mon Sep 17 00:00:00 2001 From: RoyZhang2022 <104782736+RoyZhang2022@users.noreply.github.com> Date: Tue, 4 Jul 2023 19:17:16 -0700 Subject: [PATCH] fix cppcheck failure (#1) * fix cppcheck failure * fix build script not running and credentials could not be fetched * restore configure-aws-credentials to v2 * add execute permission for shell scripts * remove bash for mac build scripts * trigger all tests --- .../build_linux_debug32_deb.sh | 2 ++ .../build_linux_debug32_rpm.sh | 2 ++ .../build_linux_debug64_deb.sh | 2 ++ .../build_linux_debug64_rpm.sh | 2 ++ .../build_linux_release32_deb.sh | 2 ++ .../build_linux_release32_rpm.sh | 2 ++ .../build_linux_release64_deb.sh | 2 ++ .../build_linux_release64_rpm.sh | 2 ++ amazon-timestream-odbc-driver/build_mac_debug64.sh | 1 - amazon-timestream-odbc-driver/build_mac_release64.sh | 0 .../build_performance_linux64.sh | 0 .../build_performance_mac64.sh | 0 amazon-timestream-odbc-driver/run_cppcheck.ps1 | 2 +- amazon-timestream-odbc-driver/run_cppcheck.sh | 2 +- amazon-timestream-odbc-driver/run_test_runner.sh | 0 amazon-timestream-odbc-driver/scripts/build_linux.sh | 0 .../scripts/env_variables_check.sh | 0 .../scripts/postinst_unix.sh | 0 .../scripts/register_driver_unix.sh | 0 .../scripts/unix_check_changes.sh | 0 amazon-timestream-odbc-driver/timestream.cfg | 11 +++++++++++ 21 files changed, 29 insertions(+), 3 deletions(-) mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_debug32_deb.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_debug32_rpm.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_debug64_deb.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_debug64_rpm.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_release32_deb.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_release32_rpm.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_release64_deb.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_linux_release64_rpm.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_mac_debug64.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_mac_release64.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_performance_linux64.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/build_performance_mac64.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/run_cppcheck.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/run_test_runner.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/scripts/build_linux.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/scripts/env_variables_check.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/scripts/postinst_unix.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/scripts/register_driver_unix.sh mode change 100644 => 100755 amazon-timestream-odbc-driver/scripts/unix_check_changes.sh create mode 100644 amazon-timestream-odbc-driver/timestream.cfg diff --git a/amazon-timestream-odbc-driver/build_linux_debug32_deb.sh b/amazon-timestream-odbc-driver/build_linux_debug32_deb.sh old mode 100644 new mode 100755 index 87f51fee7f91a..ff6a9a455617e --- a/amazon-timestream-odbc-driver/build_linux_debug32_deb.sh +++ b/amazon-timestream-odbc-driver/build_linux_debug32_deb.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_linux_debug32_rpm.sh b/amazon-timestream-odbc-driver/build_linux_debug32_rpm.sh old mode 100644 new mode 100755 index ac45eafc052d2..2bd3e3beb9c38 --- a/amazon-timestream-odbc-driver/build_linux_debug32_rpm.sh +++ b/amazon-timestream-odbc-driver/build_linux_debug32_rpm.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_linux_debug64_deb.sh b/amazon-timestream-odbc-driver/build_linux_debug64_deb.sh old mode 100644 new mode 100755 index 9711a2e16560e..e37bf2cc46bee --- a/amazon-timestream-odbc-driver/build_linux_debug64_deb.sh +++ b/amazon-timestream-odbc-driver/build_linux_debug64_deb.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_linux_debug64_rpm.sh b/amazon-timestream-odbc-driver/build_linux_debug64_rpm.sh old mode 100644 new mode 100755 index 962779041a57a..6ff4b3535a2a3 --- a/amazon-timestream-odbc-driver/build_linux_debug64_rpm.sh +++ b/amazon-timestream-odbc-driver/build_linux_debug64_rpm.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_linux_release32_deb.sh b/amazon-timestream-odbc-driver/build_linux_release32_deb.sh old mode 100644 new mode 100755 index 5ff81a51063fa..86df21a242172 --- a/amazon-timestream-odbc-driver/build_linux_release32_deb.sh +++ b/amazon-timestream-odbc-driver/build_linux_release32_deb.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_linux_release32_rpm.sh b/amazon-timestream-odbc-driver/build_linux_release32_rpm.sh old mode 100644 new mode 100755 index e0b325b8b6faf..1966ef4d3118c --- a/amazon-timestream-odbc-driver/build_linux_release32_rpm.sh +++ b/amazon-timestream-odbc-driver/build_linux_release32_rpm.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_linux_release64_deb.sh b/amazon-timestream-odbc-driver/build_linux_release64_deb.sh old mode 100644 new mode 100755 index 7150464f297fe..85b13b0352bc7 --- a/amazon-timestream-odbc-driver/build_linux_release64_deb.sh +++ b/amazon-timestream-odbc-driver/build_linux_release64_deb.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_linux_release64_rpm.sh b/amazon-timestream-odbc-driver/build_linux_release64_rpm.sh old mode 100644 new mode 100755 index df624db346ed7..e15ad88a4c242 --- a/amazon-timestream-odbc-driver/build_linux_release64_rpm.sh +++ b/amazon-timestream-odbc-driver/build_linux_release64_rpm.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Copyright <2022> Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/amazon-timestream-odbc-driver/build_mac_debug64.sh b/amazon-timestream-odbc-driver/build_mac_debug64.sh old mode 100644 new mode 100755 index c8ab731303c72..fda0c71a90317 --- a/amazon-timestream-odbc-driver/build_mac_debug64.sh +++ b/amazon-timestream-odbc-driver/build_mac_debug64.sh @@ -53,4 +53,3 @@ if [ $RET_CODE -ne 0 ]; then fi cd .. - diff --git a/amazon-timestream-odbc-driver/build_mac_release64.sh b/amazon-timestream-odbc-driver/build_mac_release64.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/build_performance_linux64.sh b/amazon-timestream-odbc-driver/build_performance_linux64.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/build_performance_mac64.sh b/amazon-timestream-odbc-driver/build_performance_mac64.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/run_cppcheck.ps1 b/amazon-timestream-odbc-driver/run_cppcheck.ps1 index d43f6a9bbb856..c2246b54ac158 100644 --- a/amazon-timestream-odbc-driver/run_cppcheck.ps1 +++ b/amazon-timestream-odbc-driver/run_cppcheck.ps1 @@ -16,7 +16,7 @@ # --force: force checks all define combinations (default max is 12) # --suppress=objectIndex: seemingly false-positive -cppcheck --force --library=boost --library=documentdb .\src\ 2> .\cppcheck-results.log +cppcheck --force --library=boost --library=timestream .\src\ 2> .\cppcheck-results.log If ((Get-Content "cppcheck-results.log") -eq $Null) { exit 0 } diff --git a/amazon-timestream-odbc-driver/run_cppcheck.sh b/amazon-timestream-odbc-driver/run_cppcheck.sh old mode 100644 new mode 100755 index cfff69491fe25..30f4b9b7f37c5 --- a/amazon-timestream-odbc-driver/run_cppcheck.sh +++ b/amazon-timestream-odbc-driver/run_cppcheck.sh @@ -17,7 +17,7 @@ RESULTS_FILE=cppcheck-results.log # --force: force checks all define combinations (default max is 12) # -iaws-sdk-cpp: avoid checking AWS C++ SDK source files in our repo -cppcheck --force --library=boost --library=documentdb -UWIN32 ./src/ 2> ${RESULTS_FILE} +cppcheck --force --library=boost --library=timestream -UWIN32 ./src/ 2> ${RESULTS_FILE} if [ -s ${RESULTS_FILE} ]; then echo "!! Cppcheck errors found! Check ${RESULTS_FILE} for details." diff --git a/amazon-timestream-odbc-driver/run_test_runner.sh b/amazon-timestream-odbc-driver/run_test_runner.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/scripts/build_linux.sh b/amazon-timestream-odbc-driver/scripts/build_linux.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/scripts/env_variables_check.sh b/amazon-timestream-odbc-driver/scripts/env_variables_check.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/scripts/postinst_unix.sh b/amazon-timestream-odbc-driver/scripts/postinst_unix.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/scripts/register_driver_unix.sh b/amazon-timestream-odbc-driver/scripts/register_driver_unix.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/scripts/unix_check_changes.sh b/amazon-timestream-odbc-driver/scripts/unix_check_changes.sh old mode 100644 new mode 100755 diff --git a/amazon-timestream-odbc-driver/timestream.cfg b/amazon-timestream-odbc-driver/timestream.cfg new file mode 100644 index 0000000000000..b50475566d5d9 --- /dev/null +++ b/amazon-timestream-odbc-driver/timestream.cfg @@ -0,0 +1,11 @@ + + + + + + + + + + +