refactor(ec2): pass log level to connect script

packages/core/resources/ec2_connect

@@ -2,7 +2,7 @@
 
 # Usage:
 #   When connecting to a dev environment
-#       AWS_REGION=… AWS_SSM_CLI=… STREAM_URL=… TOKEN=… LOG_FILE_LOCATION==… ./ec2_connect
+#       AWS_REGION=… AWS_SSM_CLI=… STREAM_URL=… TOKEN=… LOG_FILE_LOCATION==… DEBUG_LOG=… ./ec2_connect 
 
 set -e
 set -u
@@ -44,13 +44,21 @@ _ec2() {
 
 _main() {
     _log "=============================================================================="
-
-    _require AWS_SSM_CLI "${AWS_SSM_CLI:-}"
+    _require DEBUG_LOG "${DEBUG_LOG:-}"
     _require AWS_REGION "${AWS_REGION:-}"
+
+    _require SESSION_ID "${SESSION_ID:-}"
     _require_nolog STREAM_URL "${STREAM_URL:-}"
     _require_nolog TOKEN "${TOKEN:-}"
-    _require SESSION_ID "${SESSION_ID:-}"
-    _require LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}"
+
+    # Only log file paths when debug level is enabled.
+    if [ "${DEBUG_LOG:-}" -eq 1 ]; then
+        _require AWS_SSM_CLI "${AWS_SSM_CLI:-}"
+        _require LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}"
+    else
+        _require_nolog AWS_SSM_CLI "${AWS_SSM_CLI:-}"
+        _require_nolog LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}"
+    fi
 
     _ec2 "$AWS_SSM_CLI" "$AWS_REGION" "$STREAM_URL" "$TOKEN" "$SESSION_ID"
 }

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

@@ -242,7 +242,8 @@ export class Ec2Connecter implements vscode.Disposable {
         const ssmSession = await this.startSSMSession(selection.instanceId)
 
         const vars = getEc2SsmEnv(selection, ssm, ssmSession)
-        getLogger().info(`ec2: connect script logs at ${vars.LOG_FILE_LOCATION}`)
+        getLogger().debug(`ec2: connect script logs at ${vars.LOG_FILE_LOCATION}`)
+
         const envProvider = async () => {
             return { [sshAgentSocketVariable]: await startSshAgent(), ...vars }
         }

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

@@ -8,6 +8,7 @@ import { copyToClipboard } from '../../shared/utilities/messages'
 import { Ec2Selection } from './prompter'
 import { sshLogFileLocation } from '../../shared/sshConfig'
 import { SSM } from 'aws-sdk'
+import { getLogger } from '../../shared/logger'
 
 export function getIconCode(instance: SafeEc2Instance) {
     if (instance.LastSeenStatus === 'running') {
@@ -42,6 +43,7 @@ export function getEc2SsmEnv(
             STREAM_URL: session.StreamUrl,
             SESSION_ID: session.SessionId,
             TOKEN: session.TokenValue,
+            DEBUG_LOG: getLogger().logLevelEnabled('debug') ? 1 : 0,
         },
         process.env
     )

packages/core/src/shared/logger/activation.ts

@@ -13,7 +13,7 @@ import { resolvePath } from '../utilities/pathUtils'
 import fs from '../../shared/fs/fs'
 import { isWeb } from '../extensionGlobals'
 import { getUserAgent } from '../telemetry/util'
-import { isBeta } from '../vscode/env'
+import { isBeta, isDebugInstance } from '../vscode/env'
 
 /**
  * Activate Logger functionality for the extension.
@@ -46,7 +46,10 @@ export async function activate(
         const newLogLevel = fromVscodeLogLevel(logLevel)
         mainLogger.setLogLevel(newLogLevel) // Also logs a message.
     })
-    mainLogger.setLogLevel('debug') // HACK: set to "debug" when debugging the extension.
+
+    if (isDebugInstance()) {
+        mainLogger.setLogLevel('debug') // HACK: set to "debug" when debugging the extension.
+    }
 
     setLogger(mainLogger)