🐛 Source shortio: Changing links primary key (airbytehq#15066)

* Changing primary key in links stream and some small cleanups throughout the source * Adding unit tests and applied gradle formatting * update doc * auto-bump connector version [ci skip] Co-authored-by: marcosmarxm <marcosmarxm@gmail.com> Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>
UsmanAli99 · Aug 3, 2022 · 462c342 · 462c342
1 parent e70b3aa
commit 462c342
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 308 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
@@ -881,7 +881,7 @@
 - name: Short.io
   sourceDefinitionId: 2fed2292-5586-480c-af92-9944e39fe12d
   dockerRepository: airbyte/source-shortio
-  dockerImageTag: 0.1.2
+  dockerImageTag: 0.1.3
   documentationUrl: https://docs.airbyte.io/integrations/sources/shortio
   icon: short.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
@@ -8592,7 +8592,7 @@
               path_in_connector_config:
               - "credentials"
               - "client_secret"
-- dockerImage: "airbyte/source-shortio:0.1.2"
+- dockerImage: "airbyte/source-shortio:0.1.3"
   spec:
     documentationUrl: "https://developers.short.io/reference"
     connectionSpecification:
@@ -8603,7 +8603,6 @@
       - "domain_id"
       - "secret_key"
       - "start_date"
-      additionalProperties: false
       properties:
         domain_id:
           type: "string"

diff --git a/airbyte-integrations/connectors/source-shortio/Dockerfile b/airbyte-integrations/connectors/source-shortio/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.2
+LABEL io.airbyte.version=0.1.3
 LABEL io.airbyte.name=airbyte/source-shortio
diff --git a/airbyte-integrations/connectors/source-shortio/README.md b/airbyte-integrations/connectors/source-shortio/README.md
@@ -8,7 +8,7 @@ For information about how to use this connector within Airbyte, see [the documen
 ### Prerequisites
 **To iterate on this connector, make sure to complete this prerequisites section.**
 
-#### Minimum Python version required `= 3.7.0`
+#### Minimum Python version required `= 3.9.0`
 
 #### Build & Activate Virtual Environment and install dependencies
 From this connector directory, create a virtual environment:

diff --git a/airbyte-integrations/connectors/source-shortio/integration_tests/abnormal_state.json b/airbyte-integrations/connectors/source-shortio/integration_tests/abnormal_state.json
@@ -1,5 +1,5 @@
 {
   "clicks": {
-    "dt": "2022-07-17 14:03:43.449925"
+    "dt": "2052-07-17 14:03:43.449925"
   }
 }
diff --git a/airbyte-integrations/connectors/source-shortio/integration_tests/catalog.json b/airbyte-integrations/connectors/source-shortio/integration_tests/catalog.json
diff --git a/airbyte-integrations/connectors/source-shortio/integration_tests/configured_catalog.json b/airbyte-integrations/connectors/source-shortio/integration_tests/configured_catalog.json
@@ -8,83 +8,7 @@
         "source_defined_cursor": true,
         "default_cursor_field": ["dt"],
         "supported_sync_modes": ["incremental"],
-        "json_schema": {
-          "properties": {
-            "host": {
-              "type": ["null", "string"]
-            },
-            "path": {
-              "type": ["null", "string"]
-            },
-            "method": {
-              "type": ["null", "string"]
-            },
-            "url": {
-              "type": ["null", "string"]
-            },
-            "dt": {
-              "type": ["null", "string"],
-              "format": "date-time"
-            },
-            "st": {
-              "type": ["null", "integer"]
-            },
-            "ip": {
-              "type": ["null", "string"]
-            },
-            "proto": {
-              "type": ["null", "string"]
-            },
-            "ref": {
-              "type": ["null", "string"]
-            },
-            "ua": {
-              "type": ["null", "string"]
-            },
-            "human": {
-              "type": ["null", "boolean"]
-            },
-            "browser": {
-              "type": ["null", "string"]
-            },
-            "browser_version": {
-              "type": ["null", "string"]
-            },
-            "country": {
-              "type": ["null", "string"]
-            },
-            "city": {
-              "type": ["null", "string"]
-            },
-            "social": {
-              "type": ["null", "string"]
-            },
-            "refhost": {
-              "type": ["null", "string"]
-            },
-            "os": {
-              "type": ["null", "string"]
-            },
-            "utm_source": {
-              "type": ["null", "string"]
-            },
-            "utm_medium": {
-              "type": ["null", "string"]
-            },
-            "utm_campaign": {
-              "type": ["null", "string"]
-            },
-            "goal_completed": {
-              "type": ["null", "string"]
-            },
-            "ab_path": {
-              "type": ["null", "string"]
-            },
-            "lcpath": {
-              "type": ["null", "string"]
-            }
-          }
-        }
+        "json_schema": {}
       }
     },
     {
@@ -94,155 +18,7 @@
         "name": "links",
         "source_defined_cursor": true,
         "supported_sync_modes": ["full_refresh"],
-        "json_schema": {
-          "properties": {
-            "id": {
-              "type": "integer"
-            },
-            "path": {
-              "type": ["null", "string"]
-            },
-            "title": {
-              "type": ["null", "string"]
-            },
-            "icon": {
-              "type": ["null", "string"]
-            },
-            "archived": {
-              "type": ["null", "boolean"]
-            },
-            "originalURL": {
-              "type": "string"
-            },
-            "iphoneURL": {
-              "type": ["null", "string"]
-            },
-            "androidURL": {
-              "type": ["null", "string"]
-            },
-            "password": {
-              "type": ["null", "string"]
-            },
-            "utmSource": {
-              "type": ["null", "string"]
-            },
-            "utmMedium": {
-              "type": ["null", "string"]
-            },
-            "utmCampaign": {
-              "type": ["null", "string"]
-            },
-            "utmCampaignId": {
-              "type": ["null", "string"]
-            },
-            "utmTerm": {
-              "type": ["null", "string"]
-            },
-            "utmContent": {
-              "type": ["null", "string"]
-            },
-            "splitURL": {
-              "type": ["null", "string"]
-            },
-            "splitPercent": {
-              "type": ["null", "string"]
-            },
-            "expiresAt": {
-              "type": ["null", "string"]
-            },
-            "expiredURL": {
-              "type": ["null", "string"]
-            },
-            "redirectType": {
-              "type": ["null", "string"]
-            },
-            "clicksLimit": {
-              "type": ["null", "string"]
-            },
-            "cloaking": {
-              "type": ["null", "boolean"]
-            },
-            "source": {
-              "type": ["null", "string"]
-            },
-            "integrationGA": {
-              "type": ["null", "string"]
-            },
-            "integrationFB": {
-              "type": ["null", "string"]
-            },
-            "integrationAdroll": {
-              "type": ["null", "string"]
-            },
-            "integrationGTM": {
-              "type": ["null", "string"]
-            },
-            "AutodeletedAt": {
-              "type": ["null", "string"],
-              "format": "date-time"
-            },
-            "createdAt": {
-              "type": "string",
-              "format": "date-time"
-            },
-            "updatedAt": {
-              "type": "string",
-              "format": "date-time"
-            },
-            "DomainId": {
-              "type": "integer"
-            },
-            "Owner": {
-              "type": ["null", "object"],
-              "properties": {
-                "id": {
-                  "type": "integer"
-                },
-                "name": {
-                  "type": ["null", "string"]
-                },
-                "email": {
-                  "type": ["null", "string"]
-                },
-                "photoURL": {
-                  "type": ["null", "string"]
-                }
-              }
-            },
-            "tags": {
-              "type": ["null", "array"],
-              "items": {
-                "type": "string"
-              }
-            },
-            "secureShortURL": {
-              "type": ["null", "string"]
-            },
-            "idString": {
-              "type": "string"
-            },
-            "shortURL": {
-              "type": "string"
-            },
-            "User": {
-              "type": ["null", "object"],
-              "properties": {
-                "id": {
-                  "type": "integer"
-                },
-                "name": {
-                  "type": ["null", "string"]
-                },
-                "email": {
-                  "type": ["null", "string"]
-                },
-                "photoURL": {
-                  "type": ["null", "string"]
-                }
-              }
-            }
-          }
-        }
+        "json_schema": {}
       }
     }
   ]

diff --git a/airbyte-integrations/connectors/source-shortio/integration_tests/sample_config.json b/airbyte-integrations/connectors/source-shortio/integration_tests/sample_config.json
diff --git a/airbyte-integrations/connectors/source-shortio/integration_tests/state.json b/airbyte-integrations/connectors/source-shortio/integration_tests/state.json
@@ -1,5 +1,5 @@
 {
   "clicks": {
-    "dt": "2021-07-28 14:03:43.449925"
+    "dt": "2022-07-27 10:30:43.449925"
   }
 }
diff --git a/airbyte-integrations/connectors/source-shortio/setup.py b/airbyte-integrations/connectors/source-shortio/setup.py
@@ -5,12 +5,10 @@
 
 from setuptools import find_packages, setup
 
-MAIN_REQUIREMENTS = [
-    "airbyte-cdk~=0.1",
-]
+MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1.56"]
 
 TEST_REQUIREMENTS = [
-    "pytest~=6.1",
+    "pytest~=6.2.5",
     "source-acceptance-test",
 ]
 

diff --git a/airbyte-integrations/connectors/source-shortio/source_shortio/schemas/links.json b/airbyte-integrations/connectors/source-shortio/source_shortio/schemas/links.json
@@ -2,9 +2,6 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "properties": {
-    "id": {
-      "type": "integer"
-    },
     "path": {
       "type": ["null", "string"]
     },