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.

Sign up for GitHub

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 main into develop post release v1.83.1 #3841

Merged
merged 7 commits into from
Nov 11, 2024
Merged

chore(release): pull main into develop post release v1.83.1 #3841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7be165
Revert "fix: str replace is not a function error (#3799)" (#3839)
utsabc Nov 1, 2024
2083ca0
chore(release): 1.83.1
web-flow Nov 1, 2024
1032aa2
chore(release): pull hotfix-release/v1.83.1 into main (#3840)
krishna2020 Nov 1, 2024
e5c5b0a
fix: update gaec destination with config validation (#3847)
ItsSudip Nov 5, 2024
f4100a3
Revert "fix: add missing field for pinterest_tag single product event…
ItsSudip Nov 5, 2024
60468fb
chore(release): 1.83.2
web-flow Nov 5, 2024
713e584
chore(release): pull hotfix-release/v1.83.2 into main (#3852)
ItsSudip Nov 5, 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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

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


### Bug Fixes

* update gaec destination with config validation ([#3847](https://github.com/rudderlabs/rudder-transformer/issues/3847)) ([e5c5b0a](https://github.com/rudderlabs/rudder-transformer/commit/e5c5b0a28070ff5ca89a274c3998b96780139149))

### [1.83.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.83.0...v1.83.1) (2024-11-01)

## [1.83.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.82.2...v1.83.0) (2024-10-25)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.83.0",
"version": "1.83.2",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down
6 changes: 1 addition & 5 deletions src/cdk/v2/destinations/pinterest_tag/procWorkflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,7 @@ steps:
"content_ids": (props.product_id ?? props.sku ?? props.id)[],
"contents": {
"quantity": Number(props.quantity) || 1,
"item_price": String(props.price),
"item_name": String(props.name),
"id": props.product_id ?? props.sku,
"item_category": props.category,
"item_brand": props.brand
"item_price": String(props.price)
}[]
};
- name: combineAllEcomFields
Expand Down
26 changes: 16 additions & 10 deletions src/v0/destinations/google_adwords_enhanced_conversions/transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ const responseBuilder = async (metadata, message, { Config }, payload) => {
if (isNumber(customerId)) {
customerId = customerId.toString();
}
if (isNumber(loginCustomerId)) {
loginCustomerId = loginCustomerId.toString();
}
if (!isString(customerId) || !isString(loginCustomerId)) {
throw new InstrumentationError('customerId and loginCustomerId should be a string or number');
if (!isString(customerId)) {
throw new InstrumentationError('customerId should be a string or number');
}
const filteredCustomerId = removeHyphens(customerId);

response.endpoint = `${BASE_ENDPOINT}/${filteredCustomerId}:uploadConversionAdjustments`;
response.body.JSON = payload;
const accessToken = getAccessToken(metadata, 'access_token');
Expand All @@ -57,11 +55,19 @@ const responseBuilder = async (metadata, message, { Config }, payload) => {
'developer-token': getValueFromMessage(metadata, 'secret.developer_token'),
};
response.params = { event, customerId: filteredCustomerId };
if (subAccount)
if (loginCustomerId) {
const filteredLoginCustomerId = removeHyphens(loginCustomerId);
response.headers['login-customer-id'] = filteredLoginCustomerId;
} else throw new ConfigurationError(`LoginCustomerId is required as subAccount is true.`);
if (subAccount) {
if (!loginCustomerId) {
throw new ConfigurationError(`loginCustomerId is required as subAccount is true.`);
}
if (isNumber(loginCustomerId)) {
loginCustomerId = loginCustomerId.toString();
}
if (loginCustomerId && !isString(loginCustomerId)) {
throw new InstrumentationError('loginCustomerId should be a string or number');
}
const filteredLoginCustomerId = removeHyphens(loginCustomerId);
response.headers['login-customer-id'] = filteredLoginCustomerId;
}

return response;
};
Expand Down
1 change: 1 addition & 0 deletions src/v0/util/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,7 @@ describe('removeHyphens', () => {
{ input: null, expected: null },
{ input: undefined, expected: undefined },
{ input: 12345, expected: 12345 },
{ input: '123-12-241', expected: '12312241' },
];
it('should remove hyphens from string else return the input as it is', () => {
data.forEach(({ input, expected }) => {
Expand Down
8 changes: 0 additions & 8 deletions test/apitests/data_scenarios/cdk_v2/failure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -683,10 +679,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down
12 changes: 0 additions & 12 deletions test/apitests/data_scenarios/cdk_v2/success.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -638,10 +634,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -720,10 +712,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down
12 changes: 0 additions & 12 deletions test/apitests/data_scenarios/destination/proc/batch_input_multiplex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -470,10 +466,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -552,10 +544,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down
8 changes: 0 additions & 8 deletions test/apitests/data_scenarios/destination/proc/multiplex_partial_failure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -470,10 +466,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down
8 changes: 0 additions & 8 deletions test/apitests/data_scenarios/destination/proc/multiplex_success.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -289,10 +285,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down
8 changes: 0 additions & 8 deletions test/apitests/data_scenarios/destination/router/failure_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,10 +754,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down Expand Up @@ -785,10 +781,6 @@
"content_ids": ["123"],
"contents": [
{
"id": "123",
"item_brand": "Gamepro",
"item_category": "Games",
"item_name": "Game",
"quantity": 11,
"item_price": "13.49"
}
Expand Down
2 changes: 1 addition & 1 deletion test/integrations/destinations/google_adwords_enhanced_conversions/processor/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ export const data = [
},
},
statusCode: 400,
error: 'LoginCustomerId is required as subAccount is true.',
error: 'loginCustomerId is required as subAccount is true.',
statTags: {
errorCategory: 'dataValidation',
errorType: 'configuration',
Expand Down
Loading
Loading