Skip to content

Add Log Streaming capabilities #350

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.

Sign up for GitHub

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

Merged
motm32 merged 9 commits into from
Apr 25, 2023
Merged

Add Log Streaming capabilities #350

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4c630a4
Add start/stop to view
motm32 Apr 3, 2023
d08486b
Merge branch 'main' of github.com:microsoft/vscode-azurecontainerapps…
motm32 Apr 6, 2023
7acfa76
Add Streaming log capabilities
motm32 Apr 19, 2023
ca4ac7b
merge main
motm32 Apr 19, 2023
017ccd0
Suggested changes
motm32 Apr 20, 2023
f913efe
More changes
motm32 Apr 24, 2023
f97f072
Changes to RevisionListStep
motm32 Apr 24, 2023
638cce2
Remove await
motm32 Apr 25, 2023
9615154
Change to "Stop all streams"
motm32 Apr 25, 2023
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
21 changes: 14 additions & 7 deletions src/commands/logStream/RevisionListStep.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,23 @@ import { localize } from "../../utils/localize";
import { IStreamLogsContext } from "./IStreamLogsContext";

export class RevisionListStep extends AzureWizardPromptStep<IStreamLogsContext> {
private revisions: Revision[] | undefined;

public async prompt(context: IStreamLogsContext): Promise<void> {
const placeHolder: string = localize('selectRevision', 'Select a revision');
context.revision = (await context.ui.showQuickPick(this.getPicks(context), { placeHolder })).data;
context.revision = (await context.ui.showQuickPick(await this.getPicks(context), { placeHolder })).data;
Copy link
Copy Markdown
Member

@nturinski nturinski Apr 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally you don't want to await this.getPicks in showQuickPick. showQuickPick is designed to handle promises so that it will show a loading bar while the promise resolves. If you await it, there'll be a small gap where the quickpick UI doesn't show up while it's loading the picks.

Copy link
Copy Markdown
Contributor Author

@motm32 motm32 Apr 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops accidently added that ahaha.

}

public async configureBeforePrompt(context: IStreamLogsContext): Promise<void> {
const picks = await this.getPicks(context);
if (context.containerApp.revisionsMode === 'Multiple' && picks.length === 1) {
context.revision = picks[0].data;
} else if (context.containerApp.revisionsMode === 'Single') {
if (context.containerApp.revisionsMode === 'Single') {
const client: ContainerAppsAPIClient = await createContainerAppsAPIClient([context, createSubscriptionContext(context.subscription)]);
const revisionData = await client.containerAppsRevisions.getRevision(context.resourceGroupName, context.containerApp.name, nonNullProp(context.containerApp, 'latestRevisionName'));
context.revision = revisionData;
} else {
const picks = await this.getPicks(context);
if (picks.length === 1) {
context.revision = picks[0].data;
}
}
}

Expand All @@ -34,8 +38,11 @@ export class RevisionListStep extends AzureWizardPromptStep<IStreamLogsContext>

private async getPicks(context: IStreamLogsContext): Promise<IAzureQuickPickItem<Revision>[]> {
const client: ContainerAppsAPIClient = await createContainerAppsAPIClient([context, createSubscriptionContext(context.subscription)]);
const revisions = (await uiUtils.listAllIterator(client.containerAppsRevisions.listRevisions(context.resourceGroupName, context.containerApp.name)));
return revisions.map(r => {
if (!this.revisions) {
this.revisions = (await uiUtils.listAllIterator(client.containerAppsRevisions.listRevisions(context.resourceGroupName, context.containerApp.name)));
}

return this.revisions.map(r => {
const date = r.createdTime;
return { label: nonNullProp(r, 'name'), description: dayjs(date).fromNow(), data: r };
});
Expand Down
⚡