Merge branch 'master' into master

Author: PotatoWKY

packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts

@@ -17,14 +17,14 @@ import globals from '../../../shared/extensionGlobals'
 function collectDependenciesAndMetadata(dependenciesFolderPath: string, workingDirPath: string) {
     getLogger().info('CodeTransformation: running mvn clean test-compile with maven JAR')
 
-    const baseCommand = transformByQState.getMavenName()
+    const baseCommand = transformByQState.getMavenName() // always 'mvn'
     const jarPath = globals.context.asAbsolutePath(path.join('resources', 'amazonQCT', 'QCT-Maven-1-0-156-0.jar'))
 
     getLogger().info('CodeTransformation: running Maven extension with JAR')
 
     const args = [
-        `-Dmaven.ext.class.path=${jarPath}`,
-        `-Dcom.amazon.aws.developer.transform.jobDirectory=${dependenciesFolderPath}`,
+        `-Dmaven.ext.class.path="${jarPath}"`,
+        `-Dcom.amazon.aws.developer.transform.jobDirectory="${dependenciesFolderPath}"`,
         'clean',
         'test-compile',
     ]

packages/core/src/shared/sshConfig.ts

@@ -208,7 +208,7 @@ Host ${this.configHostName}
 
     protected createSSHConfigSection(proxyCommand: string): string {
         if (this.scriptPrefix === 'sagemaker_connect') {
-            return `${this.getSageMakerSSHConfig(proxyCommand)}User '%r'\n`
+            return `${this.getSageMakerSSHConfig(proxyCommand)}`
         } else if (this.keyPath) {
             return `${this.getBaseSSHConfig(proxyCommand)}IdentityFile '${this.keyPath}'\n    User '%r'\n`
         }