Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
koenighotze committed May 10, 2024
1 parent b57eb69 commit 0453ff4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Apply
name: Bootstrap setup

on:
workflow_dispatch:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ key-file.json
*.state
variable-defaults.tfvars
scripts/local.sh
defaults.auto.tfvars
4 changes: 2 additions & 2 deletions bodleian/backend-runtime-sa.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ resource "google_project_iam_member" "bodleian_backend_service_iam_binding" {
member = "serviceAccount:${google_service_account.backend_service_sa.email}"
}

resource "google_service_account_iam_member" "backend_service_sa_user_iam_binding_serviceaccountuser" {
resource "google_service_account_iam_member" "deployer_serviceaccountuser" {
service_account_id = google_service_account.backend_service_sa.name
role = "roles/iam.serviceAccountUser"

member = "serviceAccount:${google_service_account.backend_deployer_sa.email}"
}

resource "google_service_account_iam_member" "backend_service_sa_user_iam_binding_serviceaccountuser" {
resource "google_service_account_iam_member" "infrastructure_serviceaccountuser" {
service_account_id = google_service_account.backend_service_sa.name
role = "roles/iam.serviceAccountUser"

Expand Down
2 changes: 1 addition & 1 deletion scripts/local-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ gcloud config set project koenighotze-seed-398addce
# gcloud auth application-default login

if bucket_exists "$SEED_PROJECT"; then
terraform init -backend-config="bucket=$SEED_PROJECT"
terraform init -backend-config="bucket=$SEED_PROJECT" $*
else
echo "Missing bucket '$SEED_PROJECT'; cannot initialize backend"
exit 1
Expand Down
5 changes: 5 additions & 0 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@ terraform {
source = "integrations/github"
version = ">= 4.0"
}

random = {
source = "hashicorp/random"
version = "~> 3.6.0"
}
}
}

0 comments on commit 0453ff4

Please sign in to comment.