Skip to content

Commit ce061a0

Browse files
Ram1604imrannayer
Ram1604
and
imrannayer
authored
Feat: Add missing attribute to bigquery subscription and cloud storage subscription variables (#238)
Co-authored-by: Imran Nayer <imrannayer@google.com>
1 parent 0e44fc6 commit ce061a0

File tree

3 files changed

+9
-84
lines changed

3 files changed

+9
-84
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ module "pubsub" {
8484

8585
| Name | Description | Type | Default | Required |
8686
|------|-------------|------|---------|:--------:|
87-
| 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 |
88-
| 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 |
87+
| 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> max_delivery_attempts = optional(number),<br> maximum_backoff = optional(string),<br> minimum_backoff = optional(string)<br> }))</pre> | `[]` | no |
88+
| 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> max_delivery_attempts = optional(number),<br> maximum_backoff = optional(string),<br> minimum_backoff = optional(string)<br> }))</pre> | `[]` | no |
8989
| create\_subscriptions | Specify true if you want to create subscriptions. | `bool` | `true` | no |
9090
| create\_topic | Specify true if you want to create a topic. | `bool` | `true` | no |
9191
| 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 |

‎metadata.yaml‎

Lines changed: 5 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,7 @@ spec:
7676
defaultValue: {}
7777
- name: push_subscriptions
7878
description: The list of the push subscriptions.
79-
varType: |-
80-
list(object({
81-
name = string,
82-
ack_deadline_seconds = optional(number),
83-
push_endpoint = optional(string),
84-
x-goog-version = optional(string),
85-
oidc_service_account_email = optional(string),
86-
audience = optional(string),
87-
expiration_policy = optional(string),
88-
dead_letter_topic = optional(string),
89-
retain_acked_messages = optional(bool),
90-
message_retention_duration = optional(string),
91-
max_delivery_attempts = optional(number),
92-
maximum_backoff = optional(string),
93-
minimum_backoff = optional(string),
94-
filter = optional(string),
95-
enable_message_ordering = optional(bool),
96-
}))
79+
varType: "list(object({\r\n name = string,\r\n ack_deadline_seconds = optional(number),\r\n push_endpoint = optional(string),\r\n x-goog-version = optional(string),\r\n oidc_service_account_email = optional(string),\r\n audience = optional(string),\r\n expiration_policy = optional(string),\r\n dead_letter_topic = optional(string),\r\n retain_acked_messages = optional(bool),\r\n message_retention_duration = optional(string),\r\n max_delivery_attempts = optional(number),\r\n maximum_backoff = optional(string),\r\n minimum_backoff = optional(string),\r\n filter = optional(string),\r\n enable_message_ordering = optional(bool),\r\n }))"
9780
defaultValue: []
9881
connections:
9982
- source:
@@ -103,43 +86,11 @@ spec:
10386
outputExpr: "{ \"name\": service_name, \"push_endpoint\": service_uri, \"oidc_service_account_email\": service_account_id.email }"
10487
- name: pull_subscriptions
10588
description: The list of the pull subscriptions.
106-
varType: |-
107-
list(object({
108-
name = string,
109-
ack_deadline_seconds = optional(number),
110-
expiration_policy = optional(string),
111-
dead_letter_topic = optional(string),
112-
max_delivery_attempts = optional(number),
113-
retain_acked_messages = optional(bool),
114-
message_retention_duration = optional(string),
115-
maximum_backoff = optional(string),
116-
minimum_backoff = optional(string),
117-
filter = optional(string),
118-
enable_message_ordering = optional(bool),
119-
service_account = optional(string),
120-
enable_exactly_once_delivery = optional(bool),
121-
}))
89+
varType: "list(object({\r\n name = string,\r\n ack_deadline_seconds = optional(number),\r\n expiration_policy = optional(string),\r\n dead_letter_topic = optional(string),\r\n max_delivery_attempts = optional(number),\r\n retain_acked_messages = optional(bool),\r\n message_retention_duration = optional(string),\r\n maximum_backoff = optional(string),\r\n minimum_backoff = optional(string),\r\n filter = optional(string),\r\n enable_message_ordering = optional(bool),\r\n service_account = optional(string),\r\n enable_exactly_once_delivery = optional(bool),\r\n }))"
12290
defaultValue: []
12391
- name: bigquery_subscriptions
12492
description: The list of the Bigquery push subscriptions.
125-
varType: |-
126-
list(object({
127-
name = string,
128-
table = string,
129-
use_topic_schema = optional(bool),
130-
use_table_schema = optional(bool),
131-
write_metadata = optional(bool),
132-
drop_unknown_fields = optional(bool),
133-
ack_deadline_seconds = optional(number),
134-
retain_acked_messages = optional(bool),
135-
message_retention_duration = optional(string),
136-
enable_message_ordering = optional(bool),
137-
expiration_policy = optional(string),
138-
filter = optional(string),
139-
dead_letter_topic = optional(string),
140-
maximum_backoff = optional(string),
141-
minimum_backoff = optional(string)
142-
}))
93+
varType: "list(object({\r\n name = string,\r\n table = string,\r\n use_topic_schema = optional(bool),\r\n use_table_schema = optional(bool),\r\n write_metadata = optional(bool),\r\n drop_unknown_fields = optional(bool),\r\n ack_deadline_seconds = optional(number),\r\n retain_acked_messages = optional(bool),\r\n message_retention_duration = optional(string),\r\n enable_message_ordering = optional(bool),\r\n expiration_policy = optional(string),\r\n filter = optional(string),\r\n dead_letter_topic = optional(string),\r\n max_delivery_attempts = optional(number),\r\n maximum_backoff = optional(string),\r\n minimum_backoff = optional(string)\r\n }))"
14394
defaultValue: []
14495
connections:
14596
- source:
@@ -149,29 +100,7 @@ spec:
149100
outputExpr: "{ \"name\": external_table_ids[0], \"table\": external_table_ids[0]}"
150101
- name: cloud_storage_subscriptions
151102
description: The list of the Cloud Storage push subscriptions.
152-
varType: |-
153-
list(object({
154-
name = string,
155-
bucket = string,
156-
filename_prefix = optional(string),
157-
filename_suffix = optional(string),
158-
filename_datetime_format = optional(string),
159-
max_duration = optional(string),
160-
max_bytes = optional(string),
161-
max_messages = optional(string),
162-
output_format = optional(string),
163-
write_metadata = optional(bool),
164-
use_topic_schema = optional(bool),
165-
ack_deadline_seconds = optional(number),
166-
retain_acked_messages = optional(bool),
167-
message_retention_duration = optional(string),
168-
enable_message_ordering = optional(bool),
169-
expiration_policy = optional(string),
170-
filter = optional(string),
171-
dead_letter_topic = optional(string),
172-
maximum_backoff = optional(string),
173-
minimum_backoff = optional(string)
174-
}))
103+
varType: "list(object({\r\n name = string,\r\n bucket = string,\r\n filename_prefix = optional(string),\r\n filename_suffix = optional(string),\r\n filename_datetime_format = optional(string),\r\n max_duration = optional(string),\r\n max_bytes = optional(string),\r\n max_messages = optional(string),\r\n output_format = optional(string),\r\n write_metadata = optional(bool),\r\n use_topic_schema = optional(bool),\r\n ack_deadline_seconds = optional(number),\r\n retain_acked_messages = optional(bool),\r\n message_retention_duration = optional(string),\r\n enable_message_ordering = optional(bool),\r\n expiration_policy = optional(string),\r\n filter = optional(string),\r\n dead_letter_topic = optional(string),\r\n max_delivery_attempts = optional(number),\r\n maximum_backoff = optional(string),\r\n minimum_backoff = optional(string)\r\n }))"
175104
defaultValue: []
176105
connections:
177106
- source:
@@ -203,13 +132,7 @@ spec:
203132
defaultValue: true
204133
- name: schema
205134
description: Schema for the topic.
206-
varType: |-
207-
object({
208-
name = string
209-
type = string
210-
definition = string
211-
encoding = string
212-
})
135+
varType: "object({\r\n name = string\r\n type = string\r\n definition = string\r\n encoding = string\r\n })"
213136
outputs:
214137
- name: id
215138
description: The ID of the Pub/Sub topic

‎variables.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ variable "bigquery_subscriptions" {
9898
expiration_policy = optional(string),
9999
filter = optional(string),
100100
dead_letter_topic = optional(string),
101+
max_delivery_attempts = optional(number),
101102
maximum_backoff = optional(string),
102103
minimum_backoff = optional(string)
103104
}))
@@ -125,6 +126,7 @@ variable "cloud_storage_subscriptions" {
125126
expiration_policy = optional(string),
126127
filter = optional(string),
127128
dead_letter_topic = optional(string),
129+
max_delivery_attempts = optional(number),
128130
maximum_backoff = optional(string),
129131
minimum_backoff = optional(string)
130132
}))

0 commit comments

Comments
 (0)