Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(vscode): Improve Logic Apps sites API call #3338

Merged
merged 2 commits into from
Sep 18, 2023
Merged
Changes from 1 commit
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
Next Next commit
Improve logic apps loading in tree
ccastrotrejo committed Sep 15, 2023
commit d9ac628111ef2b611c07d326aef725a1f3358553
36 changes: 29 additions & 7 deletions apps/vs-code-designer/src/LogicAppResolver.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,46 @@
import { LogicAppResourceTree } from './app/tree/LogicAppResourceTree';
import { logicAppFilter } from './constants';
import { ext } from './extensionVariables';
import type { Site } from '@azure/arm-appservice';
import { createWebSiteClient } from '@microsoft/vscode-azext-azureappservice';
import { getResourceGroupFromId } from '@microsoft/vscode-azext-azureutils';
import { uiUtils } from '@microsoft/vscode-azext-azureutils';
import type { IActionContext, ISubscriptionContext } from '@microsoft/vscode-azext-utils';
import { callWithTelemetryAndErrorHandling, nonNullProp } from '@microsoft/vscode-azext-utils';
import { callWithTelemetryAndErrorHandling } from '@microsoft/vscode-azext-utils';
import type { AppResource, AppResourceResolver } from '@microsoft/vscode-azext-utils/hostapi';

export class LogicAppResolver implements AppResourceResolver {
public async resolveResource(subContext: ISubscriptionContext, resource: AppResource): Promise<LogicAppResourceTree | undefined> {
return await callWithTelemetryAndErrorHandling('resolveResource', async (context: IActionContext) => {
const client = await createWebSiteClient({ ...context, ...subContext });
const rg = getResourceGroupFromId(nonNullProp(resource, 'id'));
const name = nonNullProp(resource, 'name');

const site = await client.webApps.get(rg, name);
const site: Site = await this.getAppResourceSite(context, subContext, resource);
if (!site) {
return;
}
return LogicAppResourceTree.createLogicAppResourceTree(context, subContext, site);
});
}

public matchesResource(resource: AppResource): boolean {
return resource.type.toLowerCase() === logicAppFilter.type && resource.kind?.toLowerCase() === logicAppFilter.kind;
}

private async getAppResourceSite(context: IActionContext, subContext: ISubscriptionContext, resource: AppResource): Promise<Site> {
const logicAppsSites = ext.logicAppSitesMap.get(subContext.subscriptionId);
let site: Site;

if (!logicAppsSites) {
const client = await createWebSiteClient({ ...context, ...subContext });

const listOfSites: Site[] = await uiUtils.listAllIterator(client.webApps.list());
const subscriptionSites = new Map<string, Site>();
listOfSites.forEach((item: Site) => {
subscriptionSites.set(item.id, item);
});

ext.logicAppSitesMap.set(subContext.subscriptionId, subscriptionSites);
site = subscriptionSites.get(resource.id);
} else {
site = ext.logicAppSitesMap.get(subContext.subscriptionId).get(resource.id);
}
return site;
}
}
2 changes: 2 additions & 0 deletions apps/vs-code-designer/src/extensionVariables.ts
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import type { AzureAccountTreeItemWithProjects } from './app/tree/AzureAccountTreeItemWithProjects';
import { func } from './constants';
import type { Site } from '@azure/arm-appservice';
import type { IAzExtOutputChannel } from '@microsoft/vscode-azext-utils';
import type { AzureHostExtensionApi } from '@microsoft/vscode-azext-utils/hostapi';
import type * as cp from 'child_process';
@@ -26,6 +27,7 @@ export namespace ext {
export let azureAccountTreeItem: AzureAccountTreeItemWithProjects;
export const treeViewName = 'azLogicApps';
export let deploymentFolderPath: string;
export const logicAppSitesMap: Map<string, Map<string, Site>> = new Map();

// Resource group API
export let rgApi: AzureHostExtensionApi;