Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
nb-goog committed Dec 11, 2024
1 parent 8d4b928 commit 985eb3f
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 17 deletions.
4 changes: 2 additions & 2 deletions examples/autokey_setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions examples/bucket_setup_using_autokey/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

Expand Down
21 changes: 18 additions & 3 deletions test/fixtures/autokey_setup_fixture/main.tf
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion test/fixtures/autokey_setup_fixture/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

}
25 changes: 20 additions & 5 deletions test/fixtures/bucket_setup_using_autokey_fixture/main.tf
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 985eb3f

Please sign in to comment.