More feedback

Author: MicroFish91

src/commands/CommandAttributes.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { type ActivityAttributes } from "@microsoft/vscode-azext-utils";
+
+export class CommandAttributes {
+
+    static readonly DeployContainerAppContainerRegistry: ActivityAttributes = {
+        description: `Deploys an existing image from a container registry to a target Azure Container App.
+            The container registry and image must already be available for pulling.
+            Supports public images from any registry, and both public and private images from Azure Container Registry (ACR).
+            For private image deployment from other third party registries, we support deployment through the 'vscode-containers' extension
+            via the command titled "Container Registries: Deploy Image to Azure Container Apps...".`,
+        troubleshooting: [
+            `If a container app resource envelope is provided in attributes, do not confuse null secrets as missing container app secrets. This is because secrets are not typically
+            copied over with the core resource metadata. Any issues with secrets will require inspecting the remote resource directly.`,
+        ]
+    };
+
+    static readonly DeployWorkspaceProjectInternal: ActivityAttributes = {
+        description: `Takes a workspace project with a Dockerfile and deploys it to an Azure Container App.
+            Automatically creates any required resources (resource group, managed environment, container registry, container app, log analytics workspace).
+            Supports single repo and monorepo, with deployment settings saved and reused via local VS Code settings (.vscode/settings.json).
+            Deployment settings are saved under "containerApps.deploymentConfigurations".
+            Deployment is agnostic to project runtime and language.`,
+        troubleshooting: [
+            `When ACR build errors are present, try to inspect the Dockerfile and ACR build logs.
+            When an error is related to the Dockerfile, offer to make direct fixes for the user.`,
+            `If a container app resource envelope is provided in attributes, do not confuse empty secrets as missing container app secrets. This is because secrets are not typically
+            copied over with the core resource metadata. Any issues with secrets will require inspecting the remote resource directly.`,
+        ],
+    };
+}

src/commands/deployContainerApp/deployContainerApp.ts

@@ -14,6 +14,7 @@ import { getVerifyProvidersStep } from "../../utils/getVerifyProvidersStep";
 import { localize } from "../../utils/localize";
 import { pickContainerApp } from "../../utils/pickItem/pickContainerApp";
 import { OpenConfirmationViewStep } from "../../webviews/OpenConfirmationViewStep";
+import { CommandAttributes } from "../CommandAttributes";
 import { ContainerAppOverwriteConfirmStep } from "../ContainerAppOverwriteConfirmStep";
 import { deployWorkspaceProject } from "../deployWorkspaceProject/deployWorkspaceProject";
 import { editContainerCommandName } from "../editContainer/editContainer";
@@ -50,17 +51,7 @@ export async function deployContainerApp(context: IActionContext, node?: Contain
         containerApp: item.containerApp,
         managedEnvironment: await getManagedEnvironmentFromContainerApp(subscriptionActionContext, item.containerApp),
         imageSource,
-        activityAttributes: {
-            description: `Deploys an existing image from a container registry to a target Azure Container App.
-            The container registry and image must already be available for pulling.
-            Supports public images from any registry, and both public and private images from Azure Container Registry (ACR).
-            For private image deployment from other third party registries, we support deployment through the 'vscode-containers' extension
-            via the command titled "Container Registries: Deploy Image to Azure Container Apps...".`,
-            troubleshooting: [
-                `If a container app resource envelope is provided in attributes, do not confuse null secrets as missing container app secrets. This is because secrets are not typically
-                copied over with the core resource metadata. Any issues with secrets will require inspecting the remote resource directly.`,
-            ]
-        },
+        activityAttributes: CommandAttributes.DeployContainerAppContainerRegistry,
     };
 
     if (isAzdExtensionInstalled()) {

src/commands/deployWorkspaceProject/internal/deployWorkspaceProjectInternal.ts

@@ -12,6 +12,7 @@ import { ext } from "../../../extensionVariables";
 import { createActivityContext, prependOrInsertAfterLastInfoChild } from "../../../utils/activityUtils";
 import { getVerifyProvidersStep } from "../../../utils/getVerifyProvidersStep";
 import { localize } from "../../../utils/localize";
+import { CommandAttributes } from "../../CommandAttributes";
 import { ContainerAppCreateStep } from "../../createContainerApp/ContainerAppCreateStep";
 import { LogAnalyticsCreateStep } from "../../createManagedEnvironment/LogAnalyticsCreateStep";
 import { ManagedEnvironmentCreateStep } from "../../createManagedEnvironment/ManagedEnvironmentCreateStep";
@@ -95,19 +96,7 @@ export async function deployWorkspaceProjectInternal(
         ...context,
         ...activityContext,
         ...startingConfiguration,
-        activityAttributes: {
-            description: `Takes a workspace project with a Dockerfile and deploys it to an Azure Container App.
-                Automatically creates any required resources (resource group, managed environment, container registry, container app, log analytics workspace).
-                Supports single repo and monorepo, with deployment settings saved and reused via local VS Code settings (.vscode/settings.json).
-                Deployment settings are saved under "containerApps.deploymentConfigurations".
-                Deployment is agnostic to project runtime and language.`,
-            troubleshooting: [
-                `When ACR build errors are present, try to inspect the Dockerfile and ACR build logs.
-                When an error is related to the Dockerfile, offer to make direct fixes for the user.`,
-                `If a container app resource envelope is provided in attributes, do not confuse empty secrets as missing container app secrets. This is because secrets are not typically
-                copied over with the core resource metadata. Any issues with secrets will require inspecting the remote resource directly.`,
-            ],
-        },
+        activityAttributes: CommandAttributes.DeployWorkspaceProjectInternal,
     };
 
     const promptSteps: AzureWizardPromptStep<DeployWorkspaceProjectInternalContext>[] = [

src/commands/image/imageSource/ContainerAppStartVerificationStep.ts

@@ -122,7 +122,7 @@ export class ContainerAppStartVerificationStep<T extends ContainerAppStartVerifi
                 break;
             }
 
-            await delayWithExponentialBackoff(attempt, 2000 /** baseDelayMs */, maxWaitTimeMs);
+            await delayWithExponentialBackoff(attempt, 1000 /** baseDelayMs */, maxWaitTimeMs);
             attempt++;
 
             revision = await this._client.containerAppsRevisions.getRevision(parsedRevision.resourceGroup, containerAppName, parsedRevision.resourceName);

src/utils/delay.ts

@@ -12,12 +12,12 @@ export async function delay(ms: number): Promise<void> {
  *
  * @param attempt The current attempt number (starting from 1).
  * @param baseDelayMs The base delay in milliseconds.
- * @param maxElapsedMs The maximum elapsed delay in milliseconds.
+ * @param maxElapsedLimitMs The maximum elapsed delay in milliseconds.
  */
-export async function delayWithExponentialBackoff(attempt: number, baseDelayMs: number, maxElapsedMs: number): Promise<void> {
+export async function delayWithExponentialBackoff(attempt: number, baseDelayMs: number, maxElapsedLimitMs: number): Promise<void> {
     const elapsedTimeMs = baseDelayMs * (Math.pow(2, attempt - 1) - 1);
     const nextDelayTickMs = baseDelayMs * Math.pow(2, attempt - 1);
-    const maxWaitAdjustedMs = maxElapsedMs - elapsedTimeMs;
+    const maxWaitAdjustedMs = maxElapsedLimitMs - elapsedTimeMs;
 
     if (maxWaitAdjustedMs <= 0) {
         return;