Add Service Connector

package.json

@@ -165,6 +165,21 @@
                 "command": "containerApps.stopStreamingLogs",
                 "title": "%containerApps.stopStreamingLogs%",
                 "category": "Azure Container Apps"
+            },
+            {
+                "command": "containerApps.createServiceConnector",
+                "title": "%containerApps.createServiceConnector%",
+                "category": "Azure Container Apps"
+            },
+            {
+                "command": "containerApps.deleteServiceConnector",
+                "title": "%containerApps.deleteServiceConnector%",
+                "category": "Azure Container Apps"
+            },
+            {
+                "command": "containerApps.validateServiceConnector",
+                "title": "%containerApps.validateServiceConnector%",
+                "category": "Azure Container Apps"
             }
         ],
         "menus": {
@@ -277,6 +292,21 @@
                     "command": "containerApps.stopStreamingLogs",
                     "when": "view == azureResourceGroups && viewItem =~ /containerApp[^s]/i",
                     "group": "4@2"
+                },
+                {
+                    "command": "containerApps.createServiceConnector",
+                    "when": "view == azureResourceGroups && viewItem =~ /containerApp[^s]/i",
+                    "group": "4@3"
+                },
+                {
+                    "command": "containerApps.deleteServiceConnector",
+                    "when": "view == azureResourceGroups && viewItem =~ /containerApp[^s]/i",
+                    "group": "4@4"
+                },
+                {
+                    "command": "containerApps.validateServiceConnector",
+                    "when": "view == azureResourceGroups && viewItem =~ /containerApp[^s]/i",
+                    "group": "4@5"
                 }
             ],
             "commandPalette": [
@@ -374,10 +404,11 @@
         "@azure/arm-operationalinsights": "^8.0.0",
         "@azure/arm-resources": "^5.0.1",
         "@azure/container-registry": "1.0.0-beta.5",
-        "@azure/storage-blob": "^12.4.1",
         "@azure/core-rest-pipeline": "1.10.3",
-        "@microsoft/vscode-azext-azureutils": "^1.0.1",
-        "@microsoft/vscode-azext-utils": "^1.2.0",
+        "@azure/storage-blob": "^12.4.1",
+        "@microsoft/vscode-azext-azureutils": "^2.0.0",
+        "@microsoft/vscode-azext-serviceconnector": "file:../vscode-azuretools/serviceconnector/microsoft-vscode-azext-serviceconnector-0.0.1.tgz",
+        "@microsoft/vscode-azext-utils": "^2.0.0",
         "@microsoft/vscode-azureresources-api": "^2.0.2",
         "@octokit/rest": "^18.5.2",
         "buffer": "^6.0.3",

package.nls.json

@@ -29,5 +29,8 @@
     "containerApps.addScaleRule": "Add Scale Rule...",
     "containerApps.connectToGitHub": "Connect to GitHub Repository...",
     "containerApps.startStreamingLogs": "Start Streaming Logs...",
-    "containerApps.stopStreamingLogs": "Stop Streaming Logs..."
+    "containerApps.stopStreamingLogs": "Stop Streaming Logs...",
+    "containerApps.createServiceConnector": "Create Service Connector...",
+    "containerApps.deleteServiceConnector": "Delete Service Connector...",
+    "containerApps.validateServiceConnector": "Validate Service Connector..."
 }

src/commands/logStream/ContainerListStep.ts → src/commands/logStream/ReplicaContainerListStep.ts

@@ -8,7 +8,7 @@ import { AzureWizardPromptStep, IAzureQuickPickItem, nonNullProp, nonNullValue }
 import { localize } from "../../utils/localize";
 import { IStreamLogsContext } from "./IStreamLogsContext";
 
-export class ContainerListStep extends AzureWizardPromptStep<IStreamLogsContext> {
+export class ReplicaContainerListStep extends AzureWizardPromptStep<IStreamLogsContext> {
     public async prompt(context: IStreamLogsContext): Promise<void> {
         const placeHolder: string = localize('selectContainer', 'Select a container');
         context.container = (await context.ui.showQuickPick(this.getPicks(context), { placeHolder })).data;

src/commands/logStream/startStreamingLogs.ts

@@ -8,8 +8,8 @@ import { ContainerAppItem } from "../../tree/ContainerAppItem";
 import { createActivityContext } from "../../utils/activityUtils";
 import { localize } from "../../utils/localize";
 import { pickContainerApp } from "../../utils/pickContainerApp";
-import { ContainerListStep } from "./ContainerListStep";
 import { IStreamLogsContext } from "./IStreamLogsContext";
+import { ReplicaContainerListStep } from "./ReplicaContainerListStep";
 import { ReplicaListStep } from "./ReplicaListStep";
 import { RevisionListStep } from "./RevisionListStep";
 import { logStreamRequest } from "./logStreamRequest";
@@ -35,7 +35,7 @@ export async function startStreamingLogs(context: IActionContext, item?: Pick<Co
     const promptSteps: AzureWizardPromptStep<IStreamLogsContext>[] = [
         new RevisionListStep(),
         new ReplicaListStep(),
-        new ContainerListStep(),
+        new ReplicaContainerListStep(),
     ];
 
     const wizard: AzureWizard<IStreamLogsContext> = new AzureWizard(wizardContext, {

src/commands/registerCommands.ts

@@ -25,6 +25,9 @@ import { deactivateRevision } from './revisionCommands/deactivateRevision';
 import { restartRevision } from './revisionCommands/restartRevision';
 import { addScaleRule } from './scaling/addScaleRule/addScaleRule';
 import { editScalingRange } from './scaling/editScalingRange';
+import { createServiceConnector } from './serviceConnector/createServiceConnector';
+import { deleteServiceConnector } from './serviceConnector/deleteServiceConnector';
+import { validateServiceConnector } from './serviceConnector/validateServiceConnector';
 
 export function registerCommands(): void {
     // managed environments
@@ -62,6 +65,11 @@ export function registerCommands(): void {
     registerCommandWithTreeNodeUnwrapping('containerApps.startStreamingLogs', startStreamingLogs);
     registerCommandWithTreeNodeUnwrapping('containerApps.stopStreamingLogs', stopStreamingLogs);
 
+    // service connector
+    registerCommandWithTreeNodeUnwrapping('containerApps.createServiceConnector', createServiceConnector);
+    registerCommandWithTreeNodeUnwrapping('containerApps.deleteServiceConnector', deleteServiceConnector);
+    registerCommandWithTreeNodeUnwrapping('containerApps.validateServiceConnector', validateServiceConnector);
+
     // Suppress "Report an Issue" button for all errors in favor of the command
     registerErrorHandler(c => c.errorHandling.suppressReportIssue = true);
     registerReportIssueCommand('containerApps.reportIssue');

src/commands/serviceConnector/ContainerListStep.ts

@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { AzureWizardPromptStep, IAzureQuickPickItem, nonNullValue } from "@microsoft/vscode-azext-utils";
+import { localize } from "../../utils/localize";
+import { IServiceConnectorContext } from "./IServiceConnectorContext";
+
+export class ContainerListStep extends AzureWizardPromptStep<IServiceConnectorContext> {
+    public async prompt(context: IServiceConnectorContext): Promise<void> {
+        const placeHolder: string = localize('selectContainer', 'Select a container');
+        context.scope = (await context.ui.showQuickPick(this.getPicks(context), { placeHolder })).data;
+    }
+
+    public shouldPrompt(context: IServiceConnectorContext): boolean {
+        return !context.scope;
+    }
+
+    public async configureBeforePrompt(context: IServiceConnectorContext): Promise<void> {
+        const picks = this.getPicks(context);
+        if (picks.length === 1) {
+            context.scope = picks[0].data;
+        }
+    }
+
+    private getPicks(context: IServiceConnectorContext): IAzureQuickPickItem<string>[] {
+        const containers = nonNullValue(context.containerApp?.template?.containers);
+        return containers.map(c => {
+            return {
+                label: nonNullValue(c.name),
+                data: nonNullValue(c.name)
+            }
+        })
+    }
+}

src/commands/serviceConnector/IServiceConnectorContext.ts

@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { ICreateLinkerContext } from "@microsoft/vscode-azext-serviceconnector";
+import { IContainerAppContext } from "../createContainerApp/IContainerAppContext";
+
+export interface IServiceConnectorContext extends ICreateLinkerContext, IContainerAppContext {
+}

src/commands/serviceConnector/createServiceConnector.ts

@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { ICreateLinkerContext, createLinker } from "@microsoft/vscode-azext-serviceconnector";
+import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils";
+import { ContainerAppItem } from "../../tree/ContainerAppItem";
+import { createActivityContext } from "../../utils/activityUtils";
+import { localize } from "../../utils/localize";
+import { pickContainerApp } from "../../utils/pickContainerApp";
+import { ContainerListStep } from "./ContainerListStep";
+import { IServiceConnectorContext } from "./IServiceConnectorContext";
+
+export async function createServiceConnector(context: ICreateLinkerContext, item?: ContainerAppItem): Promise<void> {
+    item ??= await pickContainerApp(context);
+    const { subscription, containerApp } = item;
+
+    const activityContext = {
+        ...context,
+        ...await createActivityContext(),
+        containerApp: containerApp,
+        activityTitle: localize('createServiceConnector', 'Create Service Connector'),
+    }
+
+    const promptSteps: AzureWizardPromptStep<IServiceConnectorContext>[] = [
+        new ContainerListStep(),
+    ];
+
+    await createLinker(activityContext, { id: containerApp.id, subscription }, promptSteps);
+}

src/commands/serviceConnector/deleteServiceConnector.ts

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { ICreateLinkerContext, deleteLinker } from "@microsoft/vscode-azext-serviceconnector";
+import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils";
+import { ContainerAppItem } from "../../tree/ContainerAppItem";
+import { createActivityContext } from "../../utils/activityUtils";
+import { localize } from "../../utils/localize";
+import { pickContainerApp } from "../../utils/pickContainerApp";
+import { ContainerListStep } from "./ContainerListStep";
+import { IServiceConnectorContext } from "./IServiceConnectorContext";
+
+
+export async function deleteServiceConnector(context: ICreateLinkerContext, item?: ContainerAppItem): Promise<void> {
+    item ??= await pickContainerApp(context);
+    const { subscription, containerApp } = item;
+
+    const activityContext = {
+        ...context,
+        ...await createActivityContext(),
+        containerApp: containerApp,
+        activityTitle: localize('deleteServiceConnector', 'Delete Service Connector'),
+    }
+
+    const promptSteps: AzureWizardPromptStep<IServiceConnectorContext>[] = [
+        new ContainerListStep(),
+    ];
+
+    await deleteLinker(activityContext, { id: containerApp.id, subscription }, promptSteps);
+}

src/commands/serviceConnector/validateServiceConnector.ts

@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { ICreateLinkerContext, validateLinker } from "@microsoft/vscode-azext-serviceconnector";
+import { AzureWizardPromptStep } from "@microsoft/vscode-azext-utils";
+import { ContainerAppItem } from "../../tree/ContainerAppItem";
+import { createActivityContext } from "../../utils/activityUtils";
+import { localize } from "../../utils/localize";
+import { pickContainerApp } from "../../utils/pickContainerApp";
+import { ContainerListStep } from "./ContainerListStep";
+import { IServiceConnectorContext } from "./IServiceConnectorContext";
+
+export async function validateServiceConnector(context: ICreateLinkerContext, item?: ContainerAppItem): Promise<void> {
+    item ??= await pickContainerApp(context);
+    const { subscription, containerApp } = item;
+
+    const activityContext = {
+        ...context,
+        ...await createActivityContext(),
+        containerApp: containerApp,
+        activityTitle: localize('validateServiceConnector', 'Validate Service Connector'),
+    }
+
+    const promptSteps: AzureWizardPromptStep<IServiceConnectorContext>[] = [
+        new ContainerListStep(),
+    ];
+
+    await validateLinker(activityContext, { id: containerApp.id, subscription }, promptSteps);
+}

src/utils/azureClients.ts

@@ -30,8 +30,6 @@ export function createContainerRegistryClient(context: AzExtClientContext, regis
     const clientContext = parseClientContext(context);
     // @azure/container-registry doesn't support ADAL tokens at all.  If it sees `signRequest` is defined
     // it errors, but we don't actually need `signRequest` because this is a T2 package
-    const credential = clientContext.credentials as { signRequest: unknown };
-    credential.signRequest = undefined;
 
     return new ContainerRegistryClient(`https://${registry.loginServer}`, clientContext.credentials,
         { audience: KnownContainerRegistryAudience.AzureResourceManagerPublicCloud });