depends on fix

Nils · Nils · commit 2e8894f913d2 · 2023-04-18T14:46:51.000+02:00
diff --git a/examples/gitlab-ci-custom/README.md b/examples/gitlab-ci-custom/README.md
@@ -36,7 +36,7 @@ resource "google_service_account" "gitlab" {
   project      = var.project_id
   account_id   = var.gitlab_account_id
   display_name = "GitLab CI (WIF)"
-  description  = "Service Account for GitLab CI ${var.gitlab_repository} (Terraform managed)"
+  description  = "Service Account for self-managed GitLab CI ${var.gitlab_repository} (Terraform managed)"
 }
 
 # Allow service account to login via WIF and only from GitLab repository (project path)
@@ -47,6 +47,7 @@ module "github-service-account" {
   pool_name  = module.gitlab-custom-wif.pool_name
   account_id = google_service_account.gitlab.account_id
   repository = var.gitlab_repository
+  depends_on = [google_service_account.gitlab]
 }
 
 # Get the Workload Identity Pool Provider resource name for GitLab CI configuration
diff --git a/examples/gitlab-ci-custom/main.tf b/examples/gitlab-ci-custom/main.tf
@@ -18,7 +18,7 @@ resource "google_service_account" "gitlab" {
   project      = var.project_id
   account_id   = var.gitlab_account_id
   display_name = "GitLab CI (WIF)"
-  description  = "Service Account for GitLab CI ${var.gitlab_repository} (Terraform managed)"
+  description  = "Service Account for self-managed GitLab CI ${var.gitlab_repository} (Terraform managed)"
 }
 
 # Allow service account to login via WIF and only from GitLab repository (project path)
@@ -29,6 +29,7 @@ module "github-service-account" {
   pool_name  = module.gitlab-custom-wif.pool_name
   account_id = google_service_account.gitlab.account_id
   repository = var.gitlab_repository
+  depends_on = [google_service_account.gitlab]
 }
 
 # Get the Workload Identity Pool Provider resource name for GitLab CI configuration
diff --git a/examples/gitlab-ci-custom/terraform.tfvars.example b/examples/gitlab-ci-custom/terraform.tfvars.example
@@ -1,3 +1,3 @@
 project_id        = "your-project-id"
-gitlab_account_id = "gitlab-ci"
+gitlab_account_id = "gitlab-ci-custom"
 gitlab_repository = "your-org-or-user/your-repo"
diff --git a/examples/gitlab-ci/README.md b/examples/gitlab-ci/README.md
@@ -39,6 +39,7 @@ module "github-service-account" {
   pool_name  = module.gitlab-wif.pool_name
   account_id = google_service_account.gitlab.account_id
   repository = var.gitlab_repository
+  depends_on = [google_service_account.gitlab]
 }
 
 # Get the Workload Identity Pool Provider resource name for GitLab CI configuration
diff --git a/examples/gitlab-ci/main.tf b/examples/gitlab-ci/main.tf
@@ -21,6 +21,7 @@ module "github-service-account" {
   pool_name  = module.gitlab-wif.pool_name
   account_id = google_service_account.gitlab.account_id
   repository = var.gitlab_repository
+  depends_on = [google_service_account.gitlab]
 }
 
 # Get the Workload Identity Pool Provider resource name for GitLab CI configuration

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ resource "google_service_account" "gitlab" {`
`36`	`36`	`project = var.project_id`
`37`	`37`	`account_id = var.gitlab_account_id`
`38`	`38`	`display_name = "GitLab CI (WIF)"`
`39`		`- description = "Service Account for GitLab CI ${var.gitlab_repository} (Terraform managed)"`
	`39`	`+ description = "Service Account for self-managed GitLab CI ${var.gitlab_repository} (Terraform managed)"`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`# Allow service account to login via WIF and only from GitLab repository (project path)`
`@@ -47,6 +47,7 @@ module "github-service-account" {`
`47`	`47`	`pool_name = module.gitlab-custom-wif.pool_name`
`48`	`48`	`account_id = google_service_account.gitlab.account_id`
`49`	`49`	`repository = var.gitlab_repository`
	`50`	`+ depends_on = [google_service_account.gitlab]`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`# Get the Workload Identity Pool Provider resource name for GitLab CI configuration`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ resource "google_service_account" "gitlab" {`
`18`	`18`	`project = var.project_id`
`19`	`19`	`account_id = var.gitlab_account_id`
`20`	`20`	`display_name = "GitLab CI (WIF)"`
`21`		`- description = "Service Account for GitLab CI ${var.gitlab_repository} (Terraform managed)"`
	`21`	`+ description = "Service Account for self-managed GitLab CI ${var.gitlab_repository} (Terraform managed)"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`# Allow service account to login via WIF and only from GitLab repository (project path)`
`@@ -29,6 +29,7 @@ module "github-service-account" {`
`29`	`29`	`pool_name = module.gitlab-custom-wif.pool_name`
`30`	`30`	`account_id = google_service_account.gitlab.account_id`
`31`	`31`	`repository = var.gitlab_repository`
	`32`	`+ depends_on = [google_service_account.gitlab]`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`# Get the Workload Identity Pool Provider resource name for GitLab CI configuration`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ module "github-service-account" {`
`39`	`39`	`pool_name = module.gitlab-wif.pool_name`
`40`	`40`	`account_id = google_service_account.gitlab.account_id`
`41`	`41`	`repository = var.gitlab_repository`
	`42`	`+ depends_on = [google_service_account.gitlab]`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`# Get the Workload Identity Pool Provider resource name for GitLab CI configuration`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ module "github-service-account" {`
`21`	`21`	`pool_name = module.gitlab-wif.pool_name`
`22`	`22`	`account_id = google_service_account.gitlab.account_id`
`23`	`23`	`repository = var.gitlab_repository`
	`24`	`+ depends_on = [google_service_account.gitlab]`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`# Get the Workload Identity Pool Provider resource name for GitLab CI configuration`