Skip to content

Commit 9e038ef

Browse files
committed
Moves projects bucket out cloud build sectin
1 parent 2bfe7c2 commit 9e038ef

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

0-bootstrap/outputs.tf

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ output "gcs_bucket_tfstate" {
4949
value = module.seed_bootstrap.gcs_bucket_tfstate
5050
}
5151

52+
output "projects_gcs_bucket_tfstate" {
53+
description = "Bucket used for storing terraform state for stage 4-projects foundations pipelines in seed project."
54+
value = module.gcp_projects_state_bucket.bucket.name
55+
}
56+
5257
output "common_config" {
5358
description = "Common configuration data to be used in other steps."
5459
value = {
@@ -96,11 +101,6 @@ output "gcs_bucket_cloudbuild_logs" {
96101
value = { for key, value in module.tf_workspace : key => replace(value.logs_bucket, local.bucket_self_link_prefix, "") }
97102
}
98103

99-
output "projects_gcs_bucket_tfstate" {
100-
description = "Bucket used for storing terraform state for stage 4-projects foundations pipelines in seed project."
101-
value = module.gcp_projects_state_bucket.bucket.name
102-
}
103-
104104
output "cloud_builder_artifact_repo" {
105105
description = "Artifact Registry (AR) Repository created to store TF Cloud Builder images."
106106
value = "projects/${module.tf_source.cloudbuild_project_id}/locations/${var.default_region}/repositories/${module.tf_cloud_builder.artifact_repo}"
@@ -146,11 +146,6 @@ output "cloud_build_peered_network_id" {
146146
# value = module.gh_cicd.project_id
147147
# }
148148

149-
# output "projects_gcs_bucket_tfstate" {
150-
# description = "Bucket used for storing terraform state for stage 4-projects foundations pipelines in seed project."
151-
# value = module.seed_bootstrap.gcs_bucket_tfstate
152-
# }
153-
154149
/* ----------------------------------------
155150
Specific to jenkins_bootstrap module
156151
---------------------------------------- */
@@ -170,11 +165,6 @@ output "cloud_build_peered_network_id" {
170165
# value = module.jenkins_bootstrap.jenkins_agent_vpc_id
171166
# }
172167

173-
# output "projects_gcs_bucket_tfstate" {
174-
# description = "Bucket used for storing terraform state for stage 4-projects foundations pipelines in seed project."
175-
# value = module.seed_bootstrap.gcs_bucket_tfstate
176-
# }
177-
178168
# output "jenkins_agent_sa_email" {
179169
# description = "Email for privileged custom service account for Jenkins Agent GCE instance."
180170
# value = module.jenkins_bootstrap.jenkins_agent_sa_email
@@ -199,11 +189,6 @@ output "cloud_build_peered_network_id" {
199189
# value = module.gitlab_cicd.project_id
200190
# }
201191

202-
# output "projects_gcs_bucket_tfstate" {
203-
# description = "Bucket used for storing terraform state for stage 4-projects foundations pipelines in seed project."
204-
# value = module.seed_bootstrap.gcs_bucket_tfstate
205-
# }
206-
207192
/* ----------------------------------------
208193
Specific to tfc_bootstrap
209194
---------------------------------------- */

0 commit comments

Comments
 (0)