Merge pull request #484 from weaveworks/rebase-0.25-edge

Rebase 0.25 edge

package.json

@@ -14,7 +14,7 @@
 	"publisher": "weaveworks",
 	"icon": "resources/icons/gitops-logo.png",
 	"engines": {
-		"vscode": "^1.63.0",
+		"vscode": "^1.82.0",
 		"npm": ">=7.0.0"
 	},
 	"categories": [
@@ -644,7 +644,7 @@
 	"dependencies": {
 		"@kubernetes/client-node": "^0.18.1",
 		"@types/ws": "^8.5.4",
-		"@vscode/extension-telemetry": "^0.4.7",
+		"@vscode/extension-telemetry": "^0.6.0",
 		"bufferutil": "^4.0.7",
 		"change-case": "^4.1.2",
 		"extract-zip": "^2.0.1",

src/cli/kubernetes/apiResources.ts

@@ -1,4 +1,4 @@
-import { redrawhResourcesTreeViews, refreshResourcesTreeViews } from 'commands/refreshTreeViews';
+import { redrawResourcesTreeViews, refreshResourcesTreeViews } from 'commands/refreshTreeViews';
 import { currentContextData } from 'data/contextData';
 import { setVSCodeContext, telemetry } from 'extension';
 import { ContextId } from 'types/extensionIds';
@@ -52,7 +52,7 @@ export async function loadAvailableResourceKinds() {
 	context.apiResources = undefined;
 	context.apiState = ApiState.Loading;
 	// will set their content to Loading API...
-	redrawhResourcesTreeViews();
+	redrawResourcesTreeViews();
 
 	const kindsShellResult = await invokeKubectlCommand('api-resources --verbs=list -o wide');
 	if (kindsShellResult?.code !== 0) {
@@ -62,7 +62,7 @@ export async function loadAvailableResourceKinds() {
 		setVSCodeContext(ContextId.ClusterUnreachable, true);
 		clusterDataProvider.updateCurrentContextChildNodes();
 		refreshResourcesTreeViews();
-		redrawhResourcesTreeViews();
+		redrawResourcesTreeViews();
 		return;
 	}
 

src/commands/kubectlApply.ts

@@ -1,12 +1,14 @@
 import * as shell from 'cli/shell/exec';
-import { Uri } from 'vscode';
+import { Uri, window } from 'vscode';
 
 export async function kubectlApplyPath(uri?: Uri) {
+	uri ??= window.activeTextEditor?.document.uri;
 	if(uri) {
 		return await shell.execWithOutput(`kubectl apply -f ${uri.fsPath}`);
 	}
 }
 export async function kubectlDeletePath(uri?: Uri) {
+	uri ??= window.activeTextEditor?.document.uri;
 	if(uri) {
 		return await shell.execWithOutput(`kubectl delete -f ${uri.fsPath}`);
 	}

src/commands/refreshTreeViews.ts

@@ -30,7 +30,7 @@ export function refreshResourcesTreeViews() {
 	reloadTemplatesTreeView();
 }
 
-export function redrawhResourcesTreeViews() {
+export function redrawResourcesTreeViews() {
 	sourceDataProvider.redraw();
 	workloadDataProvider.redraw();
 	templateDateProvider.redraw();