Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 93 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -848,9 +848,9 @@
"@azure/container-registry": "1.0.0-beta.5",
"@azure/core-rest-pipeline": "1.10.3",
"@azure/storage-blob": "^12.4.1",
"@microsoft/vscode-azext-azureutils": "^3.1.1",
"@microsoft/vscode-azext-azureutils": "^3.2.0",
"@microsoft/vscode-azext-github": "^1.0.2",
"@microsoft/vscode-azext-utils": "^2.6.3",
"@microsoft/vscode-azext-utils": "^3.0.1",
"@microsoft/vscode-azureresources-api": "^2.0.2",
"buffer": "^6.0.3",
"dayjs": "^1.11.3",
Expand Down
84 changes: 0 additions & 84 deletions src/commands/AzureWizardActivityOutputExecuteStep.ts

This file was deleted.

3 changes: 1 addition & 2 deletions src/commands/EXECUTE_PRIORITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ When creating or updating resources, execute steps should occupy certain priorit
#### Steps
##### Managed Identity Registry Credential
- ManagedEnvironmentIdentityEnableStep: 450
- AcrPullVerifyStep: 460
- AcrPullEnableStep: 461
- AcrPullEnableStep: 460
- ManagedIdentityRegistryCredentialAddConfigurationStep: 470

##### Admin User Registry Credential
Expand Down
31 changes: 18 additions & 13 deletions src/commands/StartingResourcesLogStep.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { type ContainerApp, type ManagedEnvironment } from "@azure/arm-appcontainers";
import { type ResourceGroup } from "@azure/arm-resources";
import { LocationListStep, type ILocationWizardContext } from "@microsoft/vscode-azext-azureutils";
import { activityInfoIcon, AzureWizardPromptStep, createUniversallyUniqueContextValue, GenericTreeItem, type ExecuteActivityContext, type IActionContext } from "@microsoft/vscode-azext-utils";
import { ActivityChildItem, ActivityChildType, activityInfoIcon, AzureWizardPromptStep, createContextValue, type ExecuteActivityContext, type IActionContext } from "@microsoft/vscode-azext-utils";
import { activityInfoContext } from "../constants";
import { ext } from "../extensionVariables";
import { localize } from "../utils/localize";
Expand All @@ -17,6 +17,8 @@ type StartingResourcesLogContext = IActionContext & Partial<ExecuteActivityConte
containerApp?: ContainerApp
};

const startingResourcesContext: string = 'startingResourcesLogStepItem';

/**
* Use to display primary Azure resource data to the output and activity log
* i.e. resource group, managed environment, container app, location
Expand Down Expand Up @@ -49,9 +51,10 @@ export class StartingResourcesLogStep<T extends StartingResourcesLogContext> ext
protected async logStartingResources(context: T): Promise<void> {
if (context.resourceGroup) {
context.activityChildren?.push(
new GenericTreeItem(undefined, {
contextValue: createUniversallyUniqueContextValue(['useExistingResourceGroupInfoItem', activityInfoContext]),
label: localize('useResourceGroup', 'Using resource group "{0}"', context.resourceGroup.name),
new ActivityChildItem({
contextValue: createContextValue([startingResourcesContext, activityInfoContext]),
label: localize('useResourceGroup', 'Use resource group "{0}"', context.resourceGroup.name),
activityType: ActivityChildType.Info,
iconPath: activityInfoIcon
})
);
Expand All @@ -60,22 +63,24 @@ export class StartingResourcesLogStep<T extends StartingResourcesLogContext> ext

if (context.managedEnvironment) {
context.activityChildren?.push(
new GenericTreeItem(undefined, {
contextValue: createUniversallyUniqueContextValue(['useExistingManagedEnvironmentInfoItem', activityInfoContext]),
label: localize('useManagedEnvironment', 'Using managed environment "{0}"', context.managedEnvironment.name),
new ActivityChildItem({
label: localize('useManagedEnvironment', 'Use managed environment "{0}"', context.managedEnvironment.name),
contextValue: createContextValue([startingResourcesContext, activityInfoContext]),
activityType: ActivityChildType.Info,
iconPath: activityInfoIcon
})
}),
);
ext.outputChannel.appendLog(localize('usingManagedEnvironment', 'Using managed environment "{0}".', context.managedEnvironment.name));
}

if (context.containerApp) {
context.activityChildren?.push(
new GenericTreeItem(undefined, {
contextValue: createUniversallyUniqueContextValue(['useExistingContainerAppInfoItem', activityInfoContext]),
label: localize('useContainerApp', 'Using container app "{0}"', context.containerApp.name),
iconPath: activityInfoIcon
})
new ActivityChildItem({
label: localize('useContainerApp', 'Use container app "{0}"', context.containerApp.name),
contextValue: createContextValue([startingResourcesContext, activityInfoContext]),
activityType: ActivityChildType.Info,
iconPath: activityInfoIcon,
}),
);
ext.outputChannel.appendLog(localize('usingContainerApp', 'Using container app "{0}".', context.containerApp.name));
}
Expand Down
Loading