From 985eb3feabc07bc343fb19b55d2364599bc87150 Mon Sep 17 00:00:00 2001 From: Nikhil Bhoyar Date: Wed, 11 Dec 2024 10:46:14 +0000 Subject: [PATCH] fmt --- examples/autokey_setup/README.md | 4 +-- examples/bucket_setup_using_autokey/README.md | 12 ++++----- test/fixtures/autokey_setup_fixture/main.tf | 21 +++++++++++++--- .../autokey_setup_fixture/variables.tf | 2 +- .../main.tf | 25 +++++++++++++++---- 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/examples/autokey_setup/README.md b/examples/autokey_setup/README.md index 2413872..eb8e06e 100644 --- a/examples/autokey_setup/README.md +++ b/examples/autokey_setup/README.md @@ -7,8 +7,8 @@ This example illustrates how to setup the `autokey` kms submodule for [KMS Autok | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| folder\_id | The ID of the folder for which to configure and enable Autokey feature. Required when using Autokey. | `string` | n/a | yes | -| kms\_project\_id | The ID of the project in which kms keyring and kms keys will be provisioned by autokey. | `string` | n/a | yes | +| folder\_id | The ID of the folder for which to configure and enable Autokey feature. | `string` | n/a | yes | +| kms\_project\_id | The ID of the project in which KMS keyring and KMS keys will be provisioned by autokey. | `string` | n/a | yes | ## Outputs diff --git a/examples/bucket_setup_using_autokey/README.md b/examples/bucket_setup_using_autokey/README.md index ad90643..6cffd0c 100644 --- a/examples/bucket_setup_using_autokey/README.md +++ b/examples/bucket_setup_using_autokey/README.md @@ -7,17 +7,17 @@ This example illustrates how to use the `autokey` kms submodule for [KMS Autokey | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| bucket\_location | The gcp location where storage bucket will be created | `string` | `"us-central1"` | no | -| folder\_id | The ID of the folder for which to configure and enable Autokey feature. Required when using Autokey. | `string` | n/a | yes | -| kms\_project\_id | The ID of the project in which kms keyring and kms keys will be provisioned by autokey. | `string` | n/a | yes | -| resource\_project\_id | The ID of the project in which to provision resources (bucket, persistent disk, etc) | `string` | n/a | yes | +| bucket\_location | The GCP location where storage bucket will be created | `string` | `"us-central1"` | no | +| folder\_id | The ID of the folder for which to configure and enable Autokey feature. | `string` | n/a | yes | +| kms\_project\_id | The ID of the project in which KMS keyring and KMS keys will be provisioned by autokey. | `string` | n/a | yes | +| resource\_project\_id | The ID of the project in which to provision cloud storage bucket resource. | `string` | n/a | yes | ## Outputs | Name | Description | |------|-------------| -| bucket\_keyhandle | An Autokey configuration identifier. | -| bucket\_name | A map of KeyHandles created. | +| bucket\_keyhandle | Keyhandle configuration created for the bucket. | +| bucket\_name | Name of the bucket created. | diff --git a/test/fixtures/autokey_setup_fixture/main.tf b/test/fixtures/autokey_setup_fixture/main.tf index 85dbf31..49c53bf 100644 --- a/test/fixtures/autokey_setup_fixture/main.tf +++ b/test/fixtures/autokey_setup_fixture/main.tf @@ -1,5 +1,20 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ module "autokey_setup_fixture" { - source = "../../../examples/autokey_setup" - kms_project_id = var.project_id - folder_id = var.folder_id + source = "../../../examples/autokey_setup" + kms_project_id = var.project_id + folder_id = var.folder_id } diff --git a/test/fixtures/autokey_setup_fixture/variables.tf b/test/fixtures/autokey_setup_fixture/variables.tf index d992660..4340480 100644 --- a/test/fixtures/autokey_setup_fixture/variables.tf +++ b/test/fixtures/autokey_setup_fixture/variables.tf @@ -20,7 +20,7 @@ variable "project_id" { } variable "folder_id" { - description = "The ID of the folder for which to configure and enable Autokey feature." + description = "The ID of the folder for which to configure and enable Autokey feature." type = string } diff --git a/test/fixtures/bucket_setup_using_autokey_fixture/main.tf b/test/fixtures/bucket_setup_using_autokey_fixture/main.tf index 7938f22..80c2755 100644 --- a/test/fixtures/bucket_setup_using_autokey_fixture/main.tf +++ b/test/fixtures/bucket_setup_using_autokey_fixture/main.tf @@ -1,7 +1,22 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ module "bucket_setup_using_autokey_fixture" { - source = "../../../examples/bucket_setup_using_autokey" - kms_project_id = var.project_id - folder_id = var.folder_id - resource_project_id = var.resource_project_id - bucket_location = var.bucket_location + source = "../../../examples/bucket_setup_using_autokey" + kms_project_id = var.project_id + folder_id = var.folder_id + resource_project_id = var.resource_project_id + bucket_location = var.bucket_location }