Merge pull request #1050 from snyk/fix/align-broker-server-url

pavel-snyk · web-flow · commit cc5284c00a88 · 2025-11-28T14:34:59.000+01:00
fix: align broker server url
diff --git a/config.default.json b/config.default.json
@@ -61,7 +61,7 @@
   "BROKER_CLIENT_CONFIGURATION": {
     "common": {
       "default": {
-        "BROKER_SERVER_URL": "https://broker2.snyk.io",
+        "BROKER_SERVER_URL": "https://broker.snyk.io",
         "BROKER_HEALTHCHECK_PATH": "/healthcheck"
       },
       "required": {}
diff --git a/config.default.jsontest b/config.default.jsontest
@@ -37,7 +37,7 @@
   "BROKER_CLIENT_CONFIGURATION": {
     "common": {
       "default": {
-        "BROKER_SERVER_URL": "https://broker2.snyk.io",
+        "BROKER_SERVER_URL": "https://broker.snyk.io",
         "BROKER_HEALTHCHECK_PATH": "/healthcheck"
       },
       "required": {}
diff --git a/config.universaltest.json b/config.universaltest.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         },
@@ -62,4 +62,4 @@
         "JIRA_HOSTNAME":"${JIRA_HOSTNAME}"
       }
     }
-  }
+  }
diff --git a/config.universaltest10.json b/config.universaltest10.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         },
@@ -62,4 +62,4 @@
         "JIRA_HOSTNAME":"${JIRA_HOSTNAME}"
       }
     }
-  }
+  }
diff --git a/config.universaltest11.json b/config.universaltest11.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         },
diff --git a/config.universaltest2.json b/config.universaltest2.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
@@ -31,4 +31,4 @@
         "GITLAB":"gitlab.dev.snyk.io"
       }
     }
-  }
+  }
diff --git a/config.universaltest3.json b/config.universaltest3.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
@@ -31,4 +31,4 @@
         "GITLAB":"gitlab.dev.snyk.io"
       }
     }
-  }
+  }
diff --git a/config.universaltest4.json b/config.universaltest4.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
@@ -28,4 +28,4 @@
         "craCompatible": true
       }
     }
-  }
+  }
diff --git a/config.universaltest5.json b/config.universaltest5.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
@@ -24,4 +24,4 @@
         "identifier": "${BROKER_TOKEN_1}"
       }
     }
-  }
+  }
diff --git a/config.universaltest6.json b/config.universaltest6.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
@@ -24,4 +24,4 @@
         "identifier": "${BROKER_TOKEN_1}"
       }
     }
-  }
+  }
diff --git a/config.universaltest7.json b/config.universaltest7.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
@@ -26,4 +26,4 @@
         "BITBUCKET_PAT": "${BEARER_PAT}"
       }
     }
-  }
+  }
diff --git a/config.universaltest8.json b/config.universaltest8.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
diff --git a/config.universaltest9.json b/config.universaltest9.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         },
diff --git a/config.universaltestpool.json b/config.universaltestpool.json
@@ -2,7 +2,7 @@
     "BROKER_CLIENT_CONFIGURATION": {
       "common": {
         "default": {
-          "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",
+          "BROKER_SERVER_URL": "https://broker.dev.snyk.io",
           "BROKER_HA_MODE_ENABLED": "false",
           "BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"
         }
@@ -44,4 +44,4 @@
         "JIRA_HOSTNAME":"${JIRA_HOSTNAME}"
       }
     }
-  }
+  }
diff --git a/test/unit/config.test.ts b/test/unit/config.test.ts
@@ -54,7 +54,7 @@ describe('config', () => {
       BROKER_CLIENT_VALIDATION_AUTHORIZATION_HEADER: 'token $GITHUB_TOKEN',
       BROKER_CLIENT_VALIDATION_URL: 'https://$GITHUB_API/user',
       BROKER_HEALTHCHECK_PATH: '/healthcheck',
-      BROKER_SERVER_URL: 'https://broker2.snyk.io',
+      BROKER_SERVER_URL: 'https://broker.snyk.io',
       GITHUB: 'github.com',
       GITHUB_API: 'api.github.com',
       GITHUB_GRAPHQL: 'api.github.com',
@@ -96,7 +96,7 @@ describe('config', () => {
       BROKER_CLIENT_VALIDATION_BASIC_AUTH: 'PAT:123',
       BROKER_CLIENT_VALIDATION_URL:
         'https://hostname/org/_apis/git/repositories',
-      BROKER_SERVER_URL: 'https://broker2.dev.snyk.io',
+      BROKER_SERVER_URL: 'https://broker.dev.snyk.io',
       BROKER_HA_MODE_ENABLED: 'false',
       BROKER_DISPATCHER_BASE_URL: 'https://api.dev.snyk.io',
       BROKER_HEALTHCHECK_PATH: '/healthcheck',
@@ -132,7 +132,7 @@ describe('config', () => {
     expect(configData).toEqual({
       BROKER_CLIENT_VALIDATION_AUTHORIZATION_HEADER: 'token 123',
       BROKER_CLIENT_VALIDATION_URL: 'https://api.github.com/user',
-      BROKER_SERVER_URL: 'https://broker2.dev.snyk.io',
+      BROKER_SERVER_URL: 'https://broker.dev.snyk.io',
       BROKER_HA_MODE_ENABLED: 'false',
       BROKER_DISPATCHER_BASE_URL: 'https://api.dev.snyk.io',
       BROKER_HEALTHCHECK_PATH: '/healthcheck',
@@ -179,7 +179,7 @@ describe('config', () => {
       BROKER_CLIENT_URL: 'dummy',
       BROKER_CLIENT_VALIDATION_AUTHORIZATION_HEADER: 'token 123',
       BROKER_CLIENT_VALIDATION_URL: 'https://api.github.com/user',
-      BROKER_SERVER_URL: 'https://broker2.dev.snyk.io',
+      BROKER_SERVER_URL: 'https://broker.dev.snyk.io',
       BROKER_HA_MODE_ENABLED: 'false',
       BROKER_DISPATCHER_BASE_URL: 'https://api.dev.snyk.io',
       BROKER_HEALTHCHECK_PATH: '/healthcheck',
@@ -241,7 +241,7 @@ describe('config', () => {
     expect(configData).toEqual({
       BROKER_CLIENT_VALIDATION_AUTHORIZATION_HEADER: 'token 123',
       BROKER_CLIENT_VALIDATION_URL: 'https://api.github.com/user',
-      BROKER_SERVER_URL: 'https://broker2.dev.snyk.io',
+      BROKER_SERVER_URL: 'https://broker.dev.snyk.io',
       BROKER_HA_MODE_ENABLED: 'false',
       BROKER_DISPATCHER_BASE_URL: 'https://api.dev.snyk.io',
       BROKER_HEALTHCHECK_PATH: '/healthcheck',
@@ -291,7 +291,7 @@ describe('config', () => {
     expect(configData).toEqual({
       BROKER_CLIENT_VALIDATION_AUTHORIZATION_HEADER: 'token 456',
       BROKER_CLIENT_VALIDATION_URL: 'https://api.github.com/user',
-      BROKER_SERVER_URL: 'https://broker2.dev.snyk.io',
+      BROKER_SERVER_URL: 'https://broker.dev.snyk.io',
       BROKER_HA_MODE_ENABLED: 'false',
       BROKER_DISPATCHER_BASE_URL: 'https://api.dev.snyk.io',
       BROKER_HEALTHCHECK_PATH: '/healthcheck',

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"BROKER_CLIENT_CONFIGURATION": {`
`3`	`3`	`"common": {`
`4`	`4`	`"default": {`
`5`		`- "BROKER_SERVER_URL": "https://broker2.dev.snyk.io",`
	`5`	`+ "BROKER_SERVER_URL": "https://broker.dev.snyk.io",`
`6`	`6`	`"BROKER_HA_MODE_ENABLED": "false",`
`7`	`7`	`"BROKER_DISPATCHER_BASE_URL": "https://api.dev.snyk.io"`
`8`	`8`	`},`
`@@ -62,4 +62,4 @@`
`62`	`62`	`"JIRA_HOSTNAME":"${JIRA_HOSTNAME}"`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`- }`
	`65`	`+ }`