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 hotfix-release/v1.83.0 into main #3811

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
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
Next Next commit
feat: add missing fields on the pinterest_tag mapping (#3798)
* feat: add missing fields on the pinterest_tag mapping

* chore: fix test cases

* chore(deps): bump actions/checkout from 4.1.1 to 4.2.1 (#3796)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.2.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.1.1...v4.2.1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump actions/setup-node from 4.0.3 to 4.0.4 (#3749)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v4.0.3...v4.0.4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sankeerth <sankeerth@rudderstack.com>

* fix: heap userId extraction (#3801)

* chore: remove redundant old implementation (#3802)

* chore: remove redundant old implementation

* chore: remove test cases related to pinterest_tag

* chore: fix test cases

* chore: fix lint issue

* chore: fix lint issue again

* Should filter out falsey reserved attributes from Intercom destination  (#3767)

* Should filter out reserved attributes from Intercom destination even if they are falsey

* Fix presence check to allow null values

---------

Co-authored-by: Manish Kumar <144022547+manish339k@users.noreply.github.com>

* chore(deps): bump koa and @types/koa (#3709)

Bumps [koa](https://github.com/koajs/koa) and [@types/koa](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/koa). These dependencies needed to be updated together.

Updates `koa` from 2.15.0 to 2.15.3
- [Changelog](https://github.com/koajs/koa/blob/2.15.3/History.md)
- [Commits](koajs/koa@2.15.0...2.15.3)

Updates `@types/koa` from 2.13.12 to 2.15.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/koa)

---
updated-dependencies:
- dependency-name: koa
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: "@types/koa"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com>

* fix: populate source destination info env set properly (#3806)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Sankeerth <sankeerth@rudderstack.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dilip Kola <33080863+koladilip@users.noreply.github.com>
Co-authored-by: shrouti1507 <60211312+shrouti1507@users.noreply.github.com>
Co-authored-by: Will <will@will3942.com>
Co-authored-by: Manish Kumar <144022547+manish339k@users.noreply.github.com>
Co-authored-by: Yashasvi Bajpai <33063622+yashasvibajpai@users.noreply.github.com>
Co-authored-by: Akash Chetty <achetty.iitr@gmail.com>
  • Loading branch information
9 people authored Oct 18, 2024
commit eed35d30fbd6c51bec07d38edbc7026391ab146a
2 changes: 1 addition & 1 deletion .github/workflows/build-pr-artifacts.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:
tag_name_ut: ${{ steps.gen_tag_names.outputs.tag_name_ut }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

6 changes: 3 additions & 3 deletions .github/workflows/build-push-docker-image.yml
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ jobs:
should_execute_tests: ${{ steps.processing.outputs.should_execute_tests }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1
- id: files
@@ -92,7 +92,7 @@ jobs:
needs: [get_sha, get_changed_files]
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
ref: ${{ needs.get_sha.outputs.sha }}
fetch-depth: 1
@@ -145,7 +145,7 @@ jobs:
needs: [get_sha, get_changed_files]
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
ref: ${{ needs.get_sha.outputs.sha }}
fetch-depth: 1
4 changes: 2 additions & 2 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: '.nvmrc'
cache: 'npm'
4 changes: 2 additions & 2 deletions .github/workflows/component-test-report.yml
Original file line number Diff line number Diff line change
@@ -27,12 +27,12 @@ jobs:
aws-region: us-east-1

- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: '.nvmrc'
cache: 'npm'
4 changes: 2 additions & 2 deletions .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ jobs:
if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'koladilip' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823' || github.actor == 'chandumlg' || github.actor == 'mihir-4116' || github.actor == 'yashasvibajpai' || github.actor == 'sanpj2292' || github.actor == 'utsabc') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'koladilip' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823' || github.triggering_actor == 'chandumlg' || github.triggering_actor == 'mihir-4116' || github.triggering_actor == 'yashasvibajpai' || github.triggering_actor == 'sanpj2292' || github.triggering_actor == 'utsabc')
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: '.nvmrc'
cache: 'npm'
4 changes: 2 additions & 2 deletions .github/workflows/dt-test-and-report-code-coverage.yml
Original file line number Diff line number Diff line change
@@ -31,12 +31,12 @@ jobs:
tests_run_outcome: ${{steps.run_tests.outcome}}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: '.nvmrc'
cache: 'npm'
2 changes: 1 addition & 1 deletion .github/workflows/housekeeping.yml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1

- name: Delete Old Branches
uses: beatlabs/delete-old-branches-action@v0.0.10
2 changes: 1 addition & 1 deletion .github/workflows/prepare-for-dev-deploy.yml
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ jobs:
tag_name_ut: ${{ steps.gen_tag_names.outputs.tag_name_ut }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-prod-dt-deploy.yml
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ jobs:
tag_name_ut: ${{ steps.gen_tag_names.outputs.tag_name_ut }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

@@ -71,7 +71,7 @@ jobs:
TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-prod-ut-deploy.yml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ jobs:
tag_name_ut: ${{ steps.gen_tag_names.outputs.tag_name_ut }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

@@ -74,7 +74,7 @@ jobs:
TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-staging-deploy.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
tag_name_ut: ${{ steps.gen_tag_names.outputs.tag_name_ut }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

@@ -82,7 +82,7 @@ jobs:
UT_TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
@@ -25,12 +25,12 @@ jobs:
echo "release_version=$version" >> $GITHUB_OUTPUT

- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: '.nvmrc'
cache: 'npm'
2 changes: 1 addition & 1 deletion .github/workflows/slack-notify.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
if: ${{ inputs.should_notify }}
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1

- name: notify
uses: slackapi/slack-github-action@v1.27.0
4 changes: 2 additions & 2 deletions .github/workflows/ut-tests.yml
Original file line number Diff line number Diff line change
@@ -25,12 +25,12 @@ jobs:
run: go install sigs.k8s.io/kind@v0.17.0

- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: '.nvmrc'
cache: 'npm'
4 changes: 2 additions & 2 deletions .github/workflows/verify-server-start.yml
Original file line number Diff line number Diff line change
@@ -14,12 +14,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
fetch-depth: 1

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: '.nvmrc'
cache: 'npm'
4 changes: 2 additions & 2 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
@@ -14,13 +14,13 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.1
with:
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}

- name: Setup Node
uses: actions/setup-node@v4.0.3
uses: actions/setup-node@v4.0.4
with:
node-version-file: .nvmrc
cache: 'npm'
14 changes: 8 additions & 6 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@
"json-size": "^1.0.0",
"jsontoxml": "^1.0.1",
"jstoxml": "^5.0.2",
"koa": "^2.14.1",
"koa": "^2.15.3",
"koa-bodyparser": "^4.4.0",
"koa2-swagger-ui": "^5.7.0",
"libphonenumber-js": "^1.11.1",
@@ -128,7 +128,7 @@
"@types/fast-json-stable-stringify": "^2.1.0",
"@types/jest": "^29.5.1",
"@types/jsonpath": "^0.2.4",
"@types/koa": "^2.13.6",
"@types/koa": "^2.15.0",
"@types/koa-bodyparser": "^4.3.10",
"@types/lodash": "^4.14.197",
"@types/node": "^20.2.5",
2 changes: 1 addition & 1 deletion src/cdk/v2/destinations/intercom/utils.js
Original file line number Diff line number Diff line change
@@ -257,7 +257,7 @@ const filterCustomAttributes = (payload, type, destination, message) => {
let customAttributes = { ...get(payload, 'custom_attributes') };
if (customAttributes) {
ReservedAttributesList.forEach((trait) => {
if (customAttributes[trait]) delete customAttributes[trait];
if (trait in customAttributes) delete customAttributes[trait];
});
if (isDefinedAndNotNull(customAttributes) && Object.keys(customAttributes).length > 0) {
customAttributes =
12 changes: 12 additions & 0 deletions src/cdk/v2/destinations/intercom/utils.test.js
Original file line number Diff line number Diff line change
@@ -318,6 +318,18 @@ describe('filterCustomAttributes utility test', () => {
expect(result).toBeUndefined();
});

it('Should filter out custom attributes that are reserved attributes and that are false', () => {
const payload = { custom_attributes: { unsubscribedFromEmails: false } };
const result = filterCustomAttributes(payload, 'user', { Config: { apiVersion: 'v2' } });
expect(result).toBeUndefined();
});

it('Should filter out custom attributes that are reserved attributes and that are null', () => {
const payload = { custom_attributes: { unsubscribedFromEmails: null } };
const result = filterCustomAttributes(payload, 'user', { Config: { apiVersion: 'v2' } });
expect(result).toBeUndefined();
});

it('Should return a flattened object when custom attributes are not null, not reserved attributes and nested', () => {
const payload = {
custom_attributes: { source: 'rudder-js-sdk', data: { nestedAttribute: 'nestedValue' } },
19 changes: 19 additions & 0 deletions src/cdk/v2/destinations/pinterest_tag/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const ENDPOINT = 'https://ct.pinterest.com/events/v3';
// ref: https://developers.pinterest.com/docs/api/v5/#tag/conversion_events
const getV5EventsEndpoint = (adAccountId) =>
`https://api.pinterest.com/v5/ad_accounts/${adAccountId}/events`;

const API_VERSION = {
v3: 'legacyApi',
v5: 'newApi',
};

// ref: https://s.pinimg.com/ct/docs/conversions_api/dist/v3.html
const MAX_BATCH_SIZE = 1000;

module.exports = {
ENDPOINT,
MAX_BATCH_SIZE,
getV5EventsEndpoint,
API_VERSION,
};
Loading
Loading