Skip to content

Commit

Permalink
fix: add standalone repo for terraform-validator policies (#403)
Browse files Browse the repository at this point in the history
* add standalone repo for terraform-validator policies

* fix terraform lint issue
  • Loading branch information
daniel-cit committed Apr 2, 2021
1 parent 7beb5a0 commit b170478
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
3 changes: 2 additions & 1 deletion 0-bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Currently, the bucket information is replaced in the state backends as a part of
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| billing\_account | The ID of the billing account to associate projects with. | `string` | n/a | yes |
| cloud\_source\_repos | List of Cloud Source Repositories created during bootstrap project build stage | `list(string)` | <pre>[<br> "gcp-org",<br> "gcp-environments",<br> "gcp-networks",<br> "gcp-projects",<br> "gcp-policies"<br>]</pre> | no |
| cloud\_source\_repos | List of Cloud Source Repositories created during bootstrap project build stage for use with Cloud Build. | `list(string)` | <pre>[<br> "gcp-org",<br> "gcp-environments",<br> "gcp-networks",<br> "gcp-projects"<br>]</pre> | no |
| default\_region | Default region to create resources where applicable. | `string` | `"us-central1"` | no |
| folder\_prefix | Name prefix to use for folders created. | `string` | `"fldr"` | no |
| group\_billing\_admins | Google Group for GCP Billing Administrators | `string` | n/a | yes |
Expand All @@ -85,6 +85,7 @@ Currently, the bucket information is replaced in the state backends as a part of
| seed\_project\_id | Project where service accounts and core APIs will be enabled. |
| terraform\_sa\_name | Fully qualified name for privileged service account for Terraform. |
| terraform\_service\_account | Email for privileged service account for Terraform. |
| terraform\_validator\_policies\_repo | Cloud Source Repository created for terraform-validator policies. |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

Expand Down
9 changes: 9 additions & 0 deletions 0-bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,15 @@ module "cloudbuild_bootstrap" {
]
}

// Standalone repo for Terraform-validator policies.
// This repo does not need to trigger builds in Cloud Build.
resource "google_sourcerepo_repository" "gcp_policies" {
project = module.cloudbuild_bootstrap.cloudbuild_project_id
name = "gcp-policies"

depends_on = [module.cloudbuild_bootstrap.csr_repos]
}

resource "google_project_iam_member" "project_source_reader" {
project = module.cloudbuild_bootstrap.cloudbuild_project_id
role = "roles/source.reader"
Expand Down
5 changes: 5 additions & 0 deletions 0-bootstrap/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ output "csr_repos" {
value = module.cloudbuild_bootstrap.csr_repos
}

output "terraform_validator_policies_repo" {
description = "Cloud Source Repository created for terraform-validator policies."
value = google_sourcerepo_repository.gcp_policies
}

output "kms_keyring" {
description = "KMS Keyring created by the module."
value = module.cloudbuild_bootstrap.kms_keyring
Expand Down
4 changes: 2 additions & 2 deletions 0-bootstrap/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ variable "folder_prefix" {
default = "fldr"
}
variable "cloud_source_repos" {
description = "List of Cloud Source Repositories created during bootstrap project build stage"
description = "List of Cloud Source Repositories created during bootstrap project build stage for use with Cloud Build."
type = list(string)
default = ["gcp-org", "gcp-environments", "gcp-networks", "gcp-projects", "gcp-policies"]
default = ["gcp-org", "gcp-environments", "gcp-networks", "gcp-projects"]
}

/* ----------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion test/integration/bootstrap/controls/gcp_cloudbuild.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
'gcp-org',
'gcp-environments',
'gcp-networks',
'gcp-projects'
'gcp-projects',
'gcp-policies'
]

control 'gcp_cloudbuild' do
Expand Down

0 comments on commit b170478

Please sign in to comment.