Skip to content

Fix GHA service account permissions #2

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix GHA service account permissions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,15 @@ terraform destroy

# Input reference

| Name | Type | Required | Default |
|--------------------------------|------------|----------|------------|
| `server_service_account_email` | `string` | Yes | N/A |
| `google_cloud_project_id` | `string` | Yes | N/A |
| `resource_affix` | `string` | Yes | N/A |
| `environment` | `string` | No | `"main"` |
| `create_public_bucket` | `boolean` | No | `false` |
| `deletion_protection` | `bool` | No | `true` |
| Name | Type | Required | Default |
|----------------------------------------|------------|----------|------------|
| `server_service_account_email` | `string` | Yes | N/A |
| `github_actions_service_account_email` | `string` | Yes | N/A |
| `google_cloud_project_id` | `string` | Yes | N/A |
| `resource_affix` | `string` | Yes | N/A |
| `environment` | `string` | No | `"main"` |
| `create_public_bucket` | `boolean` | No | `false` |
| `deletion_protection` | `bool` | No | `true` |

See [`variables.tf`](/variables.tf) for descriptions.

Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0
0.1.1
10 changes: 8 additions & 2 deletions storage.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@ resource "google_storage_bucket_iam_member" "static_assets_object_viewer" {
}


# Allow the server to administer what's on the staging bucket
# Allow the server to administer what's on the static bucket.
resource "google_storage_bucket_iam_member" "static_assets_object_admin" {
for_each = toset(
[
"serviceAccount:${var.server_service_account_email}",
"serviceAccount:${var.github_actions_service_account_email}"
]
)
bucket = google_storage_bucket.static_assets.name
role = "roles/storage.objectAdmin"
member = "serviceAccount:${var.server_service_account_email}"
member = each.value
}


Expand Down
6 changes: 6 additions & 0 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ variable "server_service_account_email" {
}


variable "github_actions_service_account_email" {
type = string
description = "The email address of the GitHub Actions service account."
}


variable "google_cloud_project_id" {
type = string
description = "The ID of the GCP project to deploy resources in."
Expand Down