Skip to content

Commit

Permalink
Merge branch 'develop' into feat.warehouseNewFormBuilder
Browse files Browse the repository at this point in the history
  • Loading branch information
@cisse21
cisse21 committed Mar 5, 2024
2 parents 6606970 + 46ebb73 commit 878cb48
Show file tree
Hide file tree
Showing 16 changed files with 205 additions and 24 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
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.66.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.66.0...v1.66.1) (2024-03-04)


### Bug Fixes

* amplitude fix for user operations ([#1249](https://github.com/rudderlabs/rudder-config-schema/issues/1249)) ([1581331](https://github.com/rudderlabs/rudder-config-schema/commit/1581331260b80fb93abf539b769ffdebe3312c84))

## [1.66.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.65.0...v1.66.0) (2024-02-27)


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

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-config-schema",
"version": "1.66.0",
"version": "1.66.1",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
3 changes: 2 additions & 1 deletion src/configurations/destinations/am/db-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@
"userProvidedPageEventString",
"useUserDefinedPageEventName",
"userProvidedScreenEventString",
"useUserDefinedScreenEventName"
"useUserDefinedScreenEventName",
"enableEnhancedUserOperations"
],
"web": [
"useNativeSDK",
Expand Down
4 changes: 4 additions & 0 deletions src/configurations/destinations/am/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
}
}
},
"enableEnhancedUserOperations": {
"type": "boolean",
"default": false
},
"apiSecret": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$"
Expand Down
21 changes: 21 additions & 0 deletions src/configurations/destinations/am/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,27 @@
],
"condition": "or"
}
},
{
"type": "checkbox",
"label": "Enbale Support for enhanced user operations",
"configKey": "enableEnhancedUserOperations",
"note": "Enable support for enhanced user operations like set, setOnce, unset, increment, append, prepend, and remove for user traits in all flows",
"default": false,
"preRequisites": {
"fields": [
{
"configKey": "connectionModes.cloud",
"value": true
}
],
"featureFlags": [
{
"configKey": "AMP_amplitude-enable-enhanced-user-operations",
"value": true
}
]
}
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/bq/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"type": "textInput",
"label": "Prefix",
"configKey": "prefix",
"regex": "^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Prefix",
"placeholder": "e.g: rudder",
"secret": false,
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/clickhouse/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
"secret": false,
"note": [
{
"test": "Instructions for creating IAM Role",
"text": "Instructions for creating IAM Role",
"link": "https://www.rudderstack.com/docs/destinations/aws-iam-role-for-rudderstack/"
}
],
Expand Down
16 changes: 12 additions & 4 deletions src/configurations/destinations/deltalake/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@
},
{
"type": "checkbox",
"label": "Use location for Databricks",
"label": "Use catalog for Databricks",
"configKey": "useCatalog",
"default": false
},
{
"type": "textInput",
"label": "Catalog",
"configKey": "catalog",
"regex": "^(.*)$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Catalog",
"placeholder": "e.g: iosCatalog",
"secret": false,
Expand Down Expand Up @@ -168,13 +168,21 @@
"type": "checkbox",
"label": "Use Prefix for Deltalake",
"configKey": "usePrefix",
"default": false
"default": false,
"preRequisites": {
"fields": [
{
"configKey": "useRudderStorage",
"value": false
}
]
}
},
{
"type": "textInput",
"label": "Prefix",
"configKey": "prefix",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Prefix",
"placeholder": "e.g: rudder",
"secret": false,
Expand Down
6 changes: 3 additions & 3 deletions src/configurations/destinations/gcs_datalake/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"If configured, all data pushed by rudderstack will be at https://storage.googleapis.com/<bucketName>/<prefix>/"
],
"configKey": "prefix",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Prefix",
"secret": false,
"preRequisites": {
Expand All @@ -63,7 +63,7 @@
"If configured, table data would be pushed to <table-name>/<table-suffix>/"
],
"configKey": "tableSuffix",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|.*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Table suffix path",
"secret": false,
"preRequisites": {
Expand All @@ -85,7 +85,7 @@
],
"regexErrorMessage": "Invalid Credentials",
"placeholder": "",
"secret": true
"secret": false
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/mssql/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"configKey": "port",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Port",
"placeholder": "14X3",
"placeholder": "1433",
"secret": false
}
]
Expand Down
6 changes: 6 additions & 0 deletions src/configurations/destinations/postgres/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,12 @@
"regexErrorMessage": "Invalid Role ARN",
"placeholder": "e.g: arn:aws:iam::123456789012:role/S3Access",
"secret": false,
"note": [
{
"text": "Instructions for creating IAM Role",
"link": "https://www.rudderstack.com/docs/destinations/aws-iam-role-for-rudderstack/"
}
],
"preRequisites": {
"fields": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/rs/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
"type": "textInput",
"label": "Prefix",
"configKey": "prefix",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Prefix",
"placeholder": "e.g: rudder",
"secret": false,
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/s3_datalake/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"If configured, all data pushed by rudderstack will be at s3://<bucketName>/<prefix>/"
],
"configKey": "prefix",
"regex": ".*",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Prefix",
"secret": false,
"preRequisites": {
Expand Down
36 changes: 28 additions & 8 deletions src/configurations/destinations/snowflake/ui-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"type": "textInput",
"label": "Role",
"configKey": "role",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Role",
"placeholder": "e.g: RUDDER_ROLE",
"secret": false,
Expand Down Expand Up @@ -124,15 +124,23 @@
},
{
"type": "checkbox",
"label": "Use Prefix for RedShift",
"label": "Use Prefix for Snowflake",
"configKey": "usePrefix",
"default": false
"default": false,
"preRequisites": {
"fields": [
{
"configKey": "useRudderStorage",
"value": false
}
]
}
},
{
"type": "textInput",
"label": "Prefix",
"configKey": "prefix",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Prefix",
"placeholder": "e.g: rudder",
"secret": false,
Expand Down Expand Up @@ -237,13 +245,25 @@
"type": "checkbox",
"label": "Use Storage Integration for AWS",
"configKey": "useStorageIntegration",
"default": false
"default": false,
"preRequisites": {
"fields": [
{
"configKey": "useRudderStorage",
"value": false
},
{
"configKey": "cloudProvider",
"value": "AWS"
}
]
}
},
{
"type": "textInput",
"label": "Storage Integration",
"configKey": "storageIntegration",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Storage Integration",
"placeholder": "e.g: aws_int",
"note": [
Expand Down Expand Up @@ -274,7 +294,7 @@
"type": "textInput",
"label": "Storage Integration",
"configKey": "storageIntegration",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Storage Integration",
"placeholder": "e.g: gcs_int",
"note": [
Expand All @@ -301,7 +321,7 @@
"type": "textInput",
"label": "Storage Integration",
"configKey": "storageIntegration",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$",
"regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,100})$",
"regexErrorMessage": "Invalid Storage Integration",
"note": [
{
Expand Down
Loading

0 comments on commit 878cb48

Please sign in to comment.