Merge pull request #4771 from aws/jpinkney-aws/cc-fix

fix: User is able to create a dev environment inside of a dev environment

Author: jpinkney-aws

.changes/next-release/Bug Fix-51277dc2-c134-450c-8394-b0937055969b.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Codecatalyst: User can create a dev environment inside a dev environment"
+}

packages/core/src/codecatalyst/commands.ts

@@ -26,6 +26,7 @@ import { CreateDevEnvironmentRequest, UpdateDevEnvironmentRequest } from 'aws-sd
 import { Auth } from '../auth/auth'
 import { SsoConnection } from '../auth/connection'
 import { showManageConnections } from '../auth/ui/vue/show'
+import { isInDevEnv } from '../shared/vscode/env'
 
 /** "List CodeCatalyst Commands" command. */
 export async function listCommands(): Promise<void> {
@@ -205,6 +206,14 @@ type Inject<T, U> = T extends (...args: infer P) => infer R
 
 type WithClient<T> = Parameters<Inject<T, CodeCatalystClient>>
 
+class RemoteContextError extends ToolkitError {
+    constructor() {
+        super('Cannot connect from a remote context. Try again from a local VS Code instance.', {
+            code: 'ConnectedToRemote',
+        })
+    }
+}
+
 export class CodeCatalystCommands {
     public readonly withClient: ClientInjector
     public readonly bindClient = createCommandDecorator(this)
@@ -222,6 +231,9 @@ export class CodeCatalystCommands {
     }
 
     public createDevEnv(): Promise<void> {
+        if (vscode.env.remoteName === 'ssh-remote' && isInDevEnv()) {
+            throw new RemoteContextError()
+        }
         return this.withClient(showCreateDevEnv, globals.context, CodeCatalystCommands.declared)
     }
 
@@ -268,10 +280,8 @@ export class CodeCatalystCommands {
         targetPath?: string,
         connection?: { startUrl: string; region: string }
     ): Promise<void> {
-        if (vscode.env.remoteName === 'ssh-remote') {
-            throw new ToolkitError('Cannot connect from a remote context. Try again from a local VS Code instance.', {
-                code: 'ConnectedToRemote',
-            })
+        if (vscode.env.remoteName === 'ssh-remote' && isInDevEnv()) {
+            throw new RemoteContextError()
         }
 
         const devenv = id ?? (await this.selectDevEnv())