Fix Shielded Folder - VertexML interoperability (#1355)
* Fix Shielded Folder - VertexML interoperability * Fix README outputs * Adding prefix for keyrings and update output
This commit is contained in:
parent
e333b6ffa2
commit
4d66623de1
|
@ -176,9 +176,9 @@ terraform apply
|
||||||
|---|---|:---:|
|
|---|---|:---:|
|
||||||
| [folders](outputs.tf#L15) | Folders id. | |
|
| [folders](outputs.tf#L15) | Folders id. | |
|
||||||
| [folders_sink_writer_identities](outputs.tf#L23) | Folders id. | |
|
| [folders_sink_writer_identities](outputs.tf#L23) | Folders id. | |
|
||||||
|
| [kms_keys](outputs.tf#L31) | Cloud KMS encryption keys created. | |
|
||||||
|
|
||||||
<!-- END TFDOC -->
|
<!-- END TFDOC -->
|
||||||
|
|
||||||
## Test
|
## Test
|
||||||
|
|
||||||
```hcl
|
```hcl
|
||||||
|
|
|
@ -81,7 +81,7 @@ module "sec-kms" {
|
||||||
project_id = module.sec-project[0].project_id
|
project_id = module.sec-project[0].project_id
|
||||||
keyring = {
|
keyring = {
|
||||||
location = each.key
|
location = each.key
|
||||||
name = "${each.key}"
|
name = "sec-${each.key}"
|
||||||
}
|
}
|
||||||
# rename to `key_iam` to switch to authoritative bindings
|
# rename to `key_iam` to switch to authoritative bindings
|
||||||
key_iam_additive = {
|
key_iam_additive = {
|
||||||
|
@ -96,7 +96,7 @@ module "log-kms" {
|
||||||
project_id = module.sec-project[0].project_id
|
project_id = module.sec-project[0].project_id
|
||||||
keyring = {
|
keyring = {
|
||||||
location = each.key
|
location = each.key
|
||||||
name = "${each.key}"
|
name = "log-${each.key}"
|
||||||
}
|
}
|
||||||
keys = local.kms_log_locations_keys[each.key]
|
keys = local.kms_log_locations_keys[each.key]
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,3 +28,7 @@ output "folders_sink_writer_identities" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
output "kms_keys" {
|
||||||
|
description = "Cloud KMS encryption keys created."
|
||||||
|
value = { for k, v in module.sec-kms : k => v.key_ids }
|
||||||
|
}
|
||||||
|
|
|
@ -74,7 +74,6 @@ module "test" {
|
||||||
}
|
}
|
||||||
# tftest modules=11 resources=60
|
# tftest modules=11 resources=60
|
||||||
```
|
```
|
||||||
|
|
||||||
<!-- BEGIN TFDOC -->
|
<!-- BEGIN TFDOC -->
|
||||||
|
|
||||||
## Variables
|
## Variables
|
||||||
|
@ -101,7 +100,7 @@ module "test" {
|
||||||
|---|---|:---:|
|
|---|---|:---:|
|
||||||
| [github](outputs.tf#L30) | Github Configuration. | |
|
| [github](outputs.tf#L30) | Github Configuration. | |
|
||||||
| [notebook](outputs.tf#L35) | Vertex AI notebooks ids. | |
|
| [notebook](outputs.tf#L35) | Vertex AI notebooks ids. | |
|
||||||
| [project](outputs.tf#L43) | The project resource as return by the `project` module. | |
|
| [project_id](outputs.tf#L43) | Project ID. | |
|
||||||
|
|
||||||
<!-- END TFDOC -->
|
<!-- END TFDOC -->
|
||||||
## Test
|
## Test
|
||||||
|
|
|
@ -242,6 +242,7 @@ module "project" {
|
||||||
service_encryption_key_ids = {
|
service_encryption_key_ids = {
|
||||||
aiplatform = [var.service_encryption_keys.aiplatform]
|
aiplatform = [var.service_encryption_keys.aiplatform]
|
||||||
bq = [var.service_encryption_keys.bq]
|
bq = [var.service_encryption_keys.bq]
|
||||||
|
compute = [var.service_encryption_keys.notebooks]
|
||||||
cloudbuild = [var.service_encryption_keys.storage]
|
cloudbuild = [var.service_encryption_keys.storage]
|
||||||
notebooks = [var.service_encryption_keys.notebooks]
|
notebooks = [var.service_encryption_keys.notebooks]
|
||||||
secretmanager = [var.service_encryption_keys.secretmanager]
|
secretmanager = [var.service_encryption_keys.secretmanager]
|
||||||
|
|
|
@ -40,7 +40,7 @@ output "notebook" {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
output "project" {
|
output "project_id" {
|
||||||
description = "The project resource as return by the `project` module."
|
description = "Project ID."
|
||||||
value = module.project
|
value = module.project.project_id
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue