insert another copy

Author: Hweinstock

packages/core/src/awsService/ec2/explorer/ec2ParentNode.ts

@@ -47,13 +47,6 @@ export class Ec2ParentNode extends AWSTreeNodeBase {
         }
         this.pollingSet.start(instanceId)
     }
-    // Temporary inserted copy
-    public trackPendingNode2(instanceId: string) {
-        if (!this.ec2InstanceNodes.has(instanceId)) {
-            throw new Error(`Attempt to track ec2 node ${instanceId} that isn't a child`)
-        }
-        this.pollingSet.start(instanceId)
-    }
 
     public async updateChildren(): Promise<void> {
         const ec2Instances = await (await this.ec2Client.getInstances()).toMap((instance) => instance.InstanceId)

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

@@ -25,7 +25,7 @@ import { createBoundProcess } from '../../codecatalyst/model'
 import { getLogger } from '../../shared/logger/logger'
 import { CancellationError, Timeout } from '../../shared/utilities/timeoutUtils'
 import { showMessageWithCancel } from '../../shared/utilities/messages'
-import { SshConfig } from '../../shared/sshConfig'
+import { SshConfig, sshLogFileLocation } from '../../shared/sshConfig'
 import { SshKeyPair } from './sshKeyPair'
 import { Ec2SessionTracker } from './remoteSessionManager'
 import { getEc2SsmEnv } from './utils'
@@ -288,3 +288,22 @@ export class Ec2Connecter implements vscode.Disposable {
         throw new ToolkitError(`Unrecognized OS name ${osName} on instance ${instanceId}`, { code: 'UnknownEc2OS' })
     }
 }
+
+// Manually inserted copy
+export function notACopy(
+    selection: Ec2Selection,
+    ssmPath: string,
+    session: SSM.StartSessionResponse
+): NodeJS.ProcessEnv {
+    return Object.assign(
+        {
+            AWS_REGION: selection.region,
+            AWS_SSM_CLI: ssmPath,
+            LOG_FILE_LOCATION: sshLogFileLocation('ec2', selection.instanceId),
+            STREAM_URL: session.StreamUrl,
+            SESSION_ID: session.SessionId,
+            TOKEN: session.TokenValue,
+        },
+        process.env
+    )
+}