centralize getDeployWorkspaceProjectResults

Author: MicroFish91

src/commands/api/deployWorkspaceProjectApi.ts

@@ -3,7 +3,6 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { type RegistryPassword } from "@azure/arm-containerregistry";
 import { type ResourceGroup } from "@azure/arm-resources";
 import { ResourceGroupListStep, parseAzureResourceGroupId } from "@microsoft/vscode-azext-azureutils";
 import { createSubscriptionContext, subscriptionExperience, type IActionContext, type ISubscriptionActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
@@ -12,10 +11,10 @@ import { Uri, type WorkspaceFolder } from "vscode";
 import { ext } from "../../extensionVariables";
 import { getWorkspaceFolderFromPath } from "../../utils/workspaceUtils";
 import { deployWorkspaceProjectInternal, type DeployWorkspaceProjectInternalContext } from "../deployWorkspaceProject/deployWorkspaceProjectInternal";
-import { listCredentialsFromRegistry } from "../image/imageSource/containerRegistry/acr/listCredentialsFromRegistry";
+import { getDeployWorkspaceProjectResults, type DeployWorkspaceProjectResults } from "../deployWorkspaceProject/getDeployWorkspaceProjectResults";
 import type * as api from "./vscode-azurecontainerapps.api";
 
-export async function deployWorkspaceProjectApi(context: IActionContext, deployWorkspaceProjectOptions: api.DeployWorkspaceProjectOptionsContract): Promise<api.DeployWorkspaceProjectResults> {
+export async function deployWorkspaceProjectApi(context: IActionContext, deployWorkspaceProjectOptions: api.DeployWorkspaceProjectOptionsContract): Promise<DeployWorkspaceProjectResults> {
     const { resourceGroupId, rootPath, dockerfilePath, srcPath, suppressConfirmation, suppressContainerAppCreation, ignoreExistingDeploySettings, shouldSaveDeploySettings } = deployWorkspaceProjectOptions;
 
     const subscription: AzureSubscription = await subscriptionExperience(context, ext.rgApiV2.resources.azureResourceTreeDataProvider, {
@@ -49,20 +48,7 @@ export async function deployWorkspaceProjectApi(context: IActionContext, deployW
         suppressWizardTitle: true,
     });
 
-    const registryCredentials: { username: string, password: RegistryPassword } | undefined = deployWorkspaceProjectResultContext.registry ?
-        await listCredentialsFromRegistry(deployWorkspaceProjectResultContext, deployWorkspaceProjectResultContext.registry) : undefined;
-
-    return {
-        resourceGroupId: deployWorkspaceProjectResultContext.resourceGroup?.id,
-        logAnalyticsWorkspaceId: deployWorkspaceProjectResultContext.logAnalyticsWorkspace?.id,
-        managedEnvironmentId: deployWorkspaceProjectResultContext.managedEnvironment?.id,
-        containerAppId: deployWorkspaceProjectResultContext.containerApp?.id,
-        registryId: deployWorkspaceProjectResultContext.registry?.id,
-        registryLoginServer: deployWorkspaceProjectResultContext.registry?.loginServer,
-        registryUsername: registryCredentials?.username,
-        registryPassword: registryCredentials?.password.value,
-        imageName: deployWorkspaceProjectResultContext.imageName
-    };
+    return await getDeployWorkspaceProjectResults(deployWorkspaceProjectResultContext);
 }
 
 function getSubscriptionIdFromOptions(deployWorkspaceProjectOptions: api.DeployWorkspaceProjectOptionsContract): string | undefined {

src/commands/deployWorkspaceProject/deployWorkspaceProject.ts

@@ -3,7 +3,6 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { type RegistryPassword } from "@azure/arm-containerregistry";
 import { callWithTelemetryAndErrorHandling, createSubscriptionContext, nonNullProp, subscriptionExperience, type IActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
 import { type AzureSubscription } from "@microsoft/vscode-azureresources-api";
 import { window } from "vscode";
@@ -16,9 +15,9 @@ import { createActivityContext } from "../../utils/activity/activityUtils";
 import { localize } from "../../utils/localize";
 import { type DeployWorkspaceProjectResults } from "../api/vscode-azurecontainerapps.api";
 import { browseContainerApp } from "../browseContainerApp";
-import { listCredentialsFromRegistry } from "../image/imageSource/containerRegistry/acr/listCredentialsFromRegistry";
 import { type DeployWorkspaceProjectContext } from "./DeployWorkspaceProjectContext";
 import { deployWorkspaceProjectInternal, type DeployWorkspaceProjectInternalContext } from "./deployWorkspaceProjectInternal";
+import { getDeployWorkspaceProjectResults } from "./getDeployWorkspaceProjectResults";
 
 export async function deployWorkspaceProject(context: IActionContext & Partial<DeployWorkspaceProjectContext>, item?: ContainerAppItem | ManagedEnvironmentItem): Promise<DeployWorkspaceProjectResults> {
     // If an incompatible tree item is passed, treat it as if no item was passed
@@ -46,21 +45,7 @@ export async function deployWorkspaceProject(context: IActionContext & Partial<D
     });
 
     displayNotification(deployWorkspaceProjectResultContext);
-
-    const registryCredentials: { username: string, password: RegistryPassword } | undefined = deployWorkspaceProjectResultContext.registry ?
-        await listCredentialsFromRegistry(deployWorkspaceProjectResultContext, deployWorkspaceProjectResultContext.registry) : undefined;
-
-    return {
-        resourceGroupId: deployWorkspaceProjectResultContext.resourceGroup?.id,
-        logAnalyticsWorkspaceId: deployWorkspaceProjectResultContext.logAnalyticsWorkspace?.id,
-        managedEnvironmentId: deployWorkspaceProjectResultContext.managedEnvironment?.id,
-        containerAppId: deployWorkspaceProjectResultContext.containerApp?.id,
-        registryId: deployWorkspaceProjectResultContext.registry?.id,
-        registryLoginServer: deployWorkspaceProjectResultContext.registry?.loginServer,
-        registryUsername: registryCredentials?.username,
-        registryPassword: registryCredentials?.password.value,
-        imageName: deployWorkspaceProjectResultContext.imageName
-    };
+    return await getDeployWorkspaceProjectResults(deployWorkspaceProjectResultContext);
 }
 
 function displayNotification(context: DeployWorkspaceProjectContext): void {

src/commands/deployWorkspaceProject/getDeployWorkspaceProjectResults.ts

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { type RegistryPassword } from "@azure/arm-containerregistry";
+import type * as api from "../api/vscode-azurecontainerapps.api";
+import { listCredentialsFromRegistry } from "../image/imageSource/containerRegistry/acr/listCredentialsFromRegistry";
+import { type DeployWorkspaceProjectContext } from "./DeployWorkspaceProjectContext";
+
+export type DeployWorkspaceProjectResults = api.DeployWorkspaceProjectResults;
+
+export async function getDeployWorkspaceProjectResults(context: DeployWorkspaceProjectContext): Promise<DeployWorkspaceProjectResults> {
+    const registryCredentials: { username: string, password: RegistryPassword } | undefined = context.registry ?
+        await listCredentialsFromRegistry(context, context.registry) : undefined;
+
+    return {
+        resourceGroupId: context.resourceGroup?.id,
+        logAnalyticsWorkspaceId: context.logAnalyticsWorkspace?.id,
+        managedEnvironmentId: context.managedEnvironment?.id,
+        containerAppId: context.containerApp?.id,
+        registryId: context.registry?.id,
+        registryLoginServer: context.registry?.loginServer,
+        registryUsername: registryCredentials?.username,
+        registryPassword: registryCredentials?.password.value,
+        imageName: context.imageName
+    };
+}