refactor: re-arrange some globals and add clock

CONTRIBUTING.md

@@ -271,7 +271,7 @@ requests just from the model/types.
     src/shared/foo.d.ts
     ```
 4. To make requests with the SDK, pass the `*.api.json` service model to
-   `ext.sdkClientBuilder.createAndConfigureServiceClient` as a generic
+   `globals.sdkClientBuilder.createAndConfigureServiceClient` as a generic
    `Service` with `apiConfig=require('foo.api.json')`.
 
     ```ts
@@ -282,7 +282,7 @@ requests just from the model/types.
 
     ...
 
-    const c = await ext.sdkClientBuilder.createAwsService(
+    const c = await globals.sdkClientBuilder.createAwsService(
         opts => new Service(opts),
         {
             apiConfig: apiConfig,

package.json

@@ -2858,7 +2858,7 @@
         "serve": "webpack serve --config-name vue-hmr --mode development"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "1.0.27",
+        "@aws-toolkits/telemetry": "1.0.28",
         "@sinonjs/fake-timers": "^8.1.0",
         "@types/adm-zip": "^0.4.34",
         "@types/async-lock": "^1.1.3",

src/apigateway/commands/copyUrl.ts

@@ -10,7 +10,7 @@ import { RestApiNode } from '../explorer/apiNodes'
 import * as picker from '../../shared/ui/picker'
 import * as vscode from 'vscode'
 import { ProgressLocation } from 'vscode'
-import { ext } from '../../shared/extensionGlobals'
+
 import { Stage } from 'aws-sdk/clients/apigateway'
 import { ApiGatewayClient } from '../../shared/clients/apiGatewayClient'
 import { RegionProvider } from '../../shared/regions/regionProvider'
@@ -19,6 +19,7 @@ import { COPY_TO_CLIPBOARD_INFO_TIMEOUT_MS } from '../../shared/constants'
 import { getLogger } from '../../shared/logger'
 import { recordApigatewayCopyUrl } from '../../shared/telemetry/telemetry'
 import { addCodiconToString } from '../../shared/utilities/textUtilities'
+import globals from '../../shared/extensionGlobals'
 
 interface StageInvokeUrlQuickPick extends vscode.QuickPickItem {
     // override declaration so this can't be undefined
@@ -33,7 +34,7 @@ export async function copyUrlCommand(
 ): Promise<void> {
     const region = node.regionCode
     const dnsSuffix = regionProvider.getDnsSuffixForRegion(region) || DEFAULT_DNS_SUFFIX
-    const client: ApiGatewayClient = ext.toolkitClientBuilder.createApiGatewayClient(region)
+    const client: ApiGatewayClient = globals.toolkitClientBuilder.createApiGatewayClient(region)
 
     let stages: Stage[]
     try {

src/apigateway/commands/invokeRemoteRestApi.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import { RestApiNode } from '../explorer/apiNodes'
 import { getLogger, Logger } from '../../shared/logger'
 import { BaseTemplates } from '../../shared/templates/baseTemplates'
-import { ext } from '../../shared/extensionGlobals'
+
 import { template } from 'lodash'
 import { toArrayAsync, toMap } from '../../shared/utilities/collectionUtils'
 import { ExtensionUtilities } from '../../shared/extensionUtilities'
@@ -16,6 +16,7 @@ import { ApiGatewayClient } from '../../shared/clients/apiGatewayClient'
 import { APIG_REMOTE_INVOKE_TEMPLATE } from '../templates/apigTemplates'
 import { localize } from '../../shared/utilities/vsCodeUtils'
 import { recordApigatewayInvokeRemote, Result } from '../../shared/telemetry/telemetry'
+import globals from '../../shared/extensionGlobals'
 
 // All the commands that we receive
 interface Command {
@@ -64,7 +65,7 @@ export async function invokeRemoteRestApi(params: { outputChannel: vscode.Output
 
         const invokeTemplateFn = template(APIG_REMOTE_INVOKE_TEMPLATE)
 
-        const client = ext.toolkitClientBuilder.createApiGatewayClient(params.apiNode.regionCode)
+        const client = globals.toolkitClientBuilder.createApiGatewayClient(params.apiNode.regionCode)
         logger.info(`Loading API Resources for API ${apiNode.name} (id: ${apiNode.id})`)
 
         const resources: Map<string, Resource> = toMap(
@@ -109,7 +110,7 @@ export async function invokeRemoteRestApi(params: { outputChannel: vscode.Output
                 postMessage: message => view.webview.postMessage(message),
             }),
             undefined,
-            ext.context.subscriptions
+            globals.context.subscriptions
         )
     } catch (err) {
         logger.error(err as Error)

src/apigateway/explorer/apiGatewayNodes.ts

@@ -7,7 +7,7 @@ import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
 import * as vscode from 'vscode'
-import { ext } from '../../shared/extensionGlobals'
+
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
 import { makeChildrenNodes } from '../../shared/treeview/treeNodeUtilities'
@@ -16,6 +16,7 @@ import { ApiGatewayClient } from '../../shared/clients/apiGatewayClient'
 import { RestApi } from 'aws-sdk/clients/apigateway'
 import { toArrayAsync, toMap, updateInPlace } from '../../shared/utilities/collectionUtils'
 import { RestApiNode } from './apiNodes'
+import globals from '../../shared/extensionGlobals'
 
 /**
  * An AWS Explorer node representing the API Gateway (v1) service.
@@ -46,7 +47,7 @@ export class ApiGatewayNode extends AWSTreeNodeBase {
     }
 
     public async updateChildren(): Promise<void> {
-        const client: ApiGatewayClient = ext.toolkitClientBuilder.createApiGatewayClient(this.regionCode)
+        const client: ApiGatewayClient = globals.toolkitClientBuilder.createApiGatewayClient(this.regionCode)
         const apis: Map<string, RestApi> = toMap(
             await toArrayAsync(client.listApis()),
             configuration => `${configuration.name} (${configuration.id})`

src/apprunner/commands/createServiceFromEcr.ts

@@ -7,15 +7,16 @@ import * as telemetry from '../../shared/telemetry/telemetry'
 import * as vscode from 'vscode'
 import { EcrRepositoryNode } from '../../ecr/explorer/ecrRepositoryNode'
 import { EcrTagNode } from '../../ecr/explorer/ecrTagNode'
-import { ext } from '../../shared/extensionGlobals'
+
 import { CreateAppRunnerServiceWizard } from '../wizards/apprunnerCreateServiceWizard'
+import globals from '../../shared/extensionGlobals'
 
 export async function createFromEcr(node: EcrTagNode | EcrRepositoryNode): Promise<void> {
     let telemetryResult: telemetry.Result = 'Failed'
 
     try {
         const ecrNode = (node as any).tag === undefined ? (node as EcrRepositoryNode) : (node as EcrTagNode).parent
-        const client = ext.toolkitClientBuilder.createAppRunnerClient(ecrNode.regionCode)
+        const client = globals.toolkitClientBuilder.createAppRunnerClient(ecrNode.regionCode)
         const wizard = new CreateAppRunnerServiceWizard(ecrNode.regionCode, {
             SourceConfiguration: {
                 ImageRepository: {

src/apprunner/explorer/apprunnerNode.ts

@@ -12,6 +12,7 @@ import * as nls from 'vscode-nls'
 import { AppRunnerClient } from '../../shared/clients/apprunnerClient'
 import { getPaginatedAwsCallIter } from '../../shared/utilities/collectionUtils'
 import { AppRunner } from 'aws-sdk'
+import globals from '../../shared/extensionGlobals'
 
 const localize = nls.loadMessageBundle()
 
@@ -92,14 +93,14 @@ export class AppRunnerNode extends AWSTreeNodeBase {
 
     private clearPollTimer(): void {
         if (this.pollingNodes.size === 0 && this.pollTimer) {
-            clearInterval(this.pollTimer)
+            globals.clock.clearInterval(this.pollTimer)
             this.pollTimer = undefined
         }
     }
 
     public startPolling(id: string): void {
         this.pollingNodes.add(id)
-        this.pollTimer = this.pollTimer ?? setInterval(this.refresh.bind(this), POLLING_INTERVAL)
+        this.pollTimer = this.pollTimer ?? globals.clock.setInterval(this.refresh.bind(this), POLLING_INTERVAL)
     }
 
     public stopPolling(id: string): void {

src/apprunner/explorer/apprunnerServiceNode.ts

@@ -9,14 +9,15 @@ import { AppRunnerClient } from '../../shared/clients/apprunnerClient'
 import { AppRunner } from 'aws-sdk'
 import { AppRunnerNode } from './apprunnerNode'
 import { CloudWatchLogsClient } from '../../shared/clients/cloudWatchLogsClient'
-import { ext } from '../../shared/extensionGlobals'
+
 import { toArrayAsync, toMap } from '../../shared/utilities/collectionUtils'
 import { CloudWatchLogsBase } from '../../cloudWatchLogs/explorer/cloudWatchLogsNode'
 import { CloudWatchLogs } from 'aws-sdk'
 import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
 
 import * as nls from 'vscode-nls'
 import { getLogger } from '../../shared/logger'
+import globals from '../../shared/extensionGlobals'
 const localize = nls.loadMessageBundle()
 
 const CONTEXT_BASE = 'awsAppRunnerServiceNode'
@@ -49,8 +50,8 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
             localize('AWS.explorerNode.apprunner.nologs', '[No App Runner logs found]')
         )
         this.iconPath = {
-            dark: vscode.Uri.file(ext.iconPaths.dark.apprunner),
-            light: vscode.Uri.file(ext.iconPaths.light.apprunner),
+            dark: vscode.Uri.file(globals.iconPaths.dark.apprunner),
+            light: vscode.Uri.file(globals.iconPaths.light.apprunner),
         }
         this.id = `AppRunnerService-${_info.ServiceArn}`
         this.name = _info.ServiceName

src/apprunner/wizards/apprunnerCreateServiceWizard.ts

@@ -6,7 +6,7 @@
 import { AppRunner } from 'aws-sdk'
 import * as nls from 'vscode-nls'
 import { createCommonButtons, QuickInputToggleButton } from '../../shared/ui/buttons'
-import { ext } from '../../shared/extensionGlobals'
+
 import * as input from '../../shared/ui/inputPrompter'
 import * as picker from '../../shared/ui/pickerPrompter'
 import { Prompter } from '../../shared/ui/prompter'
@@ -17,6 +17,7 @@ import { BasicExitPrompterProvider } from '../../shared/ui/common/exitPrompter'
 import { GitExtension } from '../../shared/extensions/git'
 import { makeDeploymentButton } from './deploymentButton'
 import { apprunnerCreateServiceDocsUrl } from '../../shared/constants'
+import globals from '../../shared/extensionGlobals'
 
 const localize = nls.loadMessageBundle()
 
@@ -106,9 +107,9 @@ export class CreateAppRunnerServiceWizard extends Wizard<AppRunner.CreateService
             exitPrompterProvider: new BasicExitPrompterProvider(),
         })
 
-        const ecrClient = ext.toolkitClientBuilder.createEcrClient(region)
-        const iamClient = ext.toolkitClientBuilder.createIamClient(region)
-        const apprunnerClient = ext.toolkitClientBuilder.createAppRunnerClient(region)
+        const ecrClient = globals.toolkitClientBuilder.createEcrClient(region)
+        const iamClient = globals.toolkitClientBuilder.createIamClient(region)
+        const apprunnerClient = globals.toolkitClientBuilder.createAppRunnerClient(region)
         const autoDeployButton = makeDeploymentButton()
         const gitExtension = GitExtension.instance
         const codeRepositoryWizard = new AppRunnerCodeRepositoryWizard(apprunnerClient, gitExtension, autoDeployButton)

src/apprunner/wizards/deploymentButton.ts

@@ -5,26 +5,27 @@
 
 import * as nls from 'vscode-nls'
 import * as vscode from 'vscode'
-import { ext } from '../../shared/extensionGlobals'
+
 import { QuickInputButton, QuickInputToggleButton } from '../../shared/ui/buttons'
 import { apprunnerPricingUrl, extensionSettingsPrefix } from '../../shared/constants'
 import { DefaultSettingsConfiguration } from '../../shared/settingsConfiguration'
+import globals from '../../shared/extensionGlobals'
 
 const localize = nls.loadMessageBundle()
 
 function makeDeployButtons() {
     const autoDeploymentsEnable: QuickInputButton<void> = {
         iconPath: {
-            light: ext.iconPaths.light.syncIgnore,
-            dark: ext.iconPaths.dark.syncIgnore,
+            light: globals.iconPaths.light.syncIgnore,
+            dark: globals.iconPaths.dark.syncIgnore,
         },
         tooltip: localize('AWS.apprunner.buttons.enableAutoDeploy', 'Turn on automatic deployment'),
     }
 
     const autoDeploymentsDisable: QuickInputButton<void> = {
         iconPath: {
-            light: ext.iconPaths.light.sync,
-            dark: ext.iconPaths.dark.sync,
+            light: globals.iconPaths.light.sync,
+            dark: globals.iconPaths.dark.sync,
         },
         tooltip: localize('AWS.apprunner.buttons.disableAutoDeploy', 'Turn off automatic deployment'),
     }

src/awsexplorer/activation.ts

@@ -11,7 +11,7 @@ import { deleteCloudFormation } from '../lambda/commands/deleteCloudFormation'
 import { CloudFormationStackNode } from '../lambda/explorer/cloudFormationNodes'
 import { AwsContext } from '../shared/awsContext'
 import { AwsContextTreeCollection } from '../shared/awsContextTreeCollection'
-import { ext } from '../shared/extensionGlobals'
+
 import { safeGet } from '../shared/extensionUtilities'
 import { getLogger } from '../shared/logger'
 import { RegionProvider } from '../shared/regions/regionProvider'
@@ -40,6 +40,7 @@ import { showViewLogsMessage } from '../shared/utilities/messages'
 let didTryAutoConnect = false
 
 import * as nls from 'vscode-nls'
+import globals from '../shared/extensionGlobals'
 const localize = nls.loadMessageBundle()
 
 /**
@@ -52,17 +53,17 @@ export async function activate(args: {
     toolkitOutputChannel: vscode.OutputChannel
     remoteInvokeOutputChannel: vscode.OutputChannel
 }): Promise<void> {
-    const awsExplorer = new AwsExplorer(ext.context, args.awsContext, args.regionProvider)
+    const awsExplorer = new AwsExplorer(globals.context, args.awsContext, args.regionProvider)
 
     const view = vscode.window.createTreeView(awsExplorer.viewProviderId, {
         treeDataProvider: awsExplorer,
         showCollapseAll: true,
     })
-    ext.context.subscriptions.push(view)
+    globals.context.subscriptions.push(view)
 
-    await registerAwsExplorerCommands(ext.context, awsExplorer, args.toolkitOutputChannel)
+    await registerAwsExplorerCommands(globals.context, awsExplorer, args.toolkitOutputChannel)
 
-    ext.context.subscriptions.push(
+    globals.context.subscriptions.push(
         view.onDidChangeVisibility(async e => {
             if (e.visible) {
                 await tryAutoConnect(args.awsContext)
@@ -72,7 +73,7 @@ export async function activate(args: {
 
     args.awsContextTrees.addTree(awsExplorer)
 
-    updateAwsExplorerWhenAwsContextCredentialsChange(awsExplorer, args.awsContext, ext.context)
+    updateAwsExplorerWhenAwsContextCredentialsChange(awsExplorer, args.awsContext, globals.context)
 }
 
 async function tryAutoConnect(awsContext: AwsContext) {
@@ -98,7 +99,7 @@ async function registerAwsExplorerCommands(
     context.subscriptions.push(
         vscode.commands.registerCommand('aws.showRegion', async () => {
             try {
-                await ext.awsContextCommands.onCommandShowRegion()
+                await globals.awsContextCommands.onCommandShowRegion()
             } finally {
                 recordAwsShowRegion()
                 recordVscodeActiveRegions({ value: awsExplorer.getRegionNodesSize() })
@@ -109,7 +110,7 @@ async function registerAwsExplorerCommands(
     context.subscriptions.push(
         vscode.commands.registerCommand('aws.hideRegion', async (node?: RegionNode) => {
             try {
-                await ext.awsContextCommands.onCommandHideRegion(safeGet(node, x => x.regionCode))
+                await globals.awsContextCommands.onCommandHideRegion(safeGet(node, x => x.regionCode))
             } finally {
                 recordAwsHideRegion()
                 recordVscodeActiveRegions({ value: awsExplorer.getRegionNodesSize() })