Allow disabling topic creation in GCS module notification (#2436)
* allow disabling topic creation in GCS module notification * use proper topic name
This commit is contained in:
Ludovico Magnocavallo
committed by
GitHub
GitHub
parent
bd8938ea32
commit
99ab796c72
@@ -286,7 +286,7 @@ module "bucket" {
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [location](variables.tf#L149) | Bucket location. | <code>string</code> | ✓ | |
|
||||
| [name](variables.tf#L164) | Bucket name suffix. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L219) | Bucket project id. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L220) | Bucket project id. | <code>string</code> | ✓ | |
|
||||
| [autoclass](variables.tf#L17) | Enable autoclass to automatically transition objects to appropriate storage classes based on their access pattern. If set to true, storage_class must be set to STANDARD. Defaults to false. | <code>bool</code> | | <code>false</code> |
|
||||
| [cors](variables.tf#L23) | CORS configuration for the bucket. Defaults to null. | <code title="object({ origin = optional(list(string)) method = optional(list(string)) response_header = optional(list(string)) max_age_seconds = optional(number) })">object({…})</code> | | <code>null</code> |
|
||||
| [custom_placement_config](variables.tf#L34) | The bucket's custom location configuration, which specifies the individual regions that comprise a dual-region bucket. If the bucket is designated as REGIONAL or MULTI_REGIONAL, the parameters are empty. | <code>list(string)</code> | | <code>null</code> |
|
||||
@@ -299,18 +299,18 @@ module "bucket" {
|
||||
| [labels](variables.tf#L94) | Labels to be attached to all buckets. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [lifecycle_rules](variables.tf#L100) | Bucket lifecycle rule. | <code title="map(object({ action = object({ type = string storage_class = optional(string) }) condition = object({ age = optional(number) created_before = optional(string) custom_time_before = optional(string) days_since_custom_time = optional(number) days_since_noncurrent_time = optional(number) matches_prefix = optional(list(string)) matches_storage_class = optional(list(string)) # STANDARD, MULTI_REGIONAL, REGIONAL, NEARLINE, COLDLINE, ARCHIVE, DURABLE_REDUCED_AVAILABILITY matches_suffix = optional(list(string)) noncurrent_time_before = optional(string) num_newer_versions = optional(number) with_state = optional(string) # "LIVE", "ARCHIVED", "ANY" }) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [logging_config](variables.tf#L155) | Bucket logging configuration. | <code title="object({ log_bucket = string log_object_prefix = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
| [notification_config](variables.tf#L169) | GCS Notification configuration. | <code title="object({ enabled = bool payload_format = string topic_name = string sa_email = string event_types = optional(list(string)) custom_attributes = optional(map(string)) object_name_prefix = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
| [objects_to_upload](variables.tf#L183) | Objects to be uploaded to bucket. | <code title="map(object({ name = string metadata = optional(map(string)) content = optional(string) source = optional(string) cache_control = optional(string) content_disposition = optional(string) content_encoding = optional(string) content_language = optional(string) content_type = optional(string) event_based_hold = optional(bool) temporary_hold = optional(bool) detect_md5hash = optional(string) storage_class = optional(string) kms_key_name = optional(string) customer_encryption = optional(object({ encryption_algorithm = optional(string) encryption_key = string })) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [prefix](variables.tf#L209) | Optional prefix used to generate the bucket name. | <code>string</code> | | <code>null</code> |
|
||||
| [public_access_prevention](variables.tf#L224) | 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. | <code>string</code> | | <code>null</code> |
|
||||
| [requester_pays](variables.tf#L230) | Enables Requester Pays on a storage bucket. | <code>bool</code> | | <code>null</code> |
|
||||
| [retention_policy](variables.tf#L236) | Bucket retention policy. | <code title="object({ retention_period = number is_locked = optional(bool) })">object({…})</code> | | <code>null</code> |
|
||||
| [soft_delete_retention](variables.tf#L245) | The duration in seconds that soft-deleted objects in the bucket will be retained and cannot be permanently deleted. Set to 0 to override the default and disable. | <code>number</code> | | <code>null</code> |
|
||||
| [storage_class](variables.tf#L251) | Bucket storage class. | <code>string</code> | | <code>"MULTI_REGIONAL"</code> |
|
||||
| [tag_bindings](variables.tf#L261) | Tag bindings for this folder, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [uniform_bucket_level_access](variables.tf#L268) | 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>bool</code> | | <code>true</code> |
|
||||
| [versioning](variables.tf#L274) | Enable versioning, defaults to false. | <code>bool</code> | | <code>false</code> |
|
||||
| [website](variables.tf#L280) | Bucket website. | <code title="object({ main_page_suffix = optional(string) not_found_page = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
| [notification_config](variables.tf#L169) | GCS Notification configuration. | <code title="object({ enabled = bool payload_format = string topic_name = string sa_email = string create_topic = optional(bool, true) event_types = optional(list(string)) custom_attributes = optional(map(string)) object_name_prefix = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
| [objects_to_upload](variables.tf#L184) | Objects to be uploaded to bucket. | <code title="map(object({ name = string metadata = optional(map(string)) content = optional(string) source = optional(string) cache_control = optional(string) content_disposition = optional(string) content_encoding = optional(string) content_language = optional(string) content_type = optional(string) event_based_hold = optional(bool) temporary_hold = optional(bool) detect_md5hash = optional(string) storage_class = optional(string) kms_key_name = optional(string) customer_encryption = optional(object({ encryption_algorithm = optional(string) encryption_key = string })) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [prefix](variables.tf#L210) | Optional prefix used to generate the bucket name. | <code>string</code> | | <code>null</code> |
|
||||
| [public_access_prevention](variables.tf#L225) | 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. | <code>string</code> | | <code>null</code> |
|
||||
| [requester_pays](variables.tf#L231) | Enables Requester Pays on a storage bucket. | <code>bool</code> | | <code>null</code> |
|
||||
| [retention_policy](variables.tf#L237) | Bucket retention policy. | <code title="object({ retention_period = number is_locked = optional(bool) })">object({…})</code> | | <code>null</code> |
|
||||
| [soft_delete_retention](variables.tf#L246) | The duration in seconds that soft-deleted objects in the bucket will be retained and cannot be permanently deleted. Set to 0 to override the default and disable. | <code>number</code> | | <code>null</code> |
|
||||
| [storage_class](variables.tf#L252) | Bucket storage class. | <code>string</code> | | <code>"MULTI_REGIONAL"</code> |
|
||||
| [tag_bindings](variables.tf#L262) | Tag bindings for this folder, in key => tag value id format. | <code>map(string)</code> | | <code>{}</code> |
|
||||
| [uniform_bucket_level_access](variables.tf#L269) | 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>bool</code> | | <code>true</code> |
|
||||
| [versioning](variables.tf#L275) | Enable versioning, defaults to false. | <code>bool</code> | | <code>false</code> |
|
||||
| [website](variables.tf#L281) | Bucket website. | <code title="object({ main_page_suffix = optional(string) not_found_page = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
||||
@@ -154,23 +154,25 @@ resource "google_storage_bucket_object" "objects" {
|
||||
}
|
||||
|
||||
resource "google_storage_notification" "notification" {
|
||||
count = local.notification ? 1 : 0
|
||||
bucket = google_storage_bucket.bucket.name
|
||||
payload_format = var.notification_config.payload_format
|
||||
topic = google_pubsub_topic.topic[0].id
|
||||
count = local.notification ? 1 : 0
|
||||
bucket = google_storage_bucket.bucket.name
|
||||
payload_format = var.notification_config.payload_format
|
||||
topic = try(
|
||||
google_pubsub_topic.topic[0].id, var.notification_config.topic_name
|
||||
)
|
||||
custom_attributes = var.notification_config.custom_attributes
|
||||
event_types = var.notification_config.event_types
|
||||
object_name_prefix = var.notification_config.object_name_prefix
|
||||
depends_on = [google_pubsub_topic_iam_binding.binding]
|
||||
}
|
||||
resource "google_pubsub_topic_iam_binding" "binding" {
|
||||
count = local.notification ? 1 : 0
|
||||
count = try(var.notification_config.create_topic, null) == true ? 1 : 0
|
||||
topic = google_pubsub_topic.topic[0].id
|
||||
role = "roles/pubsub.publisher"
|
||||
members = ["serviceAccount:${var.notification_config.sa_email}"]
|
||||
}
|
||||
resource "google_pubsub_topic" "topic" {
|
||||
count = local.notification ? 1 : 0
|
||||
count = try(var.notification_config.create_topic, null) == true ? 1 : 0
|
||||
project = var.project_id
|
||||
name = var.notification_config.topic_name
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ output "objects" {
|
||||
|
||||
output "topic" {
|
||||
description = "Topic ID used by GCS."
|
||||
value = local.notification ? google_pubsub_topic.topic[0].id : null
|
||||
value = try(google_pubsub_topic.topic[0].id, null)
|
||||
}
|
||||
|
||||
output "url" {
|
||||
|
||||
@@ -173,6 +173,7 @@ variable "notification_config" {
|
||||
payload_format = string
|
||||
topic_name = string
|
||||
sa_email = string
|
||||
create_topic = optional(bool, true)
|
||||
event_types = optional(list(string))
|
||||
custom_attributes = optional(map(string))
|
||||
object_name_prefix = optional(string)
|
||||
|
||||
@@ -352,6 +352,7 @@
|
||||
service_agent: "service-%s@gs-project-accounts.iam.gserviceaccount.com"
|
||||
- name: "storagetransfer"
|
||||
service_agent: "project-%s@storage-transfer-service.iam.gserviceaccount.com"
|
||||
jit: true
|
||||
- name: "stream"
|
||||
service_agent: "service-%s@gcp-sa-stream.iam.gserviceaccount.com"
|
||||
- name: "tpu"
|
||||
|
||||
Reference in New Issue
Block a user