From 3d7ab76016a698e651b729bfaa065a6faaa89362 Mon Sep 17 00:00:00 2001 From: Steven Meyer <108885656+meyertst-aws@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:33:32 -0500 Subject: [PATCH 1/3] moving bash linter to sh-check (#25) --- .github/workflows/sh-check.yml | 19 +++++++++++++++++++ .github/workflows/super-linter.yml | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/sh-check.yml diff --git a/.github/workflows/sh-check.yml b/.github/workflows/sh-check.yml new file mode 100644 index 00000000000..dbb211abfb9 --- /dev/null +++ b/.github/workflows/sh-check.yml @@ -0,0 +1,19 @@ +name: Lint Bash +on: + pull_request: + branches: [main] + paths: + - "aws-cli/**" + workflow_dispatch: +jobs: + sh-checker: + name: Lint Bash + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Lint Bash + uses: luizm/action-sh-checker@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + sh_checker_comment: true \ No newline at end of file diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml index be11de5b3b2..8fe3fd3ce9d 100644 --- a/.github/workflows/super-linter.yml +++ b/.github/workflows/super-linter.yml @@ -37,7 +37,6 @@ jobs: VALIDATE_PYTHON_BLACK: true VALIDATE_RUBY: true VALIDATE_KOTLIN: true - VALIDATE_BASH: true yamllint: name: Lint Yaml # The type of runner that the job will run on From 768a684c938695647dd4c6a53f970fbcb586f43f Mon Sep 17 00:00:00 2001 From: Steven Meyer <108885656+meyertst-aws@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:24:57 -0500 Subject: [PATCH 2/3] filter out duplicate instance classes --- cpp/example_code/aurora/README.md | 6 +++--- .../aurora/getting_started_with_db_clusters.cpp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cpp/example_code/aurora/README.md b/cpp/example_code/aurora/README.md index 07d55b24707..a63d6b76fce 100644 --- a/cpp/example_code/aurora/README.md +++ b/cpp/example_code/aurora/README.md @@ -50,9 +50,9 @@ Code excerpts that show you how to call individual service functions. - [Create a DB cluster parameter group](getting_started_with_db_clusters.cpp#L333) (`CreateDBClusterParameterGroup`) - [Create a DB cluster snapshot](getting_started_with_db_clusters.cpp#L661) (`CreateDBClusterSnapshot`) - [Create a DB instance in a DB cluster](getting_started_with_db_clusters.cpp#L588) (`CreateDBInstance`) -- [Delete a DB cluster](getting_started_with_db_clusters.cpp#L1031) (`DeleteDBCluster`) -- [Delete a DB cluster parameter group](getting_started_with_db_clusters.cpp#L1101) (`DeleteDBClusterParameterGroup`) -- [Delete a DB instance](getting_started_with_db_clusters.cpp#L1001) (`DeleteDBInstance`) +- [Delete a DB cluster](getting_started_with_db_clusters.cpp#L1033) (`DeleteDBCluster`) +- [Delete a DB cluster parameter group](getting_started_with_db_clusters.cpp#L1103) (`DeleteDBClusterParameterGroup`) +- [Delete a DB instance](getting_started_with_db_clusters.cpp#L1003) (`DeleteDBInstance`) - [Describe DB cluster parameter groups](getting_started_with_db_clusters.cpp#L295) (`DescribeDBClusterParameterGroups`) - [Describe DB cluster snapshots](getting_started_with_db_clusters.cpp#L701) (`DescribeDBClusterSnapshots`) - [Describe DB clusters](getting_started_with_db_clusters.cpp#L746) (`DescribeDBClusters`) diff --git a/cpp/example_code/aurora/getting_started_with_db_clusters.cpp b/cpp/example_code/aurora/getting_started_with_db_clusters.cpp index 2bd6aefa4f4..26e87b56d2e 100644 --- a/cpp/example_code/aurora/getting_started_with_db_clusters.cpp +++ b/cpp/example_code/aurora/getting_started_with_db_clusters.cpp @@ -954,7 +954,9 @@ bool AwsDoc::Aurora::chooseDBInstanceClass(const Aws::String &engine, outcome.GetResult().GetOrderableDBInstanceOptions(); for (const Aws::RDS::Model::OrderableDBInstanceOption &option: options) { const Aws::String &instanceClass = option.GetDBInstanceClass(); - instanceClasses.push_back(instanceClass); + if (std::find(instanceClasses.begin(), instanceClasses.end(), instanceClass) == instanceClasses.end()) { + instanceClasses.push_back(instanceClass); + } } marker = outcome.GetResult().GetMarker(); } From 5b8ea91fe5bed33488163f484de37219315d01ec Mon Sep 17 00:00:00 2001 From: Steven Meyer <108885656+meyertst-aws@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:38:34 -0500 Subject: [PATCH 3/3] Update sh-check.yml --- .github/workflows/sh-check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sh-check.yml b/.github/workflows/sh-check.yml index b26942d83f0..3af0d3ce229 100644 --- a/.github/workflows/sh-check.yml +++ b/.github/workflows/sh-check.yml @@ -17,7 +17,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - sh_checker_comment: true sh_checker_only_diff: true sh_checker_shfmt_disable: true