Merge pull request #13 from mineiros-io/zied/issue-11

feat: add support for new fields and increase minimum supported version

README.md

@@ -325,7 +325,11 @@ project = "project-a"
 
   - [**`use_topic_schema`**](#attr-bigquery_config-use_topic_schema): *(Optional `bool`)*<a name="attr-bigquery_config-use_topic_schema"></a>
 
-    When `true`, use the topic's schema as the columns to write to in BigQuery, if it exists.
+    When `true`, use the topic's schema as the columns to write to in BigQuery, if it exists. Only one of use_topic_schema and use_table_schema can be set.
+
+  - [**`use_table_schema`**](#attr-bigquery_config-use_table_schema): *(Optional `bool`)*<a name="attr-bigquery_config-use_table_schema"></a>
+
+    When true, use the BigQuery table's schema as the columns to write to in BigQuery. Messages must be published in JSON format. Only one of use_topic_schema and use_table_schema can be set.
 
   - [**`write_metadata`**](#attr-bigquery_config-write_metadata): *(Optional `bool`)*<a name="attr-bigquery_config-write_metadata"></a>
 
@@ -335,6 +339,10 @@ project = "project-a"
 
     When `true` and `use_topic_schema` is `true`, any fields that are a part of the topic schema that are not part of the BigQuery table schema are dropped when writing to BigQuery. Otherwise, the schemas must be kept in sync and any messages with extra fields are not written and remain in the subscription's backlog.
 
+  - [**`service_account_email`**](#attr-bigquery_config-service_account_email): *(Optional `string`)*<a name="attr-bigquery_config-service_account_email"></a>
+
+    The service account to use to write to BigQuery. If not specified, the Pub/Sub service agent, service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
+
 - [**`cloud_storage_config`**](#var-cloud_storage_config): *(Optional `object(cloud_storage_config)`)*<a name="var-cloud_storage_config"></a>
 
   If delivery to Cloud Storage is used with this subscription, this field is used to configure it. Either pushConfig, bigQueryConfig or cloudStorageConfig can be set, but not combined. If all three are empty, then the subscriber will pull and ack messages using API methods.
@@ -365,17 +373,13 @@ project = "project-a"
     (Optional) The maximum bytes that can be written to a Cloud Storage file before a new file is created. 
     Min 1 KB, max 10 GiB. The maxBytes limit may be exceeded in cases where messages are larger than the limit.
 
-  - [**`state`**](#attr-cloud_storage_config-state): *(Optional `any`)*<a name="attr-cloud_storage_config-state"></a>
-
-    (Output) An output-only field that indicates whether or not the subscription can receive messages.
-
-  - [**`avro_config`**](#attr-cloud_storage_config-avro_config): *(Optional `bool`)*<a name="attr-cloud_storage_config-avro_config"></a>
+  - [**`avro_config`**](#attr-cloud_storage_config-avro_config): *(Optional `object(avro_config)`)*<a name="attr-cloud_storage_config-avro_config"></a>
 
     If set, message data will be written to Cloud Storage in Avro format.
 
-    The object accepts the following attributes:
+    The `avro_config` object accepts the following attributes:
 
-    - [**`write_metadata`**](#attr-cloud_storage_config-avro_config-write_metadata): *(Optional `any`)*<a name="attr-cloud_storage_config-avro_config-write_metadata"></a>
+    - [**`write_metadata`**](#attr-cloud_storage_config-avro_config-write_metadata): *(Optional `bool`)*<a name="attr-cloud_storage_config-avro_config-write_metadata"></a>
 
       When true, write the subscription name, messageId, publishTime, attributes, and orderingKey as additional fields in the output.
 

README.tfdoc.hcl

@@ -405,7 +405,14 @@ section {
         attribute "use_topic_schema" {
           type        = bool
           description = <<-END
-            When `true`, use the topic's schema as the columns to write to in BigQuery, if it exists.
+            When `true`, use the topic's schema as the columns to write to in BigQuery, if it exists. Only one of use_topic_schema and use_table_schema can be set.
+          END
+        }
+
+        attribute "use_table_schema" {
+          type        = bool
+          description = <<-END
+            When true, use the BigQuery table's schema as the columns to write to in BigQuery. Messages must be published in JSON format. Only one of use_topic_schema and use_table_schema can be set.
           END
         }
 
@@ -422,6 +429,13 @@ section {
             When `true` and `use_topic_schema` is `true`, any fields that are a part of the topic schema that are not part of the BigQuery table schema are dropped when writing to BigQuery. Otherwise, the schemas must be kept in sync and any messages with extra fields are not written and remain in the subscription's backlog.
           END
         }
+
+        attribute "service_account_email" {
+          type        = string
+          description = <<-END
+            The service account to use to write to BigQuery. If not specified, the Pub/Sub service agent, service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
+          END
+        }
       }
 
       variable "cloud_storage_config" {
@@ -470,21 +484,14 @@ section {
           END
         }
 
-        attribute "state" {
-          type        = any
-          description = <<-END
-            (Output) An output-only field that indicates whether or not the subscription can receive messages.
-          END
-        }
-
         attribute "avro_config" {
-          type        = bool
+          type        = object(avro_config)
           description = <<-END
             If set, message data will be written to Cloud Storage in Avro format.
           END
 
           attribute "write_metadata" {
-            type        = any
+            type        = bool
             description = <<-END
               When true, write the subscription name, messageId, publishTime, attributes, and orderingKey as additional fields in the output.
             END

main.tf

@@ -74,10 +74,12 @@ resource "google_pubsub_subscription" "subscription" {
     iterator = bqc
 
     content {
-      table               = bqc.value.table
-      use_topic_schema    = try(bqc.value.use_topic_schema, null)
-      write_metadata      = try(bqc.value.write_metadata, null)
-      drop_unknown_fields = try(bqc.value.drop_unknown_fields, null)
+      table                 = bqc.value.table
+      use_topic_schema      = try(bqc.value.use_topic_schema, null)
+      use_table_schema      = try(bqc.value.use_table_schema, null)
+      write_metadata        = try(bqc.value.write_metadata, null)
+      drop_unknown_fields   = try(bqc.value.drop_unknown_fields, null)
+      service_account_email = try(bqc.value.service_account_email, null)
     }
   }
 

test/terramate_google.tm.hcl

@@ -1,5 +1,5 @@
 globals {
-  minimum_provider_version    = "5"
+  minimum_provider_version    = "5.35.0"
   provider_version_constraint = ">= ${global.minimum_provider_version}, <6"
 
   stack_basename = tm_reverse(tm_split("/", terramate.path))[0]

test/unit-complete/_generated_google.tf

@@ -23,7 +23,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5, <6"
+      version = ">= 5.35.0, <6"
     }
     random = {
       source  = "hashicorp/random"

test/unit-disabled/_generated_google.tf

@@ -23,7 +23,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5, <6"
+      version = ">= 5.35.0, <6"
     }
     random = {
       source  = "hashicorp/random"

test/unit-minimal/_generated_google.tf

@@ -23,7 +23,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "5"
+      version = "5.35.0"
     }
     random = {
       source  = "hashicorp/random"

versions.tf

@@ -8,7 +8,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5, <6"
+      version = ">= 5.35.0, <6"
     }
   }
 }