Merge master into feature/code-diff

Author: aws-toolkit-automation

packages/core/src/awsService/sagemaker/model.ts

@@ -174,14 +174,14 @@ export async function prepareDevEnvConnection(
                   const logFileLocation = path.join(ctx.globalStorageUri.fsPath, 'hyperpod-connection.log')
                   const decodedWsUrl =
                       wsUrl
-                          ?.replace(/&/g, '&')
-                          .replace(/'/g, "'")
-                          .replace(/"/g, '"') || ''
+                          ?.replace(/'/g, "'")
+                          .replace(/"/g, '"')
+                          .replace(/&/g, '&') || ''
                   const decodedToken =
                       token
-                          ?.replace(/&/g, '&')
-                          .replace(/'/g, "'")
-                          .replace(/"/g, '"') || ''
+                          ?.replace(/'/g, "'")
+                          .replace(/"/g, '"')
+                          .replace(/&/g, '&') || ''
                   const region = decodedWsUrl ? extractRegionFromStreamUrl(decodedWsUrl) : ''
 
                   const hyperPodEnv: NodeJS.ProcessEnv = {