Skip to content

Commit a69ca8b

Browse files
committed
remove create_subscription from sub module
1 parent a31e741 commit a69ca8b

File tree

4 files changed

+9
-20
lines changed

4 files changed

+9
-20
lines changed

modules/sub/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ module "sub" {
5959
|------|-------------|------|---------|:--------:|
6060
| bigquery\_subscriptions | The list of the Bigquery push subscriptions. | <pre>list(object({<br> name = string,<br> table = string,<br> use_topic_schema = optional(bool),<br> use_table_schema = optional(bool),<br> write_metadata = optional(bool),<br> drop_unknown_fields = optional(bool),<br> ack_deadline_seconds = optional(number),<br> retain_acked_messages = optional(bool),<br> message_retention_duration = optional(string),<br> enable_message_ordering = optional(bool),<br> expiration_policy = optional(string),<br> filter = optional(string),<br> dead_letter_topic = optional(string),<br> maximum_backoff = optional(string),<br> minimum_backoff = optional(string)<br> }))</pre> | `[]` | no |
6161
| cloud\_storage\_subscriptions | The list of the Cloud Storage push subscriptions. | <pre>list(object({<br> name = string,<br> bucket = string,<br> filename_prefix = optional(string),<br> filename_suffix = optional(string),<br> filename_datetime_format = optional(string),<br> max_duration = optional(string),<br> max_bytes = optional(string),<br> max_messages = optional(string),<br> output_format = optional(string),<br> write_metadata = optional(bool),<br> use_topic_schema = optional(bool),<br> ack_deadline_seconds = optional(number),<br> retain_acked_messages = optional(bool),<br> message_retention_duration = optional(string),<br> enable_message_ordering = optional(bool),<br> expiration_policy = optional(string),<br> filter = optional(string),<br> dead_letter_topic = optional(string),<br> maximum_backoff = optional(string),<br> minimum_backoff = optional(string)<br> }))</pre> | `[]` | no |
62-
| create\_subscriptions | Specify true if you want to create subscriptions. | `bool` | `true` | no |
6362
| grant\_bigquery\_project\_roles | Specify true if you want to add bigquery.metadataViewer and bigquery.dataEditor roles to the default Pub/Sub SA. | `bool` | `true` | no |
6463
| grant\_token\_creator | Specify true if you want to add token creator role to the default Pub/Sub SA. | `bool` | `true` | no |
6564
| project\_id | The project ID to manage the Pub/Sub resources. | `string` | n/a | yes |

modules/sub/main.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ resource "google_pubsub_topic_iam_member" "bigquery_topic_binding" {
8282
}
8383

8484
resource "google_pubsub_subscription_iam_member" "pull_subscription_binding" {
85-
for_each = var.create_subscriptions ? { for i in var.pull_subscriptions : i.name => i if i.dead_letter_topic != null } : {}
85+
for_each = { for i in var.pull_subscriptions : i.name => i if i.dead_letter_topic != null }
8686

8787
project = var.project_id
8888
subscription = each.value.name
@@ -98,7 +98,7 @@ resource "google_pubsub_subscription_iam_member" "pull_subscription_binding" {
9898
}
9999

100100
resource "google_pubsub_subscription_iam_member" "push_subscription_binding" {
101-
for_each = var.create_subscriptions ? { for i in var.push_subscriptions : i.name => i if i.dead_letter_topic != null } : {}
101+
for_each = { for i in var.push_subscriptions : i.name => i if i.dead_letter_topic != null }
102102

103103
project = var.project_id
104104
subscription = each.value.name
@@ -114,7 +114,7 @@ resource "google_pubsub_subscription_iam_member" "push_subscription_binding" {
114114
}
115115

116116
resource "google_pubsub_subscription_iam_member" "bigquery_subscription_binding" {
117-
for_each = var.create_subscriptions ? { for i in var.bigquery_subscriptions : i.name => i if i.dead_letter_topic != null } : {}
117+
for_each = { for i in var.bigquery_subscriptions : i.name => i if i.dead_letter_topic != null }
118118

119119
project = var.project_id
120120
subscription = each.value.name
@@ -126,7 +126,7 @@ resource "google_pubsub_subscription_iam_member" "bigquery_subscription_binding"
126126
}
127127

128128
resource "google_pubsub_subscription" "push_subscriptions" {
129-
for_each = var.create_subscriptions ? { for i in var.push_subscriptions : i.name => i } : {}
129+
for_each = { for i in var.push_subscriptions : i.name => i }
130130

131131
name = each.value.name
132132
topic = var.topic
@@ -181,7 +181,7 @@ resource "google_pubsub_subscription" "push_subscriptions" {
181181
}
182182

183183
resource "google_pubsub_subscription" "pull_subscriptions" {
184-
for_each = var.create_subscriptions ? { for i in var.pull_subscriptions : i.name => i } : {}
184+
for_each = { for i in var.pull_subscriptions : i.name => i }
185185

186186
name = each.value.name
187187
topic = var.topic
@@ -219,7 +219,7 @@ resource "google_pubsub_subscription" "pull_subscriptions" {
219219
}
220220

221221
resource "google_pubsub_subscription" "bigquery_subscriptions" {
222-
for_each = var.create_subscriptions ? { for i in var.bigquery_subscriptions : i.name => i } : {}
222+
for_each = { for i in var.bigquery_subscriptions : i.name => i }
223223

224224
name = each.value.name
225225
topic = var.topic
@@ -269,7 +269,7 @@ resource "google_pubsub_subscription" "bigquery_subscriptions" {
269269
}
270270

271271
resource "google_pubsub_subscription" "cloud_storage_subscriptions" {
272-
for_each = var.create_subscriptions ? { for i in var.cloud_storage_subscriptions : i.name => i } : {}
272+
for_each = { for i in var.cloud_storage_subscriptions : i.name => i }
273273

274274
name = each.value.name
275275
topic = var.topic
@@ -327,7 +327,7 @@ resource "google_pubsub_subscription" "cloud_storage_subscriptions" {
327327
}
328328

329329
resource "google_pubsub_subscription_iam_member" "pull_subscription_sa_binding_subscriber" {
330-
for_each = var.create_subscriptions ? { for i in var.pull_subscriptions : i.name => i if i.service_account != null } : {}
330+
for_each = { for i in var.pull_subscriptions : i.name => i if i.service_account != null }
331331

332332
project = var.project_id
333333
subscription = each.value.name
@@ -343,7 +343,7 @@ resource "google_pubsub_subscription_iam_member" "pull_subscription_sa_binding_s
343343
}
344344

345345
resource "google_pubsub_subscription_iam_member" "pull_subscription_sa_binding_viewer" {
346-
for_each = var.create_subscriptions ? { for i in var.pull_subscriptions : i.name => i if i.service_account != null } : {}
346+
for_each = { for i in var.pull_subscriptions : i.name => i if i.service_account != null }
347347

348348
project = var.project_id
349349
subscription = each.value.name

modules/sub/metadata.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ spec:
5858
description: The Pub/Sub topic name.
5959
varType: string
6060
required: true
61-
- name: create_subscriptions
62-
description: Specify true if you want to create subscriptions.
63-
varType: bool
64-
defaultValue: true
6561
- name: push_subscriptions
6662
description: The list of the push subscriptions.
6763
varType: |-

modules/sub/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ variable "topic" {
2424
description = "The Pub/Sub topic name."
2525
}
2626

27-
variable "create_subscriptions" {
28-
type = bool
29-
description = "Specify true if you want to create subscriptions."
30-
default = true
31-
}
32-
3327
variable "push_subscriptions" {
3428
type = list(object({
3529
name = string,

0 commit comments

Comments
 (0)