Merge branch 'main' into main

Author: ps-occrp

CHANGELOG.md

@@ -7,6 +7,20 @@ The format is based on
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [10.0.2](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.1...v10.0.2) (2025-05-19)
+
+
+### Bug Fixes
+
+* Making retention_policy is_locked as optional field ([#394](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/394)) ([e823780](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/e823780aac5d8c7268f7e930f59d76798485c6e0))
+
+## [10.0.1](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v10.0.0...v10.0.1) (2025-03-18)
+
+
+### Bug Fixes
+
+* Update apphub service_uri to be available after apply ([#390](https://github.com/terraform-google-modules/terraform-google-cloud-storage/issues/390)) ([66e472b](https://github.com/terraform-google-modules/terraform-google-cloud-storage/commit/66e472b56cd21b45a3939883a66ccfcf5ec1b9ed))
+
 ## [10.0.0](https://github.com/terraform-google-modules/terraform-google-cloud-storage/compare/v9.1.0...v10.0.0) (2025-03-14)
 
 

examples/simple_bucket/main.tf

@@ -55,4 +55,7 @@ module "bucket" {
   }]
 
   autoclass = true
+  retention_policy = {
+    retention_period = 2
+  }
 }

metadata.yaml

@@ -24,7 +24,7 @@ spec:
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git
       sourceType: git
-    version: 10.0.0
+    version: 10.0.2
     actuationTool:
       flavor: Terraform
       version: ">= 0.13"

modules/simple_bucket/README.md

@@ -54,7 +54,7 @@ Functional examples are included in the
 | name | The name of the bucket. | `string` | n/a | yes |
 | project\_id | The ID of the project to create the bucket in. | `string` | n/a | yes |
 | public\_access\_prevention | Prevents public access to a bucket. Acceptable values are inherited or enforced. If inherited, the bucket uses public access prevention, only if the bucket is subject to the public access prevention organization policy constraint. | `string` | `"inherited"` | no |
-| retention\_policy | Configuration of the bucket's data retention policy for how long objects in the bucket should be retained. | <pre>object({<br>    is_locked        = bool<br>    retention_period = number<br>  })</pre> | `null` | no |
+| retention\_policy | Configuration of the bucket's data retention policy for how long objects in the bucket should be retained. | <pre>object({<br>    is_locked        = optional(bool)<br>    retention_period = number<br>  })</pre> | `null` | no |
 | soft\_delete\_policy | Soft delete policies to apply. Format is the same as described in provider documentation https://www.terraform.io/docs/providers/google/r/storage_bucket.html#nested_soft_delete_policy | <pre>object({<br>    retention_duration_seconds = optional(number)<br>  })</pre> | `{}` | no |
 | storage\_class | The Storage Class of the new bucket. | `string` | `null` | no |
 | versioning | While set to true, versioning is fully enabled for this bucket. | `bool` | `true` | no |

modules/simple_bucket/metadata.yaml

@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-cloud-storage.git
       sourceType: git
       dir: /modules/simple_bucket
-    version: 10.0.0
+    version: 10.0.2
     actuationTool:
       flavor: Terraform
       version: ">= 0.13"
@@ -100,7 +100,7 @@ spec:
         description: Configuration of the bucket's data retention policy for how long objects in the bucket should be retained.
         varType: |-
           object({
-              is_locked        = bool
+              is_locked        = optional(bool)
               retention_period = number
             })
       - name: custom_placement_config

modules/simple_bucket/variables.tf

@@ -78,7 +78,7 @@ variable "autoclass" {
 variable "retention_policy" {
   description = "Configuration of the bucket's data retention policy for how long objects in the bucket should be retained."
   type = object({
-    is_locked        = bool
+    is_locked        = optional(bool)
     retention_period = number
   })
   default = null

modules/simple_bucket/versions.tf

@@ -25,7 +25,7 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v10.0.0"
+    module_name = "blueprints/terraform/terraform-google-cloud-storage:simple_bucket/v10.0.2"
   }
 
 }

versions.tf

@@ -30,7 +30,7 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-cloud-storage/v10.0.0"
+    module_name = "blueprints/terraform/terraform-google-cloud-storage/v10.0.2"
   }
 
 }