Merge branch 'master' of github.com:terraform-google-modules/cloud-foundation-fabric
This commit is contained in:
commit
f5353d2d2c
|
@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
|
||||||
- **incompatible change** the format of the `records` variable in the `dns` module has changed, to better support dynamic values
|
- **incompatible change** the format of the `records` variable in the `dns` module has changed, to better support dynamic values
|
||||||
- new `naming-convention` module
|
- new `naming-convention` module
|
||||||
- new `cloudsql-instance` module
|
- new `cloudsql-instance` module
|
||||||
|
- added support for website to `gcs` module
|
||||||
|
|
||||||
## [6.0.0] - 2021-10-04
|
## [6.0.0] - 2021-10-04
|
||||||
|
|
||||||
|
|
|
@ -114,6 +114,7 @@ module "bucket" {
|
||||||
| *storage_class* | Bucket storage class. | <code title="">string</code> | | <code title="MULTI_REGIONAL validation { condition = contains(["STANDARD", "MULTI_REGIONAL", "REGIONAL", "NEARLINE", "COLDLINE", "ARCHIVE"], var.storage_class) error_message = "Storage class must be one of STANDARD, MULTI_REGIONAL, REGIONAL, NEARLINE, COLDLINE, ARCHIVE." }">...</code> |
|
| *storage_class* | Bucket storage class. | <code title="">string</code> | | <code title="MULTI_REGIONAL validation { condition = contains(["STANDARD", "MULTI_REGIONAL", "REGIONAL", "NEARLINE", "COLDLINE", "ARCHIVE"], var.storage_class) error_message = "Storage class must be one of STANDARD, MULTI_REGIONAL, REGIONAL, NEARLINE, COLDLINE, ARCHIVE." }">...</code> |
|
||||||
| *uniform_bucket_level_access* | Allow using object ACLs (false) or not (true, this is the recommended behavior) , defaults to true (which is the recommended practice, but not the behavior of storage API). | <code title="">bool</code> | | <code title="">true</code> |
|
| *uniform_bucket_level_access* | Allow using object ACLs (false) or not (true, this is the recommended behavior) , defaults to true (which is the recommended practice, but not the behavior of storage API). | <code title="">bool</code> | | <code title="">true</code> |
|
||||||
| *versioning* | Enable versioning, defaults to false. | <code title="">bool</code> | | <code title="">false</code> |
|
| *versioning* | Enable versioning, defaults to false. | <code title="">bool</code> | | <code title="">false</code> |
|
||||||
|
| *website* | Bucket website. | <code title="object({ main_page_suffix = string not_found_page = string })">object({...})</code> | | <code title="">null</code> |
|
||||||
|
|
||||||
## Outputs
|
## Outputs
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,15 @@ resource "google_storage_bucket" "bucket" {
|
||||||
storage_class = lower(var.storage_class)
|
storage_class = lower(var.storage_class)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
dynamic "website" {
|
||||||
|
for_each = var.website == null ? [] : [""]
|
||||||
|
|
||||||
|
content {
|
||||||
|
main_page_suffix = var.website.main_page_suffix
|
||||||
|
not_found_page = var.website.not_found_page
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dynamic "encryption" {
|
dynamic "encryption" {
|
||||||
for_each = var.encryption_key == null ? [] : [""]
|
for_each = var.encryption_key == null ? [] : [""]
|
||||||
|
|
||||||
|
|
|
@ -132,3 +132,12 @@ variable "versioning" {
|
||||||
type = bool
|
type = bool
|
||||||
default = false
|
default = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "website" {
|
||||||
|
description = "Bucket website."
|
||||||
|
type = object({
|
||||||
|
main_page_suffix = string
|
||||||
|
not_found_page = string
|
||||||
|
})
|
||||||
|
default = null
|
||||||
|
}
|
Loading…
Reference in New Issue