Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): pull release/v1.65.0 into main #1221

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
470bcb5
Merge pull request #1194 from rudderlabs/main
aashishmalik Feb 8, 2024
04e05b8
feat: improve schema generator output (#1191)
saikumarrs Feb 8, 2024
fdbb379
chore: setup python before running tests (#1199)
saikumarrs Feb 8, 2024
6edc55b
chore: use proper python setup step (#1200)
saikumarrs Feb 8, 2024
009c8da
chore: standard formatting (#1198)
sanpj2292 Feb 12, 2024
fbf62a8
Merge pull request #1210 from rudderlabs/main
aashishmalik Feb 13, 2024
daf9fa8
feat: onboard new destination commandbar (#1196)
anantjain45823 Feb 14, 2024
cd7cecd
Merge pull request #1215 from rudderlabs/main
a-rampalli Feb 14, 2024
7faa64a
fix: comscore schema (#1217)
1abhishekpandey Feb 15, 2024
9124fb4
feat: adding custom field support for freshsales (#1195)
shrouti1507 Feb 16, 2024
61d36fa
feat: tiktok_offline_events added support for all Standard events (…
anantjain45823 Feb 16, 2024
0d9b8d7
feat: onboard trade desk real time conversions (#1213)
Gauravudia Feb 17, 2024
5120ec5
Revert "feat: trade desk real time conversions" (#1212)
Gauravudia Feb 17, 2024
dde686c
feat: add connectionMode for all sourceTypes in dest def for selected…
sandeepdsvs Feb 19, 2024
1859354
fix: add support of placing properties at root in af (#1203)
aashishmalik Feb 19, 2024
b75e2e5
Revert "feat: adding custom field support for freshsales" (#1218)
shrouti1507 Feb 19, 2024
6d5e40f
feat: onboarding bluecore integration (#1182)
shrouti1507 Feb 19, 2024
e73981f
fix: reverting unhide of salesforce oauth (#1220)
shrouti1507 Feb 19, 2024
3a86c22
chore(release): 1.65.0
web-flow Feb 19, 2024
8cba110
chore: renamed advertiserId to pixelId for reddit pixel (#1223)
Gauravudia Feb 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Commitlint

on: [push]

jobs:
commitlint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0

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

- name: Install Dependencies
run: npm ci

- name: Print versions
run: |
git --version
node --version
npm --version
npx commitlint --version

# Run the commitlint action, considering its own dependencies and yours as well 🚀
# `github.workspace` is the path to your repository.
- uses: wagoid/commitlint-github-action@v5
env:
NODE_PATH: ${{ github.workspace }}/node_modules
with:
commitDepth: 1
18 changes: 8 additions & 10 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,20 @@ jobs:
run: |
npm ci

- name: Execute Unit Tests
env:
HUSKY: 0
run: |
npm run test:ci

- name: Install Python
uses: actions/setup-python@v5.0.0
with:
python-version: '3.9.13'
- name: Set up Python
run: scripts/setup-python.sh

- name: Display Python Version
run: |
which python
python -c "import sys; print(sys.version)"

- name: Execute Unit Tests
env:
HUSKY: 0
run: |
npm run test:ci

- name: Install Python Dependencies
run: pip3 install -r ./scripts/requirements.txt

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/report-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
- name: Install Dependencies
run: npm ci

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

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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
- name: Install Dependencies
run: npm ci

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

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

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

- name: Get changed files
id: changed_files
uses: tj-actions/changed-files@v41
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Code quality checks

on:
pull_request:

jobs:
py-scripts-lint:
name: Check for formatting of python scripts
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.1

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

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

# Reference: https://black.readthedocs.io/en/stable/integrations/github_actions.html
- name: Check formatting for Python files
uses: psf/black@stable
with:
options: '--check --verbose'

formatting-lint:
name: Check for formatting & lint errors
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4.1.1

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

- name: Install Dependencies
run: npm ci

- name: Run Lint Checks
run: |
npm run lint

- run: git diff --exit-code

- name: Error message
if: ${{ failure() }}
run: |
echo 'ESLint check is failing. Please run `npm run lint` on your working copy and commit the changes.'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ git
reports
.eslintcache
.vscode

__pycache__
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run pre-commit
npm run pre-commit
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.15.0
20.11.0
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@

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.65.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.64.2...v1.65.0) (2024-02-19)


### Features

* add connectionMode for all sourceTypes in dest def for selected destinations ([#1197](https://github.com/rudderlabs/rudder-config-schema/issues/1197)) ([dde686c](https://github.com/rudderlabs/rudder-config-schema/commit/dde686cc72e0ac7423487d566e8f9715cc43d24f))
* adding custom field support for freshsales ([#1195](https://github.com/rudderlabs/rudder-config-schema/issues/1195)) ([9124fb4](https://github.com/rudderlabs/rudder-config-schema/commit/9124fb44fd18d903bbf37f7cef3eaf7aeccf92e4))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shrouti1507 clean it up here too

* improve schema generator output ([#1191](https://github.com/rudderlabs/rudder-config-schema/issues/1191)) ([04e05b8](https://github.com/rudderlabs/rudder-config-schema/commit/04e05b89a7333291792fbb6e111388b5ff8b985f))
* onboard new destination commandbar ([#1196](https://github.com/rudderlabs/rudder-config-schema/issues/1196)) ([daf9fa8](https://github.com/rudderlabs/rudder-config-schema/commit/daf9fa8256eed280bad04c0c109de3787e6262e0))
* onboard trade desk real time conversions ([#1213](https://github.com/rudderlabs/rudder-config-schema/issues/1213)) ([0d9b8d7](https://github.com/rudderlabs/rudder-config-schema/commit/0d9b8d7ee45b6ba5c914aaca6c2c11474a7575e9))
* onboarding bluecore integration ([#1182](https://github.com/rudderlabs/rudder-config-schema/issues/1182)) ([6d5e40f](https://github.com/rudderlabs/rudder-config-schema/commit/6d5e40fdb812aa4c46ea13cbae5f7eb696d0cc0c))
* tiktok_offline_events added support for all Standard events ([#1216](https://github.com/rudderlabs/rudder-config-schema/issues/1216)) ([61d36fa](https://github.com/rudderlabs/rudder-config-schema/commit/61d36fa5db882f00d97dd9dc88b2f26a7d49a87a))


### Bug Fixes

* add support of placing properties at root in af ([#1203](https://github.com/rudderlabs/rudder-config-schema/issues/1203)) ([1859354](https://github.com/rudderlabs/rudder-config-schema/commit/185935467899222b8766c63c63b934d70410cc9a))
* comscore schema ([#1217](https://github.com/rudderlabs/rudder-config-schema/issues/1217)) ([7faa64a](https://github.com/rudderlabs/rudder-config-schema/commit/7faa64acfe2fca20b75789f31b541dd33e7fde8c))
* reverting unhide of salesforce oauth ([#1220](https://github.com/rudderlabs/rudder-config-schema/issues/1220)) ([e73981f](https://github.com/rudderlabs/rudder-config-schema/commit/e73981f54b757aa60181942a19e7db97aac40658))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shrouti1507 don't see any corresponding file changes for salesforce_oauth in PR

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By mistake I unhide the salesforce oauth, so hid it again. Would need a clean up in changelog. Raising a new PR


### [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)
Expand Down
108 changes: 59 additions & 49 deletions migration/migrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,116 +2,126 @@
import json
import os

DEST_WEBAPP_FILE_PATH = 'rudder-webapp/src/components/destinations/schemas/'
DEST_CONFIG_BE_FILE_PATH = 'rudder-config-backend/src/scripts/destinationConfigs/'
DEST_SCHEMA_FILE_PATH = 'rudder-config-backend/src/scripts/schemaList/destinations/'
DEST_WEBAPP_FILE_PATH = "rudder-webapp/src/components/destinations/schemas/"
DEST_CONFIG_BE_FILE_PATH = "rudder-config-backend/src/scripts/destinationConfigs/"
DEST_SCHEMA_FILE_PATH = "rudder-config-backend/src/scripts/schemaList/destinations/"

SOURCE_WEBAPP_FILE_PATH = 'rudder-webapp/src/components/sources/source/warehouseSource/warehouseSourceList/'
SOURCE_CONFIG_BE_FILE_PATH = 'rudder-config-backend/src/scripts/sourceConfigs/'
SOURCE_WEBAPP_FILE_PATH = (
"rudder-webapp/src/components/sources/source/warehouseSource/warehouseSourceList/"
)
SOURCE_CONFIG_BE_FILE_PATH = "rudder-config-backend/src/scripts/sourceConfigs/"
# SOURCE_SCHEMA_FILE_PATH = 'rudder-config-backend/src/scripts/schemaList/destinations/'

CONFIGURATIONS_DIR_PATH = '../src/configurations'
DEST_CONFIG_PATH = f'{CONFIGURATIONS_DIR_PATH}/destinations'
SRC_CONFIG_PATH = f'{CONFIGURATIONS_DIR_PATH}/sources'
CONFIGURATIONS_DIR_PATH = "../src/configurations"
DEST_CONFIG_PATH = f"{CONFIGURATIONS_DIR_PATH}/destinations"
SRC_CONFIG_PATH = f"{CONFIGURATIONS_DIR_PATH}/sources"


def update_destination():
dest_list = [d[:-5].lower() for d in os.listdir(f'../../{DEST_CONFIG_BE_FILE_PATH}')]
dest_list = [
d[:-5].lower() for d in os.listdir(f"../../{DEST_CONFIG_BE_FILE_PATH}")
]
for dest in dest_list:
final_data = []
# read db_config
with open(f'../../{DEST_CONFIG_BE_FILE_PATH}{dest.upper()}.json', 'r') as f:
with open(f"../../{DEST_CONFIG_BE_FILE_PATH}{dest.upper()}.json", "r") as f:
db_config = json.loads(f.read())
print (db_config)
print(db_config)
final_data.append(db_config)
print ("========================")
print("========================")
# read ui_config
with open(f'../../{DEST_WEBAPP_FILE_PATH}{dest.upper()}.json', 'r') as f:
with open(f"../../{DEST_WEBAPP_FILE_PATH}{dest.upper()}.json", "r") as f:
ui_config = {"uiConfig": json.loads(f.read())}
print (ui_config)
print(ui_config)
final_data.append(ui_config)
print ("========================")
print("========================")
# read schema
if f'{dest.upper()}.json' in os.listdir(f'../../{DEST_SCHEMA_FILE_PATH}'):
with open(f'../../{DEST_SCHEMA_FILE_PATH}{dest.upper()}.json', 'r') as f:
if f"{dest.upper()}.json" in os.listdir(f"../../{DEST_SCHEMA_FILE_PATH}"):
with open(f"../../{DEST_SCHEMA_FILE_PATH}{dest.upper()}.json", "r") as f:
schema = {"schema": json.loads(f.read())}
else:
schema = {"schema": None}
print (schema)
print(schema)
final_data.append(schema)
print ("========================")
print("========================")
# metadata
with open('dest_meta_template.json', 'r') as f:
with open("dest_meta_template.json", "r") as f:
metadata = json.loads(f.read())
print (metadata)
print(metadata)
final_data.append(metadata)
print ("========================")
print("========================")

########################
## write new files
########################
if dest not in os.listdir(DEST_CONFIG_PATH):
os.system(f'mkdir {DEST_CONFIG_PATH}/{dest}')
print (f'created directory for {dest}')
os.system(f"mkdir {DEST_CONFIG_PATH}/{dest}")
print(f"created directory for {dest}")

file_names = ['db-config', 'ui-config', 'schema', 'metadata']
file_names = ["db-config", "ui-config", "schema", "metadata"]
for index, f_name in enumerate(file_names):
print (f'writing {f_name} for {dest}...')
with open(f'{DEST_CONFIG_PATH}/{dest}/{f_name}.json', 'w') as f:
print(f"writing {f_name} for {dest}...")
with open(f"{DEST_CONFIG_PATH}/{dest}/{f_name}.json", "w") as f:
f.write(json.dumps(final_data[index], indent=2))

print (f'complete for {dest}...')
print ('------------------------------------------------')
print(f"complete for {dest}...")
print("------------------------------------------------")


def update_source():
source_list = [d[:-5].lower() for d in os.listdir(f'../../{SOURCE_CONFIG_BE_FILE_PATH}')]
source_list = [
d[:-5].lower() for d in os.listdir(f"../../{SOURCE_CONFIG_BE_FILE_PATH}")
]
for source in source_list:
final_data = []
# read db_config
with open(f'../../{SOURCE_CONFIG_BE_FILE_PATH}{source.upper()}.json', 'r') as f:
with open(f"../../{SOURCE_CONFIG_BE_FILE_PATH}{source.upper()}.json", "r") as f:
db_config = json.loads(f.read())
print (db_config)
print(db_config)
final_data.append(db_config)
print ("========================")
print("========================")
# read ui_config
if f'{source.upper()}.json' in os.listdir(f'../../{SOURCE_WEBAPP_FILE_PATH}'):
with open(f'../../{SOURCE_WEBAPP_FILE_PATH}{source.upper()}.json', 'r') as f:
if f"{source.upper()}.json" in os.listdir(f"../../{SOURCE_WEBAPP_FILE_PATH}"):
with open(
f"../../{SOURCE_WEBAPP_FILE_PATH}{source.upper()}.json", "r"
) as f:
ui_config = {"uiConfig": json.loads(f.read())}
else:
ui_config = {"uiConfig": None}
print (ui_config)
print(ui_config)
final_data.append(ui_config)
print ("========================")
print("========================")
# read schema (we don't need schema for sources)
# if f'{source.upper()}.json' in os.listdir(f'../../{SOURCE_SCHEMA_FILE_PATH}'):
# with open(f'../../{SOURCE_SCHEMA_FILE_PATH}{source.upper()}.json', 'r') as f:
# schema = {"schema": json.loads(f.read())}
# else:
schema = {"schema": None}
print (schema)
print(schema)
final_data.append(schema)
print ("========================")
print("========================")
# metadata
with open('source_meta_template.json', 'r') as f:
with open("source_meta_template.json", "r") as f:
metadata = json.loads(f.read())
print (metadata)
print(metadata)
final_data.append(metadata)
print ("========================")
print("========================")

########################
## write new files
########################
if source not in os.listdir(SRC_CONFIG_PATH):
os.system(f'mkdir {SRC_CONFIG_PATH}/{source}')
print (f'created directory for {source}')
os.system(f"mkdir {SRC_CONFIG_PATH}/{source}")
print(f"created directory for {source}")

file_names = ['db_config', 'ui_config', 'schema', 'metadata']
file_names = ["db_config", "ui_config", "schema", "metadata"]
for index, f_name in enumerate(file_names):
print (f'writing {f_name} for {source}...')
with open(f'{SRC_CONFIG_PATH}/{source}/{f_name}.json', 'w') as f:
print(f"writing {f_name} for {source}...")
with open(f"{SRC_CONFIG_PATH}/{source}/{f_name}.json", "w") as f:
f.write(json.dumps(final_data[index], indent=2))

print (f'complete for {source}...')
print ('------------------------------------------------')
print(f"complete for {source}...")
print("------------------------------------------------")


if __name__ == "__main__":
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.

Loading
Loading