From 85007ed780a2acd30b57d6176d66b275d912e4d6 Mon Sep 17 00:00:00 2001 From: Joe Portner <5295965+jportner@users.noreply.github.com> Date: Fri, 27 Dec 2024 13:57:32 -0500 Subject: [PATCH 1/4] Fix type definition for KubernetesObjectApi.read() --- src/object.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/object.ts b/src/object.ts index 91efe2e9c79..36cbccdafe1 100644 --- a/src/object.ts +++ b/src/object.ts @@ -19,6 +19,16 @@ import { PatchStrategy } from './patch.js'; /** Kubernetes API verbs. */ type KubernetesApiAction = 'create' | 'delete' | 'patch' | 'read' | 'list' | 'replace'; +type KubernetesObjectHeader = Pick< + T, + 'apiVersion' | 'kind' +> & { + metadata: { + name: string; + namespace?: string; + }; +}; + interface GroupVersion { group: string; version: string; @@ -278,7 +288,7 @@ export class KubernetesObjectApi { * @return Promise containing the request response and [[KubernetesObject]]. */ public async read( - spec: T, + spec: KubernetesObjectHeader, pretty?: string, exact?: boolean, exportt?: boolean, From 4c1e6c2dda94d1f48407031546b376383d2ed9db Mon Sep 17 00:00:00 2001 From: Joe Portner <5295965+jportner@users.noreply.github.com> Date: Tue, 31 Dec 2024 12:13:59 -0500 Subject: [PATCH 2/4] Change type in unit test --- src/object_test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object_test.ts b/src/object_test.ts index 0a2dd66eef2..92ed7d1933f 100644 --- a/src/object_test.ts +++ b/src/object_test.ts @@ -1725,7 +1725,7 @@ describe('KubernetesObject', () => { it('should read a custom resource', async () => { interface CustomTestResource extends KubernetesObject { - spec?: { + spec: { key: string; }; } From 0170e82c0d555eb5d49f9f63f56b5196a11af18b Mon Sep 17 00:00:00 2001 From: Joe Portner <5295965+jportner@users.noreply.github.com> Date: Tue, 31 Dec 2024 12:14:43 -0500 Subject: [PATCH 3/4] Revert "Fix type definition for KubernetesObjectApi.read()" This reverts commit 85007ed780a2acd30b57d6176d66b275d912e4d6. --- src/object.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/object.ts b/src/object.ts index 36cbccdafe1..91efe2e9c79 100644 --- a/src/object.ts +++ b/src/object.ts @@ -19,16 +19,6 @@ import { PatchStrategy } from './patch.js'; /** Kubernetes API verbs. */ type KubernetesApiAction = 'create' | 'delete' | 'patch' | 'read' | 'list' | 'replace'; -type KubernetesObjectHeader = Pick< - T, - 'apiVersion' | 'kind' -> & { - metadata: { - name: string; - namespace?: string; - }; -}; - interface GroupVersion { group: string; version: string; @@ -288,7 +278,7 @@ export class KubernetesObjectApi { * @return Promise containing the request response and [[KubernetesObject]]. */ public async read( - spec: KubernetesObjectHeader, + spec: T, pretty?: string, exact?: boolean, exportt?: boolean, From 6354cd73dd8eb47527cf024733f155e932acf49c Mon Sep 17 00:00:00 2001 From: Joe Portner <5295965+jportner@users.noreply.github.com> Date: Tue, 31 Dec 2024 12:17:07 -0500 Subject: [PATCH 4/4] Un-revert "Fix type definition for KubernetesObjectApi.read()" This reverts commit 0170e82c0d555eb5d49f9f63f56b5196a11af18b. --- src/object.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/object.ts b/src/object.ts index 91efe2e9c79..36cbccdafe1 100644 --- a/src/object.ts +++ b/src/object.ts @@ -19,6 +19,16 @@ import { PatchStrategy } from './patch.js'; /** Kubernetes API verbs. */ type KubernetesApiAction = 'create' | 'delete' | 'patch' | 'read' | 'list' | 'replace'; +type KubernetesObjectHeader = Pick< + T, + 'apiVersion' | 'kind' +> & { + metadata: { + name: string; + namespace?: string; + }; +}; + interface GroupVersion { group: string; version: string; @@ -278,7 +288,7 @@ export class KubernetesObjectApi { * @return Promise containing the request response and [[KubernetesObject]]. */ public async read( - spec: T, + spec: KubernetesObjectHeader, pretty?: string, exact?: boolean, exportt?: boolean,