From 1c679d3356ac8529ca900ec6aa59cdbbecef68fb Mon Sep 17 00:00:00 2001 From: Pepe Fagoaga Date: Mon, 9 Dec 2024 14:14:06 +0100 Subject: [PATCH] chore(actions): standardize names (#6059) (cherry picked from commit 213a793fbcb94af0d502b0005c70ff4dbc684279) # Conflicts: # .github/workflows/sdk-pull-request.yml --- .github/codeql/api-codeql-config.yml | 4 ++-- .github/codeql/codeql-config.yml | 4 ---- .github/codeql/sdk-codeql-config.yml | 4 ++++ .github/codeql/ui-codeql-config.yml | 2 +- .github/workflows/api-codeql.yml | 6 +++--- .github/workflows/api-pull-request.yml | 2 +- .github/workflows/backport.yml | 2 +- .github/workflows/build-documentation-on-pr.yml | 2 +- .github/workflows/find-secrets.yml | 4 ++-- .github/workflows/labeler.yml | 2 +- ...-containers.yml => sdk-build-lint-push-containers.yml} | 6 +++--- .github/workflows/{codeql.yml => sdk-codeql.yml} | 8 ++++---- .../workflows/{pull-request.yml => sdk-pull-request.yml} | 4 ++++ .../workflows/{pypi-release.yml => sdk-pypi-release.yml} | 2 +- ...s_regions.yml => sdk-refresh-aws-services-regions.yml} | 2 +- .github/workflows/ui-codeql.yml | 2 +- .github/workflows/{ui-checks.yml => ui-pull-request.yml} | 4 ++-- 17 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 .github/codeql/codeql-config.yml create mode 100644 .github/codeql/sdk-codeql-config.yml rename .github/workflows/{build-lint-push-containers.yml => sdk-build-lint-push-containers.yml} (99%) rename .github/workflows/{codeql.yml => sdk-codeql.yml} (93%) rename .github/workflows/{pull-request.yml => sdk-pull-request.yml} (95%) rename .github/workflows/{pypi-release.yml => sdk-pypi-release.yml} (98%) rename .github/workflows/{refresh_aws_services_regions.yml => sdk-refresh-aws-services-regions.yml} (98%) rename .github/workflows/{ui-checks.yml => ui-pull-request.yml} (93%) diff --git a/.github/codeql/api-codeql-config.yml b/.github/codeql/api-codeql-config.yml index ac8ca6beb5..9ce26a3651 100644 --- a/.github/codeql/api-codeql-config.yml +++ b/.github/codeql/api-codeql-config.yml @@ -1,3 +1,3 @@ -name: "Custom CodeQL Config for API" +name: "API - CodeQL Config" paths: - - 'api/' \ No newline at end of file + - "api/" diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml deleted file mode 100644 index f31f68cba8..0000000000 --- a/.github/codeql/codeql-config.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: "Custom CodeQL Config" -paths-ignore: - - 'api/' - - 'ui/' \ No newline at end of file diff --git a/.github/codeql/sdk-codeql-config.yml b/.github/codeql/sdk-codeql-config.yml new file mode 100644 index 0000000000..7982398f42 --- /dev/null +++ b/.github/codeql/sdk-codeql-config.yml @@ -0,0 +1,4 @@ +name: "SDK - CodeQL Config" +paths-ignore: + - "api/" + - "ui/" diff --git a/.github/codeql/ui-codeql-config.yml b/.github/codeql/ui-codeql-config.yml index 62ebee5617..fa4f80cae5 100644 --- a/.github/codeql/ui-codeql-config.yml +++ b/.github/codeql/ui-codeql-config.yml @@ -1,3 +1,3 @@ -name: "Custom CodeQL Config for UI" +name: "UI - CodeQL Config" paths: - "ui/" diff --git a/.github/workflows/api-codeql.yml b/.github/workflows/api-codeql.yml index ed9e0c3fd4..75d12109a6 100644 --- a/.github/workflows/api-codeql.yml +++ b/.github/workflows/api-codeql.yml @@ -9,11 +9,11 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "API - CodeQL" +name: API - CodeQL on: push: - branches: + branches: - "master" - "v3" - "v4.*" @@ -21,7 +21,7 @@ on: paths: - "api/**" pull_request: - branches: + branches: - "master" - "v3" - "v4.*" diff --git a/.github/workflows/api-pull-request.yml b/.github/workflows/api-pull-request.yml index 8143ca7f41..005c2afdba 100644 --- a/.github/workflows/api-pull-request.yml +++ b/.github/workflows/api-pull-request.yml @@ -1,4 +1,4 @@ -name: "API - Pull Request" +name: API - Pull Request on: push: diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 534f7d6d46..a35ebfcf2b 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -1,4 +1,4 @@ -name: Automatic Backport +name: Prowler - Automatic Backport on: pull_request_target: diff --git a/.github/workflows/build-documentation-on-pr.yml b/.github/workflows/build-documentation-on-pr.yml index a1ed22a071..7ae58b9c85 100644 --- a/.github/workflows/build-documentation-on-pr.yml +++ b/.github/workflows/build-documentation-on-pr.yml @@ -1,4 +1,4 @@ -name: Pull Request Documentation Link +name: Prowler - Pull Request Documentation Link on: pull_request: diff --git a/.github/workflows/find-secrets.yml b/.github/workflows/find-secrets.yml index e73e874f26..e2e2dcf2cd 100644 --- a/.github/workflows/find-secrets.yml +++ b/.github/workflows/find-secrets.yml @@ -1,4 +1,4 @@ -name: Find secrets +name: Prowler - Find secrets on: pull_request @@ -16,4 +16,4 @@ jobs: path: ./ base: ${{ github.event.repository.default_branch }} head: HEAD - extra_args: --only-verified \ No newline at end of file + extra_args: --only-verified diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index d7162a0058..199b17962d 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,4 +1,4 @@ -name: "Pull Request Labeler" +name: Prowler - PR Labeler on: pull_request_target: diff --git a/.github/workflows/build-lint-push-containers.yml b/.github/workflows/sdk-build-lint-push-containers.yml similarity index 99% rename from .github/workflows/build-lint-push-containers.yml rename to .github/workflows/sdk-build-lint-push-containers.yml index af17eeb193..b502af0ba4 100644 --- a/.github/workflows/build-lint-push-containers.yml +++ b/.github/workflows/sdk-build-lint-push-containers.yml @@ -1,4 +1,4 @@ -name: Build and Push containers +name: SDK - Build and Push containers on: push: @@ -85,8 +85,8 @@ jobs: echo "STABLE_TAG=v3-stable" >> "${GITHUB_ENV}" ;; - - 4) + + 4) echo "LATEST_TAG=v4-latest" >> "${GITHUB_ENV}" echo "STABLE_TAG=v4-stable" >> "${GITHUB_ENV}" ;; diff --git a/.github/workflows/codeql.yml b/.github/workflows/sdk-codeql.yml similarity index 93% rename from .github/workflows/codeql.yml rename to .github/workflows/sdk-codeql.yml index c0e319e07e..043aeb041b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/sdk-codeql.yml @@ -9,11 +9,11 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: SDK - CodeQL on: push: - branches: + branches: - "master" - "v3" - "v4.*" @@ -21,7 +21,7 @@ on: - 'ui/**' - 'api/**' pull_request: - branches: + branches: - "master" - "v3" - "v4.*" @@ -55,7 +55,7 @@ jobs: uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - config-file: ./.github/codeql/codeql-config.yml + config-file: ./.github/codeql/sdk-codeql-config.yml - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/sdk-pull-request.yml similarity index 95% rename from .github/workflows/pull-request.yml rename to .github/workflows/sdk-pull-request.yml index cdb564838b..fc60977f83 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/sdk-pull-request.yml @@ -1,4 +1,8 @@ +<<<<<<< HEAD:.github/workflows/pull-request.yml name: "Pull Request" +======= +name: SDK - Pull Request +>>>>>>> 213a793fb (chore(actions): standardize names (#6059)):.github/workflows/sdk-pull-request.yml on: push: diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/sdk-pypi-release.yml similarity index 98% rename from .github/workflows/pypi-release.yml rename to .github/workflows/sdk-pypi-release.yml index 2c8ae5e659..4d9c91d690 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/sdk-pypi-release.yml @@ -1,4 +1,4 @@ -name: PyPI release +name: SDK - PyPI release on: release: diff --git a/.github/workflows/refresh_aws_services_regions.yml b/.github/workflows/sdk-refresh-aws-services-regions.yml similarity index 98% rename from .github/workflows/refresh_aws_services_regions.yml rename to .github/workflows/sdk-refresh-aws-services-regions.yml index 548f8d5600..bf7af302e2 100644 --- a/.github/workflows/refresh_aws_services_regions.yml +++ b/.github/workflows/sdk-refresh-aws-services-regions.yml @@ -1,6 +1,6 @@ # This is a basic workflow to help you get started with Actions -name: Refresh regions of AWS services +name: SDK - Refresh AWS services' regions on: schedule: diff --git a/.github/workflows/ui-codeql.yml b/.github/workflows/ui-codeql.yml index 2765921cf6..30586f43e7 100644 --- a/.github/workflows/ui-codeql.yml +++ b/.github/workflows/ui-codeql.yml @@ -9,7 +9,7 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "UI - CodeQL" +name: UI - CodeQL on: push: diff --git a/.github/workflows/ui-checks.yml b/.github/workflows/ui-pull-request.yml similarity index 93% rename from .github/workflows/ui-checks.yml rename to .github/workflows/ui-pull-request.yml index f0556fc61f..28e5d32e0a 100644 --- a/.github/workflows/ui-checks.yml +++ b/.github/workflows/ui-pull-request.yml @@ -1,4 +1,4 @@ -name: "UI - Pull Request" +name: UI - Pull Request on: pull_request: @@ -31,4 +31,4 @@ jobs: run: npm run healthcheck - name: Build the application working-directory: ./ui - run: npm run build \ No newline at end of file + run: npm run build