Destination Bigquery: Dataset location is a required field (#12477)

* Dataset location is required * Update doc * Bump versions * reset * Bump * downgrade * Revert "downgrade" This reverts commit b482c54. * auto-bump connector version Co-authored-by: Octavia Squidington III <[email protected]>
airbytehq · Apr 29, 2022 · 5530247 · 5530247
1 parent ceec454
commit 5530247
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 70 deletions.
diff --git a/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml b/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml
@@ -24,7 +24,7 @@
 - name: BigQuery
   destinationDefinitionId: 22f6c74f-5699-40ff-833c-4a879ea40133
   dockerRepository: airbyte/destination-bigquery
-  dockerImageTag: 1.1.1
+  dockerImageTag: 1.1.2
   documentationUrl: https://docs.airbyte.io/integrations/destinations/bigquery
   icon: bigquery.svg
   resourceRequirements:
@@ -36,7 +36,7 @@
 - name: BigQuery (denormalized typed struct)
   destinationDefinitionId: 079d5540-f236-4294-ba7c-ade8fd918496
   dockerRepository: airbyte/destination-bigquery-denormalized
-  dockerImageTag: 0.3.1
+  dockerImageTag: 0.3.2
   documentationUrl: https://docs.airbyte.io/integrations/destinations/bigquery
   icon: bigquery.svg
   resourceRequirements:

diff --git a/airbyte-config/init/src/main/resources/seed/destination_specs.yaml b/airbyte-config/init/src/main/resources/seed/destination_specs.yaml
@@ -285,7 +285,7 @@
     supported_destination_sync_modes:
     - "overwrite"
     - "append"
-- dockerImage: "airbyte/destination-bigquery:1.1.1"
+- dockerImage: "airbyte/destination-bigquery:1.1.2"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/destinations/bigquery"
     connectionSpecification:
@@ -294,6 +294,7 @@
       type: "object"
       required:
       - "project_id"
+      - "dataset_location"
       - "dataset_id"
       additionalProperties: true
       properties:
@@ -317,20 +318,13 @@
             \ dataset. Read more <a href=\"https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects\"\
             >here</a>."
           title: "Project ID"
-        dataset_id:
-          type: "string"
-          description: "The default BigQuery Dataset ID that tables are replicated\
-            \ to if the source does not specify a namespace. Read more <a href=\"\
-            https://cloud.google.com/bigquery/docs/datasets#create-dataset\">here</a>."
-          title: "Default Dataset ID"
         dataset_location:
           type: "string"
           description: "The location of the dataset. Warning: Changes made after creation\
             \ will not be applied. The default \"US\" value is used if not set explicitly.\
             \ Read more <a href=\"https://cloud.google.com/bigquery/docs/locations\"\
             >here</a>."
-          title: "Dataset Location (Optional)"
-          default: "US"
+          title: "Dataset Location"
           enum:
           - "US"
           - "EU"
@@ -363,6 +357,12 @@
           - "us-west2"
           - "us-west3"
           - "us-west4"
+        dataset_id:
+          type: "string"
+          description: "The default BigQuery Dataset ID that tables are replicated\
+            \ to if the source does not specify a namespace. Read more <a href=\"\
+            https://cloud.google.com/bigquery/docs/datasets#create-dataset\">here</a>."
+          title: "Default Dataset ID"
         credentials_json:
           type: "string"
           description: "The contents of the JSON service account key. Check out the\
@@ -495,7 +495,7 @@
     - "overwrite"
     - "append"
     - "append_dedup"
-- dockerImage: "airbyte/destination-bigquery-denormalized:0.3.1"
+- dockerImage: "airbyte/destination-bigquery-denormalized:0.3.2"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/destinations/bigquery"
     connectionSpecification:

diff --git a/airbyte-integrations/connectors/destination-bigquery-denormalized/Dockerfile b/airbyte-integrations/connectors/destination-bigquery-denormalized/Dockerfile
@@ -17,5 +17,5 @@ ENV ENABLE_SENTRY true
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=0.3.1
+LABEL io.airbyte.version=0.3.2
 LABEL io.airbyte.name=airbyte/destination-bigquery-denormalized
diff --git a/airbyte-integrations/connectors/destination-bigquery/Dockerfile b/airbyte-integrations/connectors/destination-bigquery/Dockerfile
@@ -17,5 +17,5 @@ ENV ENABLE_SENTRY true
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=1.1.1
+LABEL io.airbyte.version=1.1.2
 LABEL io.airbyte.name=airbyte/destination-bigquery
diff --git a/airbyte-integrations/connectors/destination-bigquery/src/main/resources/spec.json b/airbyte-integrations/connectors/destination-bigquery/src/main/resources/spec.json
@@ -8,7 +8,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "BigQuery Destination Spec",
     "type": "object",
-    "required": ["project_id", "dataset_id"],
+    "required": ["project_id", "dataset_location", "dataset_id"],
     "additionalProperties": true,
     "properties": {
       "big_query_client_buffer_size_mb": {
@@ -25,16 +25,10 @@
         "description": "The GCP project ID for the project containing the target BigQuery dataset. Read more <a href=\"https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects\">here</a>.",
         "title": "Project ID"
       },
-      "dataset_id": {
-        "type": "string",
-        "description": "The default BigQuery Dataset ID that tables are replicated to if the source does not specify a namespace. Read more <a href=\"https://cloud.google.com/bigquery/docs/datasets#create-dataset\">here</a>.",
-        "title": "Default Dataset ID"
-      },
       "dataset_location": {
         "type": "string",
         "description": "The location of the dataset. Warning: Changes made after creation will not be applied. The default \"US\" value is used if not set explicitly. Read more <a href=\"https://cloud.google.com/bigquery/docs/locations\">here</a>.",
-        "title": "Dataset Location (Optional)",
-        "default": "US",
+        "title": "Dataset Location",
         "enum": [
           "US",
           "EU",
@@ -69,6 +63,11 @@
           "us-west4"
         ]
       },
+      "dataset_id": {
+        "type": "string",
+        "description": "The default BigQuery Dataset ID that tables are replicated to if the source does not specify a namespace. Read more <a href=\"https://cloud.google.com/bigquery/docs/datasets#create-dataset\">here</a>.",
+        "title": "Default Dataset ID"
+      },
       "credentials_json": {
         "type": "string",
         "description": "The contents of the JSON service account key. Check out the <a href=\"https://docs.airbyte.com/integrations/destinations/bigquery#service-account-key\">docs</a> if you need help generating this key. Default credentials will be used if this field is left empty.",