Skip to content

Commit d167944

Browse files
committed
pass in the negative version of --use-container when using build quickpick
1 parent 0fa1b5b commit d167944

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {
2929
} from './utils'
3030
import { getConfigFileUri, validateSamBuildConfig } from './config'
3131
import { runInTerminal } from './processTerminal'
32+
import { getLogger } from '../logger'
3233

3334
const buildMementoRootKey = 'samcli.build.params'
3435
export interface BuildParams {
@@ -213,7 +214,7 @@ export async function runBuild(arg?: TreeNode): Promise<SamBuildResult> {
213214
// refactor
214215
const buildFlags: string[] =
215216
params.paramsSource === ParamsSource.Specify && params.buildFlags
216-
? JSON.parse(params.buildFlags)
217+
? resolveBuildFlags(JSON.parse(params.buildFlags))
217218
: await getBuildFlags(params.paramsSource, projectRoot, defaultFlags)
218219

219220
// todo remove
@@ -281,3 +282,9 @@ function resolveBuildArgConflict(boundArgs: string[]): string[] {
281282
// }
282283
return Array.from(boundArgsSet)
283284
}
285+
export function resolveBuildFlags(buildFlags: string[]): string[] {
286+
if (!buildFlags.includes('--use-container')) {
287+
buildFlags.push('--no-use-container')
288+
}
289+
return buildFlags
290+
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
createParamsSourcePrompter,
1717
getBuildFlags,
1818
ParamsSource,
19+
resolveBuildFlags,
1920
runBuild,
2021
} from '../../../shared/sam/build'
2122
import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
@@ -229,6 +230,14 @@ describe('SAM build helper functions', () => {
229230
assert.deepStrictEqual(quickPick.items, expectedItems)
230231
})
231232
})
233+
234+
describe('resolveBuildFlags', () => {
235+
it('should add --no-use-container if the buildFlags array does not contain --use-container', () => {
236+
const buildFlags: string[] = ['--cached', '--debug', '--parallel']
237+
const resolvedBuildFlags = ['--cached', '--debug', '--parallel', '--no-use-container']
238+
assert.deepStrictEqual(resolvedBuildFlags, resolveBuildFlags(buildFlags))
239+
})
240+
})
232241
})
233242

234243
describe('SAM runBuild', () => {

0 commit comments

Comments
 (0)