🐛 Source Airtable: fix API Key authentication (#22224)

airbytehq · Feb 1, 2023 · b0dd975 · b0dd975
1 parent 0ae8fdb
commit b0dd975
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 52 deletions.
diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
@@ -17,11 +17,15 @@
 - name: Airtable
   sourceDefinitionId: 14c6e7ea-97ed-4f5e-a7b5-25e9a80b8212
   dockerRepository: airbyte/source-airtable
-  dockerImageTag: 2.0.0
+  dockerImageTag: 2.0.1
   documentationUrl: https://docs.airbyte.com/integrations/sources/airtable
   icon: airtable.svg
   sourceType: api
   releaseStage: beta
+  allowedHosts:
+    hosts:
+      - api.airtable.com
+      - airtable.com
 - name: Aha
   sourceDefinitionId: 81ca39dc-4534-4dd2-b848-b0cfd2c11fce
   dockerRepository: airbyte/source-aha

diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
@@ -178,7 +178,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-airtable:2.0.0"
+- dockerImage: "airbyte/source-airtable:2.0.1"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/airtable"
     connectionSpecification:

diff --git a/airbyte-integrations/connectors/source-airtable/Dockerfile b/airbyte-integrations/connectors/source-airtable/Dockerfile
@@ -34,5 +34,5 @@ COPY source_airtable ./source_airtable
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=2.0.0
+LABEL io.airbyte.version=2.0.1
 LABEL io.airbyte.name=airbyte/source-airtable
diff --git a/airbyte-integrations/connectors/source-airtable/acceptance-test-config.yml b/airbyte-integrations/connectors/source-airtable/acceptance-test-config.yml
@@ -19,13 +19,7 @@ acceptance_tests:
   discovery:
     tests:
       - config_path: "secrets/config.json"
-        # the static `string` schema is replaced with casted to JSONSchema
-        backward_compatibility_tests_config:
-          disable_for_version: "1.0.2"
       - config_path: "secrets/config_oauth.json"
-        # the static `string` schema is replaced with casted to JSONSchema
-        backward_compatibility_tests_config:
-          disable_for_version: "1.0.2"
   basic_read:
     tests:
       - config_path: "secrets/config.json"

diff --git a/airbyte-integrations/connectors/source-airtable/integration_tests/expected_records.jsonl b/airbyte-integrations/connectors/source-airtable/integration_tests/expected_records.jsonl
diff --git a/airbyte-integrations/connectors/source-airtable/source_airtable/auth.py b/airbyte-integrations/connectors/source-airtable/source_airtable/auth.py
@@ -52,4 +52,8 @@ def __new__(cls, config: dict) -> Union[TokenAuthenticator, AirtableOAuth]:
         if "api_key" in config:
             return TokenAuthenticator(token=(config or {}).get("api_key"))
         # for new oauth configs
-        return AirtableOAuth(config, "https://airtable.com/oauth2/v1/token")
+        credentials = config["credentials"]
+        if credentials["auth_method"] == "oauth2.0":
+            return AirtableOAuth(config, "https://airtable.com/oauth2/v1/token")
+        elif credentials["auth_method"] == "api_key":
+            return TokenAuthenticator(token=credentials["api_key"])
diff --git a/docs/integrations/sources/airtable.md b/docs/integrations/sources/airtable.md
@@ -103,6 +103,7 @@ See information about rate limits [here](https://airtable.com/developers/web/api
 
 | Version | Date       | Pull Request                                             | Subject                                                |
 |:--------|:-----------|:---------------------------------------------------------|:-------------------------------------------------------|
+| 2.0.1   | 2023-02-01 | [22224](https://github.com/airbytehq/airbyte/pull/22224) | Fixed broken `API Key` authentication
 | 2.0.0   | 2023-01-27 | [21962](https://github.com/airbytehq/airbyte/pull/21962) | Added casting of native Airtable data types to JsonSchema types
 | 1.0.2   | 2023-01-25 | [20934](https://github.com/airbytehq/airbyte/pull/20934) | Added `OAuth2.0` authentication support 
 | 1.0.1   | 2023-01-10 | [21215](https://github.com/airbytehq/airbyte/pull/21215) | Fix field names                                        |