package: increase minimum vscode to 1.65 #3328

* refactor: remove shared/vscode/secrets.ts
* refactor: remove SecretMemento
* techdebt.test.ts
* refactor: remove QuickPickItemKind back-compat
* refactor: remove use of "workbench.action.closeAllEditors"

Author: justinmk3

.changes/next-release/Deprecation-08856d5b-2af0-42f4-b3ba-3fc58ace344e.json

@@ -0,0 +1,4 @@
+{
+	"type": "Deprecation",
+	"description": "Minimum required VS Code version is now 1.65"
+}

package-lock.json

@@ -13,7 +13,7 @@
         "url": "https://github.com/aws/aws-toolkit-vscode"
     },
     "engines": {
-        "vscode": "^1.50.1"
+        "vscode": "^1.65.0"
     },
     "icon": "resources/marketplace/aws-icon-256x256.png",
     "bugs": {
@@ -3480,7 +3480,7 @@
         "@types/sinonjs__fake-timers": "^8.1.2",
         "@types/tcp-port-used": "^1.0.1",
         "@types/uuid": "^8.3.3",
-        "@types/vscode": "1.50.0",
+        "@types/vscode": "^1.65.0",
         "@types/vscode-webview": "^1.57.1",
         "@types/xml2js": "^0.4.8",
         "@typescript-eslint/eslint-plugin": "^5.59.0",

package.json

@@ -7,7 +7,6 @@ import * as child_process from 'child_process'
 import * as fs from 'fs-extra'
 import { join } from 'path'
 import * as readlineSync from 'readline-sync'
-import { v4 as uuid } from 'uuid'
 
 const directory = join(process.cwd(), '.changes', 'next-release')
 const changeTypes = ['Breaking Change', 'Feature', 'Bug Fix', 'Deprecation', 'Removal', 'Test']
@@ -48,7 +47,7 @@ const contents: NewChange = {
     type: type,
     description: description,
 }
-const fileName = `${type}-${uuid()}.json`
+const fileName = `${type}-${crypto.randomUUID()}.json`
 const path = join(directory, fileName)
 fs.writeFileSync(path, JSON.stringify(contents, undefined, '\t'))
 

scripts/newChange.ts

@@ -10,7 +10,7 @@ import * as vscode from 'vscode'
 
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { compareTreeItems, makeChildrenNodes } from '../../shared/treeview/utils'
 import { DefaultApiGatewayClient } from '../../shared/clients/apiGatewayClient'
 import { RestApi } from 'aws-sdk/clients/apigateway'
 import { toArrayAsync, toMap, updateInPlace } from '../../shared/utilities/collectionUtils'
@@ -43,7 +43,7 @@ export class ApiGatewayNode extends AWSTreeNodeBase {
                     this,
                     localize('AWS.explorerNode.apigateway.noApis', '[No API Gateway REST APIs found]')
                 ),
-            sort: (nodeA, nodeB) => nodeA.label!.localeCompare(nodeB.label!),
+            sort: (nodeA, nodeB) => compareTreeItems(nodeA, nodeB),
         })
     }
 

src/apigateway/explorer/apiGatewayNodes.ts

@@ -2,7 +2,7 @@
  * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { compareTreeItems, makeChildrenNodes } from '../../shared/treeview/utils'
 import * as vscode from 'vscode'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 import { AppRunnerServiceNode } from './apprunnerServiceNode'
@@ -38,7 +38,7 @@ export class AppRunnerNode extends AWSTreeNodeBase {
                     this,
                     localize('AWS.explorerNode.apprunner.noServices', '[No App Runner services found]')
                 ),
-            sort: (nodeA, nodeB) => nodeA.label!.localeCompare(nodeB.label!),
+            sort: (nodeA, nodeB) => compareTreeItems(nodeA, nodeB),
         })
     }
 

src/apprunner/explorer/apprunnerNode.ts

@@ -87,7 +87,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.lock.acquire(this._info.ServiceId, done => {
             const lastLabel = this.label
             this.updateInfo(info)
-            this.updateStatus(lastLabel)
+            this.updateStatus(typeof lastLabel === 'string' ? lastLabel : lastLabel?.label)
             done()
         })
     }

src/apprunner/explorer/apprunnerServiceNode.ts

@@ -25,7 +25,7 @@ import { DefaultIotClient } from '../shared/clients/iotClient'
 import { DefaultS3Client } from '../shared/clients/s3Client'
 import { DefaultSchemaClient } from '../shared/clients/schemaClient'
 import { getEcsRootNode } from '../ecs/model'
-import { TreeShim } from '../shared/treeview/utils'
+import { compareTreeItems, TreeShim } from '../shared/treeview/utils'
 
 const serviceCandidates = [
     {
@@ -122,11 +122,7 @@ export class RegionNode extends AWSTreeNodeBase {
     private sortNodes(nodes: AWSTreeNodeBase[]) {
         return nodes.sort((a, b) => {
             // Always sort `ResourcesNode` at the bottom
-            return a instanceof ResourcesNode
-                ? 1
-                : b instanceof ResourcesNode
-                ? -1
-                : (a.label ?? '').localeCompare(b.label ?? '')
+            return a instanceof ResourcesNode ? 1 : b instanceof ResourcesNode ? -1 : compareTreeItems(a, b)
         })
     }
     public update(region: Region): void {

src/awsexplorer/regionNode.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import { CodeCatalystClient } from '../shared/clients/codecatalystClient'
-import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
+import { getIdeProperties } from '../shared/extensionUtilities'
 import {
     Auth,
     isBuilderIdConnection,
@@ -174,41 +174,6 @@ export class CodeCatalystAuthenticationProvider {
     private static instance: CodeCatalystAuthenticationProvider
 
     public static fromContext(ctx: Pick<vscode.ExtensionContext, 'secrets' | 'globalState'>) {
-        const secrets = isCloud9() ? new SecretMemento(ctx.globalState) : ctx.secrets
-
-        return (this.instance ??= new this(new CodeCatalystAuthStorage(secrets), ctx.globalState))
-    }
-}
-
-/**
- * `secrets` API polyfill for C9.
- *
- * For development only. Do NOT use this for anything else.
- */
-class SecretMemento implements vscode.SecretStorage {
-    private readonly onDidChangeEmitter = new vscode.EventEmitter<vscode.SecretStorageChangeEvent>()
-    public readonly onDidChange = this.onDidChangeEmitter.event
-
-    public constructor(private readonly memento: vscode.Memento) {}
-
-    public async get(key: string): Promise<string | undefined> {
-        return this.getSecrets()[key]
-    }
-
-    public async store(key: string, value: string): Promise<void> {
-        const current = this.getSecrets()
-        await this.memento.update('__secrets', { ...current, [key]: value })
-        this.onDidChangeEmitter.fire({ key })
-    }
-
-    public async delete(key: string): Promise<void> {
-        const current = this.getSecrets()
-        delete current[key]
-        await this.memento.update('__secrets', current)
-        this.onDidChangeEmitter.fire({ key })
-    }
-
-    private getSecrets(): Record<string, string | undefined> {
-        return this.memento.get('__secrets', {})
+        return (this.instance ??= new this(new CodeCatalystAuthStorage(ctx.secrets), ctx.globalState))
     }
 }

src/codecatalyst/auth.ts

@@ -31,9 +31,9 @@ describe('SamTemplateCodeLensProvider', async function () {
     })
 
     it('provides a CodeLens for a file with a new resource', async function () {
-        // redhat.vscode-yaml requires vscode 1.52
-        // https://github.com/redhat-developer/vscode-yaml/blob/main/package.json
-        if (semver.lt(vscode.version, '1.52.0')) {
+        // - redhat.vscode-yaml requires vscode 1.63: https://github.com/redhat-developer/vscode-yaml/blob/main/package.json
+        // - the codelens behavior changed with the vscode 1.66 release
+        if (semver.lt(vscode.version, '1.66.0')) {
             this.skip()
         }
         await activateExtension(VSCODE_EXTENSION_ID.yaml, false)