lint: fix warnings

.eslintrc.js

@@ -94,6 +94,9 @@ module.exports = {
         // This is off because prettier takes care of it
         'no-extra-semi': 'off',
         '@typescript-eslint/no-empty-function': 'off',
+        // Disallows returning e.g. Promise<…|never> which signals that an exception may be thrown.
+        // https://stackoverflow.com/q/64230626/152142
+        '@typescript-eslint/no-redundant-type-constituents': 'off',
         '@typescript-eslint/no-unused-vars': 'off',
         '@typescript-eslint/no-floating-promises': 'error', // Promises must catch errors or be awaited.
         '@typescript-eslint/no-var-requires': 'off', // Should be able to remove with the full migration of SDK v3

packages/amazonq/src/extensionShared.ts

@@ -60,7 +60,9 @@ export async function activateShared(context: vscode.ExtensionContext, isWeb: bo
                     () =>
                         vscode.window
                             .showInformationMessage(
-                                `The Amazon Q extension is incompatible with AWS Toolkit ${toolkitVersion} and older. Your AWS Toolkit was updated to version 3.0 or later.`,
+                                `The Amazon Q extension is incompatible with AWS Toolkit ${
+                                    toolkitVersion as any
+                                } and older. Your AWS Toolkit was updated to version 3.0 or later.`,
                                 'Reload Now'
                             )
                             .then(async resp => {

packages/core/src/auth/credentials/validation.ts

@@ -114,7 +114,7 @@ export async function throwOnInvalidCredentials(profileName: SectionName, data:
 
     const credentialsDataErrors = getCredentialsErrors(data)
     if (credentialsDataErrors !== undefined) {
-        throw new ToolkitError(`Errors in credentials data: ${credentialsDataErrors}`, {
+        throw new ToolkitError(`Errors in credentials data: ${String(credentialsDataErrors)}`, {
             code: 'InvalidCredentialsData',
             details: credentialsDataErrors,
         })

packages/core/src/awsexplorer/awsExplorer.ts

@@ -75,7 +75,7 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
             }
         } catch (err) {
             const error = err as Error
-            this.logger.error(`Error getting children for node ${element?.label ?? 'Root Node'}: %s`, error)
+            this.logger.error(`Error getting children for node %O: %s`, element?.label ?? 'Root Node', error)
 
             childNodes.splice(
                 0,

packages/core/src/codewhisperer/client/codewhisperer.ts

@@ -83,6 +83,7 @@ export type ListCodeScanFindingsRequest = Readonly<
 export type SupplementalContext = Readonly<
     CodeWhispererClient.SupplementalContext | CodeWhispererUserClient.SupplementalContext
 >
+// eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
 export type ArtifactType = Readonly<CodeWhispererClient.ArtifactType | CodeWhispererUserClient.ArtifactType>
 export type ArtifactMap = Readonly<CodeWhispererClient.ArtifactMap | CodeWhispererUserClient.ArtifactMap>
 export type ListCodeScanFindingsResponse =

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -17,6 +17,7 @@ import {
     FolderInfo,
     TransformationCandidateProject,
     ZipManifest,
+    TransformByQStatus,
 } from '../models/model'
 import { convertDateToTimestamp, getStringHash } from '../../shared/utilities/textUtilities'
 import {
@@ -650,7 +651,7 @@ export async function postTransformationJob() {
         codeTransformRunTimeLatency: durationInMs,
         codeTransformLocalMavenVersion: mavenVersionInfoMessage,
         codeTransformLocalJavaVersion: javaVersionInfoMessage,
-        result: resultStatusMessage === 'Succeeded' ? MetadataResult.Pass : MetadataResult.Fail,
+        result: resultStatusMessage === TransformByQStatus.Succeeded ? MetadataResult.Pass : MetadataResult.Fail,
         reason: resultStatusMessage,
     })
 

packages/core/src/codewhisperer/service/inlineCompletionItemProvider.ts

@@ -173,7 +173,12 @@ export class CWInlineCompletionItemProvider implements vscode.InlineCompletionIt
             if (matchedCount >= 2 || this.nextToken !== '') {
                 const result = [item]
                 for (let j = 0; j < matchedCount - 1; j++) {
-                    result.push({ insertText: `${item.insertText}${j}`, range: item.range })
+                    result.push({
+                        insertText: `${
+                            typeof item.insertText === 'string' ? item.insertText : item.insertText.value
+                        }${j}`,
+                        range: item.range,
+                    })
                 }
                 return result
             }

packages/core/src/codewhisperer/service/recommendationHandler.ts

@@ -633,12 +633,14 @@ export class RecommendationHandler {
     }
 
     async onCursorChange(e: vscode.TextEditorSelectionChangeEvent) {
-        // e.kind will be 1 for keyboard cursor change events
         // we do not want to reset the states for keyboard events because they can be typeahead
-        if (e.kind !== 1 && vscode.window.activeTextEditor === e.textEditor) {
+        if (
+            e.kind !== vscode.TextEditorSelectionChangeKind.Keyboard &&
+            vscode.window.activeTextEditor === e.textEditor
+        ) {
             application()._clearCodeWhispererUIListener.fire()
             // when cursor change due to mouse movement we need to reset the active item index for inline
-            if (e.kind === 2) {
+            if (e.kind === vscode.TextEditorSelectionChangeKind.Mouse) {
                 this.inlineCompletionProvider?.clearActiveItemIndex()
             }
         }

packages/core/src/dev/activation.ts

@@ -35,7 +35,6 @@ export type DevFunction =
     | 'openTerminal'
     | 'deleteDevEnv'
     | 'editStorage'
-    | 'editStorage'
     | 'showEnvVars'
     | 'deleteSsoConnections'
     | 'expireSsoConnections'

packages/core/src/dev/codecatalyst.ts

@@ -107,13 +107,7 @@ async function promptVsix(
 ): Promise<vscode.Uri | undefined> {
     const folders = (vscode.workspace.workspaceFolders ?? []).map(f => f.uri).concat(vscode.Uri.file(ctx.extensionPath))
 
-    enum ExtensionMode {
-        Production = 1,
-        Development = 2,
-        Test = 3,
-    }
-
-    const isDevelopmentWindow = ctx.extensionMode === ExtensionMode.Development
+    const isDevelopmentWindow = ctx.extensionMode === vscode.ExtensionMode.Development
     const extPath = isDevelopmentWindow ? ctx.extensionPath : folders[0].fsPath
 
     const packageNew = {

packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts

@@ -204,7 +204,7 @@ export default defineComponent({
             }
             this.containerBuild = config.sam?.containerBuild ?? false
             this.skipNewImageCheck = config.sam?.skipNewImageCheck ?? false
-            this.msg = `Loaded config ${config}`
+            this.msg = `Loaded config: ${config.name}`
             this.company = company
         },
         loadPayload() {

packages/core/src/lambda/vue/remoteInvoke/invokeLambda.ts

@@ -69,7 +69,7 @@ export class RemoteInvokeWebview extends VueWebview {
             this.channel.appendLine(logs)
             this.channel.appendLine('')
             this.channel.appendLine('Payload:')
-            this.channel.appendLine(payload.toString())
+            this.channel.appendLine(String(payload))
             this.channel.appendLine('')
         } catch (e) {
             const error = e as Error

packages/core/src/shared/cloudformation/cloudformation.ts

@@ -446,7 +446,9 @@ export async function tryLoad(
     // https://github.com/aws-cloudformation/aws-cfn-lint-visual-studio-code/blob/629de0bac4f36cfc6534e409a6f6766a2240992f/client/src/yaml-support/yaml-schema.ts#L39-L51
     if (rv.template?.AWSTemplateFormatVersion || rv.template?.Resources) {
         rv.kind =
-            rv.template.Transform && rv.template.Transform.toString().startsWith('AWS::Serverless') ? 'sam' : 'cfn'
+            typeof rv.template.Transform === 'string' && rv.template.Transform.startsWith('AWS::Serverless')
+                ? 'sam'
+                : 'cfn'
 
         return rv
     }

packages/core/src/shared/extensions/git.ts

@@ -341,8 +341,8 @@ export class GitExtension {
 
         if (version === undefined || version.compare(minGitFilterVersion) === -1) {
             throw new Error(
-                `Git version is too low or could not be determined (min=${minGitFilterVersion}): ${
-                    version ?? 'unknown'
+                `Git version is too low or could not be determined (min=${minGitFilterVersion.version}): ${
+                    version?.version ?? 'unknown'
                 }`
             )
         }

packages/core/src/shared/fs/watchedFiles.ts

@@ -389,7 +389,7 @@ export abstract class WatchedFiles<T> implements vscode.Disposable {
     }
 
     private outputPatterns(): string {
-        const watch = this.globs.map(cur => cur.toString())
+        const watch = this.globs.map(cur => (typeof cur === 'string' ? cur.toString() : cur.pattern))
         if (this.watchingUntitledFiles) {
             watch.push('Untitled Files')
         }

packages/core/src/shared/icons.ts

@@ -17,7 +17,7 @@ import { getLogger } from './logger/logger'
 // https://code.visualstudio.com/api/references/icons-in-labels#animation
 
 type ContributedIcon = keyof typeof packageJson.contributes.icons
-type IconPath = { light: Uri; dark: Uri } | Icon
+type IconPath = { light: Uri; dark: Uri; toString: () => string } | Icon
 type IconId = `vscode-${string}` | ContributedIcon
 
 /**
@@ -117,13 +117,16 @@ function resolveIconId(
     return new Icon(namespace === 'vscode' ? name : id, source)
 }
 
-function resolvePathsSync(rootDir: string, target: string): { light: Uri; dark: Uri } | undefined {
+function resolvePathsSync(
+    rootDir: string,
+    target: string
+): { light: Uri; dark: Uri; toString: () => string } | undefined {
     const darkPath = path.join(rootDir, 'dark', `${target}.svg`)
     const lightPath = path.join(rootDir, 'light', `${target}.svg`)
 
     try {
         if (!isWeb() && fs.existsSync(darkPath) && fs.existsSync(lightPath)) {
-            return { dark: Uri.file(darkPath), light: Uri.file(lightPath) }
+            return { dark: Uri.file(darkPath), light: Uri.file(lightPath), toString: () => '[IconPath]' }
         }
     } catch (error) {
         getLogger().warn(`icons: path resolution failed for "${target}": %s`, error)

packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts

@@ -181,9 +181,7 @@ export class HttpResourceFetcher implements ResourceFetcher {
             promise.cancel(new CancellationError(event.agent).message)
         })
 
-        promise.finally(() => cancelListener?.dispose())
-
-        return promise
+        return promise.finally(() => cancelListener?.dispose())
     }
 
     private buildRequestHeaders(requestHeaders?: RequestHeaders): Headers {

packages/core/src/shared/sam/cli/samCliLocalInvoke.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as child_process from 'child_process'
+import * as proc from 'child_process'
 import { pushIf } from '../../utilities/collectionUtils'
 import * as nls from 'vscode-nls'
 import { fileExists } from '../../filesystemUtilities'
@@ -30,7 +30,7 @@ export const waitForDebuggerMessages = {
 export interface SamLocalInvokeCommandArgs {
     command: string
     args: string[]
-    options?: child_process.SpawnOptions
+    options?: proc.SpawnOptions
     /** Wait until strings specified in `debuggerAttachCues` appear in the process output.  */
     waitForCues: boolean
     timeout?: Timeout

packages/core/src/shared/sam/debugger/csharpSamDebug.ts

@@ -219,7 +219,7 @@ export async function makeDotnetDebugConfiguration(
     codeUri: string
 ): Promise<DotNetDebugConfiguration> {
     if (config.noDebug) {
-        throw Error(`SAM debug: invalid config ${config}`)
+        throw Error(`SAM debug: invalid config: ${config.name}`)
     }
     const pipeArgs = ['-c', `docker exec -i $(docker ps -q -f publish=${config.debugPort}) \${debuggerCommand}`]
     config.debuggerPath = pathutil.normalize(getDebuggerPath(codeUri))

packages/core/src/shared/typescriptLambdaHandlerSearch.ts

@@ -303,6 +303,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
     private static isNodeExported(node: ts.Node): boolean {
         const flags: ts.ModifierFlags = ts.getCombinedModifierFlags(node as ts.Declaration)
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
         return (flags & ts.ModifierFlags.Export) === ts.ModifierFlags.Export
     }
 

packages/core/src/shared/utilities/childProcess.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as child_process from 'child_process'
+import * as proc from 'child_process'
 import * as crossSpawn from 'cross-spawn'
 import * as logger from '../logger'
 import { Timeout, CancellationError, waitUntil } from './timeoutUtils'
@@ -35,7 +35,7 @@ export interface ChildProcessOptions {
     /** A `Timeout` token. The running process will be terminated on expiration or cancellation. */
     timeout?: Timeout
     /** Options sent to the `spawn` command. This is merged in with the base options if they exist. */
-    spawnOptions?: child_process.SpawnOptions
+    spawnOptions?: proc.SpawnOptions
     /** Callback for intercepting text from the stdout stream. */
     onStdout?: (text: string, context: RunParameterContext) => void
     /** Callback for intercepting text from the stderr stream. */
@@ -67,7 +67,7 @@ export const eof = Symbol('EOF')
  */
 export class ChildProcess {
     static #runningProcesses: Map<number, ChildProcess> = new Map()
-    #childProcess: child_process.ChildProcess | undefined
+    #childProcess: proc.ChildProcess | undefined
     #processErrors: Error[] = []
     #processResult: ChildProcessResult | undefined
     #log: logger.Logger
@@ -291,7 +291,7 @@ export class ChildProcess {
     }
 
     #registerLifecycleListeners(
-        process: child_process.ChildProcess,
+        process: proc.ChildProcess,
         errorHandler: (error: Error, forceStop?: boolean) => void,
         options?: ChildProcessOptions
     ): void {

packages/core/src/shared/utilities/vsCodeUtils.ts

@@ -102,7 +102,7 @@ export function buildMissingExtensionMessage(
     feat = `${getIdeProperties().company} Toolkit`
 ): string {
     const minV = semver.coerce(minVersion)
-    const expectedVersionMsg = isNonNullable(minV) ? ` of version >=${minV}` : ''
+    const expectedVersionMsg = isNonNullable(minV) ? ` of version >=${minV.version}` : ''
 
     return localize(
         'AWS.missingExtension',

packages/core/src/ssmDocument/commands/publishDocument.ts

@@ -12,7 +12,11 @@ import { ssmJson, ssmYaml } from '../../shared/constants'
 
 import * as localizedText from '../../shared/localizedText'
 import { getLogger, Logger } from '../../shared/logger'
-import { PublishSSMDocumentWizard, PublishSSMDocumentWizardResponse } from '../wizards/publishDocumentWizard'
+import {
+    PublishSSMDocumentAction,
+    PublishSSMDocumentWizard,
+    PublishSSMDocumentWizardResponse,
+} from '../wizards/publishDocumentWizard'
 import { showConfirmationMessage } from '../util/util'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { Result, SsmOperation } from '../../shared/telemetry/telemetry'
@@ -49,9 +53,9 @@ export async function publishSSMDocument(): Promise<void> {
 
     try {
         const response = await new PublishSSMDocumentWizard().run()
-        if (response?.action === 'Create') {
+        if (response?.action === PublishSSMDocumentAction.QuickCreate) {
             await createDocument(response, textDocument)
-        } else if (response?.action === 'Update') {
+        } else if (response?.action === PublishSSMDocumentAction.QuickUpdate) {
             await updateDocument(response, textDocument)
         }
     } catch (err) {

packages/core/src/test/shared/vscode/runCommand.test.ts

@@ -13,9 +13,7 @@ import { Commands, defaultTelemetryThrottleMs, unsetSource } from '../../../shar
 import { assertTelemetry, installFakeClock } from '../../testUtil'
 import { getTestWindow } from '../../shared/vscode/window'
 
-async function throwMe(
-    error?: unknown
-): Promise<void | never /* eslint-disable @typescript-eslint/no-redundant-type-constituents */> {
+async function throwMe(error?: unknown): Promise<void | never> {
     if (error) {
         throw error
     }

packages/core/src/test/testUtil.ts

@@ -230,7 +230,7 @@ export function partialDeepCompare<T>(actual: unknown, expected: T, message?: st
 export function assertTelemetry<K extends MetricName>(
     name: K,
     expected: MetricShapes[K] | MetricShapes[K][]
-): void | never // eslint-disable no-redundant-type-constituents
+): void | never
 export function assertTelemetry<K extends MetricName>(
     name: K,
     expected: MetricShapes[MetricName] | MetricShapes[MetricName][]