Remove logger parameter in favor of using getLogger (#780)

Author: awschristou

src/shared/sam/activation.ts

@@ -17,7 +17,6 @@ import { CodeLensProviderParams } from '../codelens/codeLensUtils'
 import * as csLensProvider from '../codelens/csharpCodeLensProvider'
 import * as pyLensProvider from '../codelens/pythonCodeLensProvider'
 import * as tsLensProvider from '../codelens/typescriptCodeLensProvider'
-import { getLogger } from '../logger'
 import { RegionProvider } from '../regions/regionProvider'
 import { DefaultSettingsConfiguration, SettingsConfiguration } from '../settingsConfiguration'
 import { TelemetryService } from '../telemetry/telemetryService'
@@ -39,12 +38,10 @@ export async function activate(activateArguments: {
     outputChannel: vscode.OutputChannel
     telemetryService: TelemetryService
 }): Promise<void> {
-    const logger = getLogger()
-    const channelLogger = getChannelLogger(activateArguments.outputChannel, logger)
+    const channelLogger = getChannelLogger(activateArguments.outputChannel)
 
     initializeSamCliContext({
-        settingsConfiguration: activateArguments.toolkitSettings,
-        logger
+        settingsConfiguration: activateArguments.toolkitSettings
     })
 
     activateArguments.extensionContext.subscriptions.push(

src/shared/sam/cli/samCliContext.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Logger } from '../../logger'
 import { SettingsConfiguration } from '../../settingsConfiguration'
 import { DefaultSamCliConfiguration } from './samCliConfiguration'
 import { DefaultSamCliProcessInvoker, SamCliProcessInvokerContext } from './samCliInvoker'
@@ -23,11 +22,9 @@ let samCliContextInitialized: boolean = false
 
 // Components required to load Sam Cli Context
 let settingsConfiguration: SettingsConfiguration
-let logger: Logger
 
-export function initialize(params: { settingsConfiguration: SettingsConfiguration; logger: Logger }) {
+export function initialize(params: { settingsConfiguration: SettingsConfiguration }) {
     settingsConfiguration = params.settingsConfiguration
-    logger = params.logger
 
     samCliContext = undefined
     samCliContextInitialized = true
@@ -55,8 +52,7 @@ function makeSamCliContext(): SamCliContext {
     )
 
     const invokerContext: SamCliProcessInvokerContext = {
-        cliConfig: samCliConfiguration,
-        logger
+        cliConfig: samCliConfiguration
     }
     const invoker = new DefaultSamCliProcessInvoker(invokerContext)
 

src/shared/sam/cli/samCliInvoker.ts

@@ -4,7 +4,7 @@
  */
 
 import { extensionSettingsPrefix } from '../../constants'
-import { getLogger, Logger } from '../../logger'
+import { getLogger } from '../../logger'
 import { DefaultSettingsConfiguration } from '../../settingsConfiguration'
 import { ChildProcess, ChildProcessResult } from '../../utilities/childProcess'
 import { DefaultSamCliConfiguration, SamCliConfiguration } from './samCliConfiguration'
@@ -17,15 +17,13 @@ import { DefaultSamCliLocationProvider } from './samCliLocator'
 
 export interface SamCliProcessInvokerContext {
     cliConfig: SamCliConfiguration
-    logger: Logger
 }
 
 export class DefaultSamCliProcessInvokerContext implements SamCliProcessInvokerContext {
     public cliConfig: SamCliConfiguration = new DefaultSamCliConfiguration(
         new DefaultSettingsConfiguration(extensionSettingsPrefix),
         new DefaultSamCliLocationProvider()
     )
-    public logger: Logger = getLogger()
 }
 
 export function resolveSamCliProcessInvokerContext(
@@ -34,8 +32,7 @@ export function resolveSamCliProcessInvokerContext(
     const defaults = new DefaultSamCliProcessInvokerContext()
 
     return {
-        cliConfig: params.cliConfig || defaults.cliConfig,
-        logger: params.logger || defaults.logger
+        cliConfig: params.cliConfig || defaults.cliConfig
     }
 }
 
@@ -59,7 +56,7 @@ export class DefaultSamCliProcessInvoker implements SamCliProcessInvoker {
         const samCliLocation: string | undefined = this.context.cliConfig.getSamCliLocation()
         if (!samCliLocation) {
             const err = new Error('SAM CLI location not configured')
-            this.context.logger.error(err)
+            getLogger().error(err)
             throw err
         }