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
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-pr-artifacts.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Artifacts for PRs

Check warning on line 1 in .github/workflows/build-pr-artifacts.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on:
pull_request:
Expand All @@ -22,7 +22,7 @@
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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-push-docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Transformer Docker Image

Check warning on line 1 in .github/workflows/build-push-docker-image.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on:
workflow_call:
Expand Down Expand Up @@ -64,7 +64,7 @@
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
Expand Down Expand Up @@ -92,7 +92,7 @@
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
Expand Down Expand Up @@ -145,7 +145,7 @@
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Commitlint

Check warning on line 1 in .github/workflows/commitlint.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on: [push]

Expand All @@ -11,12 +11,12 @@
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/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/component-test-report.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Component Test Reporter

Check warning on line 1 in .github/workflows/component-test-report.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on:
pull_request:
Expand Down Expand Up @@ -27,12 +27,12 @@
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/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Draft New Release

Check warning on line 1 in .github/workflows/draft-new-release.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on: workflow_dispatch

Expand All @@ -11,12 +11,12 @@
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/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
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
@@ -1,4 +1,4 @@
name: DT Tests

Check warning on line 1 in .github/workflows/dt-test-and-report-code-coverage.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.
on:
workflow_call:
secrets:
Expand Down Expand Up @@ -31,12 +31,12 @@
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/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/housekeeping.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Handle Stale PRs, Issues and Branches

Check warning on line 1 in .github/workflows/housekeeping.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on:
schedule:
Expand Down Expand Up @@ -33,7 +33,7 @@
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/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-for-dev-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Prepare for Dev Environment Deployment

Check warning on line 1 in .github/workflows/prepare-for-dev-deploy.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on:
push:
Expand Down Expand Up @@ -32,7 +32,7 @@
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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-prod-dt-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Prepare for DT Production Environment Deployment

Check warning on line 1 in .github/workflows/prepare-for-prod-dt-deploy.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on:
push:
Expand Down Expand Up @@ -32,7 +32,7 @@
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

Expand Down Expand Up @@ -71,7 +71,7 @@
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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-prod-ut-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Prepare for UT Production Environment Deployment

Check warning on line 1 in .github/workflows/prepare-for-prod-ut-deploy.yml

View workflow job for this annotation

GitHub Actions / Check for formatting & lint errors

File ignored by default.

on:
push:
Expand Down Expand Up @@ -31,7 +31,7 @@
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

Expand Down Expand Up @@ -74,7 +74,7 @@
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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-for-staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

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 @@ -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/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slack-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ut-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
run: go install sigs.k8s.io/[email protected]

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

- name: Setup Node
uses: actions/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-server-start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: '.nvmrc'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].3
uses: actions/[email protected].4
with:
node-version-file: .nvmrc
cache: 'npm'
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

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.83.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.82.1...v1.83.0) (2024-10-18)


### Features

* add missing fields on the pinterest_tag mapping ([#3798](https://github.com/rudderlabs/rudder-transformer/issues/3798)) ([eed35d3](https://github.com/rudderlabs/rudder-transformer/commit/eed35d30fbd6c51bec07d38edbc7026391ab146a)), closes [#3796](https://github.com/rudderlabs/rudder-transformer/issues/3796)

### [1.82.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.82.0...v1.82.1) (2024-10-16)


Expand Down
18 changes: 10 additions & 8 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.82.1",
"version": "1.83.0",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/v2/destinations/intercom/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
12 changes: 12 additions & 0 deletions src/cdk/v2/destinations/intercom/utils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' } },
Expand Down
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