From 23a93c7d1f61c41398236a9a99ba7d4fc58a691a Mon Sep 17 00:00:00 2001 From: Anatolii Yatsuk Date: Fri, 26 May 2023 13:41:58 +0300 Subject: [PATCH 1/3] Fix order of authentication methods --- .../connectors/source-asana/Dockerfile | 2 +- .../connectors/source-asana/metadata.yaml | 2 +- .../source-asana/source_asana/spec.json | 40 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/airbyte-integrations/connectors/source-asana/Dockerfile b/airbyte-integrations/connectors/source-asana/Dockerfile index d2fd7c5765d7b..677255da0f151 100644 --- a/airbyte-integrations/connectors/source-asana/Dockerfile +++ b/airbyte-integrations/connectors/source-asana/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.5 +LABEL io.airbyte.version=0.1.6 LABEL io.airbyte.name=airbyte/source-asana diff --git a/airbyte-integrations/connectors/source-asana/metadata.yaml b/airbyte-integrations/connectors/source-asana/metadata.yaml index 0e1b6f6b90a77..14de249414d80 100644 --- a/airbyte-integrations/connectors/source-asana/metadata.yaml +++ b/airbyte-integrations/connectors/source-asana/metadata.yaml @@ -2,7 +2,7 @@ data: connectorSubtype: api connectorType: source definitionId: d0243522-dccf-4978-8ba0-37ed47a0bdbf - dockerImageTag: 0.1.5 + dockerImageTag: 0.1.6 dockerRepository: airbyte/source-asana githubIssueLabel: source-asana icon: asana.svg diff --git a/airbyte-integrations/connectors/source-asana/source_asana/spec.json b/airbyte-integrations/connectors/source-asana/source_asana/spec.json index 83abe72408968..a7eeab0cd541b 100644 --- a/airbyte-integrations/connectors/source-asana/source_asana/spec.json +++ b/airbyte-integrations/connectors/source-asana/source_asana/spec.json @@ -11,25 +11,6 @@ "description": "Choose how to authenticate to Github", "type": "object", "oneOf": [ - { - "type": "object", - "title": "Authenticate with Personal Access Token", - "required": ["personal_access_token"], - "properties": { - "option_title": { - "type": "string", - "title": "Credentials title", - "description": "PAT Credentials", - "const": "PAT Credentials" - }, - "personal_access_token": { - "type": "string", - "title": "Personal Access Token", - "description": "Asana Personal Access Token (generate yours here).", - "airbyte_secret": true - } - } - }, { "type": "object", "title": "Authenticate via Asana (Oauth)", @@ -60,6 +41,25 @@ "airbyte_secret": true } } + }, + { + "type": "object", + "title": "Authenticate with Personal Access Token", + "required": ["personal_access_token"], + "properties": { + "option_title": { + "type": "string", + "title": "Credentials title", + "description": "PAT Credentials", + "const": "PAT Credentials" + }, + "personal_access_token": { + "type": "string", + "title": "Personal Access Token", + "description": "Asana Personal Access Token (generate yours here).", + "airbyte_secret": true + } + } } ] } @@ -68,7 +68,7 @@ "authSpecification": { "auth_type": "oauth2.0", "oauth2Specification": { - "rootObject": ["credentials", 1], + "rootObject": ["credentials", 0], "oauthFlowInitParameters": [["client_id"], ["client_secret"]], "oauthFlowOutputParameters": [["refresh_token"]] } From 951e672534be8d9358292a6f6b566550aaee9b71 Mon Sep 17 00:00:00 2001 From: Anatolii Yatsuk Date: Fri, 26 May 2023 13:49:44 +0300 Subject: [PATCH 2/3] Update changelog --- docs/integrations/sources/asana.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/integrations/sources/asana.md b/docs/integrations/sources/asana.md index 5305278168bbe..61942807a9e0b 100644 --- a/docs/integrations/sources/asana.md +++ b/docs/integrations/sources/asana.md @@ -68,6 +68,7 @@ The connector is restricted by normal Asana [requests limitation](https://develo | Version | Date | Pull Request | Subject | | :------ | :--------- | :------------------------------------------------------- | :--------------------------------------------------------- | +| 0.1.6 | 2023-05-26 | [26653](https://github.com/airbytehq/airbyte/pull/26653) | Fix order of authentication methods | | 0.1.5 | 2022-11-16 | [19561](https://github.com/airbytehq/airbyte/pull/19561) | Added errors handling, updated SAT with new format | | 0.1.4 | 2022-08-18 | [15749](https://github.com/airbytehq/airbyte/pull/15749) | Add cache to project stream | | 0.1.3 | 2021-10-06 | [6832](https://github.com/airbytehq/airbyte/pull/6832) | Add oauth init flow parameters support | From 6b841d14945fcfbd3aaabb3ba3422bb96babee5b Mon Sep 17 00:00:00 2001 From: Anatolii Yatsuk Date: Tue, 30 May 2023 11:37:47 +0300 Subject: [PATCH 3/3] Add allowedHosts to metadata.yaml --- airbyte-integrations/connectors/source-asana/metadata.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/airbyte-integrations/connectors/source-asana/metadata.yaml b/airbyte-integrations/connectors/source-asana/metadata.yaml index 7b1fd7ae7facc..3ee7abd7dcbb8 100644 --- a/airbyte-integrations/connectors/source-asana/metadata.yaml +++ b/airbyte-integrations/connectors/source-asana/metadata.yaml @@ -1,4 +1,7 @@ data: + allowedHosts: + hosts: + - app.asana.com connectorSubtype: api connectorType: source definitionId: d0243522-dccf-4978-8ba0-37ed47a0bdbf