renaming kms_project_id to key_project_id

terraform-google-modules · Dec 21, 2024 · f2f1f5a · f2f1f5a
1 parent 6546bcc
commit f2f1f5a
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/examples/autokey_setup/main.tf b/examples/autokey_setup/main.tf
@@ -18,7 +18,7 @@ module "autokey" {
   source = "terraform-google-modules/kms/google//modules/autokey"
   version = "~> 4.0"
 
-  key_project_id = var.kms_project_id
+  key_project_id = var.key_project_id
   autokey_folder_number  = var.folder_id
 }
 
diff --git a/examples/autokey_setup/outputs.tf b/examples/autokey_setup/outputs.tf
@@ -19,7 +19,7 @@ output "autokey_config_id" {
   value       = module.autokey.autokey_config_id
 }
 
-output "kms_project_id" {
+output "key_project_id" {
   description = "The ID of the project in which kms keyring and kms keys will be provisioned by autokey."
-  value       = var.kms_project_id
+  value       = var.key_project_id
 }
diff --git a/examples/autokey_setup/variables.tf b/examples/autokey_setup/variables.tf
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-variable "kms_project_id" {
+variable "key_project_id" {
   description = "The ID of the project in which KMS keyring and KMS keys will be provisioned by autokey."
   type        = string
 }

diff --git a/examples/bucket_setup_using_autokey/main.tf b/examples/bucket_setup_using_autokey/main.tf
@@ -18,7 +18,7 @@ module "autokey" {
   source  = "terraform-google-modules/kms/google//modules/autokey"
   version = "~> 4.0"
 
-  key_project_id = var.kms_project_id
+  key_project_id = var.key_project_id
   autokey_folder_number  = var.folder_id
 }
 

diff --git a/examples/bucket_setup_using_autokey/variables.tf b/examples/bucket_setup_using_autokey/variables.tf
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-variable "kms_project_id" {
+variable "key_project_id" {
   description = "The ID of the project in which KMS keyring and KMS keys will be provisioned by autokey."
   type        = string
 }

diff --git a/test/fixtures/autokey_setup_fixture/main.tf b/test/fixtures/autokey_setup_fixture/main.tf
@@ -15,6 +15,6 @@
  */
 module "autokey_setup_fixture" {
   source         = "../../../examples/autokey_setup"
-  kms_project_id = var.project_id
+  key_project_id = var.project_id
   folder_id      = var.folder_id
 }
diff --git a/test/fixtures/autokey_setup_fixture/outputs.tf b/test/fixtures/autokey_setup_fixture/outputs.tf
@@ -19,7 +19,7 @@ output "autokey_config_id" {
   value       = module.autokey_setup_fixture.autokey_config_id
 }
 
-output "kms_project_id" {
+output "key_project_id" {
   description = "The ID of the project in which KMS keyring and KMS keys will be provisioned by autokey."
   value       = var.project_id
 }
diff --git a/test/fixtures/bucket_setup_using_autokey_fixture/main.tf b/test/fixtures/bucket_setup_using_autokey_fixture/main.tf
@@ -15,7 +15,7 @@
  */
 module "bucket_setup_using_autokey_fixture" {
   source              = "../../../examples/bucket_setup_using_autokey"
-  kms_project_id      = var.project_id
+  key_project_id      = var.project_id
   folder_id           = var.folder_id
   resource_project_id = var.resource_project_id
   bucket_location     = var.bucket_location

diff --git a/test/integration/autokey_setup/autokey_setup_test.go b/test/integration/autokey_setup/autokey_setup_test.go
@@ -34,11 +34,11 @@ func validateKeyHandleVersion(input string, projectId string, autokeyResource st
 }
 
 func TestAutokeySetup(t *testing.T) {
-	bpt := tft.NewTFBlueprintTest(t, tft.WithTFDir("../../fixtures/autokey_setup_fixture"),)
+	bpt := tft.NewTFBlueprintTest(t, tft.WithTFDir("../../fixtures/autokey_setup_fixture"))
 	bpt.DefineVerify(func(assert *assert.Assertions) {
 		bpt.DefaultVerify(assert)
 
-		kmsProjectId := bpt.GetStringOutput("kms_project_id")
+		kmsProjectId := bpt.GetStringOutput("key_project_id")
 		autokeyConfig := bpt.GetStringOutput("autokey_config_id")
 
 		// Autokey config doesn't have a gcloud command yet. That's why we need to hit the API.