Skip to content

Commit 2c926dd

Browse files
committed
Updates to AcrPullVerifyStep
1 parent 55a8019 commit 2c926dd

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/commands/registryCredentials/RegistryCredentialsAddConfigurationListStep.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import { AcrEnableAdminUserConfirmStep } from "./dockerLogin/AcrEnableAdminUserC
1111
import { AcrEnableAdminUserStep } from "./dockerLogin/AcrEnableAdminUserStep";
1212
import { DockerLoginRegistryCredentialsAddConfigurationStep } from "./dockerLogin/DockerLoginRegistryCredentialsAddConfigurationStep";
1313
import { AcrPullEnableStep } from "./identity/AcrPullEnableStep";
14+
import { AcrPullVerifyStep } from "./identity/AcrPullVerifyStep";
1415
import { ManagedEnvironmentIdentityEnableStep } from "./identity/ManagedEnvironmentIdentityEnableStep";
15-
import { ManagedIdentityRegistryCredentialAddConfigurationStep } from "./identity/ManagedIdentityRegistryCredentialAddConfigurationStep";
16+
import { ManagedIdentityRegistryCredentialsAddConfigurationStep } from "./identity/ManagedIdentityRegistryCredentialsAddConfigurationStep";
1617
import { RegistryCredentialsAndSecretsConfigurationStep } from "./RegistryCredentialsAndSecretsConfigurationStep";
1718
import { type RegistryCredentialsContext } from "./RegistryCredentialsContext";
1819

@@ -62,8 +63,9 @@ export class RegistryCredentialsAddConfigurationListStep extends AzureWizardProm
6263
case RegistryCredentialType.SystemAssigned:
6364
executeSteps.push(
6465
new ManagedEnvironmentIdentityEnableStep(),
66+
new AcrPullVerifyStep(),
6567
new AcrPullEnableStep(),
66-
new ManagedIdentityRegistryCredentialAddConfigurationStep(registryDomain),
68+
new ManagedIdentityRegistryCredentialsAddConfigurationStep(registryDomain),
6769
);
6870
break;
6971
case RegistryCredentialType.DockerLogin:

src/commands/registryCredentials/identity/AcrPullVerifyStep.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ export class AcrPullVerifyStep extends AzureWizardExecuteStep<ManagedIdentityReg
4242
return {
4343
item: new GenericTreeItem(undefined, {
4444
contextValue: createUniversallyUniqueContextValue(['containerRegistryAcrPullVerifyStepSuccessItem', activitySuccessContext]),
45-
label: localize('verifyAcrPull', 'Verify "{0}" access for container environment identity', 'acrPull'),
45+
label: localize('verifyAcrPull', 'Verify "{0}" access on container registry "{1}"', 'acrPull', context.registry?.name),
4646
iconPath: activitySuccessIcon
4747
}),
48-
message: localize('verifyAcrPullSuccess', 'Successfully verified "{0}" access for container environment identity.', 'acrPull'),
48+
message: localize('verifyAcrPullSuccess', 'Successfully verified "{0}" access on container registry "{1}".', 'acrPull', context.registry?.name),
4949
};
5050
} else {
5151
// 'AcrPullEnableStep' will cover showing this output
5252
return {};
5353
}
5454
}
5555

56-
public createFailOutput(): ExecuteActivityOutput {
56+
public createFailOutput(context: ManagedIdentityRegistryCredentialsContext): ExecuteActivityOutput {
5757
return {
5858
item: new GenericParentTreeItem(undefined, {
5959
contextValue: createUniversallyUniqueContextValue(['containerRegistryAcrPullVerifyStepFailItem', activityFailContext]),
60-
label: localize('verifyAcrPull', 'Verify "{0}" access for container environment identity"', 'acrPull'),
60+
label: localize('verifyAcrPull', 'Verify "{0}" access on container registry "{1}"', 'acrPull', context.registry?.name),
6161
iconPath: activityFailIcon
6262
}),
63-
message: localize('verifyAcrPullFail', 'Failed to verify "{0}" access for container environment identity.', 'acrPull'),
63+
message: localize('verifyAcrPullFail', 'Failed to verify "{0}" access on container registry "{1}".', 'acrPull', context.registry?.name),
6464
};
6565
}
6666
}

src/commands/registryCredentials/identity/ManagedIdentityRegistryCredentialAddConfigurationStep.ts renamed to src/commands/registryCredentials/identity/ManagedIdentityRegistryCredentialsAddConfigurationStep.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { acrDomain, type SupportedRegistries } from "../../../constants";
88
import { localize } from "../../../utils/localize";
99
import { type ManagedIdentityRegistryCredentialsContext } from "./ManagedIdentityRegistryCredentialsContext";
1010

11-
export class ManagedIdentityRegistryCredentialAddConfigurationStep extends AzureWizardExecuteStep<ManagedIdentityRegistryCredentialsContext> {
11+
export class ManagedIdentityRegistryCredentialsAddConfigurationStep extends AzureWizardExecuteStep<ManagedIdentityRegistryCredentialsContext> {
1212
public priority: number = 470;
1313

1414
constructor(private readonly supportedRegistryDomain: SupportedRegistries | undefined) {

0 commit comments

Comments
 (0)