Skip to content

Commit

Permalink
Merge branch 'develop' into feat.googleads.ecom.spec.support.v2.config
Browse files Browse the repository at this point in the history
  • Loading branch information
yashasvibajpai authored Feb 22, 2024
2 parents 2df1d82 + cdd88c0 commit 27b7a9b
Show file tree
Hide file tree
Showing 104 changed files with 6,990 additions and 458 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fetch-depth: 0

- name: Setup Node
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 1

- name: Setup Node
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand All @@ -41,10 +41,7 @@ jobs:
env:
HUSKY: 0
run: |
npm ci
- name: Set up Python
run: scripts/setup-python.sh
npm run setup
- name: Display Python Version
run: |
Expand All @@ -57,9 +54,6 @@ jobs:
run: |
npm run test:ci
- name: Install Python Dependencies
run: pip3 install -r ./scripts/requirements.txt

- name: List Working Directory Files
run: |
echo current directory
Expand All @@ -78,7 +72,7 @@ jobs:
- name: Notify Slack Channel
id: slack
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
continue-on-error: true
if: inputs.notify == true
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0

- name: Setup Node
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fetch-depth: 0

- name: Setup Node
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

- name: Notify Slack Channel
id: slack
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
continue-on-error: true
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/report-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,19 @@ jobs:
fetch-depth: 1

- name: Setup Node
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install Dependencies
run: npm ci

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

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

- name: Upload Coverage Reports to Codecov
uses: codecov/codecov-action@v3.1.1
uses: codecov/codecov-action@v4.0.1
with:
directory: ./reports/coverage
token: ${{ secrets.CODECOV_TOKEN }}
9 changes: 3 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,20 @@ jobs:
fetch-depth: 1

- name: Setup Node
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install Dependencies
run: npm ci

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

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

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

Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ jobs:
- name: Checkout
uses: actions/[email protected]

- uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Setting up python libraries
run: ./scripts/setup-python.sh
- name: Install Dependencies
run: npm run setup:python

# Reference: https://black.readthedocs.io/en/stable/integrations/github_actions.html
- name: Check formatting for Python files
Expand All @@ -33,13 +29,13 @@ jobs:
uses: actions/[email protected]

- name: Setup Node
uses: actions/setup-node@v3.7.0
uses: actions/setup-node@v4.0.2
with:
node-version-file: .nvmrc
cache: 'npm'

- name: Install Dependencies
run: npm ci
run: npm run setup:npm

- name: Run Lint Checks
run: |
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [1.64.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.64.1...v1.64.2) (2024-02-14)

### [1.64.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.64.0...v1.64.1) (2024-02-13)


### Bug Fixes

* made hidden flase for trino source ([#1208](https://github.com/rudderlabs/rudder-config-schema/issues/1208)) ([977516e](https://github.com/rudderlabs/rudder-config-schema/commit/977516e568284b88da8b06201b736c98f345777b))

## [1.64.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.63.2...v1.64.0) (2024-02-05)


Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

You need to install Python3.

And then, install Python dependencies:
And then, setup the project dependencies by running below command:

`pip3 install -r ./scripts/requirements.txt`
`npm run setup`

Run below command to deploy integrations definitions config to database:

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.64.0",
"version": "1.64.2",
"description": "",
"main": "src/index.ts",
"private": true,
Expand All @@ -15,7 +15,9 @@
"url": "https://github.com/rudderlabs/rudder-config-schema.git"
},
"scripts": {
"setup": "npm ci",
"setup:python": "pip3 install -r ./scripts/requirements.txt",
"setup:npm": "npm ci",
"setup": "npm run setup:npm && npm run setup:python",
"test": "jest --detectOpenHandles --coverage --notify --watchAll=false",
"test:ci": "npm run test -- --silent --expand --maxWorkers=2",
"test:silent": "npm run test -- --silent",
Expand Down Expand Up @@ -82,7 +84,7 @@
},
"lint-staged": {
"*.{json,js,ts,md}": "prettier --write",
"*.{py}": "python3 -m black"
"*.py": "python3 -m black"
},
"config": {
"commitizen": {
Expand Down
1 change: 1 addition & 0 deletions scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
requests
jsonschema
jsondiff
black
8 changes: 0 additions & 8 deletions scripts/setup-python.sh

This file was deleted.

1 change: 1 addition & 0 deletions src/configurations/destinations/af/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"devKey",
"sharingFilter",
"useRichEventName",
"addPropertiesAtRoot",
"androidAppId",
"appleAppId",
"blacklistedEvents",
Expand Down
4 changes: 4 additions & 0 deletions src/configurations/destinations/af/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
"type": "boolean",
"default": false
},
"addPropertiesAtRoot": {
"type": "boolean",
"default": false
},
"sharingFilter": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
Expand Down
7 changes: 7 additions & 0 deletions src/configurations/destinations/af/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
"footerNote": "To include screen/page name in Screen/Page event names (ex: Viewed Contacts Page)",
"default": false
},
{
"type": "checkbox",
"label": "Add properties at root in eventValue",
"value": "addPropertiesAtRoot",
"footerNote": "To send the custom properties to the root of eventValue.",
"default": false
},
{
"type": "textInput",
"label": "Sharing Filter",
Expand Down
17 changes: 15 additions & 2 deletions src/configurations/destinations/autopilot/db-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,23 @@
"reactnative": ["cloud"],
"flutter": ["cloud"],
"cordova": ["cloud"],
"shopify": ["cloud"]
"shopify": ["cloud"],
"cloud": ["cloud"],
"warehouse": ["cloud"]
},
"destConfig": {
"defaultConfig": ["apiKey", "triggerId", "oneTrustCookieCategories"]
"defaultConfig": ["apiKey", "triggerId", "oneTrustCookieCategories"],
"android": ["connectionMode"],
"ios": ["connectionMode"],
"web": ["connectionMode"],
"unity": ["connectionMode"],
"amp": ["connectionMode"],
"reactnative": ["connectionMode"],
"flutter": ["connectionMode"],
"cordova": ["connectionMode"],
"shopify": ["connectionMode"],
"cloud": ["connectionMode"],
"warehouse": ["connectionMode"]
},
"secretKeys": []
}
Expand Down
46 changes: 46 additions & 0 deletions src/configurations/destinations/bluecore/db-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"name": "BLUECORE",
"displayName": "Bluecore",
"config": {
"cdkV2Enabled": true,
"transformAtV1": "processor",
"saveDestinationResponse": true,
"excludeKeys": [],
"supportedSourceTypes": [
"android",
"ios",
"unity",
"amp",
"reactnative",
"flutter",
"cordova",
"web",
"cloud",
"shopify",
"warehouse"
],
"supportedConnectionModes": {
"android": ["cloud"],
"ios": ["cloud"],
"web": ["cloud"],
"unity": ["cloud"],
"amp": ["cloud"],
"reactnative": ["cloud"],
"flutter": ["cloud"],
"cordova": ["cloud"],
"shopify": ["cloud"],
"cloud": ["cloud"],
"warehouse": ["cloud"]
},
"supportedMessageTypes": {
"cloud": ["identify", "track"]
},
"destConfig": {
"defaultConfig": ["bluecoreNamespace", "eventsMapping", "oneTrustCookieCategories"]
},
"secretKeys": ["bluecoreNamespace"]
},
"options": {
"isBeta": true
}
}
Loading

0 comments on commit 27b7a9b

Please sign in to comment.