Merge master into feature/cwltail

aws-toolkit-automation · web-flow · commit 6e637d4fb84d · 2024-10-15T17:02:23.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
         "eslint-plugin-security-node": "^1.1.4",
         "eslint-plugin-unicorn": "^54.0.0",
         "husky": "^9.0.7",
-        "prettier": "^3.3.2",
+        "prettier": "^3.3.3",
         "prettier-plugin-sh": "^0.14.0",
         "pretty-quick": "^4.0.0",
         "ts-node": "^10.9.1",
diff --git a/packages/core/src/amazonqFeatureDev/session/sessionState.ts b/packages/core/src/amazonqFeatureDev/session/sessionState.ts
@@ -77,10 +77,10 @@ export function registerNewFiles(
         const folder =
             workspaceFolderPrefixes === undefined
                 ? workspaceFolders[0]
-                : workspaceFolderPrefixes[prefix] ??
+                : (workspaceFolderPrefixes[prefix] ??
                   workspaceFolderPrefixes[
                       Object.values(workspaceFolderPrefixes).find((val) => val.index === 0)?.name ?? ''
-                  ]
+                  ])
         if (folder === undefined) {
             telemetry.toolkit_trackScenario.emit({
                 count: 1,
diff --git a/packages/core/src/auth/connection.ts b/packages/core/src/auth/connection.ts
@@ -73,7 +73,7 @@ export function hasScopes(target: SsoConnection | SsoProfile | string[], scopes:
  * Not optimized, but the set of possible scopes is currently very small (< 8)
  */
 export function hasExactScopes(target: SsoConnection | SsoProfile | string[], scopes: string[]): boolean {
-    const targetScopes = Array.isArray(target) ? target : target.scopes ?? []
+    const targetScopes = Array.isArray(target) ? target : (target.scopes ?? [])
     return scopes.length === targetScopes.length && scopes.every((s) => targetScopes.includes(s))
 }
 
diff --git a/packages/core/src/awsService/iot/explorer/iotCertificateNode.ts b/packages/core/src/awsService/iot/explorer/iotCertificateNode.ts
@@ -50,7 +50,7 @@ export abstract class IotCertificateNode extends AWSTreeNodeBase implements AWSR
             this.certificate.id,
             this.certificate.activeStatus,
             formatLocalized(this.certificate.creationDate),
-            things?.length ?? 0 > 0 ? `\nAttached to: ${things!.join(', ')}` : ''
+            (things?.length ?? 0 > 0) ? `\nAttached to: ${things!.join(', ')}` : ''
         )
         this.iconPath = getIcon('aws-iot-certificate')
         this.description = `\t[${this.certificate.activeStatus}]`
diff --git a/packages/core/src/awsService/iot/explorer/iotPolicyNode.ts b/packages/core/src/awsService/iot/explorer/iotPolicyNode.ts
@@ -39,7 +39,7 @@ export class IotPolicyNode extends AWSTreeNodeBase implements AWSResourceNode {
             'AWS.explorerNode.iot.policyToolTip',
             '{0}{1}',
             policy.name,
-            certs?.length ?? 0 > 0 ? `\nAttached to: ${certs?.join(', ')}` : ''
+            (certs?.length ?? 0 > 0) ? `\nAttached to: ${certs?.join(', ')}` : ''
         )
         this.iconPath = getIcon('aws-iot-policy')
         this.contextValue = 'awsIotPolicyNode.Certificates'
diff --git a/packages/core/src/codecatalyst/devEnv.ts b/packages/core/src/codecatalyst/devEnv.ts
@@ -98,7 +98,7 @@ export class DevEnvActivityStarter {
         }
         // If user is not authenticated, assume 15 minutes.
         const inactivityTimeoutMin =
-            devenvTimeoutMs > 0 ? devenvTimeoutMs / 60000 : thisDevenv?.summary.inactivityTimeoutMinutes ?? 15
+            devenvTimeoutMs > 0 ? devenvTimeoutMs / 60000 : (thisDevenv?.summary.inactivityTimeoutMinutes ?? 15)
         if (!shouldSendActivity(inactivityTimeoutMin)) {
             getLogger().info(
                 `codecatalyst: disabling DevEnvActivity heartbeat: configured to never timeout (inactivityTimeoutMinutes=${inactivityTimeoutMin})`
diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts
@@ -310,7 +310,7 @@ export async function uploadArtifactToS3(
         )
         const errorMessage = getTelemetryReasonDesc(error)?.includes(`"PUT" request failed with code "403"`)
             ? `"PUT" request failed with code "403"`
-            : getTelemetryReasonDesc(error) ?? 'Security scan failed.'
+            : (getTelemetryReasonDesc(error) ?? 'Security scan failed.')
 
         throw new UploadArtifactToS3Error(errorMessage)
     }
diff --git a/packages/core/src/lambda/models/samLambdaRuntime.ts b/packages/core/src/lambda/models/samLambdaRuntime.ts
@@ -258,7 +258,7 @@ export function createRuntimeQuickPick(params: {
     totalSteps?: number
 }): QuickPickPrompter<RuntimeAndPackage> {
     const zipRuntimes = params.runtimeFamily
-        ? getRuntimesForFamily(params.runtimeFamily) ?? samLambdaCreatableRuntimes()
+        ? (getRuntimesForFamily(params.runtimeFamily) ?? samLambdaCreatableRuntimes())
         : samLambdaCreatableRuntimes()
 
     const zipRuntimeItems = zipRuntimes
diff --git a/packages/core/src/shared/errors.ts b/packages/core/src/shared/errors.ts
@@ -454,7 +454,7 @@ export function scrubNames(s: string, username?: string) {
  * @param err Error object, or message text
  */
 export function getTelemetryReasonDesc(err: unknown | undefined): string | undefined {
-    const m = typeof err === 'string' ? err : getErrorMsg(err as Error, true) ?? ''
+    const m = typeof err === 'string' ? err : (getErrorMsg(err as Error, true) ?? '')
     const msg = scrubNames(m, _username)
 
     // Truncate message as these strings can be very long.
diff --git a/packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts b/packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts
@@ -138,7 +138,7 @@ export class HttpResourceFetcher implements ResourceFetcher {
     }
 
     private logText(): string {
-        return this.params.showUrl ? this.url : this.params.friendlyName ?? 'resource from URL'
+        return this.params.showUrl ? this.url : (this.params.friendlyName ?? 'resource from URL')
     }
 
     private logCancellation(event: CancelEvent) {
diff --git a/packages/core/src/shared/sam/debugger/awsSamDebugger.ts b/packages/core/src/shared/sam/debugger/awsSamDebugger.ts
@@ -267,11 +267,11 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                         if (resource) {
                             // we do not know enough to populate the runtime field for Image-based Lambdas
                             const runtimeName = CloudFormation.isZipLambdaResource(resource?.Properties)
-                                ? CloudFormation.getStringForProperty(
+                                ? (CloudFormation.getStringForProperty(
                                       resource?.Properties,
                                       'Runtime',
                                       templateDatum.item
-                                  ) ?? ''
+                                  ) ?? '')
                                 : ''
                             configs.push(
                                 createTemplateAwsSamDebugConfig(
diff --git a/packages/core/src/webviews/main.ts b/packages/core/src/webviews/main.ts
@@ -349,7 +349,7 @@ function createWebviewPanel(ctx: vscode.ExtensionContext, params: WebviewPanelPa
     const viewColumn =
         isCloud9() && params.viewColumn === vscode.ViewColumn.Beside
             ? vscode.ViewColumn.Two
-            : params.viewColumn ?? vscode.ViewColumn.Active
+            : (params.viewColumn ?? vscode.ViewColumn.Active)
 
     const panel = vscode.window.createWebviewPanel(
         params.id,

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export function hasScopes(target: SsoConnection \| SsoProfile \| string[], scopes:`
`73`	`73`	`* Not optimized, but the set of possible scopes is currently very small (< 8)`
`74`	`74`	`*/`
`75`	`75`	`export function hasExactScopes(target: SsoConnection \| SsoProfile \| string[], scopes: string[]): boolean {`
`76`		`- const targetScopes = Array.isArray(target) ? target : target.scopes ?? []`
	`76`	`+ const targetScopes = Array.isArray(target) ? target : (target.scopes ?? [])`
`77`	`77`	`return scopes.length === targetScopes.length && scopes.every((s) => targetScopes.includes(s))`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export abstract class IotCertificateNode extends AWSTreeNodeBase implements AWSR`
`50`	`50`	`this.certificate.id,`
`51`	`51`	`this.certificate.activeStatus,`
`52`	`52`	`formatLocalized(this.certificate.creationDate),`
`53`		- things?.length ?? 0 > 0 ? `\nAttached to: ${things!.join(', ')}` : ''
	`53`	+ (things?.length ?? 0 > 0) ? `\nAttached to: ${things!.join(', ')}` : ''
`54`	`54`	`)`
`55`	`55`	`this.iconPath = getIcon('aws-iot-certificate')`
`56`	`56`	this.description = `\t[${this.certificate.activeStatus}]`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class IotPolicyNode extends AWSTreeNodeBase implements AWSResourceNode {`
`39`	`39`	`'AWS.explorerNode.iot.policyToolTip',`
`40`	`40`	`'{0}{1}',`
`41`	`41`	`policy.name,`
`42`		- certs?.length ?? 0 > 0 ? `\nAttached to: ${certs?.join(', ')}` : ''
	`42`	+ (certs?.length ?? 0 > 0) ? `\nAttached to: ${certs?.join(', ')}` : ''
`43`	`43`	`)`
`44`	`44`	`this.iconPath = getIcon('aws-iot-policy')`
`45`	`45`	`this.contextValue = 'awsIotPolicyNode.Certificates'`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export class DevEnvActivityStarter {`
`98`	`98`	`}`
`99`	`99`	`// If user is not authenticated, assume 15 minutes.`
`100`	`100`	`const inactivityTimeoutMin =`
`101`		`- devenvTimeoutMs > 0 ? devenvTimeoutMs / 60000 : thisDevenv?.summary.inactivityTimeoutMinutes ?? 15`
	`101`	`+ devenvTimeoutMs > 0 ? devenvTimeoutMs / 60000 : (thisDevenv?.summary.inactivityTimeoutMinutes ?? 15)`
`102`	`102`	`if (!shouldSendActivity(inactivityTimeoutMin)) {`
`103`	`103`	`getLogger().info(`
`104`	`104`	`codecatalyst: disabling DevEnvActivity heartbeat: configured to never timeout (inactivityTimeoutMinutes=${inactivityTimeoutMin})`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ export async function uploadArtifactToS3(`
`310`	`310`	`)`
`311`	`311`	const errorMessage = getTelemetryReasonDesc(error)?.includes(`"PUT" request failed with code "403"`)
`312`	`312`	? `"PUT" request failed with code "403"`
`313`		`- : getTelemetryReasonDesc(error) ?? 'Security scan failed.'`
	`313`	`+ : (getTelemetryReasonDesc(error) ?? 'Security scan failed.')`
`314`	`314`
`315`	`315`	`throw new UploadArtifactToS3Error(errorMessage)`
`316`	`316`	`}`