CI checks for #23868 (#24717)

* feat(source-bing-ads): add dimensional columns for AccountPerformanceReport * feat(source-bing-ads): add dimensional columns for AdGroupPerformanceReport * feat(source-bing-ads): add dimensional columns for AdPerformanceReport * feat(source-bing-ads): add dimensional columns for KeywordPerformanceReport * feat(source-bing-ads): add dimensional columns for CampaignPerformanceReport * docs(source-bing-ads): update changelog * chore(source-bing-ads): bump version in Dockerfile * test(source-bing-ads): allow extra fields for basic read * Revert "test(source-bing-ads): allow extra fields for basic read" This reverts commit 961f0d6. * test(source-bing-ads): ignore community contributed fields * fix: updated expected_records of report streams * auto-bump connector version * Automated Change --------- Co-authored-by: Rachel RIZK <rachel.rizk@backmarket.com> Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com> Co-authored-by: sajarin <sajarin@users.noreply.github.com>
airbytehq · Apr 14, 2023 · cba36b0 · cba36b0
1 parent 0d9392e
commit cba36b0
Show file tree

Hide file tree

Showing 14 changed files with 99 additions and 30 deletions.
diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json b/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json
@@ -9715,7 +9715,7 @@
     "sourceDefinitionId": "47f25999-dd5e-4636-8c39-e7cea2453331",
     "name": "Bing Ads",
     "dockerRepository": "airbyte/source-bing-ads",
-    "dockerImageTag": "0.1.18",
+    "dockerImageTag": "0.1.19",
     "documentationUrl": "https://docs.airbyte.com/integrations/sources/bing-ads",
     "icon": "bingads.svg",
     "sourceType": "api",

diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml b/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml
@@ -211,7 +211,7 @@
 - name: Bing Ads
   sourceDefinitionId: 47f25999-dd5e-4636-8c39-e7cea2453331
   dockerRepository: airbyte/source-bing-ads
-  dockerImageTag: 0.1.18
+  dockerImageTag: 0.1.19
   documentationUrl: https://docs.airbyte.com/integrations/sources/bing-ads
   icon: bingads.svg
   sourceType: api

diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml b/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml
@@ -1958,7 +1958,7 @@
     - "overwrite"
     - "append"
     - "append_dedup"
-- dockerImage: "airbyte/source-bing-ads:0.1.18"
+- dockerImage: "airbyte/source-bing-ads:0.1.19"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/bing-ads"
     connectionSpecification:

diff --git a/airbyte-integrations/connectors/source-bing-ads/Dockerfile b/airbyte-integrations/connectors/source-bing-ads/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.18
+LABEL io.airbyte.version=0.1.19
 LABEL io.airbyte.name=airbyte/source-bing-ads
diff --git a/airbyte-integrations/connectors/source-bing-ads/acceptance-test-config.yml b/airbyte-integrations/connectors/source-bing-ads/acceptance-test-config.yml
@@ -3,18 +3,18 @@ test_strictness_level: high
 acceptance_tests:
   spec:
     tests:
-    - spec_path: source_bing_ads/spec.json
+      - spec_path: source_bing_ads/spec.json
   discovery:
     tests:
-    - config_path: secrets/config.json
+      - config_path: secrets/config.json
   connection:
     tests:
-    - config_path: secrets/config_old.json
-      status: succeed
-    - config_path: secrets/config.json
-      status: succeed
-    - config_path: integration_tests/invalid_config.json
-      status: failed
+      - config_path: secrets/config_old.json
+        status: succeed
+      - config_path: secrets/config.json
+        status: succeed
+      - config_path: integration_tests/invalid_config.json
+        status: failed
   basic_read:
     tests:
     - config_path: secrets/config.json
@@ -35,8 +35,8 @@ acceptance_tests:
       fail_on_extra_columns: false
   full_refresh:
     tests:
-    - config_path: secrets/config.json
-      configured_catalog_path: integration_tests/configured_catalog.json
+      - config_path: secrets/config.json
+        configured_catalog_path: integration_tests/configured_catalog.json
   incremental:
     tests:
     bypass_reason: "SAT doesn't support complex nested states used in incremental report streams"
diff --git a/airbyte-integrations/connectors/source-bing-ads/integration_tests/expected_records.txt b/airbyte-integrations/connectors/source-bing-ads/integration_tests/expected_records.txt
diff --git a/...ations/connectors/source-bing-ads/source_bing_ads/schemas/account_performance_report.json b/...ations/connectors/source-bing-ads/source_bing_ads/schemas/account_performance_report.json
@@ -31,6 +31,12 @@
     "BidMatchType": {
       "type": ["null", "string"]
     },
+    "AccountName": {
+      "type": ["null", "string"]
+    },
+    "AccountNumber": {
+      "type": ["null", "string"]
+    },
     "PhoneImpressions": {
       "type": ["null", "integer"]
     },

diff --git a/...tions/connectors/source-bing-ads/source_bing_ads/schemas/ad_group_performance_report.json b/...tions/connectors/source-bing-ads/source_bing_ads/schemas/ad_group_performance_report.json
@@ -41,6 +41,21 @@
     "Language": {
       "type": ["null", "string"]
     },
+    "AccountName": {
+      "type": ["null", "string"]
+    },
+    "CampaignName": {
+      "type": ["null", "string"]
+    },
+    "CampaignType": {
+      "type": ["null", "string"]
+    },
+    "AdGroupName": {
+      "type": ["null", "string"]
+    },
+    "AdGroupType": {
+      "type": ["null", "string"]
+    },
     "Impressions": {
       "type": ["null", "integer"]
     },

diff --git a/...ntegrations/connectors/source-bing-ads/source_bing_ads/schemas/ad_performance_report.json b/...ntegrations/connectors/source-bing-ads/source_bing_ads/schemas/ad_performance_report.json
@@ -44,6 +44,18 @@
     "DeliveredMatchType": {
       "type": ["null", "string"]
     },
+    "AccountName": {
+      "type": ["null", "string"]
+    },
+    "CampaignName": {
+      "type": ["null", "string"]
+    },
+    "CampaignType": {
+      "type": ["null", "string"]
+    },
+    "AdGroupName": {
+      "type": ["null", "string"]
+    },
     "Impressions": {
       "type": ["null", "integer"]
     },

diff --git a/...tions/connectors/source-bing-ads/source_bing_ads/schemas/campaign_performance_report.json b/...tions/connectors/source-bing-ads/source_bing_ads/schemas/campaign_performance_report.json
@@ -35,6 +35,15 @@
     "BidMatchType": {
       "type": ["null", "string"]
     },
+    "AccountName": {
+      "type": ["null", "string"]
+    },
+    "CampaignName": {
+      "type": ["null", "string"]
+    },
+    "CampaignType": {
+      "type": ["null", "string"]
+    },
     "CampaignStatus": {
       "type": ["null", "string"]
     },

diff --git a/...ations/connectors/source-bing-ads/source_bing_ads/schemas/keyword_performance_report.json b/...ations/connectors/source-bing-ads/source_bing_ads/schemas/keyword_performance_report.json
@@ -51,6 +51,15 @@
     "BidMatchType": {
       "type": ["null", "string"]
     },
+    "AccountName": {
+      "type": ["null", "string"]
+    },
+    "CampaignName": {
+      "type": ["null", "string"]
+    },
+    "AdGroupName": {
+      "type": ["null", "string"]
+    },
     "KeywordStatus": {
       "type": ["null", "string"]
     },

diff --git a/airbyte-integrations/connectors/source-bing-ads/source_bing_ads/source.py b/airbyte-integrations/connectors/source-bing-ads/source_bing_ads/source.py
@@ -367,6 +367,9 @@ class CampaignPerformanceReport(ReportsMixin, BingAdsStream):
 
     report_columns = [
         *primary_key,
+        "AccountName",
+        "CampaignName",
+        "CampaignType",
         "CampaignStatus",
         "Impressions",
         "Clicks",
@@ -451,6 +454,10 @@ class AdPerformanceReport(ReportsMixin, BingAdsStream):
 
     report_columns = [
         *primary_key,
+        "AccountName",
+        "CampaignName",
+        "CampaignType",
+        "AdGroupName",
         "Impressions",
         "Clicks",
         "Ctr",
@@ -519,6 +526,11 @@ class AdGroupPerformanceReport(ReportsMixin, BingAdsStream):
 
     report_columns = [
         *primary_key,
+        "AccountName",
+        "CampaignName",
+        "CampaignType",
+        "AdGroupName",
+        "AdGroupType",
         "Impressions",
         "Clicks",
         "Ctr",
@@ -602,6 +614,9 @@ class KeywordPerformanceReport(ReportsMixin, BingAdsStream):
 
     report_columns = [
         *primary_key,
+        "AccountName",
+        "CampaignName",
+        "AdGroupName",
         "Keyword",
         "KeywordStatus",
         "Impressions",
@@ -679,6 +694,8 @@ class AccountPerformanceReport(ReportsMixin, BingAdsStream):
 
     report_columns = [
         *primary_key,
+        "AccountName",
+        "AccountNumber",
         "PhoneImpressions",
         "PhoneCalls",
         "Clicks",

diff --git a/connectors.md b/connectors.md
@@ -28,7 +28,7 @@
 | **BambooHR** | <img alt="BambooHR icon" src="https://raw.githubusercontent.com/airbytehq/airbyte /master/airbyte-config-oss/init-oss/src/main/resources/icons/bamboohr.svg" height="30" height="30"/> | Source | airbyte/source-bamboo-hr:0.2.2 | alpha | [docs](https://docs.airbyte.com/integrations/sources/bamboo-hr) | [connectors/source/bamboo-hr](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/bamboo-hr) | [source-bamboo-hr](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-bamboo-hr) | <small>`90916976-a132-4ce9-8bce-82a03dd58788`</small> |
 | **BigCommerce** | <img alt="BigCommerce icon" src="https://raw.githubusercontent.com/airbytehq/airbyte /master/airbyte-config-oss/init-oss/src/main/resources/icons/bigcommerce.svg" height="30" height="30"/> | Source | airbyte/source-bigcommerce:0.1.10 | alpha | [docs](https://docs.airbyte.com/integrations/sources/bigcommerce) | [connectors/source/bigcommerce](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/bigcommerce) | [source-bigcommerce](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-bigcommerce) | <small>`59c5501b-9f95-411e-9269-7143c939adbd`</small> |
 | **BigQuery** | <img alt="BigQuery icon" src="https://raw.githubusercontent.com/airbytehq/airbyte /master/airbyte-config-oss/init-oss/src/main/resources/icons/bigquery.svg" height="30" height="30"/> | Source | airbyte/source-bigquery:0.2.3 | alpha | [docs](https://docs.airbyte.com/integrations/sources/bigquery) | [connectors/source/bigquery](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/bigquery) | [source-bigquery](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-bigquery) | <small>`bfd1ddf8-ae8a-4620-b1d7-55597d2ba08c`</small> |
-| **Bing Ads** | <img alt="Bing Ads icon" src="https://raw.githubusercontent.com/airbytehq/airbyte /master/airbyte-config-oss/init-oss/src/main/resources/icons/bingads.svg" height="30" height="30"/> | Source | airbyte/source-bing-ads:0.1.18 | generally_available | [docs](https://docs.airbyte.com/integrations/sources/bing-ads) | [connectors/source/bing-ads](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/bing-ads) | [source-bing-ads](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-bing-ads) | <small>`47f25999-dd5e-4636-8c39-e7cea2453331`</small> |
+| **Bing Ads** | <img alt="Bing Ads icon" src="https://raw.githubusercontent.com/airbytehq/airbyte /master/airbyte-config-oss/init-oss/src/main/resources/icons/bingads.svg" height="30" height="30"/> | Source | airbyte/source-bing-ads:0.1.19 | generally_available | [docs](https://docs.airbyte.com/integrations/sources/bing-ads) | [connectors/source/bing-ads](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/bing-ads) | [source-bing-ads](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-bing-ads) | <small>`47f25999-dd5e-4636-8c39-e7cea2453331`</small> |
 | **Braintree** | <img alt="Braintree icon" src="https://raw.githubusercontent.com/airbytehq/airbyte /master/airbyte-config-oss/init-oss/src/main/resources/icons/braintree.svg" height="30" height="30"/> | Source | airbyte/source-braintree:0.1.4 | alpha | [docs](https://docs.airbyte.com/integrations/sources/braintree) | [connectors/source/braintree](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/braintree) | [source-braintree](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-braintree) | <small>`63cea06f-1c75-458d-88fe-ad48c7cb27fd`</small> |
 | **Braze** | x | Source | airbyte/source-braze:0.1.3 | alpha | [docs](https://docs.airbyte.io/integrations/sources/braze) | [connectors/source/braze](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/braze) | [source-braze](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-braze) | <small>`68b9c98e-0747-4c84-b05b-d30b47686725`</small> |
 | **Breezometer** | <img alt="Breezometer icon" src="https://raw.githubusercontent.com/airbytehq/airbyte /master/airbyte-config-oss/init-oss/src/main/resources/icons/breezometer.svg" height="30" height="30"/> | Source | airbyte/source-breezometer:0.1.0 | alpha | [docs](https://docs.airbyte.com/integrations/sources/breezometer) | [connectors/source/breezometer](https://github.com/airbytehq/airbyte/issues?q=is:open+is:issue+label:connectors/source/breezometer) | [source-breezometer](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-breezometer) | <small>`7c37685e-8512-4901-addf-9afbef6c0de9`</small> |

diff --git a/docs/integrations/sources/bing-ads.md b/docs/integrations/sources/bing-ads.md
@@ -102,6 +102,7 @@ The Bing Ads API limits the number of requests for all Microsoft Advertising cli
 ## Changelog
 | Version | Date       | Pull Request                                                                                                                     | Subject                                                                                                                    |
 |:--------|:-----------|:---------------------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------|
+| 0.1.19  | 2023-03-08 | [23868](https://github.com/airbytehq/airbyte/pull/23868)                                                                            | Add dimensional-type columns for reports.                                            |
 | 0.1.18  | 2023-01-30 | [22073](https://github.com/airbytehq/airbyte/pull/22073)                                                                         | Fix null values in the `Keyword` column of `keyword_performance_report` streams                                            |
 | 0.1.17  | 2022-12-10 | [20005](https://github.com/airbytehq/airbyte/pull/20005)                                                                         | Add `Keyword` to `keyword_performance_report` stream                                                                       |
 | 0.1.16  | 2022-10-12 | [17873](https://github.com/airbytehq/airbyte/pull/17873)                                                                         | Fix: added missing campaign types in (Audience, Shopping and DynamicSearchAds) in campaigns stream                         |