Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔄 synced file(s) with WordPress/openverse-infrastructure #1127

Merged
merged 2 commits into from
Apr 3, 2023
Merged

🔄 synced file(s) with WordPress/openverse-infrastructure #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7775ca0
🔄 synced local '.github/workflows/' with remote 'next/production/depl…
Apr 3, 2023
42b7ff9
🔄 synced local '.github/workflows/' with remote 'next/staging/deploym…
Apr 3, 2023
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
41 changes: 15 additions & 26 deletions .github/workflows/deploy-production-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
### !!!
# This file is automatically generated using Terraform.
# Do not update it manually. If changes need to be made,
# please request help from a maintainer to generate the
# updated version.
# Do not update it manually. Changes must be made to
# `next/modules/generic/service/deploy_workflow.yml` in
# the `WordPress/openverse-infrastructure` repository.
# If changes need to be made, please request help from
# a maintainer to generate the updated version.
### !!!

name: "Deployment: production-api"
Expand All @@ -14,28 +16,15 @@ on:
type: string
required: true
description: Image tag to deploy.
workflow_call:
inputs:
tag:
# When the workflow is called by the CI + CD pipeline, the actor appears
# as "github-actions[bot]". In those circumstances, this input, if
# provided must be the GitHub handle of the actual actor. When triggering
# this workflow manually, please leave this empty and it will fallback to
# the right actor.
actor:
type: string
required: true
description: Image tag to deploy.
secrets:
ACCESS_TOKEN:
required: true
description: GitHub access token.
AWS_ACCESS_KEY_ID:
required: true
description: AWS access key ID.
AWS_SECRET_ACCESS_KEY:
required: true
description: AWS secret access key.
SLACK_WEBHOOK_URL:
required: true
description: Slack webhook URL.
GH_SLACK_USERNAME_MAP:
required: true
description: JSON mapping of GitHub usernames to Slack user IDs.
default: ""
description: The actual GitHub user that triggered this dispatch. Leave blank to use workflow dispatcher.

# Only allow a single deployment workflow (service + environment) to happen at a time
# If you need to stop an in-progress deployment of a service to force another for
Expand All @@ -60,7 +49,7 @@ jobs:
org: 'WordPress',
team_slug: 'openverse-maintainers',
});
const isAllowed = members.some(m => m.login === "${{ github.actor }}")
const isAllowed = "${{ github.actor }}" === "github-actions[bot]" || members.some(m => m.login === "${{ github.actor }}")
if (!isAllowed) {
throw new Error(
"Only GitHub users in the @WordPress/openverse-maintainers "
Expand All @@ -77,7 +66,7 @@ jobs:
import json
import os
mapping = json.loads('${{ env.GH_SLACK_USERNAME_MAP }}')
github_user = "${{ github.actor }}"
github_user = "${{ inputs.actor || github.actor }}"
slack_id = mapping[github_user]
with open(os.getenv('GITHUB_ENV'), "a") as env_file:
env_file.write(f"SLACK_USER_ID={slack_id}")
Expand Down
41 changes: 15 additions & 26 deletions .github/workflows/deploy-production-nuxt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
### !!!
# This file is automatically generated using Terraform.
# Do not update it manually. If changes need to be made,
# please request help from a maintainer to generate the
# updated version.
# Do not update it manually. Changes must be made to
# `next/modules/generic/service/deploy_workflow.yml` in
# the `WordPress/openverse-infrastructure` repository.
# If changes need to be made, please request help from
# a maintainer to generate the updated version.
### !!!

name: "Deployment: production-nuxt"
Expand All @@ -14,28 +16,15 @@ on:
type: string
required: true
description: Image tag to deploy.
workflow_call:
inputs:
tag:
# When the workflow is called by the CI + CD pipeline, the actor appears
# as "github-actions[bot]". In those circumstances, this input, if
# provided must be the GitHub handle of the actual actor. When triggering
# this workflow manually, please leave this empty and it will fallback to
# the right actor.
actor:
type: string
required: true
description: Image tag to deploy.
secrets:
ACCESS_TOKEN:
required: true
description: GitHub access token.
AWS_ACCESS_KEY_ID:
required: true
description: AWS access key ID.
AWS_SECRET_ACCESS_KEY:
required: true
description: AWS secret access key.
SLACK_WEBHOOK_URL:
required: true
description: Slack webhook URL.
GH_SLACK_USERNAME_MAP:
required: true
description: JSON mapping of GitHub usernames to Slack user IDs.
default: ""
description: The actual GitHub user that triggered this dispatch. Leave blank to use workflow dispatcher.

# Only allow a single deployment workflow (service + environment) to happen at a time
# If you need to stop an in-progress deployment of a service to force another for
Expand All @@ -60,7 +49,7 @@ jobs:
org: 'WordPress',
team_slug: 'openverse-maintainers',
});
const isAllowed = members.some(m => m.login === "${{ github.actor }}")
const isAllowed = "${{ github.actor }}" === "github-actions[bot]" || members.some(m => m.login === "${{ github.actor }}")
if (!isAllowed) {
throw new Error(
"Only GitHub users in the @WordPress/openverse-maintainers "
Expand All @@ -77,7 +66,7 @@ jobs:
import json
import os
mapping = json.loads('${{ env.GH_SLACK_USERNAME_MAP }}')
github_user = "${{ github.actor }}"
github_user = "${{ inputs.actor || github.actor }}"
slack_id = mapping[github_user]
with open(os.getenv('GITHUB_ENV'), "a") as env_file:
env_file.write(f"SLACK_USER_ID={slack_id}")
Expand Down
41 changes: 15 additions & 26 deletions .github/workflows/deploy-staging-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
### !!!
# This file is automatically generated using Terraform.
# Do not update it manually. If changes need to be made,
# please request help from a maintainer to generate the
# updated version.
# Do not update it manually. Changes must be made to
# `next/modules/generic/service/deploy_workflow.yml` in
# the `WordPress/openverse-infrastructure` repository.
# If changes need to be made, please request help from
# a maintainer to generate the updated version.
### !!!

name: "Deployment: staging-api"
Expand All @@ -14,28 +16,15 @@ on:
type: string
required: true
description: Image tag to deploy.
workflow_call:
inputs:
tag:
# When the workflow is called by the CI + CD pipeline, the actor appears
# as "github-actions[bot]". In those circumstances, this input, if
# provided must be the GitHub handle of the actual actor. When triggering
# this workflow manually, please leave this empty and it will fallback to
# the right actor.
actor:
type: string
required: true
description: Image tag to deploy.
secrets:
ACCESS_TOKEN:
required: true
description: GitHub access token.
AWS_ACCESS_KEY_ID:
required: true
description: AWS access key ID.
AWS_SECRET_ACCESS_KEY:
required: true
description: AWS secret access key.
SLACK_WEBHOOK_URL:
required: true
description: Slack webhook URL.
GH_SLACK_USERNAME_MAP:
required: true
description: JSON mapping of GitHub usernames to Slack user IDs.
default: ""
description: The actual GitHub user that triggered this dispatch. Leave blank to use workflow dispatcher.

# Only allow a single deployment workflow (service + environment) to happen at a time
# If you need to stop an in-progress deployment of a service to force another for
Expand All @@ -60,7 +49,7 @@ jobs:
org: 'WordPress',
team_slug: 'openverse-maintainers',
});
const isAllowed = members.some(m => m.login === "${{ github.actor }}")
const isAllowed = "${{ github.actor }}" === "github-actions[bot]" || members.some(m => m.login === "${{ github.actor }}")
if (!isAllowed) {
throw new Error(
"Only GitHub users in the @WordPress/openverse-maintainers "
Expand All @@ -77,7 +66,7 @@ jobs:
import json
import os
mapping = json.loads('${{ env.GH_SLACK_USERNAME_MAP }}')
github_user = "${{ github.actor }}"
github_user = "${{ inputs.actor || github.actor }}"
slack_id = mapping[github_user]
with open(os.getenv('GITHUB_ENV'), "a") as env_file:
env_file.write(f"SLACK_USER_ID={slack_id}")
Expand Down
41 changes: 15 additions & 26 deletions .github/workflows/deploy-staging-nuxt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
### !!!
# This file is automatically generated using Terraform.
# Do not update it manually. If changes need to be made,
# please request help from a maintainer to generate the
# updated version.
# Do not update it manually. Changes must be made to
# `next/modules/generic/service/deploy_workflow.yml` in
# the `WordPress/openverse-infrastructure` repository.
# If changes need to be made, please request help from
# a maintainer to generate the updated version.
### !!!

name: "Deployment: staging-nuxt"
Expand All @@ -14,28 +16,15 @@ on:
type: string
required: true
description: Image tag to deploy.
workflow_call:
inputs:
tag:
# When the workflow is called by the CI + CD pipeline, the actor appears
# as "github-actions[bot]". In those circumstances, this input, if
# provided must be the GitHub handle of the actual actor. When triggering
# this workflow manually, please leave this empty and it will fallback to
# the right actor.
actor:
type: string
required: true
description: Image tag to deploy.
secrets:
ACCESS_TOKEN:
required: true
description: GitHub access token.
AWS_ACCESS_KEY_ID:
required: true
description: AWS access key ID.
AWS_SECRET_ACCESS_KEY:
required: true
description: AWS secret access key.
SLACK_WEBHOOK_URL:
required: true
description: Slack webhook URL.
GH_SLACK_USERNAME_MAP:
required: true
description: JSON mapping of GitHub usernames to Slack user IDs.
default: ""
description: The actual GitHub user that triggered this dispatch. Leave blank to use workflow dispatcher.

# Only allow a single deployment workflow (service + environment) to happen at a time
# If you need to stop an in-progress deployment of a service to force another for
Expand All @@ -60,7 +49,7 @@ jobs:
org: 'WordPress',
team_slug: 'openverse-maintainers',
});
const isAllowed = members.some(m => m.login === "${{ github.actor }}")
const isAllowed = "${{ github.actor }}" === "github-actions[bot]" || members.some(m => m.login === "${{ github.actor }}")
if (!isAllowed) {
throw new Error(
"Only GitHub users in the @WordPress/openverse-maintainers "
Expand All @@ -77,7 +66,7 @@ jobs:
import json
import os
mapping = json.loads('${{ env.GH_SLACK_USERNAME_MAP }}')
github_user = "${{ github.actor }}"
github_user = "${{ inputs.actor || github.actor }}"
slack_id = mapping[github_user]
with open(os.getenv('GITHUB_ENV'), "a") as env_file:
env_file.write(f"SLACK_USER_ID={slack_id}")
Expand Down