Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/actions/notify-slack/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:
steps:
- name: Load secrets from 1Password
id: onepw_secrets
uses: 1password/load-secrets-action@v2.0.0
uses: 1password/load-secrets-action@v4
with:
export-env: true
env:
Expand Down Expand Up @@ -78,9 +78,10 @@ runs:
}' > slack_payload.json

- name: Post notification in Slack channel
uses: slackapi/slack-github-action@v1.26.0
uses: slackapi/slack-github-action@v4
with:
# slack-github-action v2+ moved the webhook URL and type from env vars
# (SLACK_WEBHOOK_URL / SLACK_WEBHOOK_TYPE) to these inputs.
webhook: ${{ env.SLACK_WEBHOOK_URL }}
webhook-type: incoming-webhook
payload-file-path: ./slack_payload.json
env:
SLACK_WEBHOOK_URL: ${{ env.SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
42 changes: 21 additions & 21 deletions .github/workflows/api-deploy-developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ jobs:
needs: []
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Extract commit hash and version from git
run: ./scripts/extract-hash-and-version.sh

- name: Set up JDK ${{ env.java_version }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ env.java_version }}
distribution: 'temurin'

- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: ${{ env.python_version }}

Expand Down Expand Up @@ -111,32 +111,32 @@ jobs:
run: scripts/function-python-build.sh --function_name operations_api

- name: Upload generated feeds_gen
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: feeds_gen
path: api/src/feeds_gen/

- name: Upload generated database_gen
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: database_gen
path: api/src/shared/database_gen/

- name: Upload generated users_database_gen
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: users_database_gen
path: api/src/shared/users_database_gen/

- name: Upload generated user_service_gen
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: user_service_gen
path: api/src/user_service_gen/

- name: Upload operations API build
if: ${{ github.event.inputs.deploy_operations_api != 'false' }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: operations_api_build
path: functions-python/operations_api/.dist/
Expand All @@ -153,7 +153,7 @@ jobs:
service_url: ${{ steps.get_url.outputs.url }}
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set service name and image tag
id: names
Expand All @@ -162,22 +162,22 @@ jobs:
echo "image_tag=developer-$(date +%s)-${GITHUB_SHA::8}" >> "$GITHUB_OUTPUT"

- name: Download generated artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: feeds_gen
path: api/src/feeds_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: database_gen
path: api/src/shared/database_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: users_database_gen
path: api/src/shared/users_database_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: user_service_gen
path: api/src/user_service_gen/
Expand All @@ -187,12 +187,12 @@ jobs:
echo "ENVIRONMENT=dev" > config/.env.local

- name: Authenticate to Google Cloud
uses: google-github-actions/auth@v2
uses: google-github-actions/auth@v3
with:
credentials_json: ${{ secrets.DEV_GCP_MOBILITY_FEEDS_SA_KEY }}

- name: Login to Artifact Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{ env.REGION }}-docker.pkg.dev
username: _json_key_base64
Expand All @@ -208,7 +208,7 @@ jobs:
-version "${{ steps.names.outputs.image_tag }}"

- name: GCloud Setup
uses: google-github-actions/setup-gcloud@v2
uses: google-github-actions/setup-gcloud@v3

- name: Deploy to developer Cloud Run
# Creates/updates ONLY developer-feed-api-<suffix> — shared dev Cloud Run is untouched.
Expand Down Expand Up @@ -248,34 +248,34 @@ jobs:
function_url: ${{ steps.get_url.outputs.url }}
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set function name
id: names
run: |
echo "function_name=operations-api-developer-${{ github.event.inputs.name_suffix || 'dev' }}" >> "$GITHUB_OUTPUT"

- name: Download operations API build
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: operations_api_build
path: functions-python/operations_api/.dist/

- name: Authenticate to Google Cloud
uses: google-github-actions/auth@v2
uses: google-github-actions/auth@v3
with:
credentials_json: ${{ secrets.DEV_GCP_MOBILITY_FEEDS_SA_KEY }}

- name: Load OPERATIONS_OAUTH2_CLIENT_ID from 1Password
uses: 1password/load-secrets-action@v2
uses: 1password/load-secrets-action@v4
with:
export-env: true
env:
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
OPERATIONS_OAUTH2_CLIENT_ID: "op://rbiv7rvkkrsdlpcrz3bmv7nmcu/GCP_RETOOL_OAUTH2_CREDS/username"

- name: GCloud Setup
uses: google-github-actions/setup-gcloud@v2
uses: google-github-actions/setup-gcloud@v3

- name: Deploy to developer Cloud Function
# Creates/updates ONLY operations-api-developer-<suffix> — shared operations-api is untouched.
Expand Down
58 changes: 29 additions & 29 deletions .github/workflows/api-deployer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,20 @@ jobs:
permissions: write-all
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: ${{ env.python_version }}

- name: Authenticate to Google Cloud
id: gcloud_auth
uses: google-github-actions/auth@v2
uses: google-github-actions/auth@v3
with:
credentials_json: ${{ secrets.GCP_MOBILITY_FEEDS_SA_KEY }}

- name: GCloud Setup
uses: google-github-actions/setup-gcloud@v2
uses: google-github-actions/setup-gcloud@v3

- name: Set Variables
run: |
Expand All @@ -130,7 +130,7 @@ jobs:
scripts/replace-variables.sh -in_file infra/backend.conf.rename_me -out_file infra/artifact-registry/backend.conf -variables BUCKET_NAME,OBJECT_PREFIX
scripts/replace-variables.sh -in_file infra/artifact-registry/vars.tfvars.rename_me -out_file infra/artifact-registry/vars.tfvars -variables PROJECT_ID,REGION,ENVIRONMENT,ARTIFACT_REPO_NAME

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: 1.5.3
terraform_wrapper: false
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Persist TF plan
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: terraform-artifact-plan.txt
path: infra/artifact-registry/terraform-plan.txt
Expand All @@ -171,38 +171,38 @@ jobs:
needs: [create-artifact-repo, api-build-test]
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Extract commit hash and version from git
run: ./scripts/extract-hash-and-version.sh

- name: Upload version_info to workflow artefacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: version_info
path: api/src/version_info
compression-level: 0

- name: Authenticate to Google Cloud
id: gcloud_auth
uses: google-github-actions/auth@v2
uses: google-github-actions/auth@v3
with:
credentials_json: ${{ secrets.GCP_MOBILITY_FEEDS_SA_KEY }}

- name: Login to Google Artifact Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{inputs.REGION}}-docker.pkg.dev
username: _json_key_base64
password: ${{ secrets.GCP_MOBILITY_FEEDS_SA_KEY }}

- name: Set up JDK ${{ env.java_version }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ env.java_version }}
distribution: 'temurin'

- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: ${{ env.python_version }}

Expand All @@ -219,23 +219,23 @@ jobs:
echo "ENVIRONMENT=dev" >> config/.env.local

# db models were generated and uploaded in api-build-test job above.
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: database_gen
path: api/src/shared/database_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: users_database_gen
path: api/src/shared/users_database_gen/

# api schema was generated and uploaded in api-build-test job above.
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: feeds_gen
path: api/src/feeds_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: user_service_gen
path: api/src/user_service_gen/
Expand Down Expand Up @@ -263,38 +263,38 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Extract commit hash and version from git
run: ./scripts/extract-hash-and-version.sh

- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: ${{ env.python_version }}

# db models were generated and uploaded in api-build-test job above.
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: database_gen
path: api/src/shared/database_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: users_database_gen
path: api/src/shared/users_database_gen/

# api schema was generated and uploaded in api-build-test job above.
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: feeds_gen
path: api/src/feeds_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: user_service_gen
path: api/src/user_service_gen/

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: feeds_operations_gen
path: functions-python/operations_api/src/feeds_gen/
Expand All @@ -305,12 +305,12 @@ jobs:

- name: Authenticate to Google Cloud
id: gcloud_auth
uses: google-github-actions/auth@v2
uses: google-github-actions/auth@v3
with:
credentials_json: ${{ secrets.GCP_MOBILITY_FEEDS_SA_KEY }}

- name: GCloud Setup
uses: google-github-actions/setup-gcloud@v2
uses: google-github-actions/setup-gcloud@v3

- name: Set Variables
run: |
Expand All @@ -330,7 +330,7 @@ jobs:
echo "BREVO_API_ANNOUNCEMENTS_LIST_ID=${{ inputs.BREVO_API_ANNOUNCEMENTS_LIST_ID }}" >> $GITHUB_ENV

- name: Load secret from 1Password
uses: 1password/load-secrets-action@v2
uses: 1password/load-secrets-action@v4
with:
export-env: true
env:
Expand All @@ -341,7 +341,7 @@ jobs:

- name: Load website revalidation secret from 1Password
if: ${{ inputs.WEB_APP_REVALIDATE_SECRET_1PASSWORD != '' }}
uses: 1password/load-secrets-action@v2
uses: 1password/load-secrets-action@v4
with:
export-env: true
env:
Expand All @@ -353,7 +353,7 @@ jobs:
scripts/replace-variables.sh -in_file infra/backend.conf.rename_me -out_file infra/backend.conf -variables BUCKET_NAME,OBJECT_PREFIX
scripts/replace-variables.sh -in_file infra/vars.tfvars.rename_me -out_file infra/vars.tfvars -variables PROJECT_ID,REGION,ENVIRONMENT,DEPLOYER_SERVICE_ACCOUNT,FEED_API_IMAGE_VERSION,OAUTH2_CLIENT_ID,OAUTH2_CLIENT_SECRET,GLOBAL_RATE_LIMIT_REQ_PER_MINUTE,ARTIFACT_REPO_NAME,VALIDATOR_ENDPOINT,TRANSITLAND_API_KEY,OPERATIONS_OAUTH2_CLIENT_ID,TDG_API_TOKEN,WEB_APP_REVALIDATE_URL,WEB_APP_REVALIDATE_SECRET,BREVO_API_ANNOUNCEMENTS_LIST_ID

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: 1.5.3
terraform_wrapper: false
Expand All @@ -374,7 +374,7 @@ jobs:
PLAN_OUTPUT: ${{ steps.plan.outputs.stdout }}

- name: Persist TF plan
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: terraform-plan.txt
path: infra/terraform-plan.txt
Expand Down
Loading
Loading