Skip to content

Commit

Permalink
Merge branch 'develop' into chore.clean-up-marketo-bulk-upload
Browse files Browse the repository at this point in the history
  • Loading branch information
utsabc authored Nov 12, 2024
2 parents baec0b9 + 6604902 commit 34739e9
Show file tree
Hide file tree
Showing 36 changed files with 1,594 additions and 379 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-push-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
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/login-action@v3.3.0
Expand All @@ -107,7 +107,7 @@ jobs:
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 @@ jobs:
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 @@ jobs:
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/login-action@v3.3.0
Expand All @@ -160,7 +160,7 @@ jobs:
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 @@ jobs:
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 @@ jobs:

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/login-action@v3.3.0
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
Expand Up @@ -58,14 +58,14 @@ jobs:
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 @@ jobs:
- 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
21 changes: 12 additions & 9 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
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

0 comments on commit 34739e9

Please sign in to comment.