Skip to content

Commit

Permalink
Merge pull request #1791 from rudderlabs/main
Browse files Browse the repository at this point in the history
chore(release): pull main into develop post release v1.97.2
  • Loading branch information
sanpj2292 authored Nov 7, 2024
2 parents faa4fa6 + f9cca3b commit 1900eba
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 40 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
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.97.2](https://github.com/rudderlabs/rudder-config-schema/compare/v1.97.1...v1.97.2) (2024-11-07)


### Bug Fixes

* webhook url regex to support ports with valid dns ([#1788](https://github.com/rudderlabs/rudder-config-schema/issues/1788)) ([3d91ced](https://github.com/rudderlabs/rudder-config-schema/commit/3d91ced7213453e1c7c8128c0367ac13cf3cc868))

### [1.97.1](https://github.com/rudderlabs/rudder-config-schema/compare/v1.97.0...v1.97.1) (2024-11-01)


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-config-schema",
"version": "1.97.1",
"version": "1.97.2",
"description": "",
"main": "src/index.ts",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/webhook/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@
},
"webhookUrl": {
"type": "string",
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(https?:\\/\\/)(?![a-zA-Z0-9-]*\\.ngrok\\.io)(?!localhost|.*\\.localhost)([a-zA-Z0-9-]{1,63}\\.)+[a-zA-Z]{2,}(\\/.*)?$"
"pattern": "(^\\{\\{.*\\|\\|(.*)\\}\\}$)|(^env[.].+)|^(https?://)(?![a-zA-Z0-9-]*\\.ngrok\\.io)(?!localhost|.*\\.localhost)([a-zA-Z0-9-]{1,63}\\.)+[a-zA-Z]{2,}(:(6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5]\\d{4}|[1-9]\\d{1,3}))?(/.*)?$"
},
"webhookMethod": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion src/configurations/destinations/webhook/ui-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"value": "webhookUrl",
"required": true,
"placeholder": "http://www.abcd.com",
"regex": "^(https?:\\/\\/)(?![a-zA-Z0-9-]*\\.ngrok\\.io)(?!localhost|.*\\.localhost)([a-zA-Z0-9-]{1,63}\\.)+[a-zA-Z]{2,}(\\/.*)?$"
"regex": "^(https?://)(?![a-zA-Z0-9-]*\\.ngrok\\.io)(?!localhost|.*\\.localhost)([a-zA-Z0-9-]{1,63}\\.)+[a-zA-Z]{2,}(:(6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5]\\d{4}|[1-9]\\d{1,3}))?(/.*)?$"
},
{
"type": "singleSelect",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"category": "singer-protocol",
"displayName": "Klaviyo v2",
"options": {
"image": "rudderstack/source-klaviyo:v8.3.0",
"image": "rudderstack/source-klaviyo:v8.3.12",
"isBeta": true,
"hidden": false
},
Expand Down
169 changes: 135 additions & 34 deletions test/data/validation/destinations/webhook.json

Large diffs are not rendered by default.

0 comments on commit 1900eba

Please sign in to comment.