Merge branch 'master' into feat/add-autokey-plus-migration

terraform-google-modules · Sep 24, 2024 · c6c99a2 · c6c99a2
2 parents 73bfbba + 8f768c9
commit c6c99a2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ The format is based on
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.0](https://github.com/terraform-google-modules/terraform-google-kms/compare/v3.0.0...v3.1.0) (2024-09-17)
+
+
+### Features
+
+* Introduce autokey feature ([#151](https://github.com/terraform-google-modules/terraform-google-kms/issues/151)) ([f4471fd](https://github.com/terraform-google-modules/terraform-google-kms/commit/f4471fd65b36775f10f50f3624f573beadc77b81))
+
 ## [3.0.0](https://github.com/terraform-google-modules/terraform-google-kms/compare/v2.3.0...v3.0.0) (2024-08-29)
 
 

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Basic usage of this module is as follows:
 ```hcl
 module "kms" {
   source  = "terraform-google-modules/kms/google"
-  version = "~> 3.0"
+  version = "~> 3.1"
 
   project_id         = "<PROJECT ID>"
   location           = "europe"

diff --git a/modules/autokey/main.tf b/modules/autokey/main.tf
@@ -39,7 +39,7 @@ resource "google_kms_key_handle" "primary" {
   provider = google-beta
 
   project                = each.value.project
-  name                   = each.value.name
+  name                   = "${each.value.name}-${random_string.suffix[0].result}"
   location               = each.value.location
   resource_type_selector = each.value.resource_type_selector
 

diff --git a/modules/autokey/versions.tf b/modules/autokey/versions.tf
@@ -37,10 +37,10 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-kms:autokey/v3.0.0"
+    module_name = "blueprints/terraform/terraform-google-kms:autokey/v3.1.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-kms:autokey/v3.0.0"
+    module_name = "blueprints/terraform/terraform-google-kms:autokey/v3.1.0"
   }
 
 }
diff --git a/versions.tf b/versions.tf
@@ -25,7 +25,7 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-kms/v3.0.0"
+    module_name = "blueprints/terraform/terraform-google-kms/v3.1.0"
   }
 
 }