refractor prompters and tests

Author: vicheey

package-lock.json

@@ -7,7 +7,7 @@ import { CloudFormationTemplateRegistry } from '../../../shared/fs/templateRegis
 import { syncMementoRootKey } from '../../../shared/sam/sync'
 
 import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
-import { createTemplatePrompter, TemplateItem } from '../../../shared/ui/common/samTemplate'
+import { createTemplatePrompter, TemplateItem } from '../../../shared/ui/sam/samTemplate'
 import { Wizard } from '../../../shared/wizards/wizard'
 
 export interface OpenTemplateParams {

packages/core/src/awsService/appBuilder/explorer/openTemplate.ts

@@ -4,7 +4,7 @@
  */
 
 import * as vscode from 'vscode'
-import { TemplateItem, createTemplatePrompter } from '../ui/common/samTemplate'
+import { TemplateItem, createTemplatePrompter } from '../ui/sam/samTemplate'
 import { ChildProcess } from '../utilities/processUtils'
 import { addTelemetryEnvVar } from './cli/samCliInvokerUtils'
 import { Wizard } from '../wizards/wizard'
@@ -59,7 +59,7 @@ export function createParamsSourcePrompter(existValidSamconfig: boolean) {
     )
 
     return createQuickPick(items, {
-        title: 'Specify parameters for build',
+        title: 'Specify parameter source for build',
         placeholder: 'Select configuration options for sam build',
         buttons: createCommonButtons(samBuildUrl),
     })

packages/core/src/shared/sam/build.ts

@@ -22,11 +22,11 @@ import { CancellationError } from '../utilities/timeoutUtils'
 import { Wizard } from '../wizards/wizard'
 import { addTelemetryEnvVar } from './cli/samCliInvokerUtils'
 import { validateSamDeployConfig, SamConfig, writeSamconfigGlobal } from './config'
-import { BucketSource, createBucketSourcePrompter, createBucketPrompter } from '../ui/common/bucket'
-import { createStackPrompter } from '../ui/common/stack'
-import { TemplateItem, createTemplatePrompter } from '../ui/common/samTemplate'
+import { BucketSource, createBucketSourcePrompter, createBucketPrompter } from '../ui/sam/bucket'
+import { createStackPrompter } from '../ui/sam/stack'
+import { TemplateItem, createTemplatePrompter } from '../ui/sam/samTemplate'
 import { getProjectRoot, getRecentResponse, getSamCliPathAndVersion, getSource, updateRecentResponse } from './utils'
-import { createDeployParamsSourcePrompter, ParamsSource } from '../ui/common/paramsSource'
+import { createDeployParamsSourcePrompter, ParamsSource } from '../ui/sam/paramsSource'
 import { runInTerminal } from './processTerminal'
 
 export interface DeployParams {

packages/core/src/shared/sam/deploy.ts

@@ -45,11 +45,11 @@ import {
     getSource,
     updateRecentResponse,
 } from './utils'
-import { TemplateItem, createTemplatePrompter } from '../ui/common/samTemplate'
-import { createStackPrompter } from '../ui/common/stack'
-import { ParamsSource, createSyncParamsSourcePrompter } from '../ui/common/paramsSource'
-import { createEcrPrompter } from '../ui/common/ecr'
-import { BucketSource, createBucketPrompter } from '../ui/common/bucket'
+import { TemplateItem, createTemplatePrompter } from '../ui/sam/samTemplate'
+import { createStackPrompter } from '../ui/sam/stack'
+import { ParamsSource, createSyncParamsSourcePrompter } from '../ui/sam/paramsSource'
+import { createEcrPrompter } from '../ui/sam/ecr'
+import { BucketSource, createBucketPrompter } from '../ui/sam/bucket'
 import { runInTerminal } from './processTerminal'
 
 export interface SyncParams {
@@ -67,8 +67,6 @@ export interface SyncParams {
     readonly syncFlags?: string
 }
 
-export const prefixNewBucketName = (name: string) => `newbucket:${name}`
-export const prefixNewRepoName = (name: string) => `newrepo:${name}`
 export const syncMementoRootKey = 'samcli.sync.params'
 
 // TODO: hook this up so it prompts the user when more than 1 environment is present in `samconfig.toml`

packages/core/src/shared/sam/process.ts

@@ -8,7 +8,7 @@ import * as path from 'path'
 import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase'
 import { TreeNode, isTreeNode } from '../treeview/resourceTreeDataProvider'
 import * as CloudFormation from '../cloudformation/cloudformation'
-import { TemplateItem } from '../ui/common/samTemplate'
+import { TemplateItem } from '../ui/sam/samTemplate'
 import { RuntimeFamily, getFamily } from '../../lambda/models/samLambdaRuntime'
 import { SamCliSettings } from './cli/samCliSettings'
 import { ToolkitError } from '../errors'

packages/core/src/shared/sam/sync.ts

@@ -6,11 +6,12 @@ import { DefaultS3Client } from '../../clients/s3Client'
 import { samDeployUrl, samSyncUrl } from '../../constants'
 import { createCommonButtons } from '../buttons'
 import { createQuickPick, DataQuickPickItem } from '../pickerPrompter'
-import { SyncParams, prefixNewBucketName } from '../../sam/sync'
+import type { SyncParams } from '../../sam/sync'
 import * as nls from 'vscode-nls'
 import { getRecentResponse } from '../../sam/utils'
 
 const localize = nls.loadMessageBundle()
+export const prefixNewBucketName = (name: string) => `newbucket:${name}`
 
 export enum BucketSource {
     SamCliManaged,

packages/core/src/shared/sam/utils.ts

@@ -7,11 +7,12 @@ import { DefaultEcrClient } from '../../clients/ecrClient'
 import { samSyncUrl } from '../../constants'
 import { createCommonButtons } from '../buttons'
 import { createQuickPick } from '../pickerPrompter'
-import { prefixNewRepoName } from '../../sam/sync'
+
 import * as nls from 'vscode-nls'
 import { getRecentResponse } from '../../sam/utils'
 
 export const localize = nls.loadMessageBundle()
+export const prefixNewRepoName = (name: string) => `newrepo:${name}`
 
 export function createEcrPrompter(client: DefaultEcrClient, mementoRootKey: string) {
     const recentEcrRepo = getRecentResponse(mementoRootKey, client.regionCode, 'ecrRepoUri')

packages/core/src/shared/ui/common/bucket.ts renamed to packages/core/src/shared/ui/sam/bucket.ts

@@ -38,7 +38,7 @@ export function createDeployParamsSourcePrompter(existValidSamconfig: boolean |
     const items = loadParamsSourcePrompterItems(existValidSamconfig)
 
     return createQuickPick(items, {
-        title: 'Specify parameters for deploy',
+        title: 'Specify parameter source for deploy',
         placeholder: 'Press enter to proceed with highlighted option',
         buttons: createCommonButtons(samDeployUrl),
     })
@@ -48,7 +48,7 @@ export function createSyncParamsSourcePrompter(existValidSamconfig: boolean | un
     const items = loadParamsSourcePrompterItems(existValidSamconfig)
 
     return createQuickPick(items, {
-        title: 'Specify parameters for sync',
+        title: 'Specify parameter source for sync',
         placeholder: 'Press enter to proceed with highlighted option',
         buttons: createCommonButtons(samSyncUrl),
     })