From 67f70d5c771016481f4222320a655fdb1d5134af Mon Sep 17 00:00:00 2001 From: Dennis Traub <604796+DennisTraub@users.noreply.github.com> Date: Thu, 20 Jun 2024 20:07:27 +0200 Subject: [PATCH 1/3] Bugfix: Typo in import leads to error (#6567) --- .../bedrock-runtime/models/ai21_labs_jurassic2/invoke_model.py | 2 +- .../bedrock-runtime/models/amazon_titan_text/invoke_model.py | 2 +- .../bedrock-runtime/models/anthropic_claude/invoke_model.py | 2 +- .../models/cohere_command/command_invoke_model.py | 2 +- .../cohere_command/command_invoke_model_with_response_stream.py | 2 +- .../models/cohere_command/command_r_invoke_model.py | 2 +- .../command_r_invoke_model_with_response_stream.py | 2 +- .../bedrock-runtime/models/meta_llama/llama2_invoke_model.py | 2 +- .../meta_llama/llama2_invoke_model_with_response_stream.py | 2 +- .../bedrock-runtime/models/meta_llama/llama3_invoke_model.py | 2 +- .../meta_llama/llama3_invoke_model_with_response_stream.py | 2 +- .../bedrock-runtime/models/mistral_ai/invoke_model.py | 2 +- .../models/mistral_ai/invoke_model_with_response_stream.py | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/python/example_code/bedrock-runtime/models/ai21_labs_jurassic2/invoke_model.py b/python/example_code/bedrock-runtime/models/ai21_labs_jurassic2/invoke_model.py index 77e3e5ca9ed..bf54beaef4a 100644 --- a/python/example_code/bedrock-runtime/models/ai21_labs_jurassic2/invoke_model.py +++ b/python/example_code/bedrock-runtime/models/ai21_labs_jurassic2/invoke_model.py @@ -7,7 +7,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/amazon_titan_text/invoke_model.py b/python/example_code/bedrock-runtime/models/amazon_titan_text/invoke_model.py index 7ff52c02917..88c5b009524 100644 --- a/python/example_code/bedrock-runtime/models/amazon_titan_text/invoke_model.py +++ b/python/example_code/bedrock-runtime/models/amazon_titan_text/invoke_model.py @@ -7,7 +7,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/anthropic_claude/invoke_model.py b/python/example_code/bedrock-runtime/models/anthropic_claude/invoke_model.py index 40fe10f0b35..4b54a46d459 100644 --- a/python/example_code/bedrock-runtime/models/anthropic_claude/invoke_model.py +++ b/python/example_code/bedrock-runtime/models/anthropic_claude/invoke_model.py @@ -7,7 +7,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model.py b/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model.py index cdf3f7f95e2..4b3c6b51a6d 100644 --- a/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model.py +++ b/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model.py @@ -7,7 +7,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model_with_response_stream.py b/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model_with_response_stream.py index e71727037d8..de28ffed1bb 100644 --- a/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model_with_response_stream.py +++ b/python/example_code/bedrock-runtime/models/cohere_command/command_invoke_model_with_response_stream.py @@ -8,7 +8,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model.py b/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model.py index 2e3f5efeeb1..e425cf02d5e 100644 --- a/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model.py +++ b/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model.py @@ -7,7 +7,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model_with_response_stream.py b/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model_with_response_stream.py index a6c7f071241..d818e690470 100644 --- a/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model_with_response_stream.py +++ b/python/example_code/bedrock-runtime/models/cohere_command/command_r_invoke_model_with_response_stream.py @@ -8,7 +8,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model.py b/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model.py index 102493c1ebe..2b6555b08df 100644 --- a/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model.py +++ b/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model.py @@ -7,7 +7,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model_with_response_stream.py b/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model_with_response_stream.py index 9c14d51558d..f3c7ad5713a 100644 --- a/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model_with_response_stream.py +++ b/python/example_code/bedrock-runtime/models/meta_llama/llama2_invoke_model_with_response_stream.py @@ -8,7 +8,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model.py b/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model.py index fa79ad51b41..86c5f996243 100644 --- a/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model.py +++ b/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model.py @@ -7,7 +7,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model_with_response_stream.py b/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model_with_response_stream.py index ca7322ece6f..5a7eb34cbba 100644 --- a/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model_with_response_stream.py +++ b/python/example_code/bedrock-runtime/models/meta_llama/llama3_invoke_model_with_response_stream.py @@ -8,7 +8,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model.py b/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model.py index 77326795b4a..1fb62bc1507 100644 --- a/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model.py +++ b/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model.py @@ -6,7 +6,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") diff --git a/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model_with_response_stream.py b/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model_with_response_stream.py index 341368da435..4b32bbd2dd2 100644 --- a/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model_with_response_stream.py +++ b/python/example_code/bedrock-runtime/models/mistral_ai/invoke_model_with_response_stream.py @@ -8,7 +8,7 @@ import boto3 import json -from botocore.Exceptions import ClientError +from botocore.exceptions import ClientError # Create a Bedrock Runtime client in the AWS Region of your choice. client = boto3.client("bedrock-runtime", region_name="us-east-1") From 8d09dbd3a3913244a858494ac1841b30be9f0480 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 11:16:26 -0700 Subject: [PATCH 2/3] Bump braces from 3.0.2 to 3.0.3 in /resources/cdk/aurora_serverless_app (#6566) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../cdk/aurora_serverless_app/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/cdk/aurora_serverless_app/package-lock.json b/resources/cdk/aurora_serverless_app/package-lock.json index e3bf768106f..ac787aebbf7 100644 --- a/resources/cdk/aurora_serverless_app/package-lock.json +++ b/resources/cdk/aurora_serverless_app/package-lock.json @@ -1834,12 +1834,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2391,9 +2391,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" From f60de4435e333fc92b27e977373d47d562078ea4 Mon Sep 17 00:00:00 2001 From: Jason Q <81179619+beqqrry-aws@users.noreply.github.com> Date: Thu, 20 Jun 2024 11:34:50 -0700 Subject: [PATCH 3/3] GitHub: Expand yaml-lint.yml (#6571) --- .github/allowed-labels.yml | 1 - .github/linters/.ruby-lint.yml | 2 +- .github/workflows/docker-push.yml | 4 +- .github/workflows/issue-metrics.yml | 42 +++++++++---------- .github/workflows/label-auditor.yml | 8 ++-- .github/workflows/label-auto-language.yml | 16 ++++--- .github/workflows/label-checker.yml | 4 +- ...dotnet-check.yml => lint-check-dotnet.yml} | 5 ++- .../{golangci-lint.yml => lint-golang.yml} | 8 ++-- .../{javascript.yml => lint-javascript.yml} | 4 +- .../{kotlin-lint.yml => lint-kotlin.yml} | 5 +-- .../workflows/{php-lint.yml => lint-php.yml} | 9 ++-- .../workflows/{python.yml => lint-python.yml} | 2 +- .github/workflows/{ruby.yml => lint-ruby.yml} | 2 +- .github/workflows/{rust.yml => lint-rust.yml} | 5 ++- .github/workflows/pr_stats.yml | 2 +- .github/workflows/sd-cpp-lint.yml | 4 +- .github/workflows/sh-check.yml | 2 +- .github/workflows/validate-doc-metadata.yml | 6 +-- .github/workflows/writeme.yml | 10 ++--- .github/workflows/yaml-lint.yml | 10 ++--- .tools/test/stacks/config/targets.yaml | 4 +- 22 files changed, 75 insertions(+), 80 deletions(-) rename .github/workflows/{dotnet-check.yml => lint-check-dotnet.yml} (93%) rename .github/workflows/{golangci-lint.yml => lint-golang.yml} (83%) rename .github/workflows/{javascript.yml => lint-javascript.yml} (96%) rename .github/workflows/{kotlin-lint.yml => lint-kotlin.yml} (94%) rename .github/workflows/{php-lint.yml => lint-php.yml} (80%) rename .github/workflows/{python.yml => lint-python.yml} (95%) rename .github/workflows/{ruby.yml => lint-ruby.yml} (95%) rename .github/workflows/{rust.yml => lint-rust.yml} (97%) diff --git a/.github/allowed-labels.yml b/.github/allowed-labels.yml index 36b82e9fd91..f55d35e679a 100644 --- a/.github/allowed-labels.yml +++ b/.github/allowed-labels.yml @@ -125,4 +125,3 @@ - name: Text Review not needed color: "f5f7f9" description: "This contains no text which needs review" - diff --git a/.github/linters/.ruby-lint.yml b/.github/linters/.ruby-lint.yml index c5893ac3cd7..7f58c80ee94 100644 --- a/.github/linters/.ruby-lint.yml +++ b/.github/linters/.ruby-lint.yml @@ -16,4 +16,4 @@ Layout/LineLength: Naming/FileName: Enabled: false Style/HashSyntax: - EnforcedShorthandSyntax: either \ No newline at end of file + EnforcedShorthandSyntax: either diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index fdddafadf0f..62323c9918e 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -5,7 +5,7 @@ permissions: contents: read id-token: write -on: +on: # yamllint disable-line rule:truthy pull_request_target: types: - closed @@ -30,7 +30,7 @@ jobs: ################################################## - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@master # More information on this action can be found below in the 'AWS Credentials' section + uses: aws-actions/configure-aws-credentials@master # More information on this action can be found below in the 'AWS Credentials' section with: role-to-assume: arn:aws:iam::808326389482:role/automation aws-region: us-east-1 diff --git a/.github/workflows/issue-metrics.yml b/.github/workflows/issue-metrics.yml index 8bb15c74909..2a944c12ea4 100644 --- a/.github/workflows/issue-metrics.yml +++ b/.github/workflows/issue-metrics.yml @@ -6,7 +6,7 @@ # https://github.com/marketplace/actions/issue-metrics name: Monthly issue metrics -on: +on: # yamllint disable-line rule:truthy workflow_dispatch: schedule: - cron: '3 2 1 * *' @@ -20,27 +20,27 @@ jobs: name: Issue metrics runs-on: ubuntu-latest steps: - - name: Get dates for last month - shell: bash - run: | - # Calculate the first day of the previous month - first_day=$(date -d "last month" +%Y-%m-01) + - name: Get dates for last month + shell: bash + run: | + # Calculate the first day of the previous month + first_day=$(date -d "last month" +%Y-%m-01) - # Calculate the last day of the previous month - last_day=$(date -d "$first_day +1 month -1 day" +%Y-%m-%d) + # Calculate the last day of the previous month + last_day=$(date -d "$first_day +1 month -1 day" +%Y-%m-%d) - #Set an environment variable with the date range - echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV" + # Set an environment variable with the date range + echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV" - - name: Run issue-metrics tool - uses: github/issue-metrics@v2 - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SEARCH_QUERY: 'repo:awsdocs/aws-doc-sdk-examples is:issue created:${{ env.last_month }} -reason:"not planned"' + - name: Run issue-metrics tool + uses: github/issue-metrics@v2 + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SEARCH_QUERY: 'repo:awsdocs/aws-doc-sdk-examples is:issue created:${{ env.last_month }} -reason:"not planned"' - - name: Create issue - uses: peter-evans/create-issue-from-file@v5 - with: - title: Monthly issue metrics report ${{ env.last_month }} - token: ${{ secrets.GITHUB_TOKEN }} - content-filepath: ./issue_metrics.md + - name: Create issue + uses: peter-evans/create-issue-from-file@v5 + with: + title: Monthly issue metrics report ${{ env.last_month }} + token: ${{ secrets.GITHUB_TOKEN }} + content-filepath: ./issue_metrics.md diff --git a/.github/workflows/label-auditor.yml b/.github/workflows/label-auditor.yml index ffbba7aec2d..4860b5ed9a6 100644 --- a/.github/workflows/label-auditor.yml +++ b/.github/workflows/label-auditor.yml @@ -1,6 +1,6 @@ name: "Audit Labels" -on: +on: # yamllint disable-line rule:truthy workflow_dispatch: pull_request: branches: @@ -16,8 +16,7 @@ jobs: runs-on: ubuntu-latest if: github.event.pull_request.merged == true steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v3 with: sparse-checkout: .github/allowed-labels.yml @@ -31,8 +30,7 @@ jobs: # # For more information, see: # https://github.com/crazy-max/ghaction-github-labeler - - - name: Audit Labels + - name: Audit Labels if: success() uses: crazy-max/ghaction-github-labeler@v4 with: diff --git a/.github/workflows/label-auto-language.yml b/.github/workflows/label-auto-language.yml index 9eff849adaa..4e19507b2d2 100644 --- a/.github/workflows/label-auto-language.yml +++ b/.github/workflows/label-auto-language.yml @@ -1,6 +1,6 @@ name: "Auto Labeler" -on: +on: # yamllint disable-line rule:truthy pull_request_target: branches: - main @@ -12,8 +12,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout repository uses: actions/checkout@v3 # The Add Labels workflow adds a label to pull requests @@ -24,9 +23,8 @@ jobs: # # For more information, see: # https://github.com/actions/labeler - - - name: Add Labels - uses: actions/labeler@v4 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - configuration-path: .github/label-ruleset.yml + - name: Add Labels + uses: actions/labeler@v4 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" + configuration-path: .github/label-ruleset.yml diff --git a/.github/workflows/label-checker.yml b/.github/workflows/label-checker.yml index d7878f16b38..d9d80df44dd 100644 --- a/.github/workflows/label-checker.yml +++ b/.github/workflows/label-checker.yml @@ -1,6 +1,5 @@ ---- name: Label Checker -on: +on: # yamllint disable-line rule:truthy pull_request: branches: - main @@ -12,7 +11,6 @@ on: - unlabeled jobs: - check_oncall_labels: name: Check On Call Review labels runs-on: ubuntu-latest diff --git a/.github/workflows/dotnet-check.yml b/.github/workflows/lint-check-dotnet.yml similarity index 93% rename from .github/workflows/dotnet-check.yml rename to .github/workflows/lint-check-dotnet.yml index 5c96d1c6cb8..4bebd7e102d 100644 --- a/.github/workflows/dotnet-check.yml +++ b/.github/workflows/lint-check-dotnet.yml @@ -1,5 +1,6 @@ -name: Dotnet lint check -on: +name: Dotnet Lint and Check + +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: permissions: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/lint-golang.yml similarity index 83% rename from .github/workflows/golangci-lint.yml rename to .github/workflows/lint-golang.yml index fc3877e1e49..618654de1fb 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/lint-golang.yml @@ -1,5 +1,6 @@ -name: golangci-lint -on: +name: Lint GoLang + +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: permissions: @@ -29,7 +30,6 @@ jobs: run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.3 - name: run golangci-lint if: steps.changed-files.outputs.any_changed == 'true' - # If you get a linting error of "File is not `goimports`-ed", the solution is to run "gofmt -w ./". - run: | + run: | # If you get a linting error of "File is not `goimports`-ed", the solution is to run "gofmt -w ./". cd gov2 ./lint_all_go.sh diff --git a/.github/workflows/javascript.yml b/.github/workflows/lint-javascript.yml similarity index 96% rename from .github/workflows/javascript.yml rename to .github/workflows/lint-javascript.yml index b9c511fecbe..b1276d9b34b 100644 --- a/.github/workflows/javascript.yml +++ b/.github/workflows/lint-javascript.yml @@ -1,6 +1,6 @@ name: JavaScript -on: +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: @@ -36,4 +36,4 @@ jobs: if: steps.changed-files.outputs.any_changed == 'true' run: | changed_files=(${{steps.changed-files.outputs.all_changed_files}}) - ./javascriptv3/github_scripts/lint.sh "${changed_files[@]}" \ No newline at end of file + ./javascriptv3/github_scripts/lint.sh "${changed_files[@]}" diff --git a/.github/workflows/kotlin-lint.yml b/.github/workflows/lint-kotlin.yml similarity index 94% rename from .github/workflows/kotlin-lint.yml rename to .github/workflows/lint-kotlin.yml index 2d1a98163f8..52a0e55faf2 100644 --- a/.github/workflows/kotlin-lint.yml +++ b/.github/workflows/lint-kotlin.yml @@ -1,6 +1,6 @@ name: Kotlin Linter -on: +on: # yamllint disable-line rule:truthy workflow_dispatch: pull_request: @@ -12,7 +12,7 @@ jobs: - name: Checkout files uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 0 - name: Get changed files id: changed-files uses: tj-actions/changed-files@v41 @@ -34,4 +34,3 @@ jobs: run: | ktlint --reporter=plain?group_by_file --editorconfig=".github/linters/ktlint_config" continue-on-error: false - diff --git a/.github/workflows/php-lint.yml b/.github/workflows/lint-php.yml similarity index 80% rename from .github/workflows/php-lint.yml rename to .github/workflows/lint-php.yml index f7c723e07de..39fda76a4a2 100644 --- a/.github/workflows/php-lint.yml +++ b/.github/workflows/lint-php.yml @@ -1,6 +1,7 @@ name: "PHP Linter" -on: +on: # yamllint disable-line rule:truthy + workflow_dispatch: pull_request: paths: - "**.php" @@ -12,7 +13,8 @@ jobs: name: "PHP Linter" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 with: fetch-depth: 0 @@ -28,7 +30,8 @@ jobs: curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar php phpcs.phar --version - - uses: thenabeel/action-phpcs@v8 + - name: Run PHPCS + uses: thenabeel/action-phpcs@v8 if: steps.changed-files.outputs.any_changed == 'true' with: files: "**.php" diff --git a/.github/workflows/python.yml b/.github/workflows/lint-python.yml similarity index 95% rename from .github/workflows/python.yml rename to .github/workflows/lint-python.yml index 9abeaeef173..fc149a0b814 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/lint-python.yml @@ -1,6 +1,6 @@ name: Lint Python -on: +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: diff --git a/.github/workflows/ruby.yml b/.github/workflows/lint-ruby.yml similarity index 95% rename from .github/workflows/ruby.yml rename to .github/workflows/lint-ruby.yml index f0e2c7a5938..a5ba1eb578b 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/lint-ruby.yml @@ -1,6 +1,6 @@ name: Ruby Linting -on: +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: diff --git a/.github/workflows/rust.yml b/.github/workflows/lint-rust.yml similarity index 97% rename from .github/workflows/rust.yml rename to .github/workflows/lint-rust.yml index a02b34093b2..201cd32955b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/lint-rust.yml @@ -1,5 +1,6 @@ -name: Rust -on: +name: Lint - Test - Format Rust + +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: permissions: diff --git a/.github/workflows/pr_stats.yml b/.github/workflows/pr_stats.yml index 01f3c8b90cb..19e6d8f2845 100644 --- a/.github/workflows/pr_stats.yml +++ b/.github/workflows/pr_stats.yml @@ -1,6 +1,6 @@ name: Pull Request Stats -on: +on: # yamllint disable-line rule:truthy workflow_dispatch: jobs: diff --git a/.github/workflows/sd-cpp-lint.yml b/.github/workflows/sd-cpp-lint.yml index c2d68fc38a4..3c5074249be 100644 --- a/.github/workflows/sd-cpp-lint.yml +++ b/.github/workflows/sd-cpp-lint.yml @@ -1,5 +1,5 @@ -name: "cpp lint check" -on: +name: "Lint C++" +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: diff --git a/.github/workflows/sh-check.yml b/.github/workflows/sh-check.yml index bfebcd0d7d7..bdc8b3c4773 100644 --- a/.github/workflows/sh-check.yml +++ b/.github/workflows/sh-check.yml @@ -2,7 +2,7 @@ name: Lint Bash -on: +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: diff --git a/.github/workflows/validate-doc-metadata.yml b/.github/workflows/validate-doc-metadata.yml index 34098105214..e3099504d49 100644 --- a/.github/workflows/validate-doc-metadata.yml +++ b/.github/workflows/validate-doc-metadata.yml @@ -1,14 +1,12 @@ name: Validate Documentation Metadata -on: +on: # yamllint disable-line rule:truthy + workflow_dispatch: push: branches: [main] pull_request: branches: [main] - # Allows running this workflow manually from the Actions tab - workflow_dispatch: - jobs: validate-doc-metadata: name: Validate Doc Metadata diff --git a/.github/workflows/writeme.yml b/.github/workflows/writeme.yml index 361dc90cdd8..848c5f53c97 100644 --- a/.github/workflows/writeme.yml +++ b/.github/workflows/writeme.yml @@ -1,7 +1,7 @@ name: Validate WRITEMEs # Controls when the action will run. -on: +on: # yamllint disable-line rule:truthy # Triggers the workflow on push or pull request events but only for the main branch push: branches: [main] @@ -21,12 +21,12 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: checkout repo content - uses: actions/checkout@v3 # checkout the repository content to github runner. - - name: setup python + - name: Checkout repo content + uses: actions/checkout@v3 # checkout the repository content to github runner. + - name: Setup Python uses: actions/setup-python@v3 with: - python-version: 3.11 #install the python needed + python-version: 3.11 # install the python needed - name: Install dependencies run: >- python3 -m pip install -r .tools/readmes/requirements.txt diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index e899e19005d..79031b597ce 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -1,6 +1,6 @@ -name: Lint Metadata Yaml +name: Lint Yaml -on: +on: # yamllint disable-line rule:truthy pull_request: workflow_dispatch: @@ -20,7 +20,7 @@ jobs: id: changed-files uses: tj-actions/changed-files@v41 with: - files: ".doc_gen/metadata/**/*.{yml,yaml}" + files: "**/*.{yml,yaml}" - name: Setup Python if: steps.changed-files.outputs.any_changed == 'true' uses: actions/setup-python@v3 @@ -30,7 +30,7 @@ jobs: if: steps.changed-files.outputs.any_changed == 'true' run: >- python3 -m pip install -r .tools/base_requirements.txt - - name: Lint metadata files + - name: Lint YAML files if: steps.changed-files.outputs.any_changed == 'true' run: >- - yamllint --format standard -c .tools/validation/.yamllint.yaml .doc_gen/metadata + yamllint --format standard -c .tools/validation/.yamllint.yaml . diff --git a/.tools/test/stacks/config/targets.yaml b/.tools/test/stacks/config/targets.yaml index 5da50d34739..397ac5a46a3 100644 --- a/.tools/test/stacks/config/targets.yaml +++ b/.tools/test/stacks/config/targets.yaml @@ -13,10 +13,10 @@ javascriptv3: account_id: "875008041426" status: "enabled" javav2: - account_id: "667348412466" # back-up "814548047983" + account_id: "667348412466" # back-up "814548047983" status: "enabled" kotlin: - account_id: "471951630130" # back-up "814548047983" + account_id: "471951630130" # back-up "814548047983" status: "enabled" php: account_id: "733931915187"