diff --git a/CHANGELOG.md b/CHANGELOG.md index cd89b1b6e..39e274ed1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.94.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.94.0...v1.94.1) (2024-10-01) + + +### Bug Fixes + +* revert redshift serverless bq partitioning configuration changes ([#1727](https://github.com/rudderlabs/rudder-config-schema/issues/1727)) ([f2011dc](https://github.com/rudderlabs/rudder-config-schema/commit/f2011dce9330e697eca5d9d762a11580cc28ea66)) + ## [1.94.0](https://github.com/rudderlabs/rudder-config-schema/compare/v1.93.1...v1.94.0) (2024-09-30) diff --git a/package-lock.json b/package-lock.json index 9cfc0fbd8..fbec2e5c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudder-config-schema", - "version": "1.94.0", + "version": "1.94.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rudder-config-schema", - "version": "1.94.0", + "version": "1.94.1", "license": "MIT", "dependencies": { "ajv": "^8.12.0", diff --git a/package.json b/package.json index 19e93e80d..a36b32ebf 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudder-config-schema", - "version": "1.94.0", + "version": "1.94.1", "description": "", "main": "src/index.ts", "private": true, diff --git a/src/configurations/destinations/bq/db-config.json b/src/configurations/destinations/bq/db-config.json index dc87d8e71..c9733b01a 100644 --- a/src/configurations/destinations/bq/db-config.json +++ b/src/configurations/destinations/bq/db-config.json @@ -35,9 +35,7 @@ "skipUsersTable", "jsonPaths", "underscoreDivideNumbers", - "allowUsersContextTraits", - "partitionColumn", - "partitionType" + "allowUsersContextTraits" ], "android": [ "connectionMode", diff --git a/src/configurations/destinations/bq/schema.json b/src/configurations/destinations/bq/schema.json index ca4b66f9d..8a1a5b836 100644 --- a/src/configurations/destinations/bq/schema.json +++ b/src/configurations/destinations/bq/schema.json @@ -33,16 +33,6 @@ "pattern": "^(5|15|30|60|180|360|720|1440)$", "default": "180" }, - "partitionColumn": { - "type": "string", - "pattern": "^(_PARTITIONTIME|loaded_at|received_at)$", - "default": "_PARTITIONTIME" - }, - "partitionType": { - "type": "string", - "pattern": "^(hour|day)$", - "default": "day" - }, "syncStartAt": { "type": "string" }, diff --git a/src/configurations/destinations/bq/ui-config.json b/src/configurations/destinations/bq/ui-config.json index 41760ea6b..8a10f689b 100644 --- a/src/configurations/destinations/bq/ui-config.json +++ b/src/configurations/destinations/bq/ui-config.json @@ -142,52 +142,6 @@ }, "required": false, "footerNote": "Note: Please specify time in UTC" - }, - { - "type": "singleSelect", - "immutable": true, - "label": "Partition Column", - "value": "partitionColumn", - "options": [ - { - "name": "Ingestion Time", - "value": "_PARTITIONTIME" - }, - { - "name": "Loaded At", - "value": "loaded_at" - }, - { - "name": "Received At", - "value": "received_at" - } - ], - "defaultOption": { - "name": "Ingestion Time", - "value": "_PARTITIONTIME" - }, - "required": false - }, - { - "type": "singleSelect", - "immutable": true, - "label": "Partition Type", - "value": "partitionType", - "options": [ - { - "name": "Hour", - "value": "hour" - }, - { - "name": "Day", - "value": "day" - } - ], - "defaultOption": { - "name": "Day", - "value": "day" - }, - "required": false } ] }, diff --git a/src/configurations/destinations/rs/db-config.json b/src/configurations/destinations/rs/db-config.json index c1fe5e62e..6c6d9de0c 100644 --- a/src/configurations/destinations/rs/db-config.json +++ b/src/configurations/destinations/rs/db-config.json @@ -44,8 +44,6 @@ "iamRoleARNForAuth", "clusterId", "clusterRegion", - "useServerless", - "workgroupName", "bucketName", "iamRoleARN", "roleBasedAuth", diff --git a/src/configurations/destinations/rs/schema.json b/src/configurations/destinations/rs/schema.json index d7678a83b..5290eb6d8 100644 --- a/src/configurations/destinations/rs/schema.json +++ b/src/configurations/destinations/rs/schema.json @@ -941,51 +941,19 @@ "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{0,100})$" }, + "clusterId": { + "type": "string", + "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$" + }, "clusterRegion": { "type": "string", "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$" }, "useIAMForAuth": { "const": true - }, - "useServerless": { - "type": "boolean", - "default": false } }, - "anyOf": [ - { - "properties": { - "clusterId": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$" - }, - "useServerless": { - "const": false - }, - "useIAMForAuth": { - "const": true - } - }, - "required": ["clusterId", "useIAMForAuth"] - }, - { - "properties": { - "workgroupName": { - "type": "string", - "pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$" - }, - "useIAMForAuth": { - "const": true - }, - "useServerless": { - "const": true - } - }, - "required": ["workgroupName", "useIAMForAuth", "useServerless"] - } - ], - "required": ["clusterRegion", "iamRoleARNForAuth", "useIAMForAuth"] + "required": ["clusterId", "clusterRegion", "iamRoleARNForAuth", "useIAMForAuth"] } }, { diff --git a/src/configurations/destinations/rs/ui-config.json b/src/configurations/destinations/rs/ui-config.json index 5e8d04057..94991e2b2 100644 --- a/src/configurations/destinations/rs/ui-config.json +++ b/src/configurations/destinations/rs/ui-config.json @@ -40,29 +40,12 @@ "placeholder": "5439", "required": true }, - { - "type": "checkbox", - "preRequisiteField": [ - { - "name": "useIAMForAuth", - "selectedValue": true - } - ], - "label": "Use Redshift Serverless", - "value": "useServerless", - "required": false, - "default": false - }, { "type": "textInput", "preRequisiteField": [ { "name": "useIAMForAuth", "selectedValue": true - }, - { - "name": "useServerless", - "selectedValue": false } ], "label": "Cluster Id", @@ -72,25 +55,6 @@ "placeholder": "Cluster Identifier", "required": true }, - { - "type": "textInput", - "preRequisiteField": [ - { - "name": "useIAMForAuth", - "selectedValue": true - }, - { - "name": "useServerless", - "selectedValue": true - } - ], - "label": "Workgroup Name", - "value": "workgroupName", - "regex": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(.{1,255})$", - "regexErrorMessage": "Invalid Workgroup Name", - "placeholder": "Workgroup Name", - "required": true - }, { "type": "textInput", "preRequisiteField": [ diff --git a/test/data/validation/destinations/bq.json b/test/data/validation/destinations/bq.json index feed21204..8ecb38f76 100644 --- a/test/data/validation/destinations/bq.json +++ b/test/data/validation/destinations/bq.json @@ -13,74 +13,6 @@ }, "result": true }, - { - "config": { - "project": "test-gcs-project", - "location": "", - "bucketName": "test-bucket", - "prefix": "xyzxx", - "namespace": "eu_new3", - "partitionColumn": "_PARTITIONTIME", - "partitionType": "day", - "credentials": "{}", - "syncFrequency": "30", - "testConnection": false, - "testConnectionTS": 1621402528550 - }, - "result": true - }, - { - "config": { - "project": "test-gcs-project", - "location": "", - "bucketName": "test-bucket", - "prefix": "xyzxx", - "namespace": "eu_new3", - "partitionColumn": "received_at", - "partitionType": "hour", - "credentials": "{}", - "syncFrequency": "30", - "testConnection": false, - "testConnectionTS": 1621402528550 - }, - "result": true - }, - { - "config": { - "project": "test-gcs-project", - "location": "", - "bucketName": "test-bucket", - "prefix": "xyzxx", - "namespace": "eu_new3", - "partitionColumn": "invalid", - "partitionType": "day", - "credentials": "{}", - "syncFrequency": "30", - "testConnection": false, - "testConnectionTS": 1621402528550 - }, - "result": false, - "error": [ - "partitionColumn must match pattern \"^(_PARTITIONTIME|loaded_at|received_at|timestamp)$\"" - ] - }, - { - "config": { - "project": "test-gcs-project", - "location": "", - "bucketName": "test-bucket", - "prefix": "xyzxx", - "namespace": "eu_new3", - "partitionColumn": "_PARTITIONTIME", - "partitionType": "invalid", - "credentials": "{}", - "syncFrequency": "30", - "testConnection": false, - "testConnectionTS": 1621402528550 - }, - "result": false, - "error": ["partitionType must match pattern \"^(hour|day|month|year)$\""] - }, { "config": { "project": "test-gcs-project", diff --git a/test/data/validation/destinations/rs.json b/test/data/validation/destinations/rs.json index 966873298..7419ae921 100644 --- a/test/data/validation/destinations/rs.json +++ b/test/data/validation/destinations/rs.json @@ -125,117 +125,11 @@ "result": false, "err": [ " must have required property 'clusterId'", - " must have required property 'workgroupName'", - " must have required property 'useServerless'", - " must match a schema in anyOf", " must have required property 'clusterRegion'", " must have required property 'iamRoleARNForAuth'", " must match \"then\" schema" ] }, - { - "config": { - "host": "", - "password": "", - "port": "", - "database": "test-database", - "user": "test-user", - "useIAMForAuth": true, - "useServerless": false, - "iamRoleARNForAuth": "iamRoleARNForAuth", - "clusterId": "clusterId", - "clusterRegion": "clusterRegion", - "useSSH": false, - "syncFrequency": "30", - "enableSSE": false, - "useRudderStorage": false, - "useSTSTokens": false, - "bucketName": "test-bucket", - "roleBasedAuth": false, - "accessKeyID": "", - "accessKey": "" - }, - "result": true - }, - { - "config": { - "host": "", - "password": "", - "port": "", - "database": "test-database", - "user": "test-user", - "useIAMForAuth": true, - "useServerless": true, - "iamRoleARNForAuth": "iamRoleARNForAuth", - "clusterId": "clusterId", - "clusterRegion": "clusterRegion", - "useSSH": false, - "syncFrequency": "30", - "enableSSE": false, - "useRudderStorage": false, - "useSTSTokens": false, - "bucketName": "test-bucket", - "roleBasedAuth": false, - "accessKeyID": "", - "accessKey": "" - }, - "result": false, - "err": [ - "useServerless must be equal to constant", - " must have required property 'workgroupName'", - " must match a schema in anyOf", - " must match \"then\" schema" - ] - }, - { - "config": { - "host": "", - "password": "", - "port": "", - "database": "test-database", - "user": "test-user", - "useIAMForAuth": true, - "useServerless": true, - "iamRoleARNForAuth": "iamRoleARNForAuth", - "workgroupName": "workgroupName", - "clusterRegion": "clusterRegion", - "useSSH": false, - "syncFrequency": "30", - "enableSSE": false, - "useRudderStorage": false, - "useSTSTokens": false, - "bucketName": "test-bucket", - "roleBasedAuth": false, - "accessKeyID": "", - "accessKey": "" - }, - "result": true - }, - { - "config": { - "host": "", - "password": "", - "port": "", - "database": "test-database", - "user": "test-user", - "useIAMForAuth": true, - "useServerless": true, - "iamRoleARNForAuth": "iamRoleARNForAuth", - "clusterId": "clusterId", - "workgroupName": "workgroupName", - "clusterRegion": "clusterRegion", - "useSSH": false, - "syncFrequency": "30", - "enableSSE": false, - "useRudderStorage": false, - "useSTSTokens": false, - "bucketName": "test-bucket", - "roleBasedAuth": false, - "accessKeyID": "", - "accessKey": "" - }, - "result": true - }, { "config": { "host": "test-host",