Skip to content

Commit

Permalink
Merge branch 'develop' into feat/synk-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanjay-Veernala authored Sep 21, 2023
2 parents 16a9b8e + fd6698e commit 5a15022
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 98 deletions.
22 changes: 3 additions & 19 deletions .github/workflows/prepare-for-prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
echo "Tag Name: $tag_name"
echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
build-rudderstack-transformer-image:
name: Build Transformer Docker Image for Rudderstack org- Prod
build-transformer-image:
name: Build Transformer Docker Image - Prod
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
needs: [generate-tag-names]
Expand All @@ -55,26 +55,10 @@ jobs:
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

build-rudderlabs-transformer-image:
name: Build Transformer Docker Image for Rudderlabs org - Prod
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
needs: [generate-tag-names]
uses: ./.github/workflows/build-push-docker-image.yml
with:
build_tag: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
push_tags: rudderlabs/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }},rudderlabs/rudder-transformer:latest
img_tag: ${{ needs.generate-tag-names.outputs.tag_name }}
dockerfile: Dockerfile
load_target: development
push_target: production
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

create-pull-request:
name: Update Helm Charts For Production and Create Pull Request
runs-on: ubuntu-latest
needs: [generate-tag-names, build-rudderstack-transformer-image, build-rudderlabs-transformer-image]
needs: [generate-tag-names, build-transformer-image]
env:
TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name }}
TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
Expand Down
23 changes: 3 additions & 20 deletions .github/workflows/prepare-for-prod-ut-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
echo "UT Tag Name: $tag_name_ut"
echo "tag_name_ut=$tag_name_ut" >> $GITHUB_OUTPUT
build-rudderstack-user-transformer-image:
name: Build User Transformer Docker Image for Rudderstack org - Prod
build-user-transformer-image:
name: Build User Transformer Docker Image - Prod
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
needs: [generate-tag-names]
Expand All @@ -58,27 +58,10 @@ jobs:
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

build-rudderlabs-user-transformer-image:
name: Build User Transformer Docker Image for Rudderlabs org - Prod
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
needs: [generate-tag-names]
uses: ./.github/workflows/build-push-docker-image.yml
with:
build_tag: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
push_tags: rudderlabs/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }},rudderlabs/rudder-transformer:ut-latest
img_tag: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
dockerfile: Dockerfile-ut-func
load_target: development
push_target: production
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}


create-pull-request:
name: Update Helm Charts For Production and Create Pull Request
runs-on: ubuntu-latest
needs: [generate-tag-names, build-rudderstack-user-transformer-image, build-rudderlabs-user-transformer-image]
needs: [generate-tag-names, build-user-transformer-image]
env:
UT_TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
Expand Down
42 changes: 5 additions & 37 deletions .github/workflows/prepare-for-staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
echo "UT Tag Name: $tag_name_ut"
echo "tag_name_ut=$tag_name_ut" >> $GITHUB_OUTPUT
build-rudderstack-transformer-image:
name: Build Transformer Docker Image For Rudderstack org - Staging
build-transformer-image:
name: Build Transformer Docker Image - Staging
# Only pull requests from release candidate branches must trigger
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))
needs: [generate-tag-names]
Expand All @@ -51,24 +51,8 @@ jobs:
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

build-rudderlabs-transformer-image:
name: Build Transformer Docker Image For Rudderlabs org - Staging
# Only pull requests from release candidate branches must trigger
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))
needs: [generate-tag-names]
uses: ./.github/workflows/build-push-docker-image.yml
with:
build_tag: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
push_tags: rudderlabs/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
img_tag: ${{ needs.generate-tag-names.outputs.tag_name }}
dockerfile: Dockerfile
load_target: development
push_target: production
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

build-rudderstack-user-transformer-image:
name: Build User Transformer Docker Image For Rudderstack org - Staging
build-user-transformer-image:
name: Build User Transformer Docker Image - Staging
# Only pull requests from release candidate branches must trigger
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))

Expand All @@ -84,27 +68,11 @@ jobs:
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

build-rudderlabs-user-transformer-image:
name: Build User Transformer Docker Image For Rudderlabs org - Staging
# Only pull requests from release candidate branches must trigger
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))

needs: [generate-tag-names]
uses: ./.github/workflows/build-push-docker-image.yml
with:
build_tag: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
push_tags: rudderlabs/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
img_tag: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
dockerfile: Dockerfile-ut-func
load_target: development
push_target: production
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

create-pull-request:
name: Update Helm Charts For Staging and Create Pull Request
runs-on: ubuntu-latest
needs: [generate-tag-names, build-rudderstack-transformer-image, build-rudderlabs-transformer-image, build-rudderstack-user-transformer-image, build-rudderlabs-user-transformer-image]
needs: [generate-tag-names, build-transformer-image, build-user-transformer-image]
env:
TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name }}
UT_TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,33 @@

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.42.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.41.1...v1.42.0) (2023-09-18)


### Features

* added profiling endpoints to fetch profiles ([#2540](https://github.com/rudderlabs/rudder-transformer/issues/2540)) ([e537364](https://github.com/rudderlabs/rudder-transformer/commit/e537364841729f738e75bfbf859abad745f1f78f))
* google ads v14 upgrade ([#2578](https://github.com/rudderlabs/rudder-transformer/issues/2578)) ([f44a951](https://github.com/rudderlabs/rudder-transformer/commit/f44a951fc2a23135e3d0950d7a29421ca939de1a))
* introduce de-activation of authStatus for access_denied or inva… ([#2598](https://github.com/rudderlabs/rudder-transformer/issues/2598)) ([3b1fef6](https://github.com/rudderlabs/rudder-transformer/commit/3b1fef63c7aee376dd67c6b3235095f311d673fb))
* **mixpanel:** add incremental properties support ([#2550](https://github.com/rudderlabs/rudder-transformer/issues/2550)) ([e98ea84](https://github.com/rudderlabs/rudder-transformer/commit/e98ea84265ee37bfc6d3e99104af7bb4a3d78007))
* onboard fullstory cloud mode ([#2536](https://github.com/rudderlabs/rudder-transformer/issues/2536)) ([dfd6117](https://github.com/rudderlabs/rudder-transformer/commit/dfd6117fbba521941876bc9681858d4a6d32b0bf))
* onboard intercom to transformer proxy ([#2548](https://github.com/rudderlabs/rudder-transformer/issues/2548)) ([ed27a11](https://github.com/rudderlabs/rudder-transformer/commit/ed27a11799ded0e9f7f77401ddc58061a5908b37))
* onboard launchdarkly audience ([#2529](https://github.com/rudderlabs/rudder-transformer/issues/2529)) ([082e1d1](https://github.com/rudderlabs/rudder-transformer/commit/082e1d190f4df152cd7dc3141cc33b406720215f))


### Bug Fixes

* **INT-339:** marketo response handler to handle static list removed and skipped statuses ([#2606](https://github.com/rudderlabs/rudder-transformer/issues/2606)) ([e3fed49](https://github.com/rudderlabs/rudder-transformer/commit/e3fed49d2725a6c60409db00cfda2a997da78e71))
* **INT-339:** marketo response handler to handle static list removed and skipped statuses ([#2620](https://github.com/rudderlabs/rudder-transformer/issues/2620)) ([87d8216](https://github.com/rudderlabs/rudder-transformer/commit/87d82165089b706da1213cb3859f0f6d73f917db))
* **INT-523:** replaced flag with dropdown for datacenter selection ([#2575](https://github.com/rudderlabs/rudder-transformer/issues/2575)) ([735d5d1](https://github.com/rudderlabs/rudder-transformer/commit/735d5d1e4f1d84edaed488642eefe8d41bf6f20a))
* **INT-568:** slack send event to event specific channel based on channel webhook ([#2563](https://github.com/rudderlabs/rudder-transformer/issues/2563)) ([0f3b39e](https://github.com/rudderlabs/rudder-transformer/commit/0f3b39e64f50cec54a5fcd59e0da298092ca0f22))
* **INT-591:** added support of id parameter for update events ([#2595](https://github.com/rudderlabs/rudder-transformer/issues/2595)) ([a2a9c37](https://github.com/rudderlabs/rudder-transformer/commit/a2a9c374517826738ba9677511c6247316fc836e))
* **iterable:** updated mappings ([#2602](https://github.com/rudderlabs/rudder-transformer/issues/2602)) ([23bb1f6](https://github.com/rudderlabs/rudder-transformer/commit/23bb1f64168f0e0a2ded4cbce8c99ef807fef9ad))
* pyroscope endpoints ([#2613](https://github.com/rudderlabs/rudder-transformer/issues/2613)) ([7d268f0](https://github.com/rudderlabs/rudder-transformer/commit/7d268f046f92d86f48ced06c586b0d098a913113))
* remove hashing on twclid for twitter ads ([#2605](https://github.com/rudderlabs/rudder-transformer/issues/2605)) ([6c984a4](https://github.com/rudderlabs/rudder-transformer/commit/6c984a4821124e1054be1c81a9bf110c36311f13))
* seperate build steps for ruddestack and rudderlabs repo ([#2625](https://github.com/rudderlabs/rudder-transformer/issues/2625)) ([fcafacd](https://github.com/rudderlabs/rudder-transformer/commit/fcafacd10be7f1c9c001a6a805b4cb9daafd4413))
* **transformation:** block ipv6 requests in user transformer ([#2618](https://github.com/rudderlabs/rudder-transformer/issues/2618)) ([fd81211](https://github.com/rudderlabs/rudder-transformer/commit/fd8121108594d6ca032c36c7b8d47d26c1b389e0))

### [1.41.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.41.0...v1.41.1) (2023-09-14)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.41.1",
"version": "1.42.0",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down
14 changes: 8 additions & 6 deletions src/v0/destinations/mp/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,14 @@ const processIncrementalProperties = (message, destination, propIncrements) => {
payload.$distinct_id = message.userId || `$device:${message.anonymousId}`;
}

Object.keys(message.properties).forEach((prop) => {
const value = message.properties[prop];
if (value && propIncrements.includes(prop)) {
payload.$add[prop] = value;
}
});
if (message.properties) {
Object.keys(message.properties).forEach((prop) => {
const value = message.properties[prop];
if (value && propIncrements.includes(prop)) {
payload.$add[prop] = value;
}
});
}

return Object.keys(payload.$add).length > 0
? responseBuilderSimple(payload, message, 'incremental_properties', destination.Config)
Expand Down
10 changes: 5 additions & 5 deletions src/v0/destinations/slack/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,17 @@ const buildtemplateList = (templateListForThisEvent, eventTemplateSettings, even
const processTrack = (message, destination) => {
// logger.debug(JSON.stringify(destination));
const { Config } = destination;
const { eventChannelSettings, eventTemplateSettings, incomingWebhooksType, blacklistedEvents } =
const { eventChannelSettings, eventTemplateSettings, incomingWebhooksType, denyListOfEvents } =
Config;
const eventName = message.event;

if (!eventName) {
throw new InstrumentationError('Event name is required');
}
if (blacklistedEvents?.length > 0) {
const blackListedEvents = blacklistedEvents.map((item) => item.eventName);
if (blackListedEvents.includes(eventName)) {
throw new ConfigurationError('Event is blacklisted. Please check configuration.');
if (denyListOfEvents?.length > 0) {
const denyListofEvents = denyListOfEvents.map((item) => item.eventName);
if (denyListofEvents.includes(eventName)) {
throw new ConfigurationError('Event is denied. Please check configuration.');
}
}

Expand Down
14 changes: 7 additions & 7 deletions test/__tests__/data/slack_input.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
"trait": ""
}
],
"blacklistedEvents": [
"denyListOfEvents": [
{
"eventName": "black_event"
}
Expand Down Expand Up @@ -390,7 +390,7 @@
"trait": ""
}
],
"blacklistedEvents": [
"denyListOfEvents": [
{
"eventName": "black_event"
}
Expand Down Expand Up @@ -518,7 +518,7 @@
"trait": ""
}
],
"blacklistedEvents": [
"denyListOfEvents": [
{
"eventName": "black_event"
}
Expand Down Expand Up @@ -646,7 +646,7 @@
"trait": ""
}
],
"blacklistedEvents": [
"denyListOfEvents": [
{
"eventName": "black_event"
}
Expand Down Expand Up @@ -772,7 +772,7 @@
"trait": ""
}
],
"blacklistedEvents": [
"denyListOfEvents": [
{
"eventName": "black_event"
}
Expand Down Expand Up @@ -899,7 +899,7 @@
"trait": ""
}
],
"blacklistedEvents": [
"denyListOfEvents": [
{
"eventName": "black_event"
}
Expand Down Expand Up @@ -1369,7 +1369,7 @@
"trait": ""
}
],
"blacklistedEvents": [
"denyListOfEvents": [
{
"eventName": "black_event"
}
Expand Down
2 changes: 1 addition & 1 deletion test/__tests__/data/slack_output.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,6 @@
"error": "Something is wrong with the event template: '{{name}} performed {{event}} with {{properties. key1}} {{properties.key2}} and traits {{traitsList.hiji}}'"
},
{
"error": "Event is blacklisted. Please check configuration."
"error": "Event is denied. Please check configuration."
}
]

0 comments on commit 5a15022

Please sign in to comment.