Skip to content

Commit

Permalink
chore: pr conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
mihir-4116 committed Dec 7, 2023
2 parents 05055d6 + c00fee0 commit d9c7343
Show file tree
Hide file tree
Showing 230 changed files with 1,069 additions and 651 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
echo "version=$version" >> $GITHUB_OUTPUT
deploy:
needs: [ extract-version ]
needs: [extract-version]
name: Deployment To Production DB
# Only merged pull requests from release candidate branches and external workflow calls must trigger
if: (((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true) || github.event_name == 'workflow_call')
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ jobs:

- name: Run Unit Tests
run: npm run test:ci

- name: Set up Python
run: scripts/setup-python.sh

- name: Get changed files
id: changed_files
uses: tj-actions/changed-files@v36
with:
sha: ${{ github.event.pull_request.head.sha }}

- name: Run schema validation for changed files
run: |
chmod +x scripts/run-schema-validation.sh
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
</p>

---

[![codecov](https://codecov.io/gh/rudderlabs/rudder-integrations-config/branch/develop/graph/badge.svg?token=K75QABOWUT)](https://codecov.io/gh/rudderlabs/rudder-integrations-config)

# \*\*rudder-config-schema\*\*
Expand Down
1 change: 0 additions & 1 deletion oscontrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ For the above input data, the UI will look like as shown below:
<img width="1303" alt="connectionSettings" src="https://github.com/rudderlabs/rudder-integrations-config/assets/63387036/ee28b3fe-5a81-4289-9f6a-54cf5abe0f4c">
<img width="1292" alt="configurationSettings" src="https://github.com/rudderlabs/rudder-integrations-config/assets/63387036/ce765f0f-b680-46ca-b46d-ed58e39a7667">


In the input file, you need to provide the destination name you want to display in the UI in the displayName field.

Each json object inside the formFields represents a field you want to add as a connection/configuration settings to the destination.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "ACTIVE_CAMPAIGN",
"displayName": "ActiveCampaign",
"config": {
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"isAudienceSupported": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,7 @@
"sdkTemplate": {
"title": "SDK settings",
"note": "not visible in the ui",
"fields": [
]
"fields": []
}
}
}

1 change: 0 additions & 1 deletion src/configurations/destinations/adj/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "ADJ",
"displayName": "Adjust",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "ADOBE_ANALYTICS",
"displayName": "Adobe Analytics",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/adroll/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "ADROLL",
"displayName": "Adroll",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/af/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "AF",
"displayName": "AppsFlyer",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/airship/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "AIRSHIP",
"displayName": "Airship",
"config": {
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/algolia/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"displayName": "Algolia",
"config": {
"cdkV2Enabled": true,
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/am/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"config": {
"isAudienceSupported": false,
"supportsVisualMapper": true,
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/appcenter/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "APPCENTER",
"displayName": "App Center",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/appcues/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "APPCUES",
"displayName": "Appcues",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "ATTENTIVE_TAG",
"displayName": "Attentive Tag",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down
4 changes: 1 addition & 3 deletions src/configurations/destinations/attribution/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "ATTRIBUTION",
"displayName": "Attribution",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": false,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down Expand Up @@ -35,8 +34,7 @@
"shopify": ["cloud"]
},
"destConfig": {
"defaultConfig": ["writeKey", "oneTrustCookieCategories"],
"web": []
"defaultConfig": ["writeKey", "oneTrustCookieCategories"]
},
"secretKeys": ["writeKey"]
}
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/autopilot/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "AUTOPILOT",
"displayName": "Autopilot",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"cdkEnabled": true,
"saveDestinationResponse": true,
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/awin/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "AWIN",
"displayName": "Awin",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": ["advertiserId", "eventsToTrack", "oneTrustCookieCategories"],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/axeptio/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "AXEPTIO",
"displayName": "Axeptio",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
2 changes: 0 additions & 2 deletions src/configurations/destinations/azure_blob/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "AZURE_BLOB",
"displayName": "Azure Blob Storage",
"config": {
"transformAt": "none",
"transformAtV1": "none",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand All @@ -20,7 +19,6 @@
"cordova",
"shopify"
],
"supportedConnectionModes": {},
"destConfig": {
"defaultConfig": [
"containerName",
Expand Down
2 changes: 0 additions & 2 deletions src/configurations/destinations/azure_datalake/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"displayName": "Azure Datalake",
"category": "warehouse",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand All @@ -21,7 +20,6 @@
"cordova",
"shopify"
],
"supportedConnectionModes": {},
"destConfig": {
"defaultConfig": [
"containerName",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "AZURE_EVENT_HUB",
"displayName": "Azure Event Hubs",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down
2 changes: 0 additions & 2 deletions src/configurations/destinations/azure_synapse/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"displayName": "Azure Synapse",
"category": "warehouse",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand All @@ -21,7 +20,6 @@
"cordova",
"shopify"
],
"supportedConnectionModes": {},
"destConfig": {
"defaultConfig": [
"host",
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/bingads/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "BINGADS",
"displayName": "Bing Ads",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": false,
"includeKeys": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"auth": {
"type": "OAuth"
},
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/blueshift/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "BLUESHIFT",
"displayName": "Blueshift",
"config": {
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down
2 changes: 0 additions & 2 deletions src/configurations/destinations/bq/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"displayName": "BigQuery",
"category": "warehouse",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand All @@ -21,7 +20,6 @@
"cordova",
"shopify"
],
"supportedConnectionModes": {},
"destConfig": {
"defaultConfig": [
"project",
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/bqstream/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "BQSTREAM",
"displayName": "BigQuery Stream",
"config": {
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": ["oneTrustCookieCategories"],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/branch/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "BRANCH",
"displayName": "Branch Metrics",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
15 changes: 8 additions & 7 deletions src/configurations/destinations/braze/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"config": {
"isAudienceSupported": true,
"supportsVisualMapper": true,
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down Expand Up @@ -61,11 +60,7 @@
},
"hybridModeCloudEventsFilter": {
"web": {
"messageType": [
"identify",
"track",
"page"
]
"messageType": ["identify", "track", "page"]
}
},
"destConfig": {
Expand All @@ -86,7 +81,13 @@
"ios": ["useNativeSDK", "connectionMode"],
"reactnative": ["useNativeSDK", "connectionMode"],
"flutter": ["useNativeSDK", "connectionMode"],
"web": ["useNativeSDK", "enableBrazeLogging", "connectionMode", "enablePushNotification", "allowUserSuppliedJavascript"]
"web": [
"useNativeSDK",
"enableBrazeLogging",
"connectionMode",
"enablePushNotification",
"allowUserSuppliedJavascript"
]
},
"secretKeys": ["restApiKey"]
}
Expand Down
10 changes: 8 additions & 2 deletions src/configurations/destinations/braze/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,14 @@
"flutter": { "type": "string", "enum": ["cloud", "device"] }
}
},
"enablePushNotification": { "type": "object", "properties": { "web": { "type": "boolean" } } },
"allowUserSuppliedJavascript": { "type": "object", "properties": { "web": { "type": "boolean" } } }
"enablePushNotification": {
"type": "object",
"properties": { "web": { "type": "boolean" } }
},
"allowUserSuppliedJavascript": {
"type": "object",
"properties": { "web": { "type": "boolean" } }
}
}
}
}
1 change: 0 additions & 1 deletion src/configurations/destinations/bugsnag/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "BUGSNAG",
"displayName": "Bugsnag",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"role": "campaign_manager",
"rudderScopes": ["delivery"]
},
"transformAt": "router",
"transformAtV1": "router",
"includeKeys": ["oneTrustCookieCategories"],
"excludeKeys": [],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/candu/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "CANDU",
"displayName": "Candu",
"config": {
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": ["apiKey", "oneTrustCookieCategories"],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/canny/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "CANNY",
"displayName": "Canny",
"config": {
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": ["apiKey", "eventsToEvents", "oneTrustCookieCategories"],
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/chartbeat/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "CHARTBEAT",
"displayName": "Chartbeat",
"config": {
"transformAt": "processor",
"transformAtV1": "processor",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
1 change: 0 additions & 1 deletion src/configurations/destinations/clevertap/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "CLEVERTAP",
"displayName": "CleverTap",
"config": {
"transformAt": "router",
"transformAtV1": "router",
"saveDestinationResponse": true,
"includeKeys": [
Expand Down
Loading

0 comments on commit d9c7343

Please sign in to comment.