zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address reviewer comments.

This commit is contained in:
Israel Herraiz 2022-11-20 16:32:37 +01:00
parent 54e9738c39
commit 3f4fa74729
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/pubsub/README.md
View File

@ -136,7 +136,7 @@ module "pubsub" {
| [message_retention_duration](variables.tf#L62) | Minimum duration to retain a message after it is published to the topic. | <code>string</code> | | <code>null</code> |
| [push_configs](variables.tf#L78) | Push subscription configurations. | <code title="map&#40;object&#40;&#123;&#10; attributes &#61; map&#40;string&#41;&#10; endpoint &#61; string&#10; oidc_token &#61; object&#40;&#123;&#10; audience &#61; string&#10; service_account_email &#61; string&#10; &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | | <code>&#123;&#125;</code> |
| [regions](variables.tf#L91) | List of regions used to set persistence policy. | <code>list&#40;string&#41;</code> | | <code>&#91;&#93;</code> |
| [schema](variables.tf#L118) | Topic schema. If set, all messages in this topic should follow this schema. | <code title="object&#40;&#123;&#10; schema_type &#61; string&#10; definition &#61; string&#10; msg_encoding &#61; optional&#40;string, &#34;ENCODING_UNSPECIFIED&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | | <code>null</code> |
| [schema](variables.tf#L118) | Topic schema. If set, all messages in this topic should follow this schema. | <code title="object&#40;&#123;&#10; definition &#61; string&#10; msg_encoding &#61; optional&#40;string, &#34;ENCODING_UNSPECIFIED&#34;&#41;&#10; schema_type &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | | <code>null</code> |
| [subscription_iam](variables.tf#L97) | IAM bindings for subscriptions in {SUBSCRIPTION => {ROLE => [MEMBERS]}} format. | <code>map&#40;map&#40;list&#40;string&#41;&#41;&#41;</code> | | <code>&#123;&#125;</code> |
| [subscriptions](variables.tf#L103) | Topic subscriptions. Also define push configs for push subscriptions. If options is set to null subscription defaults will be used. Labels default to topic labels if set to null. | <code title="map&#40;object&#40;&#123;&#10; labels &#61; map&#40;string&#41;&#10; options &#61; object&#40;&#123;&#10; ack_deadline_seconds &#61; number&#10; message_retention_duration &#61; string&#10; retain_acked_messages &#61; bool&#10; expiration_policy_ttl &#61; string&#10; filter &#61; string&#10; &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | | <code>&#123;&#125;</code> |
@ -145,10 +145,11 @@ module "pubsub" {
| name | description | sensitive |
|---|---|:---:|
| [id](outputs.tf#L17) | Topic id. | |
| [schema](outputs.tf#L59) | Schema resource. | |
| [schema_id](outputs.tf#L51) | Schema resource id. | |
| [schema](outputs.tf#L43) | Schema resource. | |
| [schema_id](outputs.tf#L48) | Schema resource id. | |
| [schema_id](outputs.tf#L61) | Schema resource id. | |
| [subscription_id](outputs.tf#L25) | Subscription ids. | |
| [subscriptions](outputs.tf#L35) | Subscription resources. | |
| [topic](outputs.tf#L43) | Topic resource. | |
| [topic](outputs.tf#L53) | Topic resource. | |
<!-- END TFDOC -->

3
modules/pubsub/main.tf
View File

@ -37,7 +37,7 @@ locals {
resource "google_pubsub_schema" "default" {
count = var.schema == null ? 0 : 1
name = format("%s-%s", var.name, "schema")
name = "{$var.name}-schema"
type = var.schema.schema_type
definition = var.schema.definition
project = var.project_id
@ -57,7 +57,6 @@ resource "google_pubsub_topic" "default" {
}
}
depends_on = [google_pubsub_schema.default]
dynamic "schema_settings" {
for_each = var.schema == null ? [] : [""]
content {

20
modules/pubsub/outputs.tf
View File

@ -40,6 +40,16 @@ output "subscriptions" {
]
}
output "schema" {
description = "Schema resource."
value = try(google_pubsub_schema.default[0], null)
}
output "schema_id" {
description = "Schema resource id."
value = try(google_pubsub_schema.default[0].id, null)
}
output "topic" {
description = "Topic resource."
value = google_pubsub_topic.default
@ -51,15 +61,5 @@ output "topic" {
output "schema_id" {
description = "Schema resource id."
value = google_pubsub_schema.default[0].id
depends_on = [
google_pubsub_schema.default
]
}
output "schema" {
description = "Schema resource."
value = google_pubsub_schema.default[0]
depends_on = [
google_pubsub_schema.default
]
}

20
modules/pubsub/variables.tf
View File

@ -94,6 +94,16 @@ variable "regions" {
default = []
}
variable "schema" {
description = "Topic schema. If set, all messages in this topic should follow this schema."
type = object({
definition = string
msg_encoding = optional(string, "ENCODING_UNSPECIFIED")
schema_type = string
})
default = null
}
variable "subscription_iam" {
description = "IAM bindings for subscriptions in {SUBSCRIPTION => {ROLE => [MEMBERS]}} format."
type = map(map(list(string)))
@ -114,13 +124,3 @@ variable "subscriptions" {
}))
default = {}
}
variable "schema" {
description = "Topic schema. If set, all messages in this topic should follow this schema."
type = object({
schema_type = string
definition = string
msg_encoding = optional(string, "ENCODING_UNSPECIFIED")
})
default = null
}