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.84.0 into main #3869

Merged
merged 23 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a15a9fe
chore(release): pull main into develop post release v1.83.0 (#3834)
yashasvibajpai Oct 30, 2024
386b8c2
chore(deps): bump docker/setup-buildx-action from 3.6.1 to 3.7.1 (#3787)
dependabot[bot] Nov 1, 2024
34a2dfa
chore(deps): bump codecov/codecov-action from 4.0.1 to 4.6.0 (#3788)
dependabot[bot] Nov 1, 2024
ba694a5
chore(deps): bump docker/build-push-action from 6.7.0 to 6.9.0 (#3789)
dependabot[bot] Nov 1, 2024
b5003d1
chore: new flags incorporate env variables via features.ts file
vinayteki95 Nov 4, 2024
7a26459
feat: gaec migration (#3855)
aashishmalik Nov 6, 2024
bbd31a1
Merge branch 'develop' into chore.features-json-to-ts
vinayteki95 Nov 6, 2024
2c22ba7
chore: features json to typescript with ENV overwrite support (#3848)
vinayteki95 Nov 6, 2024
f4b38eb
feat(GARL): support vdm next for GARL (#3835)
sandeepdsvs Nov 7, 2024
80d7b41
fix: unsafe property getting set via set value library (#3853)
sanpj2292 Nov 8, 2024
adc8976
feat: update on twitter_ads (#3856)
aanshi07 Nov 8, 2024
f831487
chore(deps-dev): bump husky from 9.1.1 to 9.1.6 (#3807)
dependabot[bot] Nov 8, 2024
5426d6c
chore(deps): bump libphonenumber-js from 1.11.1 to 1.11.12 (#3813)
dependabot[bot] Nov 8, 2024
716744f
chore(deps): bump SonarSource/sonarcloud-github-action from 3.0.0 to …
dependabot[bot] Nov 11, 2024
bfd7edc
fix: linkedin ads conversionValue object as well as price is not mand…
shrouti1507 Nov 11, 2024
f959a7d
fix: marketo bulk upload handle special chars (#3859)
utsabc Nov 11, 2024
fa93f09
fix: adding throttled status code for server unavailable error in sal…
shrouti1507 Nov 11, 2024
10d4cc0
chore: resolve conflicts and merge main to develop (#3865)
ItsSudip Nov 11, 2024
c1626ab
chore: resolve conflicts again (#3867)
ItsSudip Nov 11, 2024
28a85fa
Merge remote-tracking branch 'origin/main' into chore.main-dev-conflict
Nov 11, 2024
b5baa75
chore: remove repeated test cases
Nov 11, 2024
6604902
chore: conflict between main and develop (#3868)
sanpj2292 Nov 11, 2024
b10a39f
chore(release): 1.84.0
web-flow Nov 11, 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
14 changes: 7 additions & 7 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 @@ -98,7 +98,7 @@
fetch-depth: 1

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v3.6.1
uses: docker/setup-buildx-action@v3.7.1

- name: Login to DockerHub
uses: docker/[email protected]
Expand All @@ -107,7 +107,7 @@
password: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

- name: Build Docker Image
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.9.0
with:
context: .
file: ${{ inputs.dockerfile }}
Expand All @@ -124,7 +124,7 @@
docker run ${{ inputs.build_tag }} npm run test:ts:ci

- name: Build and Push Multi-platform Images
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.9.0
with:
context: .
file: ${{ inputs.dockerfile }}
Expand All @@ -151,7 +151,7 @@
fetch-depth: 1

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v3.6.1
uses: docker/setup-buildx-action@v3.7.1

- name: Login to DockerHub
uses: docker/[email protected]
Expand All @@ -160,7 +160,7 @@
password: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

- name: Build Docker Image
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.9.0
with:
context: .
file: ${{ inputs.dockerfile }}
Expand All @@ -177,7 +177,7 @@
docker run ${{ inputs.build_tag }} npm run test:ts:ci

- name: Build and Push Multi-platform Images
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.9.0
with:
context: .
file: ${{ inputs.dockerfile }}
Expand All @@ -199,7 +199,7 @@

steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.6.1
uses: docker/setup-buildx-action@v3.7.1

- name: Login to DockerHub
uses: docker/[email protected]
Expand Down
6 changes: 3 additions & 3 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 @@ -58,14 +58,14 @@
npm run lint:fix

- name: Upload Coverage Reports to Codecov
uses: codecov/codecov-action@v4.0.1
uses: codecov/codecov-action@v4.6.0
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
directory: ./reports/coverage

- name: Upload TS Coverage Reports to Codecov
uses: codecov/codecov-action@v4.0.1
uses: codecov/codecov-action@v4.6.0
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand All @@ -80,7 +80,7 @@

- name: SonarCloud Scan
if: always()
uses: SonarSource/sonarcloud-github-action@v3.0.0
uses: SonarSource/sonarcloud-github-action@v3.1.0
env:
GITHUB_TOKEN: ${{ secrets.PAT }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

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.84.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.83.2...v1.84.0) (2024-11-11)


### Features

* gaec migration ([#3855](https://github.com/rudderlabs/rudder-transformer/issues/3855)) ([7a26459](https://github.com/rudderlabs/rudder-transformer/commit/7a264590b61d3d31d5559c8ac53fd572b40cddec))
* **GARL:** support vdm next for GARL ([#3835](https://github.com/rudderlabs/rudder-transformer/issues/3835)) ([f4b38eb](https://github.com/rudderlabs/rudder-transformer/commit/f4b38eba3ca8dff602915853fda5cd7ca284bba3))
* update on twitter_ads ([#3856](https://github.com/rudderlabs/rudder-transformer/issues/3856)) ([adc8976](https://github.com/rudderlabs/rudder-transformer/commit/adc8976990fa98c5b874472aee180cadfabb0088))


### Bug Fixes

* adding throttled status code for server unavailable error in salesforce ([#3862](https://github.com/rudderlabs/rudder-transformer/issues/3862)) ([fa93f09](https://github.com/rudderlabs/rudder-transformer/commit/fa93f0917d4f75fc197a6ea4c574d37faa0a3f77))
* linkedin ads conversionValue object as well as price is not mandatory ([#3860](https://github.com/rudderlabs/rudder-transformer/issues/3860)) ([bfd7edc](https://github.com/rudderlabs/rudder-transformer/commit/bfd7edc5608c60a39644a1d4ad6e15e5dbcbea0e))
* marketo bulk upload handle special chars ([#3859](https://github.com/rudderlabs/rudder-transformer/issues/3859)) ([f959a7d](https://github.com/rudderlabs/rudder-transformer/commit/f959a7dc2487dc7e36377f5f2e265014f692f476))
* unsafe property getting set via set value library ([#3853](https://github.com/rudderlabs/rudder-transformer/issues/3853)) ([80d7b41](https://github.com/rudderlabs/rudder-transformer/commit/80d7b417be7a0e459de49caca25aba43ffdba337))

### [1.83.2](https://github.com/rudderlabs/rudder-transformer/compare/v1.83.1...v1.83.2) (2024-11-05)


Expand Down
25 changes: 14 additions & 11 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.83.2",
"version": "1.84.0",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down Expand Up @@ -64,7 +64,7 @@
"@koa/router": "^12.0.0",
"@ndhoule/extend": "^2.0.0",
"@pyroscope/nodejs": "^0.2.9",
"@rudderstack/integrations-lib": "^0.2.10",
"@rudderstack/integrations-lib": "^0.2.12",
"@rudderstack/json-template-engine": "^0.18.0",
"@rudderstack/workflow-engine": "^0.8.13",
"@shopify/jest-koa-mocks": "^5.1.1",
Expand Down Expand Up @@ -95,7 +95,7 @@
"koa": "^2.15.3",
"koa-bodyparser": "^4.4.0",
"koa2-swagger-ui": "^5.7.0",
"libphonenumber-js": "^1.11.1",
"libphonenumber-js": "^1.11.12",
"lodash": "^4.17.21",
"match-json": "^1.3.5",
"md5": "^2.3.0",
Expand Down Expand Up @@ -152,7 +152,7 @@
"eslint-plugin-unicorn": "^46.0.1",
"glob": "^10.3.3",
"http-terminator": "^3.2.0",
"husky": "^9.1.1",
"husky": "^9.1.6",
"jest": "^29.5.0",
"jest-sonar": "^0.2.16",
"jest-when": "^3.5.2",
Expand Down
6 changes: 2 additions & 4 deletions src/cdk/v2/destinations/linkedin_ads/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function checkIfPricePresent(properties) {
}

const calculateConversionObject = (message) => {
const { properties, event } = message;
const { properties } = message;

const calculateAmount = () => {
if (properties?.products && properties.products.length > 0) {
Expand All @@ -107,9 +107,7 @@ const calculateConversionObject = (message) => {
};
return conversionObject;
}
throw new InstrumentationError(
`[LinkedIn Conversion API]: Cannot map price for event ${event}. Aborting`,
);
return null;
};

const deduceConversionRules = (trackEventName, destConfig) => {
Expand Down
9 changes: 5 additions & 4 deletions src/cdk/v2/destinations/linkedin_ads/utils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ describe('formatEmail', () => {
});

describe('calculateConversionObject', () => {
// Returns a conversion object with currency code 'USD' and amount 0 when message properties are empty
it('should throw instrumentation error when message properties are empty', () => {
// Returns empty object when message properties are empty
it('should return empty object when message properties are empty', () => {
const message = { properties: {} };
expect(() => {
fetchUserIds(calculateConversionObject(message));
}).toThrow(InstrumentationError);
const conversionObject = calculateConversionObject(message);
expect(conversionObject).toEqual({});
});
});

// Returns a conversion object with currency code 'USD' and amount 0 when message properties price is defined but quantity is 0
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/misc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class MiscController {
}

public static features(ctx: Context) {
ctx.body = MiscService.getFetaures();
ctx.body = MiscService.getFeatures();
ctx.status = 200;
return ctx;
}
Expand Down
105 changes: 0 additions & 105 deletions src/features.json

This file was deleted.

Loading
Loading