Merge branch 'master' into feature/inlinebug

Author: bywang56

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

@@ -133,6 +133,16 @@ export async function stopSpace(
     ctx: vscode.ExtensionContext,
     sageMakerClient?: SagemakerClient
 ) {
+    await tryRefreshNode(node)
+    if (node.getStatus() === 'Stopped' || node.getStatus() === 'Stopping') {
+        void vscode.window.showWarningMessage(`Space ${node.spaceApp.SpaceName} is already in Stopped/Stopping state.`)
+        return
+    } else if (node.getStatus() === 'Starting') {
+        void vscode.window.showWarningMessage(
+            `Space ${node.spaceApp.SpaceName} is in Starting state. Wait until it is Running to attempt stop again.`
+        )
+        return
+    }
     const spaceName = node.spaceApp.SpaceName!
     const confirmed = await showConfirmationMessage({
         prompt: `You are about to stop this space. Any active resource will also be stopped. Are you sure you want to stop the space?`,
@@ -179,7 +189,7 @@ export async function openRemoteConnect(
         void vscode.window.showErrorMessage(ConnectFromRemoteWorkspaceMessage)
         return
     }
-
+    await tryRefreshNode(node)
     if (node.getStatus() === 'Stopped') {
         //  In case of SMUS, we pass in a SM Client and for SM AI, it creates a new SM Client.
         const client = sageMakerClient ? sageMakerClient : new SagemakerClient(node.regionCode)

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

@@ -275,7 +275,8 @@ function isExcludedSourceFile(path: string): boolean {
     return sourceExcludedExtensions.some((extension) => path.endsWith(extension))
 }
 
-// zip all dependency files and all source files excluding "target" (contains large JARs) plus ".git" and ".idea" (may appear in diff.patch)
+// zip all dependency files and all source files
+// excludes "target" (contains large JARs) plus ".git", ".idea", and ".github" (may appear in diff.patch)
 export function getFilesRecursively(dir: string, isDependenciesFolder: boolean): string[] {
     const entries = nodefs.readdirSync(dir, { withFileTypes: true })
     const files = entries.flatMap((entry) => {
@@ -284,7 +285,12 @@ export function getFilesRecursively(dir: string, isDependenciesFolder: boolean):
             if (isDependenciesFolder) {
                 // include all dependency files
                 return getFilesRecursively(res, isDependenciesFolder)
-            } else if (entry.name !== 'target' && entry.name !== '.git' && entry.name !== '.idea') {
+            } else if (
+                entry.name !== 'target' &&
+                entry.name !== '.git' &&
+                entry.name !== '.idea' &&
+                entry.name !== '.github'
+            ) {
                 // exclude the above directories when zipping source code
                 return getFilesRecursively(res, isDependenciesFolder)
             } else {

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`
         }

packages/core/src/test/codewhisperer/commands/transformByQ.test.ts

@@ -503,6 +503,10 @@ dependencyManagement:
         await fs.mkdir(gitFolder)
         await fs.writeFile(path.join(gitFolder, 'config'), 'sample content for the test file')
 
+        const githubFolder = path.join(tempDir, '.github')
+        await fs.mkdir(githubFolder)
+        await fs.writeFile(path.join(githubFolder, 'config'), 'more sample content for the test file')
+
         const zippedFiles = getFilesRecursively(tempDir, false)
         assert.strictEqual(zippedFiles.length, 1)
     })