Merge main

microsoft · Sep 13, 2023 · c01f652 · c01f652
2 parents b542657 + a731826
commit c01f652
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/serviceconnector/src/createLinker/LinkerCreateStep.ts b/serviceconnector/src/createLinker/LinkerCreateStep.ts
@@ -13,7 +13,7 @@ export class LinkerCreateStep extends AzureWizardExecuteStep<ICreateLinkerContex
     public priority: number = 10;
 
     public async execute(context: ICreateLinkerContext): Promise<void> {
-        const client = await createLinkerClient(context.credentials);
+        const client = await createLinkerClient(context);
 
         context.linker = {
             authInfo: context.authType,

diff --git a/serviceconnector/src/deleteLinker/DeleteLinkerStep.ts b/serviceconnector/src/deleteLinker/DeleteLinkerStep.ts
@@ -11,7 +11,7 @@ export class DeleteLinkerStep extends AzureWizardExecuteStep<IPickLinkerContext>
     public priority: number = 10;
 
     public async execute(context: IPickLinkerContext): Promise<void> {
-        const client = await createLinkerClient(context.credentials);
+        const client = await createLinkerClient(context);
         const config = await client.linker.listConfigurations(nonNullProp(context, 'sourceResourceUri'), nonNullProp(context, 'linkerName'));
 
         context.activityChildren = [];

diff --git a/serviceconnector/src/deleteLinker/LinkerListStep.ts b/serviceconnector/src/deleteLinker/LinkerListStep.ts
@@ -19,7 +19,7 @@ export class LinkerListStep extends AzureWizardPromptStep<IPickLinkerContext>{
     }
 
     private async getPicks(context: IPickLinkerContext): Promise<IAzureQuickPickItem<string>[]> {
-        const client = await createLinkerClient(context.credentials);
+        const client = await createLinkerClient(context);
         const linkers = (await uiUtils.listAllIterator(client.linker.list(nonNullProp(context, 'sourceResourceUri'))));
         return linkers.map(l => {
             return { label: nonNullProp(l, 'name'), data: nonNullProp(l, 'name') }

diff --git a/serviceconnector/src/linkerClient.ts b/serviceconnector/src/linkerClient.ts
@@ -3,8 +3,10 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { AzExtServiceClientCredentials } from "@microsoft/vscode-azext-utils";
+import { ServiceLinkerManagementClient } from "@azure/arm-servicelinker";
+import { createAzureSubscriptionClient } from "@microsoft/vscode-azext-azureutils";
+import { ICreateLinkerContext } from "./createLinker/ICreateLinkerContext";
 
-export async function createLinkerClient(credentials: AzExtServiceClientCredentials) {
-    return new (await import('@azure/arm-servicelinker')).ServiceLinkerManagementClient(credentials);
+export async function createLinkerClient(context: ICreateLinkerContext): Promise<ServiceLinkerManagementClient> {
+    return createAzureSubscriptionClient(context, (await import('@azure/arm-servicelinker')).ServiceLinkerManagementClient)
 }
diff --git a/serviceconnector/src/validateLinker/ValidateLinkerStep.ts b/serviceconnector/src/validateLinker/ValidateLinkerStep.ts
@@ -12,7 +12,7 @@ export class ValidateLinkerStep extends AzureWizardExecuteStep<IPickLinkerContex
     public priority: number = 10;
 
     public async execute(context: IPickLinkerContext): Promise<void> {
-        const client = await createLinkerClient(context.credentials);
+        const client = await createLinkerClient(context);
         const response = await client.linker.beginValidateAndWait(nonNullProp(context, 'sourceResourceUri'), nonNullProp(context, 'linkerName'));
 
         context.activityChildren = [];