🐛 Fix flexport schema & format files (#15584)

* Fix the new API discrepancies * Fix integration test * Update configured catalogs * Run gradlew format * Update changelog * solve conflict * run format * correct doc in spec def * auto-bump connector version [ci skip] Co-authored-by: monai <monai@cure.lt> Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>
airbytehq · Aug 12, 2022 · 5305ad2 · 5305ad2
1 parent 4704486
commit 5305ad2
Show file tree

Hide file tree

Showing 43 changed files with 483 additions and 709 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
@@ -281,6 +281,11 @@
   dockerRepository: airbyte/source-freshcaller
   dockerImageTag: 0.1.0
   documentationUrl: https://docs.airbyte.io/integrations/sources/freshcaller
+- name: Flexport
+  sourceDefinitionId: f95337f1-2ad1-4baf-922f-2ca9152de630
+  dockerRepository: airbyte/source-flexport
+  dockerImageTag: 0.1.0
+  documentationUrl: https://docs.airbyte.io/integrations/sources/flexport
   sourceType: api
   releaseStage: alpha
 - name: Freshdesk

diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
@@ -2534,6 +2534,31 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
+- dockerImage: "airbyte/source-flexport:0.1.0"
+  spec:
+    documentationUrl: "https://docs.airbyte.io/integrations/sources/flexport"
+    connectionSpecification:
+      $schema: "http://json-schema.org/draft-07/schema#"
+      title: "Flexport Spec"
+      additionalProperties: true
+      type: "object"
+      required:
+      - "api_key"
+      - "start_date"
+      properties:
+        api_key:
+          order: 0
+          type: "string"
+          title: "API Key"
+          airbyte_secret: true
+        start_date:
+          order: 1
+          title: "Start Date"
+          type: "string"
+          format: "date-time"
+    supportsNormalization: false
+    supportsDBT: false
+    supported_destination_sync_modes: []
 - dockerImage: "airbyte/source-freshdesk:0.3.3"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/freshdesk"

diff --git a/...tegrations/connectors/source-flexport/integration_tests/configured_catalog_companies.json b/...tegrations/connectors/source-flexport/integration_tests/configured_catalog_companies.json
@@ -6,7 +6,6 @@
         "json_schema": {
           "$schema": "http://json-schema.org/draft-07/schema#",
           "type": "object",
-          "additionalProperties": false,
           "properties": {
             "_object": {
               "type": "string",
@@ -35,7 +34,6 @@
               "items": {
                 "$schema": "http://json-schema.org/draft-07/schema#",
                 "type": "object",
-                "additionalProperties": false,
                 "properties": {
                   "_object": {
                     "type": "string",
@@ -50,6 +48,10 @@
                     "type": "string",
                     "description": "Name of the company entity."
                   },
+                  "ref": {
+                    "type": "string",
+                    "description": "Your reference for this company entity, as set in the Network tab."
+                  },
                   "mailing_address": {
                     "description": "Address of the company entity.",
                     "oneOf": [
@@ -59,7 +61,6 @@
                       {
                         "$schema": "http://json-schema.org/draft-07/schema#",
                         "type": "object",
-                        "additionalProperties": false,
                         "properties": {
                           "_object": {
                             "type": "string",
@@ -94,33 +95,28 @@
                             "type": ["null", "string"],
                             "description": "ZIP or postal code."
                           },
-                          "unlocode": {
-                            "type": ["null", "string"],
-                            "description": "If port, then UN/LOCODE (United Nations Code for Trade and Transport Locations)."
-                          },
                           "timezone": {
-                            "type": "string",
+                            "type": ["null", "string"],
                             "description": "Timezone for this address"
                           },
                           "ref": {
                             "type": ["null", "string"],
                             "description": "Your reference for the address, as set in your network tab"
+                          },
+                          "unlocode": {
+                            "type": ["null", "string"],
+                            "description": "If port, then UN/LOCODE (United Nations Code for Trade and Transport Locations)."
                           }
                         }
                       }
                     ]
                   },
-                  "ref": {
-                    "type": "string",
-                    "description": "Your reference for this company entity, as set in the Network tab."
-                  },
                   "vat_numbers": {
                     "type": "array",
                     "description": "Array of VAT numbers of the company entity.",
                     "items": {
                       "$schema": "http://json-schema.org/draft-07/schema#",
                       "type": "object",
-                      "additionalProperties": false,
                       "properties": {
                         "_object": {
                           "type": "string",
@@ -144,7 +140,6 @@
             "locations": {
               "$schema": "http://json-schema.org/draft-07/schema#",
               "type": "object",
-              "additionalProperties": false,
               "properties": {
                 "_object": {
                   "type": "string",
@@ -164,7 +159,6 @@
             "contacts": {
               "$schema": "http://json-schema.org/draft-07/schema#",
               "type": "object",
-              "additionalProperties": false,
               "properties": {
                 "_object": {
                   "type": "string",

diff --git a/...ntegrations/connectors/source-flexport/integration_tests/configured_catalog_invoices.json b/...ntegrations/connectors/source-flexport/integration_tests/configured_catalog_invoices.json
@@ -6,7 +6,6 @@
         "json_schema": {
           "$schema": "http://json-schema.org/draft-07/schema#",
           "type": "object",
-          "additionalProperties": false,
           "properties": {
             "_object": {
               "type": "string",
@@ -34,7 +33,6 @@
             "total": {
               "$schema": "http://json-schema.org/draft-07/schema#",
               "type": "object",
-              "additionalProperties": false,
               "properties": {
                 "_object": {
                   "type": "string",
@@ -54,7 +52,6 @@
             "balance": {
               "$schema": "http://json-schema.org/draft-07/schema#",
               "type": "object",
-              "additionalProperties": false,
               "properties": {
                 "_object": {
                   "type": "string",
@@ -99,7 +96,6 @@
             "recipient": {
               "$schema": "http://json-schema.org/draft-07/schema#",
               "type": "object",
-              "additionalProperties": false,
               "properties": {
                 "_object": {
                   "type": "string",
@@ -114,6 +110,10 @@
                   "type": "string",
                   "description": "Name of the company entity."
                 },
+                "ref": {
+                  "type": "string",
+                  "description": "Your reference for this company entity, as set in the Network tab."
+                },
                 "mailing_address": {
                   "description": "Address of the company entity.",
                   "oneOf": [
@@ -123,7 +123,6 @@
                     {
                       "$schema": "http://json-schema.org/draft-07/schema#",
                       "type": "object",
-                      "additionalProperties": false,
                       "properties": {
                         "_object": {
                           "type": "string",
@@ -158,33 +157,28 @@
                           "type": ["null", "string"],
                           "description": "ZIP or postal code."
                         },
-                        "unlocode": {
-                          "type": ["null", "string"],
-                          "description": "If port, then UN/LOCODE (United Nations Code for Trade and Transport Locations)."
-                        },
                         "timezone": {
-                          "type": "string",
+                          "type": ["null", "string"],
                           "description": "Timezone for this address"
                         },
                         "ref": {
                           "type": ["null", "string"],
                           "description": "Your reference for the address, as set in your network tab"
+                        },
+                        "unlocode": {
+                          "type": ["null", "string"],
+                          "description": "If port, then UN/LOCODE (United Nations Code for Trade and Transport Locations)."
                         }
                       }
                     }
                   ]
                 },
-                "ref": {
-                  "type": "string",
-                  "description": "Your reference for this company entity, as set in the Network tab."
-                },
                 "vat_numbers": {
                   "type": "array",
                   "description": "Array of VAT numbers of the company entity.",
                   "items": {
                     "$schema": "http://json-schema.org/draft-07/schema#",
                     "type": "object",
-                    "additionalProperties": false,
                     "properties": {
                       "_object": {
                         "type": "string",
@@ -207,7 +201,6 @@
             "issuer": {
               "$schema": "http://json-schema.org/draft-07/schema#",
               "type": "object",
-              "additionalProperties": false,
               "properties": {
                 "_object": {
                   "type": "string",
@@ -222,6 +215,10 @@
                   "type": "string",
                   "description": "Name of the company entity."
                 },
+                "ref": {
+                  "type": "string",
+                  "description": "Your reference for this company entity, as set in the Network tab."
+                },
                 "mailing_address": {
                   "description": "Address of the company entity.",
                   "oneOf": [
@@ -231,7 +228,6 @@
                     {
                       "$schema": "http://json-schema.org/draft-07/schema#",
                       "type": "object",
-                      "additionalProperties": false,
                       "properties": {
                         "_object": {
                           "type": "string",
@@ -266,33 +262,28 @@
                           "type": ["null", "string"],
                           "description": "ZIP or postal code."
                         },
-                        "unlocode": {
-                          "type": ["null", "string"],
-                          "description": "If port, then UN/LOCODE (United Nations Code for Trade and Transport Locations)."
-                        },
                         "timezone": {
-                          "type": "string",
+                          "type": ["null", "string"],
                           "description": "Timezone for this address"
                         },
                         "ref": {
                           "type": ["null", "string"],
                           "description": "Your reference for the address, as set in your network tab"
+                        },
+                        "unlocode": {
+                          "type": ["null", "string"],
+                          "description": "If port, then UN/LOCODE (United Nations Code for Trade and Transport Locations)."
                         }
                       }
                     }
                   ]
                 },
-                "ref": {
-                  "type": "string",
-                  "description": "Your reference for this company entity, as set in the Network tab."
-                },
                 "vat_numbers": {
                   "type": "array",
                   "description": "Array of VAT numbers of the company entity.",
                   "items": {
                     "$schema": "http://json-schema.org/draft-07/schema#",
                     "type": "object",
-                    "additionalProperties": false,
                     "properties": {
                       "_object": {
                         "type": "string",
@@ -318,7 +309,6 @@
               "items": {
                 "$schema": "http://json-schema.org/draft-07/schema#",
                 "type": "object",
-                "additionalProperties": false,
                 "properties": {
                   "_object": {
                     "type": "string",
@@ -340,7 +330,6 @@
                   "amount": {
                     "$schema": "http://json-schema.org/draft-07/schema#",
                     "type": "object",
-                    "additionalProperties": false,
                     "properties": {
                       "_object": {
                         "type": "string",
@@ -366,7 +355,6 @@
                       {
                         "$schema": "http://json-schema.org/draft-07/schema#",
                         "type": "object",
-                        "additionalProperties": false,
                         "properties": {
                           "_object": {
                             "type": "string",
@@ -394,7 +382,6 @@
                       {
                         "$schema": "http://json-schema.org/draft-07/schema#",
                         "type": "object",
-                        "additionalProperties": false,
                         "properties": {
                           "_object": {
                             "type": "string",
@@ -422,7 +409,6 @@
               "items": {
                 "$schema": "http://json-schema.org/draft-07/schema#",
                 "type": "object",
-                "additionalProperties": false,
                 "properties": {
                   "_object": {
                     "type": "string",
@@ -432,7 +418,6 @@
                   "amount": {
                     "$schema": "http://json-schema.org/draft-07/schema#",
                     "type": "object",
-                    "additionalProperties": false,
                     "properties": {
                       "_object": {
                         "type": "string",
@@ -449,18 +434,24 @@
                       }
                     }
                   },
-                  "category": {
-                    "type": "string",
-                    "description": "Category of the credit memo"
-                  },
-                  "reason": {
-                    "type": "string",
-                    "description": "Why the credit was applied to the invoice"
-                  },
                   "credited_at": {
                     "type": "string",
                     "description": "When the credit was applied. In ISO8601 UTC format with timezone denoted by Z.",
                     "format": "date-time"
+                  },
+                  "categories": {
+                    "type": "array",
+                    "description": "Category of the credit memo",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "reasons": {
+                    "type": "array",
+                    "description": "Why the credit was applied to the invoice",
+                    "items": {
+                      "type": ["null", "string"]
+                    }
                   }
                 }
               }
@@ -475,7 +466,6 @@
             "shipments": {
               "$schema": "http://json-schema.org/draft-07/schema#",
               "type": "object",
-              "additionalProperties": false,
               "properties": {
                 "_object": {
                   "type": "string",