Add support for choosing a source directory when deploying from a workspace project

src/commands/image/imageSource/buildImageInAzure/BuildFromProjectListStep.ts

@@ -14,6 +14,7 @@ import { ImageNameStep } from "./ImageNameStep";
 import { OSPickStep } from "./OSPickStep";
 import { RootFolderStep } from "./RootFolderStep";
 import { RunStep } from "./RunStep";
+import { SourcePathStep } from "./SourcePathStep";
 import { TarFileStep } from "./TarFileStep";
 import { UploadSourceCodeStep } from "./UploadSourceCodeStep";
 
@@ -49,7 +50,7 @@ export class BuildFromProjectListStep extends AzureWizardPromptStep<ImageSourceC
 
         switch (context.buildType) {
             case ImageSource.RemoteAcrBuild:
-                promptSteps.push(new AcrListStep(), new RootFolderStep(), new DockerFileItemStep(), new ImageNameStep(), new OSPickStep());
+                promptSteps.push(new AcrListStep(), new RootFolderStep(), new DockerFileItemStep(), new SourcePathStep(), new ImageNameStep(), new OSPickStep());
                 executeSteps.push(new TarFileStep(), new UploadSourceCodeStep(), new RunStep(), new BuildImageStep());
                 break;
             //TODO: case for 'Build from project locally using Docker'

src/commands/image/imageSource/buildImageInAzure/BuildImageInAzureImageSourceContext.ts

@@ -12,6 +12,7 @@ import { type AcrBuildSupportedOS } from './OSPickStep';
 
 export interface BuildImageInAzureImageSourceBaseContext extends ContainerRegistryImageSourceBaseContext {
     rootFolder: vscode.WorkspaceFolder;
+    srcPath: string;
     dockerfilePath: string;
     imageName: string;
     os: AcrBuildSupportedOS;

src/commands/image/imageSource/buildImageInAzure/SourcePathStep.ts

@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { AzureWizardPromptStep } from '@microsoft/vscode-azext-utils';
+import * as path from 'path';
+import { browseItem } from '../../../../constants';
+import { localize } from '../../../../utils/localize';
+import { type BuildImageInAzureImageSourceContext } from './BuildImageInAzureImageSourceContext';
+
+export class SourcePathStep extends AzureWizardPromptStep<BuildImageInAzureImageSourceContext> {
+    public async prompt(context: BuildImageInAzureImageSourceContext): Promise<void> {
+        await context.ui.showQuickPick([browseItem], {
+            placeHolder: localize('sourceDirectoryPick', 'Choose your source code directory')
+        });
+
+        context.srcPath = (await context.ui.showOpenDialog({
+            defaultUri: context.rootFolder?.uri,
+            canSelectFiles: false,
+            canSelectFolders: true
+        }))[0].fsPath;
+
+        context.telemetry.properties.sourceDepth = String(this.getRelativePathDepthFromRoot(context.srcPath));
+    }
+
+    public async configureBeforePrompt(context: BuildImageInAzureImageSourceContext): Promise<void> {
+        if (context.srcPath) {
+            context.telemetry.properties.sourceDepth = String(this.getRelativePathDepthFromRoot(context.srcPath));
+        }
+    }
+
+    public shouldPrompt(context: BuildImageInAzureImageSourceContext): boolean {
+        return !context.srcPath && !this.hasRootDockerfile(context);
+    }
+
+    // If a provided dockerfile is not at the project root, we need to acquire the project's source context
+    private hasRootDockerfile(context: BuildImageInAzureImageSourceContext): boolean {
+        if (!context.rootFolder || !context.dockerfilePath) {
+            return false;
+        }
+
+        const rootPath: string = context.rootFolder.uri.fsPath;
+        return path.relative(rootPath, context.dockerfilePath) === path.basename(context.dockerfilePath);
+    }
+
+    private getRelativePathDepthFromRoot(relativePath: string): number {
+        return relativePath === '.' ? 0 : relativePath.split(path.sep).length;
+    }
+}

src/commands/image/imageSource/buildImageInAzure/UploadSourceCodeStep.ts

@@ -19,24 +19,26 @@ const vcsIgnoreList = ['.git', '.gitignore', '.bzr', 'bzrignore', '.hg', '.hgign
 
 export class UploadSourceCodeStep extends ExecuteActivityOutputStepBase<BuildImageInAzureImageSourceContext> {
     public priority: number = 430;
-    private _sourceFilePath: string;
+    private _sourceFilePath: string;  // Relative path of src folder from rootFolder and what gets deployed
 
     protected async executeCore(context: BuildImageInAzureImageSourceContext, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
-        /* relative path of src folder from rootFolder and what gets deployed */
-        this._sourceFilePath = path.dirname(path.relative(context.rootFolder.uri.path, context.dockerfilePath));
+        if (context.srcPath) {
+            this._sourceFilePath = path.relative(context.rootFolder.uri.fsPath, context.srcPath);
+        } else {
+            this._sourceFilePath = path.dirname(path.relative(context.rootFolder.uri.fsPath, context.dockerfilePath));
+        }
+
         context.telemetry.properties.sourceDepth = this._sourceFilePath === '.' ? '0' : String(this._sourceFilePath.split(path.sep).length);
 
         context.registryName = nonNullValue(context.registry?.name);
         context.resourceGroupName = getResourceGroupFromId(nonNullValue(context.registry?.id));
         context.client = await createContainerRegistryManagementClient(context);
 
-        const uploading: string = localize('uploadingSourceCode', 'Uploading source code...', this._sourceFilePath);
-        progress.report({ message: uploading });
+        progress.report({ message: localize('uploadingSourceCode', 'Uploading source code...') });
+
         const source: string = path.join(context.rootFolder.uri.fsPath, this._sourceFilePath);
         let items = await AzExtFsExtra.readDirectory(source);
-        items = items.filter(i => {
-            return !vcsIgnoreList.includes(i.name)
-        });
+        items = items.filter(i => !vcsIgnoreList.includes(i.name));
 
         tar.c({ cwd: source }, items.map(i => i.name)).pipe(fse.createWriteStream(context.tarFilePath));