TDL-16481 Update schema (#10)

* updated typo in schemas * Updated test case * Updated config.yml file * Fixed automation_blocks stream
singer-io · Jan 17, 2022 · 363839b · 363839b
1 parent d958720
commit 363839b
Show file tree

Hide file tree

Showing 20 changed files with 667 additions and 258 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: 218546966473.dkr.ecr.us-east-1.amazonaws.com/circle-ci:tap-tester-v4
+      - image: 218546966473.dkr.ecr.us-east-1.amazonaws.com/circle-ci:stitch-tap-tester
     steps:
       - checkout
       - run:
@@ -12,25 +12,31 @@ jobs:
             source /usr/local/share/virtualenvs/tap-activecampaign/bin/activate
             pip install -U 'pip<19.2' setuptools
             pip install .[dev]
+      - run:
+          name: 'JSON Validator'
+          command: |
+            source /usr/local/share/virtualenvs/tap-tester/bin/activate
+            stitch-validate-json tap_activecampaign/schemas/*.json
+      - run:
+          name: 'pylint'
+          command: |
+            source /usr/local/share/virtualenvs/tap-activecampaign/bin/activate
+            pylint tap_activecampaign -d C,R,W
       - add_ssh_keys
       - run:
           name: 'Integration Tests'
           command: |
-            aws s3 cp s3://com-stitchdata-dev-deployment-assets/environments/tap-tester/sandbox dev_env.sh
+            aws s3 cp s3://com-stitchdata-dev-deployment-assets/environments/tap-tester/tap_tester_sandbox dev_env.sh
             source dev_env.sh
             source /usr/local/share/virtualenvs/tap-tester/bin/activate
-            run-test --tap=tap-activecampaign \
-                       --target=target-stitch \
-                       --orchestrator=stitch-orchestrator \
-                       --email=harrison+sandboxtest@stitchdata.com \
-                       --password=$SANDBOX_PASSWORD \
-                       --client-id=50 \
-                       tests
+            run-test --tap=tap-activecampaign tests
 workflows:
   version: 2
   commit:
     jobs:
-      - build
+      - build:
+          context:
+            - circleci-user
   build_daily:
     triggers:
       - schedule:

diff --git a/tap_activecampaign/schemas/automation_blocks.json b/tap_activecampaign/schemas/automation_blocks.json
@@ -12,9 +12,21 @@
       "type": ["null", "integer"]
     },
     "params": {
-      "type": ["null", "object"],
-      "additionalProperties": true,
-      "properties": {}
+      "anyOf": [
+        {
+          "type": ["null", "object"],
+          "additionalProperties": true,
+          "properties": {}
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": ["null", "object"],
+            "additionalProperties": true,
+            "properties": {}
+          }
+        }
+      ]
     },
     "deleted": {
       "type": ["null", "integer"]

diff --git a/tap_activecampaign/schemas/brandings.json b/tap_activecampaign/schemas/brandings.json
@@ -2,7 +2,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "group_id": {
+    "groupid": {
       "type": ["null", "string"]
     },
     "site_name": {
@@ -38,13 +38,13 @@
     "help": {
       "type": ["null", "integer"]
     },
-    "admin_template_httm": {
+    "admin_template_htm": {
       "type": ["null", "string"]
     },
     "admin_template_css": {
       "type": ["null", "string"]
     },
-    "public_template_httm": {
+    "public_template_htm": {
       "type": ["null", "string"]
     },
     "public_template_css": {

diff --git a/tap_activecampaign/schemas/campaign_links.json b/tap_activecampaign/schemas/campaign_links.json
@@ -20,7 +20,7 @@
     "tracked": {
       "type": ["null", "integer"]
     },
-    "uniqueclicks": {
+    "uniquelinkclicks": {
       "type": ["null", "integer"]
     },
     "linkclicks": {

diff --git a/tap_activecampaign/schemas/contact_custom_fields.json b/tap_activecampaign/schemas/contact_custom_fields.json
@@ -17,7 +17,7 @@
     "perstag": {
       "type": ["null", "string"]
     },
-    "defvalue": {
+    "defval": {
       "type": ["null", "string"]
     },
     "show_in_list": {

diff --git a/tap_activecampaign/schemas/contact_lists.json b/tap_activecampaign/schemas/contact_lists.json
@@ -46,7 +46,7 @@
     "last_name": {
       "type": ["null", "string"]
     },
-    "ip4_sub": {
+    "ip_4sub": {
       "type": ["null", "integer"]
     },
     "sourceid": {
@@ -58,7 +58,7 @@
     "ip4_last": {
       "type": ["null", "integer"]
     },
-    "ip4_unsub": {
+    "ip_4unsub": {
       "type": ["null", "integer"]
     },
     "created_timestamp": {

diff --git a/tap_activecampaign/schemas/contacts.json b/tap_activecampaign/schemas/contacts.json
@@ -15,7 +15,7 @@
     "last_name": {
       "type": ["null", "string"]
     },
-    "org_id": {
+    "orgid": {
       "type": ["null", "integer"]
     },
     "segmentio_id": {

diff --git a/tap_activecampaign/schemas/conversions.json b/tap_activecampaign/schemas/conversions.json
@@ -14,7 +14,7 @@
     "limit": {
       "type": ["null", "integer"]
     },
-    "enforce_limit": {
+    "enforcelimit": {
       "type": ["null", "integer"]
     },
     "cdate": {

diff --git a/tap_activecampaign/schemas/deal_activities.json b/tap_activecampaign/schemas/deal_activities.json
@@ -5,7 +5,7 @@
     "d_id": {
       "type": ["null", "integer"]
     },
-    "d_stage_id": {
+    "d_stageid": {
       "type": ["null", "integer"]
     },
     "userid": {
@@ -20,7 +20,7 @@
     "data_action": {
       "type": ["null", "string"]
     },
-    "data_old_val": {
+    "data_oldval": {
       "type": ["null", "string"]
     },
     "cdate": {

diff --git a/tap_activecampaign/schemas/deal_stages.json b/tap_activecampaign/schemas/deal_stages.json
@@ -2,19 +2,19 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "card_region_1": {
+    "card_region1": {
       "type": ["null", "string"]
     },
-    "card_region_2": {
+    "card_region2": {
       "type": ["null", "string"]
     },
-    "card_region_3": {
+    "card_region3": {
       "type": ["null", "string"]
     },
-    "card_region_4": {
+    "card_region4": {
       "type": ["null", "string"]
     },
-    "card_region_5": {
+    "card_region5": {
       "type": ["null", "string"]
     },
     "cdate": {

diff --git a/tap_activecampaign/schemas/forms.json b/tap_activecampaign/schemas/forms.json
@@ -171,7 +171,7 @@
     "cfields": {
       "anyOf": [
         {
-          "type": "null"
+          "type": ["null", "object"]
         },
         {
           "type": "array",
@@ -228,7 +228,7 @@
     "defaultscreenshot": {
       "type": ["null", "string"]
     },
-    "recents": {
+    "recent": {
       "anyOf": [
         {
           "type": "array",

diff --git a/tap_activecampaign/schemas/tasks.json b/tap_activecampaign/schemas/tasks.json
@@ -28,7 +28,7 @@
     "reltype": {
       "type": ["null", "string"]
     },
-    "deal_task_type": {
+    "deal_tasktype": {
       "type": ["null", "integer"]
     },
     "cdate": {

diff --git a/tap_activecampaign/schemas/templates.json b/tap_activecampaign/schemas/templates.json
@@ -17,7 +17,7 @@
     "subject": {
       "type": ["null", "string"]
     },
-    "contant": {
+    "content": {
       "type": ["null", "string"]
     },
     "categoryid": {

diff --git a/tap_activecampaign/schemas/users.json b/tap_activecampaign/schemas/users.json
@@ -20,7 +20,7 @@
     "signature": {
       "type": ["null", "string"]
     },
-    "local_zone_id": {
+    "local_zoneid": {
       "type": ["null", "string"]
     },
     "password_updated_utc_timestamp": {

diff --git a/tap_activecampaign/transform.py b/tap_activecampaign/transform.py
@@ -25,6 +25,6 @@ def transform_json(this_json, stream_name, data_key):
     else:
         converted_json = humps.decamelize(this_json)
 
-    fixed_records = fix_records(converted_json)
+    fix_records(converted_json)
 
     return converted_json
diff --git a/tests/__init__.py b/tests/__init__.py