Source Google Search Console: correct spec.json file (#6222)

* correct spec.json file * bump version * bump version * update doc for connector spec ref Co-authored-by: Marcos Marx <[email protected]>
airbytehq · Sep 23, 2021 · b4cca60 · b4cca60
1 parent 5861b6f
commit b4cca60
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/...ain/resources/config/STANDARD_SOURCE_DEFINITION/eb4c9e00-db83-4d63-a386-39cfa91012a8.json b/...ain/resources/config/STANDARD_SOURCE_DEFINITION/eb4c9e00-db83-4d63-a386-39cfa91012a8.json
@@ -2,6 +2,6 @@
   "sourceDefinitionId": "eb4c9e00-db83-4d63-a386-39cfa91012a8",
   "name": "Google Search Console (native)",
   "dockerRepository": "airbyte/source-google-search-console",
-  "dockerImageTag": "0.1.1",
+  "dockerImageTag": "0.1.2",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/google-search-console"
 }
diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
@@ -370,7 +370,7 @@
 - sourceDefinitionId: eb4c9e00-db83-4d63-a386-39cfa91012a8
   name: Google Search Console
   dockerRepository: airbyte/source-google-search-console
-  dockerImageTag: 0.1.1
+  dockerImageTag: 0.1.2
   documentationUrl: https://docs.airbyte.io/integrations/sources/google-search-console
   sourceType: api
 - sourceDefinitionId: bad83517-5e54-4a3d-9b53-63e85fbd4d7c

diff --git a/airbyte-integrations/connectors/source-google-search-console/Dockerfile b/airbyte-integrations/connectors/source-google-search-console/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.1
+LABEL io.airbyte.version=0.1.2
 LABEL io.airbyte.name=airbyte/source-google-search-console
diff --git a/...tegrations/connectors/source-google-search-console/source_google_search_console/spec.json b/...tegrations/connectors/source-google-search-console/source_google_search_console/spec.json
@@ -28,6 +28,7 @@
         "type": "object",
         "oneOf": [
           {
+            "title": "Client Auth",
             "type": "object",
             "required": [
               "auth_type",
@@ -38,7 +39,10 @@
             "properties": {
               "auth_type": {
                 "type": "string",
-                "const": "Client"
+                "const": "Client",
+                "enum": ["Client"],
+                "default": "Client",
+                "order": 0
               },
               "client_id": {
                 "type": "string",
@@ -59,11 +63,15 @@
           },
           {
             "type": "object",
+            "title": "Service Auth",
             "required": ["auth_type", "service_account_info"],
             "properties": {
               "auth_type": {
                 "type": "string",
-                "const": "Service"
+                "const": "Service",
+                "enum": ["Service"],
+                "default": "Service",
+                "order": 0
               },
               "service_account_info": {
                 "type": "string",

diff --git a/docs/connector-development/connector-specification-reference.md b/docs/connector-development/connector-specification-reference.md
@@ -64,7 +64,7 @@ In order for the Airbyte UI to correctly render a specification, however, a few
 Let's look at the [source-file](../integrations/sources/file.md) implementation as an example. In this example, we have `provider` as a dropdown
 list option, which allows the user to select what provider their file is being hosted on. We note that the `oneOf` keyword lives under the `provider` object as follows:
 
-In each item in the `oneOf` array, the `option_title` string field exists with the aforementioned `const` value unique to that item. This helps the UI and the connector distinguish between the option that was chosen by the user. This can
+In each item in the `oneOf` array, the `option_title` string field exists with the aforementioned `const`, `default` and `enum` value unique to that item. There is a [Github issue](https://github.com/airbytehq/airbyte/issues/6384) to improve it and use only `const` in the specification. This helps the UI and the connector distinguish between the option that was chosen by the user. This can
 be displayed with adapting the file source spec to this example:
 
 ```json
@@ -98,7 +98,10 @@ be displayed with adapting the file source spec to this example:
             "properties": {
               "option_title": {
                 "type": "string",
-                "const": "HTTPS: Public Web"
+                "const": "HTTPS: Public Web",
+                "enum": ["HTTPS: Public Web"],
+                "default": "HTTPS: Public Web",
+                "order": 0
               }
             }
           },
@@ -109,7 +112,10 @@ be displayed with adapting the file source spec to this example:
             "properties": {
               "option_title": {
                 "type": "string",
-                "const": "GCS: Google Cloud Storage"
+                "const": "GCS: Google Cloud Storage",
+                "enum": ["GCS: Google Cloud Storage"],
+                "default": "GCS: Google Cloud Storage",
+                "order": 0
               },
               "service_account_json": {
                 "type": "string",

diff --git a/docs/integrations/sources/google-search-console.md b/docs/integrations/sources/google-search-console.md
@@ -95,5 +95,6 @@ You should now be ready to use the Google Workspace Admin Reports API connector
 
 | Version | Date | Pull Request | Subject |
 | :------ | :--------  | :-----       | :------ |
+| `0.1.2` | 2021-09-17 | [6222](https://github.com/airbytehq/airbyte/pull/6222) | Correct Spec File |
 | `0.1.1` | 2021-09-22 | [6315](https://github.com/airbytehq/airbyte/pull/6315) | Verify access to all sites when performing connection check |
 | `0.1.0` | 2021-09-03 | [5350](https://github.com/airbytehq/airbyte/pull/5350) | Initial Release |