fix: patches on partially existing tty objects (#1007)

* fix: provide required name argument

* fix: set patch method

* fix: use patch strategy accepted for custom object

* test: add some return value to verify mock function call

* test: provide call parameters of valid type

---------

Co-authored-by: svcAPLBot <174728082+svcAPLBot@users.noreply.github.com>

Author: merll

src/tty.test.ts

@@ -52,12 +52,15 @@ jest.mock('@kubernetes/client-node', () => {
   class CoreV1Api {}
   class CustomObjectsApi {}
   class RbacAuthorizationV1Api {}
+  const PatchStrategy = { ServerSideApply: 'application/apply-patch+yaml' }
 
   return {
     ApiException: MockApiException,
     CoreV1Api,
     CustomObjectsApi,
     RbacAuthorizationV1Api,
+    PatchStrategy,
+    setHeaderOptions: jest.fn().mockImplementation(() => 'header-options'),
     KubeConfig: jest.fn().mockImplementation(() => ({
       makeApiClient: mockMakeApiClient,
       loadFromDefault: jest.fn(),
@@ -87,9 +90,10 @@ describe('CloudTty', () => {
     const createFn = jest.fn().mockResolvedValue({ kind: 'created' })
     const patchFn = jest.fn().mockResolvedValue({ kind: 'patched' })
 
-    const result = await tty.createOrPatch(createFn, patchFn, { id: 'x' })
+    const params = { body: { metadata: { name: 'x' }, spec: {} } }
+    const result = await tty.createOrPatch(createFn, patchFn, params)
 
-    expect(createFn).toHaveBeenCalledWith({ id: 'x' })
+    expect(createFn).toHaveBeenCalledWith(params)
     expect(patchFn).not.toHaveBeenCalled()
     expect(result).toEqual({ kind: 'created' })
   })
@@ -101,10 +105,14 @@ describe('CloudTty', () => {
     })
     const patchFn = jest.fn().mockResolvedValue({ kind: 'patched' })
 
-    const result = await tty.createOrPatch(createFn, patchFn, { id: 'x' })
+    const params = { body: { metadata: { name: 'x' }, spec: {} } }
+    const result = await tty.createOrPatch(createFn, patchFn, params)
 
-    expect(createFn).toHaveBeenCalledWith({ id: 'x' })
-    expect(patchFn).toHaveBeenCalledWith({ id: 'x' })
+    expect(createFn).toHaveBeenCalledWith(params)
+    expect(patchFn).toHaveBeenCalledWith(
+      { name: 'x', body: params.body, fieldManager: 'apl-api', force: true },
+      'header-options',
+    )
     expect(result).toEqual({ kind: 'patched' })
   })
 

src/tty.ts

@@ -1,10 +1,13 @@
 import {
   ApiException,
+  ConfigurationOptions,
   CoreV1Api,
   CustomObjectsApi,
   KubeConfig,
   KubernetesObject,
+  PatchStrategy,
   RbacAuthorizationV1Api,
+  setHeaderOptions,
 } from '@kubernetes/client-node'
 import Debug from 'debug'
 import { SessionUser } from './otomi-models'
@@ -35,16 +38,20 @@ export default class CloudTty {
     this.debug = Debug('tty')
   }
 
-  async createOrPatch<T>(
+  async createOrPatch<T extends { body: KubernetesObject }>(
     createFunc: (params: T) => Promise<KubernetesObject>,
-    patchFunc: (params: T) => Promise<KubernetesObject>,
+    patchFunc: (params: T, options?: ConfigurationOptions) => Promise<KubernetesObject>,
     params: T,
   ): Promise<KubernetesObject> {
     try {
       return await createFunc(params)
     } catch (error) {
       if (error instanceof ApiException && error.code === 409) {
-        return await patchFunc(params)
+        const { name } = params.body.metadata!
+        return await patchFunc(
+          { name, ...params, fieldManager: 'apl-api', force: true },
+          setHeaderOptions('Content-Type', PatchStrategy.ServerSideApply),
+        )
       } else {
         throw error
       }