diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index fac79b1ca6c..5f7b6466061 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1785,6 +1785,12 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9e791085833..21dae854050 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,6 +122,12 @@ jobs: - name: Clone The Salt Repository uses: actions/checkout@v3 + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 9c442eee6b7..200ee21817d 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1767,6 +1767,12 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -1804,6 +1810,12 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/nightly.yml.jinja b/.github/workflows/templates/nightly.yml.jinja index 049feeaf7e8..dbe2fe9560d 100644 --- a/.github/workflows/templates/nightly.yml.jinja +++ b/.github/workflows/templates/nightly.yml.jinja @@ -111,6 +111,12 @@ concurrency: steps: - uses: actions/checkout@v3 + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index 751c3a53121..909580a36a6 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -164,6 +164,12 @@ permissions: - name: Clone The Salt Repository uses: actions/checkout@v3 + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/staging.yml.jinja b/.github/workflows/templates/staging.yml.jinja index 15c9595d61a..7a5e86d2742 100644 --- a/.github/workflows/templates/staging.yml.jinja +++ b/.github/workflows/templates/staging.yml.jinja @@ -101,6 +101,12 @@ concurrency: steps: - uses: actions/checkout@v3 + - name: Get Salt Project GitHub Actions Bot Environment + run: | + TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 95b7ca57a5d..0cbe51769f4 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -145,7 +145,7 @@ jobs: if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' run: | TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" -v http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - name: Start VM @@ -255,7 +255,7 @@ jobs: - name: Get Salt Project GitHub Actions Bot Environment run: | TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" -v http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - name: Start VM diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index a8d4e3c12fe..51931bf9836 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -118,7 +118,7 @@ jobs: if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' run: | TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" -v http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - name: Start VM @@ -216,7 +216,7 @@ jobs: - name: Get Salt Project GitHub Actions Bot Environment run: | TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" -v http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) + SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - name: Start VM diff --git a/tools/changelog.py b/tools/changelog.py index 85fdbacb1bc..0a2762f6263 100644 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -1,7 +1,7 @@ """ These commands are used manage Salt's changelog. """ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import datetime diff --git a/tools/ci.py b/tools/ci.py index e0354b6d1b1..64d6fa39452 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -1,7 +1,7 @@ """ These commands are used in the CI pipeline. """ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import json diff --git a/tools/docs.py b/tools/docs.py index da4dd6a00db..83868d1af7e 100644 --- a/tools/docs.py +++ b/tools/docs.py @@ -1,7 +1,7 @@ """ These commands are used to generate Salt's manpages. """ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import logging diff --git a/tools/pkg.py b/tools/pkg.py index 3f8794c4a41..fc1edea711d 100644 --- a/tools/pkg.py +++ b/tools/pkg.py @@ -1,7 +1,7 @@ """ These commands are used to build Salt packages. """ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import fnmatch diff --git a/tools/pkgrepo.py b/tools/pkgrepo.py index 979048fcc17..1315b023824 100644 --- a/tools/pkgrepo.py +++ b/tools/pkgrepo.py @@ -1,7 +1,7 @@ """ These commands are used to build the pacakge repository files. """ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import fnmatch diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 235a29d3e9d..f79e85b4a57 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -1,7 +1,7 @@ """ These commands are used by pre-commit. """ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import logging diff --git a/tools/release.py b/tools/release.py index 9d840f7a44a..a6f1ea17847 100644 --- a/tools/release.py +++ b/tools/release.py @@ -1,7 +1,7 @@ """ These commands are used to release Salt. """ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import logging diff --git a/tools/utils.py b/tools/utils.py index 410ebbb6f5b..8c7c220e2b4 100644 --- a/tools/utils.py +++ b/tools/utils.py @@ -1,6 +1,7 @@ -# pylint: disable=resource-leakage,broad-except +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations +import os import pathlib import packaging.version @@ -17,10 +18,11 @@ from rich.progress import ( REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent GPG_KEY_FILENAME = "SALT-PROJECT-GPG-PUBKEY-2023" -NIGHTLY_BUCKET_NAME = "salt-project-prod-salt-artifacts-nightly" -STAGING_BUCKET_NAME = "salt-project-prod-salt-artifacts-staging" -RELEASE_BUCKET_NAME = "salt-project-prod-salt-artifacts-release" -BACKUP_BUCKET_NAME = "salt-project-prod-salt-artifacts-backup" +SPB_ENVIRONMENT = os.environ.get("SPB_ENVIRONMENT") or "prod" +NIGHTLY_BUCKET_NAME = f"salt-project-{SPB_ENVIRONMENT}-salt-artifacts-nightly" +STAGING_BUCKET_NAME = f"salt-project-{SPB_ENVIRONMENT}-salt-artifacts-staging" +RELEASE_BUCKET_NAME = f"salt-project-{SPB_ENVIRONMENT}-salt-artifacts-release" +BACKUP_BUCKET_NAME = f"salt-project-{SPB_ENVIRONMENT}-salt-artifacts-backup" class UpdateProgress: diff --git a/tools/vm.py b/tools/vm.py index bb0d65d47b7..a34c7bf7e5f 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -2,6 +2,7 @@ These commands are used to create/destroy VMs, sync the local checkout to the VM and to run commands on the VM. """ +# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated from __future__ import annotations import hashlib