First try: fully qualified Flux API names

Signed-off-by: Kingdon Barrett <[email protected]>
weaveworks · Sep 5, 2023 · f8763dc · f8763dc
1 parent aa60ca9
commit f8763dc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 4 deletions.
diff --git a/src/cli/kubernetes/kubectlGet.ts b/src/cli/kubernetes/kubectlGet.ts
@@ -9,7 +9,7 @@ import { HelmRelease } from 'types/flux/helmRelease';
 import { HelmRepository } from 'types/flux/helmRepository';
 import { Kustomization } from 'types/flux/kustomization';
 import { OCIRepository } from 'types/flux/ociRepository';
-import { Deployment, Kind, KubernetesObject, Pod } from 'types/kubernetes/kubernetesTypes';
+import { Deployment, FullyQualifiedKinds, Kind, KubernetesObject, Pod } from 'types/kubernetes/kubernetesTypes';
 import { TelemetryError } from 'types/telemetryEventNames';
 import { parseJson, parseJsonItems } from 'utils/jsonUtils';
 import { invokeKubectlCommand } from './kubernetesToolsKubectl';
@@ -49,9 +49,12 @@ export async function getResourcesAllNamespaces<T extends KubernetesObject>(kind
 		return list as T[];
 	}
 
+	let fqKind = FullyQualifiedKinds[kind];
 
-	const shellResult = await invokeKubectlCommand(`get ${kind} -A -o json`);
-
+	const shellResult = await invokeKubectlCommand(`get ${fqKind} -A -o json`);
+	// if (kind == Kind.HelmRelease) {
+	// 	console.warn("HelmRelease is not fully qualified, put your debugger instance here");
+	// }
 	if (shellResult?.code !== 0) {
 		console.warn(`Failed to \`kubectl get ${kind} -A\`: ${shellResult?.stderr}`);
 		if (shellResult?.stderr && !notAnErrorServerDoesntHaveResourceTypeRegExp.test(shellResult.stderr)) {
@@ -181,4 +184,3 @@ export async function getPodsOfADeployment(name = '', namespace = ''): Promise<P
 
 	return parseJsonItems(podResult?.stdout);
 }
-
diff --git a/src/types/kubernetes/kubernetesTypes.ts b/src/types/kubernetes/kubernetesTypes.ts
@@ -50,6 +50,41 @@ export const enum Kind {
 	GitOpsTemplate = 'GitOpsTemplate',
 }
 
+export const enum FullyKind {
+	Bucket = 'Buckets.source.toolkit.fluxcd.io',
+	GitRepository = 'GitRepositories.source.toolkit.fluxcd.io',
+	OCIRepository = 'OCIRepositories.source.toolkit.fluxcd.io',
+	HelmRepository = 'HelmRepositories.source.toolkit.fluxcd.io',
+	HelmRelease = 'HelmReleases.helm.toolkit.fluxcd.io',
+	Kustomization = 'Kustomizations.kustomize.toolkit.fluxcd.io',
+	GitOpsTemplate = 'GitOpsTemplates.templates.weave.works',
+	List = '',
+	Deployment = '',
+	Node = '',
+	Pod = '',
+	Namespace = '',
+	ConfigMap = '',
+}
+
+type KindMapType = {
+	[id in Kind]: FullyKind;
+};
+
+export const FullyQualifiedKinds: KindMapType = {
+	Bucket: FullyKind.Bucket,
+	GitRepository: FullyKind.GitRepository,
+	OCIRepository: FullyKind.OCIRepository,
+	HelmRepository: FullyKind.HelmRepository,
+	HelmReleases: FullyKind.HelmRelease,
+	Kustomization: FullyKind.Kustomization,
+	GitOpsTemplate: FullyKind.GitOpsTemplate,
+	List: FullyKind.List,
+	Deployment: FullyKind.Deployment,
+	Node: FullyKind.Node,
+	Pod: FullyKind.Pod,
+	Namespace: FullyKind.Namespace,
+	ConfigMap: FullyKind.ConfigMap,
+};
 
 export const enum SourceKind {
 	Bucket = 'Bucket',