refactor to avoid module-level args

Author: Hweinstock

src/codecatalyst/model.ts

@@ -33,8 +33,8 @@ import { VscodeRemoteConnection, ensureDependencies } from '../shared/remoteSess
 import { VscodeRemoteSshConfig, sshLogFileLocation } from '../shared/vscodeRemoteSshConfig'
 
 export type DevEnvironmentId = Pick<DevEnvironment, 'id' | 'org' | 'project'>
-export const hostNamePrefix = 'aws-devenv-'
-export const connectScriptPrefix = 'codecatalyst_connect'
+// export const hostNamePrefix = 'aws-devenv-'
+// export const connectScriptPrefix = 'codecatalyst_connect'
 
 export const docs = {
     vscode: {
@@ -142,10 +142,6 @@ export function bearerTokenCacheLocation(devenvId: string): string {
     return path.join(globals.context.globalStorageUri.fsPath, `codecatalyst.${devenvId}.token`)
 }
 
-export function getHostNameFromEnv(env: DevEnvironmentId): string {
-    return `${hostNamePrefix}${env.id}`
-}
-
 export interface ConnectedDevEnv {
     readonly summary: DevEnvironment
     readonly devenvClient: DevEnvClient
@@ -209,7 +205,8 @@ export async function prepareDevEnvConnection(
     { topic, timeout }: { topic?: string; timeout?: Timeout } = {}
 ): Promise<DevEnvConnection> {
     const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap()
-    const sshConfig = new VscodeRemoteSshConfig(ssh, hostNamePrefix, connectScriptPrefix)
+    const hostNamePrefix = 'aws-devenv-'
+    const sshConfig = new VscodeRemoteSshConfig(ssh, hostNamePrefix, 'codecatalyst_connect')
     const config = await sshConfig.ensureValid()
 
     if (config.isErr()) {
@@ -225,7 +222,7 @@ export async function prepareDevEnvConnection(
         projectName: project.name,
     })
 
-    const hostname = getHostNameFromEnv({ id, org, project })
+    const hostname = `${hostNamePrefix}${id}`
     const logPrefix = topic ? `codecatalyst ${topic} (${id})` : `codecatalyst (${id})`
     const logger = (data: string) => getLogger().verbose(`${logPrefix}: ${data}`)
     const envProvider = createCodeCatalystEnvProvider(client, ssm, runningDevEnv)
@@ -263,7 +260,7 @@ export async function openDevEnv(
         const repo = env.devenv.repositories.length == 1 ? env.devenv.repositories[0].repositoryName : undefined
         targetPath = repo ? `/projects/${repo}` : '/projects'
     }
-    await startVscodeRemote(env.SessionProcess, getHostNameFromEnv(env.devenv), targetPath, env.vscPath)
+    await startVscodeRemote(env.SessionProcess, env.hostname, targetPath, env.vscPath)
 }
 
 // The "codecatalyst_connect" metric should really be splt into two parts:

src/ec2/model.ts

@@ -30,9 +30,6 @@ interface Ec2RemoteEnv extends VscodeRemoteConnection {
     selection: Ec2Selection
 }
 
-const ec2ConnectScriptPrefix = 'ec2_connect'
-const hostNamePrefix = 'ec2-'
-
 export class Ec2ConnectionManager {
     protected ssmClient: SsmClient
     protected ec2Client: Ec2Client
@@ -177,9 +174,8 @@ export class Ec2ConnectionManager {
         const remoteUser = await this.getRemoteUser(selection.instanceId)
         const remoteEnv = await this.prepareEc2RemoteEnvWithProgress(selection, remoteUser)
 
-        const fullHostName = `${hostNamePrefix}${selection.instanceId}`
         try {
-            await startVscodeRemote(remoteEnv.SessionProcess, fullHostName, '/', remoteEnv.vscPath, remoteUser)
+            await startVscodeRemote(remoteEnv.SessionProcess, remoteEnv.hostname, '/', remoteEnv.vscPath, remoteUser)
         } catch (err) {
             this.throwGeneralConnectionError(selection, err as Error)
         }
@@ -195,7 +191,8 @@ export class Ec2ConnectionManager {
         const logger = this.configureRemoteConnectionLogger(selection.instanceId)
         const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap()
         const keyPath = await this.configureSshKeys(selection, remoteUser)
-        const sshConfig = new VscodeRemoteSshConfig(ssh, hostNamePrefix, ec2ConnectScriptPrefix, keyPath)
+        const hostNamePrefix = 'aws-ec2-'
+        const sshConfig = new VscodeRemoteSshConfig(ssh, hostNamePrefix, 'ec2-connect', keyPath)
 
         const config = await sshConfig.ensureValid()
         if (config.isErr()) {
@@ -216,7 +213,7 @@ export class Ec2ConnectionManager {
         })
 
         return {
-            hostname: selection.instanceId,
+            hostname: `${hostNamePrefix}${selection.instanceId}`,
             envProvider,
             sshPath: ssh,
             vscPath: vsc,