Source metabase: allow using only https urls (#18607)

* #16519 source metabase: allow using only https urls * source metabase: upd changelog * #16519 fix url regexp * auto-bump connector version Co-authored-by: Octavia Squidington III <[email protected]>
airbytehq · Oct 31, 2022 · 3b44baf · 3b44baf
1 parent 96ebd96
commit 3b44baf
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 23 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
@@ -729,7 +729,7 @@
 - name: Metabase
   sourceDefinitionId: c7cb421b-942e-4468-99ee-e369bcabaec5
   dockerRepository: airbyte/source-metabase
-  dockerImageTag: 0.1.0
+  dockerImageTag: 0.2.0
   documentationUrl: https://docs.airbyte.com/integrations/sources/metabase
   icon: metabase.svg
   sourceType: api

diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
@@ -6677,7 +6677,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-metabase:0.1.0"
+- dockerImage: "airbyte/source-metabase:0.2.0"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/metabase"
     connectionSpecification:
@@ -6693,7 +6693,8 @@
           title: "Metabase Instance API URL"
           description: "URL to your metabase instance API"
           examples:
-          - "http://localhost:3000/api/"
+          - "https://localhost:3000/api/"
+          pattern: "^https://"
           order: 0
         username:
           type: "string"

diff --git a/airbyte-integrations/connectors/source-metabase/Dockerfile b/airbyte-integrations/connectors/source-metabase/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.0
+LABEL io.airbyte.version=0.2.0
 LABEL io.airbyte.name=airbyte/source-metabase
diff --git a/airbyte-integrations/connectors/source-metabase/acceptance-test-config.yml b/airbyte-integrations/connectors/source-metabase/acceptance-test-config.yml
@@ -2,13 +2,19 @@ connector_image: airbyte/source-metabase:dev
 tests:
   spec:
     - spec_path: "source_metabase/spec.yaml"
+      backward_compatibility_tests_config:
+        disable_for_version: "0.1.0"
   connection:
     - config_path: "secrets/config.json"
       status: "succeed"
     - config_path: "integration_tests/invalid_config.json"
       status: "failed"
+    - config_path: "integration_tests/config_http_url.json"
+      status: "failed"
   discovery:
     - config_path: "secrets/config.json"
+      backward_compatibility_tests_config:
+        disable_for_version: "0.1.0"
   basic_read:
     - config_path: "secrets/config.json"
       configured_catalog_path: "integration_tests/configured_catalog.json"
diff --git a/airbyte-integrations/connectors/source-metabase/integration_tests/config_http_url.json b/airbyte-integrations/connectors/source-metabase/integration_tests/config_http_url.json
@@ -0,0 +1,3 @@
+{
+  "instance_api_url": "http://localhost:3000"
+}
diff --git a/airbyte-integrations/connectors/source-metabase/integration_tests/invalid_config.json b/airbyte-integrations/connectors/source-metabase/integration_tests/invalid_config.json
@@ -1,5 +1,5 @@
 {
-  "instance_api_url": "localhost:3000",
+  "instance_api_url": "https://localhost:3000",
   "username": "wrong-account-id",
   "password": "2020-05-01T00:00:00Z",
   "session_token": "invalid"

diff --git a/airbyte-integrations/connectors/source-metabase/setup.py b/airbyte-integrations/connectors/source-metabase/setup.py
@@ -5,7 +5,7 @@
 
 from setuptools import find_packages, setup
 
-MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1", "requests>=2.28.0", "types-requests>=2.27.30"]
+MAIN_REQUIREMENTS = ["airbyte-cdk~=0.2", "requests>=2.28.0", "types-requests>=2.27.30"]
 
 TEST_REQUIREMENTS = [
     "pytest~=6.1",

diff --git a/airbyte-integrations/connectors/source-metabase/source_metabase/schemas/activity.json b/airbyte-integrations/connectors/source-metabase/source_metabase/schemas/activity.json
@@ -5,7 +5,25 @@
       "type": ["null", "integer"]
     },
     "table": {
-      "type": ["null", "string"]
+      "type": ["null", "object"],
+      "properties": {
+        "active": {"type": "boolean"},
+        "caveats": {"type": ["null", "string"]},
+        "created_at": {"type": ["null", "string"]},
+        "db_id": {"type": "integer"},
+        "description": {"type": ["null", "string"]},
+        "display_name": {"type": ["null", "string"]},
+        "entity_type": {"type": ["null", "string"]},
+        "field_order": {"type": ["null", "string"]},
+        "id": {"type": "integer"},
+        "initial_sync_status": {"type": ["null", "string"]},
+        "name": {"type": ["null", "string"]},
+        "points_of_interest": {"type": ["null", "array"]},
+        "schema": {"type": ["null", "string"]},
+        "show_in_getting_started": {"type":  "boolean"},
+        "updated_at": {"type": ["null", "string"]},
+        "visibility_type": {"type":  ["null", "string"]}
+      }
     },
     "database_id": {
       "type": ["null", "integer"]

diff --git a/airbyte-integrations/connectors/source-metabase/source_metabase/spec.yaml b/airbyte-integrations/connectors/source-metabase/source_metabase/spec.yaml
@@ -13,7 +13,8 @@ connectionSpecification:
       description: >-
         URL to your metabase instance API
       examples:
-        - "http://localhost:3000/api/"
+        - "https://localhost:3000/api/"
+      pattern: "^https://"
       order: 0
     username:
       type: string

diff --git a/docs/integrations/sources/metabase.md b/docs/integrations/sources/metabase.md
@@ -16,21 +16,21 @@ This Source is capable of syncing the following Streams:
 
 ### Data type mapping
 
-| Integration Type | Airbyte Type | Notes |
-| :--- | :--- | :--- |
-| `string` | `string` |  |
-| `integer`, `number` | `number` |  |
-| `array` | `array` |  |
-| `object` | `object` |  |
+| Integration Type    | Airbyte Type | Notes |
+|:--------------------|:-------------|:------|
+| `string`            | `string`     |       |
+| `integer`, `number` | `number`     |       |
+| `array`             | `array`      |       |
+| `object`            | `object`     |       |
 
 ### Features
 
-| Feature | Supported?\(Yes/No\) | Notes |
-| :--- | :--- | :--- |
-| Full Refresh Sync | Yes |  |
-| Incremental Sync | No |  |
-| SSL connection | Yes |
-| Namespaces | No |  |
+| Feature           | Supported?\(Yes/No\) | Notes |
+|:------------------|:---------------------|:------|
+| Full Refresh Sync | Yes                  |       |
+| Incremental Sync  | No                   |       |
+| SSL connection    | Yes                  |
+| Namespaces        | No                   |       |
 
 ## Getting started
 
@@ -68,6 +68,7 @@ authenticated query is running, which might trigger security alerts on the user'
 
 ## Changelog
 
-| Version | Date | Pull Request | Subject |
-| :--- | :--- | :--- | :--- |
-| 0.1.0 | 2022-06-15 | [6975](https://github.com/airbytehq/airbyte/pull/13752) |  Initial (alpha) release |
+| Version | Date       | Pull Request                                             | Subject                    |
+|:--------|:-----------|:---------------------------------------------------------|:---------------------------|
+| 0.2.0   | 2022-10-28 | [18607](https://github.com/airbytehq/airbyte/pull/18607) | Disallow using `http` URLs |
+| 0.1.0   | 2022-06-15 | [6975](https://github.com/airbytehq/airbyte/pull/13752)  | Initial (alpha) release    |