Publish source shopify: added shop_url to all stream records (airbyte…

…hq#9635) * add shop url in shopify orders stream * Add shop url in all streams * Fix: add shop url in customers schema * chore: bump version * chore: added spec Co-authored-by: Manoj <[email protected]>
frankfanslc · Jan 20, 2022 · 0e5f1a8 · 0e5f1a8
1 parent 1108361
commit 0e5f1a8
Show file tree

Hide file tree

Showing 25 changed files with 68 additions and 3 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
@@ -641,7 +641,7 @@
 - name: Shopify
   sourceDefinitionId: 9da77001-af33-4bcd-be46-6252bf9342b9
   dockerRepository: airbyte/source-shopify
-  dockerImageTag: 0.1.28
+  dockerImageTag: 0.1.29
   documentationUrl: https://docs.airbyte.io/integrations/sources/shopify
   icon: shopify.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
@@ -6755,7 +6755,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-shopify:0.1.28"
+- dockerImage: "airbyte/source-shopify:0.1.29"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/shopify"
     connectionSpecification:

diff --git a/airbyte-integrations/connectors/source-shopify/Dockerfile b/airbyte-integrations/connectors/source-shopify/Dockerfile
@@ -28,5 +28,5 @@ COPY source_shopify ./source_shopify
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.28
+LABEL io.airbyte.version=0.1.29
 LABEL io.airbyte.name=airbyte/source-shopify
diff --git a/...te-integrations/connectors/source-shopify/source_shopify/schemas/abandoned_checkouts.json b/...te-integrations/connectors/source-shopify/source_shopify/schemas/abandoned_checkouts.json
@@ -252,6 +252,9 @@
     "source_url": {
       "type": ["null", "string"]
     },
+    "shop_url": {
+      "type": ["null", "string"]
+    },
     "total_discounts": {
       "type": ["null", "number"]
     },

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/collects.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/collects.json
@@ -20,6 +20,9 @@
     "sort_value": {
       "type": ["null", "string"]
     },
+    "shop_url": {
+      "type": ["null", "string"]
+    },
     "updated_at": {
       "type": ["null", "string"],
       "format": "date-time"

diff --git a/...yte-integrations/connectors/source-shopify/source_shopify/schemas/custom_collections.json b/...yte-integrations/connectors/source-shopify/source_shopify/schemas/custom_collections.json
@@ -52,6 +52,9 @@
     },
     "template_suffix": {
       "type": ["null", "string"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   },
   "type": ["null", "object"]

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/customers.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/customers.json
@@ -13,6 +13,9 @@
     "multipass_identifier": {
       "type": ["null", "string"]
     },
+    "shop_url":{
+      "type": ["null", "string"]
+    },
     "default_address": {
       "type": ["null", "object"],
       "properties": {

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/discount_codes.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/discount_codes.json
@@ -20,6 +20,9 @@
     "updated_at": {
       "type": ["null", "string"],
       "format": "date-time"
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/draft_orders.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/draft_orders.json
@@ -528,6 +528,9 @@
           }
         }
       }
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/...yte-integrations/connectors/source-shopify/source_shopify/schemas/fulfillment_orders.json b/...yte-integrations/connectors/source-shopify/source_shopify/schemas/fulfillment_orders.json
@@ -175,6 +175,9 @@
           "type": ["null", "string"]
         }
       }
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/fulfillments.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/fulfillments.json
@@ -264,6 +264,9 @@
           }
         }
       }
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/inventory_items.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/inventory_items.json
@@ -20,6 +20,9 @@
     },
     "sku": {
       "type": ["null", "string"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/inventory_levels.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/inventory_levels.json
@@ -13,6 +13,9 @@
     "updated_at": {
       "type": ["null", "string"],
       "format": "date-time"
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/locations.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/locations.json
@@ -50,6 +50,9 @@
     },
     "localized_province_name": {
       "type": ["null", "string"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/metafields.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/metafields.json
@@ -34,6 +34,9 @@
     "updated_at": {
       "type": ["null", "string"],
       "format": "date-time"
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   },
   "type": ["null", "object"]

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/order_refunds.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/order_refunds.json
@@ -461,6 +461,9 @@
           }
         }
       }
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/order_risks.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/order_risks.json
@@ -30,6 +30,9 @@
     },
     "merchant_message": {
       "type": ["null", "string"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/orders.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/orders.json
@@ -304,6 +304,9 @@
     "source_url": {
       "type": ["null", "string"]
     },
+    "shop_url": {
+      "type": ["null", "string"]
+    },
     "subtotal_price": {
       "type": ["null", "number"]
     },

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/pages.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/pages.json
@@ -33,6 +33,9 @@
     "updated_at": {
       "type": ["null", "string"],
       "format": "date-time"
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/price_rules.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/price_rules.json
@@ -146,6 +146,9 @@
     },
     "allocation_limit": {
       "type": ["null", "integer"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/products.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/products.json
@@ -264,6 +264,9 @@
     },
     "id": {
       "type": ["null", "integer"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/shop.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/shop.json
@@ -167,6 +167,9 @@
     },
     "zip": {
       "type": ["null", "string"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/transactions.json b/airbyte-integrations/connectors/source-shopify/source_shopify/schemas/transactions.json
@@ -91,6 +91,9 @@
     },
     "location_id": {
       "type": ["null", "integer"]
+    },
+    "shop_url": {
+      "type": ["null", "string"]
     }
   },
   "type": ["null", "object"]

diff --git a/airbyte-integrations/connectors/source-shopify/source_shopify/source.py b/airbyte-integrations/connectors/source-shopify/source_shopify/source.py
@@ -65,10 +65,14 @@ def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapp
         # this solution designed to convert string into number, but in future can be modified for general purpose
         if isinstance(records, dict):
             # for cases when we have a single record as dict
+            # add shop_url to the record to make querying easy
+            records['shop_url'] = self.config["shop"]
             yield self._transformer.transform(records)
         else:
             # for other cases
             for record in records:
+                # add shop_url to the record to make querying easy
+                record['shop_url'] = self.config["shop"]
                 yield self._transformer.transform(record)
 
     @property

diff --git a/docs/integrations/sources/shopify.md b/docs/integrations/sources/shopify.md
@@ -101,6 +101,7 @@ This connector support both: `OAuth 2.0` and `API PASSWORD` (for private applica
 
 | Version | Date | Pull Request | Subject |
 | :--- | :--- | :--- | :--- |
+| 0.1.29 | 2022-01-20 | [9049](https://github.com/airbytehq/airbyte/pull/9248) | Added `shop_url` to the record for all streams |
 | 0.1.28 | 2022-01-19 | [9591](https://github.com/airbytehq/airbyte/pull/9591) | Implemented `OAuth2.0` authentication method for Airbyte Cloud |
 | 0.1.27 | 2021-12-22 | [9049](https://github.com/airbytehq/airbyte/pull/9049) | Update connector fields title/description |
 | 0.1.26 | 2021-12-14 | [8597](https://github.com/airbytehq/airbyte/pull/8597) | Fix `mismatched number of tables` for base-normalization, increased performance of `order_refunds` stream |
-Original file line number
+Diff line change
@@ Expand Up / @@ -528,6 +528,9 @@ @@
               }
             }
           }
+        },
+        "shop_url": {
+          "type": ["null", "string"]
         }
       }
     }