refactor: avoid noisy imports

Author: Hweinstock

packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts

@@ -8,13 +8,8 @@ import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { AppRunnerServiceNode } from './apprunnerServiceNode'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import * as nls from 'vscode-nls'
-import {
-    AppRunnerClient,
-    AppRunnerCreateServiceRequest,
-    AppRunnerServiceSummary,
-} from '../../../shared/clients/apprunner'
+import { AppRunnerClient, CreateServiceRequest, ServiceSummary } from '../../../shared/clients/apprunner'
 import { PollingSet } from '../../../shared/utilities/pollingSet'
-import { ListServicesRequest } from '@aws-sdk/client-apprunner'
 
 const localize = nls.loadMessageBundle()
 
@@ -46,9 +41,9 @@ export class AppRunnerNode extends AWSTreeNodeBase {
         })
     }
 
-    private async getServiceSummaries(request: ListServicesRequest = {}): Promise<AppRunnerServiceSummary[]> {
+    private async getServiceSummaries(): Promise<ServiceSummary[]> {
         // TODO: avoid resolving all services at once.
-        const serviceCollection = this.client.paginateServices(request)
+        const serviceCollection = this.client.paginateServices({})
         return await serviceCollection.flatten().promise()
     }
 
@@ -90,7 +85,7 @@ export class AppRunnerNode extends AWSTreeNodeBase {
         this.pollingSet.delete(id)
     }
 
-    public async createService(request: AppRunnerCreateServiceRequest): Promise<void> {
+    public async createService(request: CreateServiceRequest): Promise<void> {
         await this.client.createService(request)
         this.refresh()
     }

packages/core/src/awsService/apprunner/explorer/apprunnerServiceNode.ts

@@ -4,7 +4,7 @@
  */
 
 import AsyncLock from 'async-lock'
-import { AppRunnerClient, AppRunnerServiceSummary } from '../../../shared/clients/apprunner'
+import { AppRunnerClient, ServiceSummary } from '../../../shared/clients/apprunner'
 import { AppRunnerNode } from './apprunnerNode'
 
 import { toArrayAsync, toMap } from '../../../shared/utilities/collectionUtils'
@@ -16,7 +16,7 @@ import * as nls from 'vscode-nls'
 import { getLogger } from '../../../shared/logger/logger'
 import { getIcon } from '../../../shared/icons'
 import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
-import { OperationSummary, UpdateServiceRequest } from '@aws-sdk/client-apprunner'
+import * as AppRunner from '@aws-sdk/client-apprunner'
 const localize = nls.loadMessageBundle()
 
 const contextBase = 'awsAppRunnerServiceNode'
@@ -41,8 +41,8 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
     constructor(
         public readonly parent: AppRunnerNode,
         private readonly client: AppRunnerClient,
-        private _info: AppRunnerServiceSummary,
-        private currentOperation: OperationSummary & { Type?: ServiceOperation } = {},
+        private _info: ServiceSummary,
+        private currentOperation: AppRunner.OperationSummary & { Type?: ServiceOperation } = {},
         cloudwatchClient = new DefaultCloudWatchLogsClient(client.regionCode)
     ) {
         super('App Runner Service', parent.regionCode, cloudwatchClient)
@@ -55,7 +55,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.update(_info)
     }
 
-    public get info(): Readonly<AppRunnerServiceSummary> {
+    public get info(): Readonly<ServiceSummary> {
         return this._info
     }
 
@@ -81,7 +81,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.label = `${this._info.ServiceName} [${displayStatus}]`
     }
 
-    public update(info: AppRunnerServiceSummary): void {
+    public update(info: ServiceSummary): void {
         // update can be called multiple times during an event loop
         // this would rarely cause the node's status to appear as 'Operation in progress'
         this.lock
@@ -135,7 +135,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
             })
     }
 
-    private updateInfo(info: AppRunnerServiceSummary): void {
+    private updateInfo(info: ServiceSummary): void {
         if (info.Status === 'OPERATION_IN_PROGRESS' && this.currentOperation.Type === undefined) {
             // Asynchronous since it is not currently possible for race-conditions to occur with updating operations
             void this.updateOperation()
@@ -161,7 +161,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.setOperation(resp.Service, resp.OperationId, 'DELETE_SERVICE')
     }
 
-    public async updateService(request: UpdateServiceRequest): Promise<void> {
+    public async updateService(request: AppRunner.UpdateServiceRequest): Promise<void> {
         const resp = await this.client.updateService({ ...request, ServiceArn: this._info.ServiceArn })
         this.setOperation(resp.Service, resp.OperationId, 'UPDATE_SERVICE')
     }
@@ -172,13 +172,13 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
     }
 
     // eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
-    public setOperation(info: AppRunnerServiceSummary, id?: string, type?: ServiceOperation): void {
+    public setOperation(info: ServiceSummary, id?: string, type?: ServiceOperation): void {
         this.currentOperation.Id = id
         this.currentOperation.Type = type
         this.update(info)
     }
 
-    public async describe(): Promise<AppRunnerServiceSummary> {
+    public async describe(): Promise<ServiceSummary> {
         const resp = await this.client.describeService({ ServiceArn: this.arn })
         this.update(resp.Service)
         return this._info

packages/core/src/awsService/apprunner/wizards/apprunnerCreateServiceWizard.ts

@@ -16,13 +16,9 @@ import { makeDeploymentButton } from './deploymentButton'
 import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
 import { IamClient } from '../../../shared/clients/iam'
 import { DefaultEcrClient } from '../../../shared/clients/ecrClient'
-import {
-    AppRunnerClient,
-    AppRunnerCreateServiceRequest,
-    AppRunnerSourceConfiguration,
-} from '../../../shared/clients/apprunner'
+import { AppRunnerClient, CreateServiceRequest, SourceConfiguration } from '../../../shared/clients/apprunner'
 import { getAppRunnerCreateServiceDocUrl } from '../../../shared/extensionUtilities'
-import { InstanceConfiguration } from '@aws-sdk/client-apprunner'
+import * as AppRunner from '@aws-sdk/client-apprunner'
 
 const localize = nls.loadMessageBundle()
 
@@ -58,14 +54,14 @@ const validateName = (name: string) => {
     return undefined
 }
 
-function createInstanceStep(): Prompter<InstanceConfiguration> {
+function createInstanceStep(): Prompter<AppRunner.InstanceConfiguration> {
     const enumerations = [
         [1, 2],
         [1, 3],
         [2, 4],
     ]
 
-    const items: picker.DataQuickPickItem<InstanceConfiguration>[] = enumerations.map((e) => ({
+    const items: picker.DataQuickPickItem<AppRunner.InstanceConfiguration>[] = enumerations.map((e) => ({
         label: `${e[0]} vCPUs, ${e[1]} GBs Memory`,
         data: { Cpu: `${e[0]} vCPU`, Memory: `${e[1]} GB` },
     }))
@@ -78,10 +74,10 @@ function createInstanceStep(): Prompter<InstanceConfiguration> {
 
 function createSourcePrompter(
     autoDeployButton: QuickInputToggleButton
-): Prompter<AppRunnerCreateServiceRequest['SourceConfiguration']> {
+): Prompter<CreateServiceRequest['SourceConfiguration']> {
     const ecrPath = {
         label: 'ECR',
-        data: { ImageRepository: {} } as AppRunnerSourceConfiguration,
+        data: { ImageRepository: {} } as SourceConfiguration,
         detail: localize(
             'AWS.apprunner.createService.ecr.detail',
             'Create a service from a public or private Elastic Container Registry repository'
@@ -90,7 +86,7 @@ function createSourcePrompter(
 
     const repositoryPath = {
         label: 'Repository',
-        data: { CodeRepository: {} } as AppRunnerSourceConfiguration,
+        data: { CodeRepository: {} } as SourceConfiguration,
         detail: localize('AWS.apprunner.createService.repository.detail', 'Create a service from a GitHub repository'),
     }
 
@@ -100,11 +96,11 @@ function createSourcePrompter(
     })
 }
 
-export class CreateAppRunnerServiceWizard extends Wizard<AppRunnerCreateServiceRequest> {
+export class CreateAppRunnerServiceWizard extends Wizard<CreateServiceRequest> {
     public constructor(
         region: string,
-        initState: WizardState<AppRunnerCreateServiceRequest> = {},
-        implicitState: WizardState<AppRunnerCreateServiceRequest> = {},
+        initState: WizardState<CreateServiceRequest> = {},
+        implicitState: WizardState<CreateServiceRequest> = {},
         clients = {
             iam: new IamClient(region),
             ecr: new DefaultEcrClient(region),

packages/core/src/awsService/apprunner/wizards/codeRepositoryWizard.ts

@@ -12,9 +12,9 @@ import { WizardForm } from '../../../shared/wizards/wizardForm'
 import { createVariablesPrompter } from '../../../shared/ui/common/variablesPrompter'
 import {
     AppRunnerClient,
-    AppRunnerSourceConfiguration,
-    AppRunnerCodeRepository,
-    AppRunnerCodeConfigurationValues,
+    SourceConfiguration,
+    CodeRepository,
+    CodeConfigurationValues,
 } from '../../../shared/clients/apprunner'
 import { makeDeploymentButton } from './deploymentButton'
 import {
@@ -28,7 +28,7 @@ import { apprunnerConfigHelpUrl, apprunnerConnectionHelpUrl, apprunnerRuntimeHel
 import { Wizard, WIZARD_BACK } from '../../../shared/wizards/wizard'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
 import { getAppRunnerCreateServiceDocUrl } from '../../../shared/extensionUtilities'
-import { ConfigurationSource, Runtime } from '@aws-sdk/client-apprunner'
+import * as AppRunner from '@aws-sdk/client-apprunner'
 
 const localize = nls.loadMessageBundle()
 
@@ -91,10 +91,10 @@ function createBranchPrompter(
     })
 }
 
-function createRuntimePrompter(): QuickPickPrompter<Runtime> {
-    const items: DataQuickPickItem<Runtime>[] = [
-        { label: 'python3', data: Runtime.PYTHON_3 },
-        { label: 'nodejs16', data: Runtime.NODEJS_16 },
+function createRuntimePrompter(): QuickPickPrompter<AppRunner.Runtime> {
+    const items: DataQuickPickItem<AppRunner.Runtime>[] = [
+        { label: 'python3', data: AppRunner.Runtime.PYTHON_3 },
+        { label: 'nodejs16', data: AppRunner.Runtime.NODEJS_16 },
     ]
 
     return createQuickPick(items, {
@@ -103,7 +103,7 @@ function createRuntimePrompter(): QuickPickPrompter<Runtime> {
     })
 }
 
-function createBuildCommandPrompter(runtime: Runtime): InputBoxPrompter {
+function createBuildCommandPrompter(runtime: AppRunner.Runtime): InputBoxPrompter {
     const buildCommandMap = {
         python: 'pip install -r requirements.txt',
         node: 'npm install',
@@ -118,7 +118,7 @@ function createBuildCommandPrompter(runtime: Runtime): InputBoxPrompter {
     })
 }
 
-function createStartCommandPrompter(runtime: Runtime): InputBoxPrompter {
+function createStartCommandPrompter(runtime: AppRunner.Runtime): InputBoxPrompter {
     const startCommandMap = {
         python: 'python runapp.py',
         node: 'node app.js',
@@ -189,17 +189,20 @@ export function createConnectionPrompter(client: AppRunnerClient) {
     return prompter
 }
 
-function createSourcePrompter(): QuickPickPrompter<ConfigurationSource> {
+function createSourcePrompter(): QuickPickPrompter<AppRunner.ConfigurationSource> {
     const configDetail = localize(
         'AWS.apprunner.createService.configSource.detail',
         'App Runner will read "apprunner.yaml" in the root of your repository for configuration details'
     )
     const apiLabel = localize('AWS.apprunner.createService.configSource.apiLabel', 'Configure all settings here')
     const repoLabel = localize('AWS.apprunner.createService.configSource.repoLabel', 'Use configuration file')
-    const apiItem: DataQuickPickItem<ConfigurationSource> = { label: apiLabel, data: ConfigurationSource.API }
-    const repoItem: DataQuickPickItem<ConfigurationSource> = {
+    const apiItem: DataQuickPickItem<AppRunner.ConfigurationSource> = {
+        label: apiLabel,
+        data: AppRunner.ConfigurationSource.API,
+    }
+    const repoItem: DataQuickPickItem<AppRunner.ConfigurationSource> = {
         label: repoLabel,
-        data: ConfigurationSource.REPOSITORY,
+        data: AppRunner.ConfigurationSource.REPOSITORY,
         detail: configDetail,
     }
 
@@ -209,8 +212,8 @@ function createSourcePrompter(): QuickPickPrompter<ConfigurationSource> {
     })
 }
 
-function createCodeRepositorySubForm(git: GitExtension): WizardForm<AppRunnerCodeRepository> {
-    const subform = new WizardForm<AppRunnerCodeRepository>()
+function createCodeRepositorySubForm(git: GitExtension): WizardForm<CodeRepository> {
+    const subform = new WizardForm<CodeRepository>()
     const form = subform.body
 
     form.RepositoryUrl.bindPrompter(() => createRepoPrompter(git).transform((r) => r.fetchUrl!))
@@ -222,7 +225,7 @@ function createCodeRepositorySubForm(git: GitExtension): WizardForm<AppRunnerCod
     form.CodeConfiguration.ConfigurationSource.bindPrompter(createSourcePrompter)
     form.SourceCodeVersion.Type.setDefault(() => 'BRANCH')
 
-    const codeConfigForm = new WizardForm<AppRunnerCodeConfigurationValues>()
+    const codeConfigForm = new WizardForm<CodeConfigurationValues>()
     codeConfigForm.body.Runtime.bindPrompter(createRuntimePrompter)
     codeConfigForm.body.BuildCommand.bindPrompter((state) => createBuildCommandPrompter(state.Runtime!))
     codeConfigForm.body.StartCommand.bindPrompter((state) => createStartCommandPrompter(state.Runtime!))
@@ -239,7 +242,7 @@ function createCodeRepositorySubForm(git: GitExtension): WizardForm<AppRunnerCod
     return subform
 }
 
-export class AppRunnerCodeRepositoryWizard extends Wizard<AppRunnerSourceConfiguration> {
+export class AppRunnerCodeRepositoryWizard extends Wizard<SourceConfiguration> {
     constructor(
         client: AppRunnerClient,
         git: GitExtension,

packages/core/src/awsService/apprunner/wizards/imageRepositoryWizard.ts

@@ -21,7 +21,7 @@ import { createRolePrompter } from '../../../shared/ui/common/roles'
 import { getLogger } from '../../../shared/logger/logger'
 import { getAppRunnerCreateServiceDocUrl, isCloud9 } from '../../../shared/extensionUtilities'
 import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
-import { AppRunnerImageRepository, AppRunnerSourceConfiguration } from '../../../shared/clients/apprunner'
+import { ImageRepository, SourceConfiguration } from '../../../shared/clients/apprunner'
 
 const localize = nls.loadMessageBundle()
 
@@ -223,8 +223,8 @@ export class ImageIdentifierForm extends WizardForm<{ repo: TaggedEcrRepository
 function createImageRepositorySubForm(
     ecrClient: EcrClient,
     autoDeployButton: QuickInputToggleButton
-): WizardForm<AppRunnerImageRepository> {
-    const subform = new WizardForm<AppRunnerImageRepository>()
+): WizardForm<ImageRepository> {
+    const subform = new WizardForm<ImageRepository>()
     const form = subform.body
 
     // note: this is intentionally initialized only once to preserve caches
@@ -253,7 +253,7 @@ function createImageRepositorySubForm(
     return subform
 }
 
-export class AppRunnerImageRepositoryWizard extends Wizard<AppRunnerSourceConfiguration> {
+export class AppRunnerImageRepositoryWizard extends Wizard<SourceConfiguration> {
     constructor(ecrClient: EcrClient, iamClient: IamClient, autoDeployButton = makeDeploymentButton()) {
         super()
         const form = this.form