Skip to content

Commit f396741

Browse files
oikarinendaniel-citeeaton
authored
fix(cai): modules must not define providers (#1132)
Co-authored-by: Daniel Andrade <[email protected]> Co-authored-by: eeaton <[email protected]>
1 parent 229e53c commit f396741

File tree

4 files changed

+6
-39
lines changed

4 files changed

+6
-39
lines changed

1-org/envs/shared/cai_monitoring.tf

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ module "kms" {
2828
module "cai_monitoring" {
2929
source = "../../modules/cai-monitoring"
3030

31-
org_id = local.org_id
32-
billing_account = local.billing_account
33-
project_id = module.scc_notifications.project_id
34-
location = local.default_region
35-
enable_cmek = true
36-
encryption_key = module.kms.keys["key-cai-monitoring"]
37-
impersonate_sa_email = local.org_step_terraform_service_account_email
31+
org_id = local.org_id
32+
billing_account = local.billing_account
33+
project_id = module.scc_notifications.project_id
34+
location = local.default_region
35+
enable_cmek = true
36+
encryption_key = module.kms.keys["key-cai-monitoring"]
3837
}

1-org/modules/cai-monitoring/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module "secure_cai_notification" {
1313
region = <REGION>
1414
encryption_key = <CMEK KEY>
1515
labels = <LABELS>
16-
impersonate_sa_email = <SA TO IMPERSONATE>
1716
roles_to_monitor = <ROLES TO MONITOR>
1817
}
1918
```
@@ -26,7 +25,6 @@ module "secure_cai_notification" {
2625
| billing\_account | The ID of the billing account to associate projects with. | `string` | n/a | yes |
2726
| enable\_cmek | The KMS Key to Encrypt Artifact Registry repository, Cloud Storage Bucket and Pub/Sub. | `bool` | `false` | no |
2827
| encryption\_key | The KMS Key to Encrypt Artifact Registry repository, Cloud Storage Bucket and Pub/Sub. | `string` | `null` | no |
29-
| impersonate\_sa\_email | The Service Account email who will execute terraform code. | `string` | n/a | yes |
3028
| labels | Labels to be assigned to resources. | `map(any)` | `{}` | no |
3129
| location | Default location to create resources where applicable. | `string` | `"us-central1"` | no |
3230
| org\_id | GCP Organization ID | `string` | n/a | yes |

1-org/modules/cai-monitoring/providers.tf

Lines changed: 0 additions & 25 deletions
This file was deleted.

1-org/modules/cai-monitoring/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ variable "labels" {
5353
default = {}
5454
}
5555

56-
variable "impersonate_sa_email" {
57-
description = "The Service Account email who will execute terraform code."
58-
type = string
59-
}
60-
6156
variable "roles_to_monitor" {
6257
description = "List of roles that will save a SCC Finding if granted to any member (service account, user or group) on an update in the IAM Policy."
6358
type = list(string)

0 commit comments

Comments
 (0)