Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove duplicate variable key #154

Merged
merged 1 commit into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/secure_cloud_run/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ This example assumes that below mentioned pre-requisites are in place before con
| create\_cloud\_armor\_policies | When `true`, the terraform will create the Cloud Armor policies. When `false`, the user must provide their own Cloud Armor name in `cloud_armor_policies_name`. | `bool` | `true` | no |
| domain | Domain list to run on the load balancer. Used if `ssl` is `true`. | `list(string)` | n/a | yes |
| folder\_id | The folder ID to apply the policy to. | `string` | `""` | no |
| groups | Groups which will have roles assigned.<br> The Serverless Administrators email group which the following roles will be added: Cloud Run Admin, Compute Network Viewer and Compute Network User.<br> The Serverless Security Administrators email group which the following roles will be added: Cloud Run Viewer, Cloud KMS Viewer and Artifact Registry Reader.<br> The Cloud Run Developer email group which the following roles will be added: Cloud Run Developer, Artifact Registry Writer and Cloud KMS CryptoKey Encrypter.<br> The Cloud Run User email group which the following roles will be added: Cloud Run Invoker. | <pre>object({<br> group_serverless_administrator = optional(string, null)<br> group_serverless_security_administrator = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_user = optional(string, null)<br> })</pre> | `{}` | no |
| groups | Groups which will have roles assigned.<br> The Serverless Administrators email group which the following roles will be added: Cloud Run Admin, Compute Network Viewer and Compute Network User.<br> The Serverless Security Administrators email group which the following roles will be added: Cloud Run Viewer, Cloud KMS Viewer and Artifact Registry Reader.<br> The Cloud Run Developer email group which the following roles will be added: Cloud Run Developer, Artifact Registry Writer and Cloud KMS CryptoKey Encrypter.<br> The Cloud Run User email group which the following roles will be added: Cloud Run Invoker. | <pre>object({<br> group_serverless_administrator = optional(string, null)<br> group_serverless_security_administrator = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_user = optional(string, null)<br> })</pre> | `{}` | no |
| ip\_cidr\_range | The range of internal addresses that are owned by the subnetwork and which is going to be used by VPC Connector. For example, 10.0.0.0/28 or 192.168.0.0/28. Ranges must be unique and non-overlapping within a network. Only IPv4 is supported. | `string` | n/a | yes |
| kms\_project\_id | The project where KMS will be created. | `string` | n/a | yes |
| organization\_id | The organization ID to apply the policy to. | `string` | `""` | no |
Expand Down
1 change: 0 additions & 1 deletion examples/secure_cloud_run/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ variable "groups" {
group_serverless_administrator = optional(string, null)
group_serverless_security_administrator = optional(string, null)
group_cloud_run_developer = optional(string, null)
group_cloud_run_developer = optional(string, null)
group_cloud_run_user = optional(string, null)
})

Expand Down
2 changes: 1 addition & 1 deletion modules/secure-cloud-run-security/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module "cloud_run_security" {
| decrypters | List of comma-separated owners for each key declared in set\_decrypters\_for. | `list(string)` | `[]` | no |
| encrypters | List of comma-separated owners for each key declared in set\_encrypters\_for. | `list(string)` | `[]` | no |
| folder\_id | The folder ID to apply the policy to. | `string` | `""` | no |
| groups | Groups which will have roles assigned.<br> The Serverless Administrators email group which the following roles will be added: Cloud Run Admin, Compute Network Viewer and Compute Network User.<br> The Serverless Security Administrators email group which the following roles will be added: Cloud Run Viewer, Cloud KMS Viewer and Artifact Registry Reader.<br> The Cloud Run Developer email group which the following roles will be added: Cloud Run Developer, Artifact Registry Writer and Cloud KMS CryptoKey Encrypter.<br> The Cloud Run User email group which the following roles will be added: Cloud Run Invoker. | <pre>object({<br> group_serverless_administrator = optional(string, null)<br> group_serverless_security_administrator = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_user = optional(string, null)<br> })</pre> | `{}` | no |
| groups | Groups which will have roles assigned.<br> The Serverless Administrators email group which the following roles will be added: Cloud Run Admin, Compute Network Viewer and Compute Network User.<br> The Serverless Security Administrators email group which the following roles will be added: Cloud Run Viewer, Cloud KMS Viewer and Artifact Registry Reader.<br> The Cloud Run Developer email group which the following roles will be added: Cloud Run Developer, Artifact Registry Writer and Cloud KMS CryptoKey Encrypter.<br> The Cloud Run User email group which the following roles will be added: Cloud Run Invoker. | <pre>object({<br> group_serverless_administrator = optional(string, null)<br> group_serverless_security_administrator = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_user = optional(string, null)<br> })</pre> | `{}` | no |
| key\_name | Key name. | `string` | n/a | yes |
| key\_protection\_level | The protection level to use when creating a version based on this template. Possible values: ["SOFTWARE", "HSM"] | `string` | `"HSM"` | no |
| key\_rotation\_period | Period of key rotation in seconds. | `string` | `"2592000s"` | no |
Expand Down
1 change: 0 additions & 1 deletion modules/secure-cloud-run-security/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ variable "groups" {
group_serverless_administrator = optional(string, null)
group_serverless_security_administrator = optional(string, null)
group_cloud_run_developer = optional(string, null)
group_cloud_run_developer = optional(string, null)
group_cloud_run_user = optional(string, null)
})

Expand Down
2 changes: 1 addition & 1 deletion modules/secure-cloud-run/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ module "secure_cloud_run" {
| env\_vars | Environment variables (cleartext) | <pre>list(object({<br> value = string<br> name = string<br> }))</pre> | `[]` | no |
| folder\_id | The folder ID to apply the policy to. | `string` | `""` | no |
| grant\_artifact\_register\_reader | When true it will grant permission to read an image from your artifact registry. When true, you must provide `artifact_registry_repository_project_id`, `artifact_registry_repository_location` and `artifact_registry_repository_name`. | `bool` | `false` | no |
| groups | Groups which will have roles assigned.<br> The Serverless Administrators email group which the following roles will be added: Cloud Run Admin, Compute Network Viewer and Compute Network User.<br> The Serverless Security Administrators email group which the following roles will be added: Cloud Run Viewer, Cloud KMS Viewer and Artifact Registry Reader.<br> The Cloud Run Developer email group which the following roles will be added: Cloud Run Developer, Artifact Registry Writer and Cloud KMS CryptoKey Encrypter.<br> The Cloud Run User email group which the following roles will be added: Cloud Run Invoker. | <pre>object({<br> group_serverless_administrator = optional(string, null)<br> group_serverless_security_administrator = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_user = optional(string, null)<br> })</pre> | `{}` | no |
| groups | Groups which will have roles assigned.<br> The Serverless Administrators email group which the following roles will be added: Cloud Run Admin, Compute Network Viewer and Compute Network User.<br> The Serverless Security Administrators email group which the following roles will be added: Cloud Run Viewer, Cloud KMS Viewer and Artifact Registry Reader.<br> The Cloud Run Developer email group which the following roles will be added: Cloud Run Developer, Artifact Registry Writer and Cloud KMS CryptoKey Encrypter.<br> The Cloud Run User email group which the following roles will be added: Cloud Run Invoker. | <pre>object({<br> group_serverless_administrator = optional(string, null)<br> group_serverless_security_administrator = optional(string, null)<br> group_cloud_run_developer = optional(string, null)<br> group_cloud_run_user = optional(string, null)<br> })</pre> | `{}` | no |
| image | Image url to be deployed on Cloud Run. | `string` | n/a | yes |
| ip\_cidr\_range | The range of internal addresses that are owned by the subnetwork and which is going to be used by VPC Connector. For example, 10.0.0.0/28 or 192.168.0.0/28. Ranges must be unique and non-overlapping within a network. Only IPv4 is supported. | `string` | n/a | yes |
| key\_name | The name of KMS Key to be created and used in Cloud Run. | `string` | `"cloud-run-kms-key"` | no |
Expand Down
1 change: 0 additions & 1 deletion modules/secure-cloud-run/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ variable "groups" {
group_serverless_administrator = optional(string, null)
group_serverless_security_administrator = optional(string, null)
group_cloud_run_developer = optional(string, null)
group_cloud_run_developer = optional(string, null)
group_cloud_run_user = optional(string, null)
})

Expand Down