From 51e8d2ef8d1907a4a65230b799a455fffaaa2030 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Wed, 22 Dec 2021 16:58:50 +0200 Subject: [PATCH 1/3] add 'order' to spec.json props Signed-off-by: Sergey Chvalyuk --- .../eb4c9e00-db83-4d63-a386-39cfa91012a8.json | 2 +- .../src/main/resources/seed/source_definitions.yaml | 2 +- .../connectors/source-google-search-console/Dockerfile | 2 +- .../source_google_search_console/spec.json | 10 +++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/eb4c9e00-db83-4d63-a386-39cfa91012a8.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/eb4c9e00-db83-4d63-a386-39cfa91012a8.json index 9fb33d14d49e..440225168620 100644 --- a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/eb4c9e00-db83-4d63-a386-39cfa91012a8.json +++ b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/eb4c9e00-db83-4d63-a386-39cfa91012a8.json @@ -2,7 +2,7 @@ "sourceDefinitionId": "eb4c9e00-db83-4d63-a386-39cfa91012a8", "name": "Google Search Console", "dockerRepository": "airbyte/source-google-search-console", - "dockerImageTag": "0.1.4", + "dockerImageTag": "0.1.9", "documentationUrl": "https://docs.airbyte.io/integrations/sources/google-search-console", "icon": "googlesearchconsole.svg" } diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index a2eaf409d3be..d091399d0fda 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -252,7 +252,7 @@ - name: Google Search Console sourceDefinitionId: eb4c9e00-db83-4d63-a386-39cfa91012a8 dockerRepository: airbyte/source-google-search-console - dockerImageTag: 0.1.8 + dockerImageTag: 0.1.9 documentationUrl: https://docs.airbyte.io/integrations/sources/google-search-console icon: googlesearchconsole.svg sourceType: api diff --git a/airbyte-integrations/connectors/source-google-search-console/Dockerfile b/airbyte-integrations/connectors/source-google-search-console/Dockerfile index 841d087b3c63..7a392def2eb1 100755 --- a/airbyte-integrations/connectors/source-google-search-console/Dockerfile +++ b/airbyte-integrations/connectors/source-google-search-console/Dockerfile @@ -13,5 +13,5 @@ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENV SENTRY_DSN "https://d4b03de0c4574c78999b8d58e55243dc@o1009025.ingest.sentry.io/6102835" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.1.8 +LABEL io.airbyte.version=0.1.9 LABEL io.airbyte.name=airbyte/source-google-search-console diff --git a/airbyte-integrations/connectors/source-google-search-console/source_google_search_console/spec.json b/airbyte-integrations/connectors/source-google-search-console/source_google_search_console/spec.json index a68132a48c61..26e659b8a80f 100755 --- a/airbyte-integrations/connectors/source-google-search-console/source_google_search_console/spec.json +++ b/airbyte-integrations/connectors/source-google-search-console/source_google_search_console/spec.json @@ -13,23 +13,27 @@ "type": "string" }, "description": "Website URLs property; do not include the domain-level property in the list", - "examples": ["https://example1.com", "https://example2.com"] + "examples": ["https://example1.com", "https://example2.com"], + "order": 0 }, "start_date": { "type": "string", "description": "The date from which you'd like to replicate data in the format YYYY-MM-DD.", "examples": ["2021-01-01"], - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$", + "order": 1 }, "end_date": { "type": "string", "description": "The date from which you'd like to replicate data in the format YYYY-MM-DD. Must be greater or equal start_date field", "examples": ["2021-12-12"], - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$", + "order": 2 }, "authorization": { "type": "object", "title": "Authentication Type", + "order": 3, "oneOf": [ { "title": "Authenticate via Google (Oauth)", From 2beae7ea62016fc5aa1b124eaaead8af6563664d Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Wed, 22 Dec 2021 17:02:57 +0200 Subject: [PATCH 2/3] google-search-console.md updated Signed-off-by: Sergey Chvalyuk --- docs/integrations/sources/google-search-console.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/integrations/sources/google-search-console.md b/docs/integrations/sources/google-search-console.md index e7519b1151fd..86d74155b401 100644 --- a/docs/integrations/sources/google-search-console.md +++ b/docs/integrations/sources/google-search-console.md @@ -96,6 +96,7 @@ You should now be ready to use the Google Workspace Admin Reports API connector | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | +| `0.1.9` | 2021-12-22 | [9047](https://github.com/airbytehq/airbyte/pull/9047) | Add 'order' to spec.json props | | `0.1.8` | 2021-12-21 | [8248](https://github.com/airbytehq/airbyte/pull/8248) | Enable Sentry for performance and errors tracking | | `0.1.7` | 2021-11-26 | [7431](https://github.com/airbytehq/airbyte/pull/7431) | Add default `end_date` param value | | `0.1.6` | 2021-09-27 | [6460](https://github.com/airbytehq/airbyte/pull/6460) | Update OAuth Spec File | From 57066657449af735a2f8c1c161aec117b02233c5 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 23 Dec 2021 23:51:19 +0200 Subject: [PATCH 3/3] source_specs.yaml updated Signed-off-by: Sergey Chvalyuk --- .../init/src/main/resources/seed/source_specs.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index f7103d501e24..eb4bc5a3d2db 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -2455,7 +2455,7 @@ - - "client_secret" oauthFlowOutputParameters: - - "refresh_token" -- dockerImage: "airbyte/source-google-search-console:0.1.8" +- dockerImage: "airbyte/source-google-search-console:0.1.9" spec: documentationUrl: "https://docs.airbyte.io/integrations/sources/google-search-console" connectionSpecification: @@ -2477,6 +2477,7 @@ examples: - "https://example1.com" - "https://example2.com" + order: 0 start_date: type: "string" description: "The date from which you'd like to replicate data in the format\ @@ -2484,6 +2485,7 @@ examples: - "2021-01-01" pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" + order: 1 end_date: type: "string" description: "The date from which you'd like to replicate data in the format\ @@ -2491,9 +2493,11 @@ examples: - "2021-12-12" pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" + order: 2 authorization: type: "object" title: "Authentication Type" + order: 3 oneOf: - title: "Authenticate via Google (Oauth)" type: "object"