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.

Sign up for GitHub

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 Shielded Folder - VertexML interoperability #1355

Merged
merged 4 commits into from
May 5, 2023
Merged

Fix Shielded Folder - VertexML interoperability #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
905dc6d
Fix Shielded Folder - VertexML interoperability
lcaggio May 4, 2023
34f276b
Fix README outputs
lcaggio May 4, 2023
15d2844
Adding prefix for keyrings and update output
lcaggio May 4, 2023
6a1255b
Merge branch 'master' into lcaggio/shielded-vertex
lcaggio May 5, 2023
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 blueprints/data-solutions/shielded-folder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ terraform apply
|---|---|:---:|
| [folders](outputs.tf#L15) | Folders id. | |
| [folders_sink_writer_identities](outputs.tf#L23) | Folders id. | |
| [kms_keys](outputs.tf#L31) | Cloud KMS encryption keys created. | |

<!-- END TFDOC -->

## Test

```hcl
Expand Down
4 changes: 2 additions & 2 deletions blueprints/data-solutions/shielded-folder/kms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ module "sec-kms" {
project_id = module.sec-project[0].project_id
keyring = {
location = each.key
name = "${each.key}"
name = "sec-${each.key}"
}
# rename to `key_iam` to switch to authoritative bindings
key_iam_additive = {
Expand All @@ -96,7 +96,7 @@ module "log-kms" {
project_id = module.sec-project[0].project_id
keyring = {
location = each.key
name = "${each.key}"
name = "log-${each.key}"
}
keys = local.kms_log_locations_keys[each.key]
}
4 changes: 4 additions & 0 deletions blueprints/data-solutions/shielded-folder/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
3 changes: 1 addition & 2 deletions blueprints/data-solutions/vertex-mlops/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ module "test" {
}
# tftest modules=11 resources=60
```

<!-- BEGIN TFDOC -->

## Variables
Expand All @@ -101,7 +100,7 @@ module "test" {
|---|---|:---:|
| [github](outputs.tf#L30) | Github Configuration. | |
| [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 -->
## Test
Expand Down
1 change: 1 addition & 0 deletions blueprints/data-solutions/vertex-mlops/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ module "project" {
service_encryption_key_ids = {
aiplatform = [var.service_encryption_keys.aiplatform]
bq = [var.service_encryption_keys.bq]
compute = [var.service_encryption_keys.notebooks]
cloudbuild = [var.service_encryption_keys.storage]
notebooks = [var.service_encryption_keys.notebooks]
secretmanager = [var.service_encryption_keys.secretmanager]
Expand Down
6 changes: 3 additions & 3 deletions blueprints/data-solutions/vertex-mlops/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ output "notebook" {
)
}

output "project" {
description = "The project resource as return by the `project` module."
value = module.project
output "project_id" {
description = "Project ID."
value = module.project.project_id
}