Skip to content

Commit 0256b14

Browse files
MicroFish91MicroFish91
committed
Merge with main
2 parents 6621678 + d200981 commit 0256b14

28 files changed

+104
-1002
lines changed

‎package-lock.json‎

Lines changed: 31 additions & 242 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 16 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,22 @@
6565
"category": "Azure Container Apps",
6666
"icon": "$(add)"
6767
},
68-
{
69-
"command": "containerApps.deleteManagedEnvironment",
70-
"title": "%containerApps.deleteManagedEnvironment%",
71-
"category": "Azure Container Apps"
72-
},
73-
{
74-
"command": "containerApps.editContainerApp",
75-
"title": "%containerApps.editContainerApp%",
76-
"category": "Azure Container Apps"
77-
},
7868
{
7969
"command": "containerApps.deployImage",
8070
"title": "%containerApps.deployImage%",
81-
"category": "Azure Container Apps"
71+
"category": "Azure Container Apps",
72+
"icon": "$(cloud-upload)"
8273
},
8374
{
8475
"command": "containerApps.deployImageApi",
8576
"title": "%containerApps.deployImageApi%",
8677
"category": "Azure Container Apps"
8778
},
79+
{
80+
"command": "containerApps.deleteManagedEnvironment",
81+
"title": "%containerApps.deleteManagedEnvironment%",
82+
"category": "Azure Container Apps"
83+
},
8884
{
8985
"command": "containerApps.deleteContainerApp",
9086
"title": "%containerApps.deleteContainerApp%",
@@ -110,12 +106,6 @@
110106
"title": "%containerApps.editTargetPort%",
111107
"category": "Azure Container Apps"
112108
},
113-
{
114-
"command": "containerApps.discardRevisionDraft",
115-
"title": "%containerApps.discardRevisionDraft%",
116-
"category": "Azure Container Apps",
117-
"icon": "$(discard)"
118-
},
119109
{
120110
"command": "containerApps.chooseRevisionMode",
121111
"title": "%containerApps.chooseRevisionMode%",
@@ -225,39 +215,24 @@
225215
"group": "2@2"
226216
},
227217
{
228-
"command": "containerApps.discardRevisionDraft",
229-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single(.*)unsavedChanges:true/i",
230-
"group": "inline@2"
231-
},
232-
{
233-
"command": "containerApps.discardRevisionDraft",
234-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single(.*)unsavedChanges:true/i",
235-
"group": "3@2"
236-
},
237-
{
238-
"command": "containerApps.editContainerApp",
239-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single/i",
240-
"group": "4@1"
241-
},
242-
{
243-
"command": "containerApps.deleteContainerApp",
218+
"command": "containerApps.deployImage",
244219
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
245-
"group": "5@1"
220+
"group": "3@1"
246221
},
247222
{
248-
"command": "containerApps.deployImage",
223+
"command": "containerApps.deleteContainerApp",
249224
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
250-
"group": "6@1"
225+
"group": "3@2"
251226
},
252227
{
253228
"command": "containerApps.startStreamingLogs",
254229
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
255-
"group": "7@1"
230+
"group": "4@1"
256231
},
257232
{
258233
"command": "containerApps.stopStreamingLogs",
259234
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem/i",
260-
"group": "7@2"
235+
"group": "4@2"
261236
},
262237
{
263238
"command": "containerApps.chooseRevisionMode",
@@ -311,12 +286,12 @@
311286
},
312287
{
313288
"command": "containerApps.openGitHubRepo",
314-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azureContainerActionsConnected/i",
289+
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /actionsConnected:true(.*)containerAppsActionsItem/i",
315290
"group": "1@1"
316291
},
317292
{
318293
"command": "containerApps.disconnectRepo",
319-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /azureContainerActionsConnected/i",
294+
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /actionsConnected:true(.*)containerAppsActionsItem/i",
320295
"group": "1@2"
321296
}
322297
],
@@ -376,7 +351,6 @@
376351
"@azure/ms-rest-azure-env": "^2.0.0",
377352
"@microsoft/eslint-config-azuretools": "^0.2.1",
378353
"@microsoft/vscode-azext-dev": "^2.0.1",
379-
"@octokit/types": "^9.1.0",
380354
"@types/deep-eql": "^4.0.0",
381355
"@types/fs-extra": "^8.1.1",
382356
"@types/gulp": "^4.0.6",
@@ -410,9 +384,9 @@
410384
"@azure/core-rest-pipeline": "1.10.3",
411385
"@azure/storage-blob": "^12.4.1",
412386
"@microsoft/vscode-azext-azureutils": "^2.0.0",
387+
"@microsoft/vscode-azext-github": "^1.0.0",
413388
"@microsoft/vscode-azext-utils": "^2.0.0",
414389
"@microsoft/vscode-azureresources-api": "^2.0.2",
415-
"@octokit/rest": "^18.5.2",
416390
"buffer": "^6.0.3",
417391
"dayjs": "^1.11.3",
418392
"deep-eql": "^4.1.3",

‎src/commands/gitHub/connectToGitHub/IConnectToGitHubContext.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import type { Registry } from '@azure/arm-containerregistry';
7+
import type { GitHubContext } from '@microsoft/vscode-azext-github';
78
import type { ExecuteActivityContext } from "@microsoft/vscode-azext-utils";
8-
import type { IGitHubContext } from '../../../gitHub/IGitHubContext';
99
import type { ContainerAppModel } from "../../../tree/ContainerAppItem";
1010
import type { IContainerAppContext } from '../../IContainerAppContext';
1111

12-
export interface IConnectToGitHubContext extends IContainerAppContext, IGitHubContext, ExecuteActivityContext {
12+
export interface IConnectToGitHubContext extends IContainerAppContext, GitHubContext, ExecuteActivityContext {
1313
// Make containerApp _required_
1414
containerApp: ContainerAppModel;
1515

‎src/commands/gitHub/connectToGitHub/connectToGitHub.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6+
import { GitHubBranchListStep, GitHubOrgListStep, GitHubRepositoryListStep } from "@microsoft/vscode-azext-github";
67
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, ITreeItemPickerContext, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
7-
import { GitHubBranchListStep } from "../../../gitHub/GitHubBranchListStep";
8-
import { GitHubOrgListStep } from "../../../gitHub/GitHubOrgListStep";
9-
import { GitHubRepositoryListStep } from "../../../gitHub/GitHubRepositoryListStep";
10-
import { getGitHubAccessToken } from "../../../gitHub/getGitHubAccessToken";
118
import type { ContainerAppItem } from "../../../tree/ContainerAppItem";
129
import { createActivityContext } from "../../../utils/activityUtils";
1310
import { localize } from "../../../utils/localize";
@@ -35,7 +32,6 @@ export async function connectToGitHub(context: ITreeItemPickerContext & Partial<
3532
...await createActivityContext(),
3633
subscription,
3734
containerApp,
38-
gitHubAccessToken: await getGitHubAccessToken()
3935
};
4036

4137
if (await isGitHubConnected(wizardContext)) {

‎src/commands/gitHub/disconnectRepo/GitHubRepositoryDisconnectStep.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import type { ContainerAppsAPIClient, SourceControl } from "@azure/arm-appcontainers";
7-
import { AzureWizardExecuteStep, nonNullProp } from "@microsoft/vscode-azext-utils";
7+
import { gitHubUrlParse } from "@microsoft/vscode-azext-github";
8+
import { AzureWizardExecuteStep, nonNullProp, nonNullValue } from "@microsoft/vscode-azext-utils";
89
import type { Progress } from "vscode";
910
import { ext } from "../../../extensionVariables";
10-
import { gitHubUrlParse } from "../../../gitHub/gitHubUrlParse";
1111
import { createContainerAppsClient } from "../../../utils/azureClients";
1212
import { localize } from "../../../utils/localize";
1313
import { getContainerAppSourceControl } from "../connectToGitHub/getContainerAppSourceControl";
@@ -20,7 +20,7 @@ export class GitHubRepositoryDisconnectStep extends AzureWizardExecuteStep<IDisc
2020
const client: ContainerAppsAPIClient = await createContainerAppsClient(context, context.subscription);
2121
const sourceControl: SourceControl | undefined = await getContainerAppSourceControl(context, context.subscription, context.containerApp);
2222

23-
const { ownerOrOrganization: owner, repositoryName: repo } = gitHubUrlParse(sourceControl?.repoUrl);
23+
const { ownerOrOrganization: owner, repositoryName: repo } = gitHubUrlParse(nonNullValue(sourceControl?.repoUrl));
2424

2525
const rgName: string = context.containerApp.resourceGroup;
2626
const caName: string = context.containerApp.name;

‎src/commands/gitHub/disconnectRepo/IDisconnectRepoContext.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6+
import type { GitHubContext } from "@microsoft/vscode-azext-github";
67
import type { ExecuteActivityContext } from "@microsoft/vscode-azext-utils";
7-
import type { IGitHubContext } from "../../../gitHub/IGitHubContext";
88
import type { ContainerAppModel } from "../../../tree/ContainerAppItem";
99
import type { IContainerAppContext } from "../../IContainerAppContext";
1010

11-
export interface IDisconnectRepoContext extends IContainerAppContext, IGitHubContext, ExecuteActivityContext {
11+
export interface IDisconnectRepoContext extends IContainerAppContext, GitHubContext, ExecuteActivityContext {
1212
// Make containerApp _required_
1313
containerApp: ContainerAppModel;
1414
}

‎src/commands/gitHub/disconnectRepo/disconnectRepo.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6+
import { getGitHubAccessToken } from "@microsoft/vscode-azext-github";
67
import { AzureWizard, AzureWizardExecuteStep, ITreeItemPickerContext, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
7-
import { getGitHubAccessToken } from "../../../gitHub/getGitHubAccessToken";
88
import { ContainerAppsItem } from "../../../tree/ContainerAppsBranchDataProvider";
9-
import { ActionsTreeItem } from "../../../tree/gitHub/ActionsTreeItem";
9+
import { ActionsItem } from "../../../tree/configurations/ActionsItem";
1010
import { createActivityContext } from "../../../utils/activityUtils";
1111
import { localize } from "../../../utils/localize";
1212
import { pickContainerApp } from "../../../utils/pickContainerApp";
1313
import { isGitHubConnected } from "../connectToGitHub/isGitHubConnected";
1414
import { GitHubRepositoryDisconnectStep } from "./GitHubRepositoryDisconnectStep";
1515
import { IDisconnectRepoContext } from "./IDisconnectRepoContext";
1616

17-
export async function disconnectRepo(context: ITreeItemPickerContext & Partial<IDisconnectRepoContext>, node?: ContainerAppsItem | ActionsTreeItem): Promise<void> {
17+
export async function disconnectRepo(context: ITreeItemPickerContext & Partial<IDisconnectRepoContext>, node?: ContainerAppsItem | ActionsItem): Promise<void> {
1818
if (!node) {
1919
context.suppressCreatePick = true;
2020
node = await pickContainerApp(context);

‎src/commands/gitHub/openGitHubRepo.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import type { SourceControl } from "@azure/arm-appcontainers";
77
import { ITreeItemPickerContext, openUrl } from "@microsoft/vscode-azext-utils";
88
import type { ContainerAppsItem } from "../../tree/ContainerAppsBranchDataProvider";
9-
import type { ActionsTreeItem } from "../../tree/gitHub/ActionsTreeItem";
9+
import type { ActionsItem } from "../../tree/configurations/ActionsItem";
1010
import { localize } from "../../utils/localize";
1111
import { pickContainerApp } from "../../utils/pickContainerApp";
1212
import { getContainerAppSourceControl } from "./connectToGitHub/getContainerAppSourceControl";
1313

14-
export async function openGitHubRepo(context: ITreeItemPickerContext, node?: ContainerAppsItem | ActionsTreeItem): Promise<void> {
14+
export async function openGitHubRepo(context: ITreeItemPickerContext, node?: ContainerAppsItem | ActionsItem): Promise<void> {
1515
if (!node) {
1616
context.suppressCreatePick = true;
1717
node = await pickContainerApp(context);

‎src/gitHub/GitHubBranchListStep.ts‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎src/gitHub/GitHubOrgListStep.ts‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)
⚡