Unexports helper function

googleforgames · May 2, 2024 · 6b0f24d · 6b0f24d
1 parent 0318be2
commit 6b0f24d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 43 deletions.
diff --git a/pkg/sdkserver/sdkserver.go b/pkg/sdkserver/sdkserver.go
@@ -504,12 +504,7 @@ func (s *SDKServer) updateAnnotations(ctx context.Context) error {
 	}
 	s.gsUpdateMutex.RUnlock()
 
-	patch, err := gs.Patch(gsCopy)
-	if err != nil {
-		return err
-	}
-
-	_, err = s.gameServerGetter.GameServers(s.namespace).Patch(ctx, gs.GetObjectMeta().GetName(), types.JSONPatchType, patch, metav1.PatchOptions{})
+	_, err = s.patchGameServer(ctx, gs, gsCopy)
 	return err
 }
 
@@ -989,12 +984,7 @@ func (s *SDKServer) updateCounter(ctx context.Context) error {
 		names = append(names, name)
 	}
 
-	patch, err := gs.Patch(gsCopy)
-	if err != nil {
-		return err
-	}
-
-	_, err = s.gameServerGetter.GameServers(s.namespace).Patch(ctx, gs.GetObjectMeta().GetName(), types.JSONPatchType, patch, metav1.PatchOptions{})
+	_, err = s.patchGameServer(ctx, gs, gsCopy)
 	if err != nil {
 		return err
 	}
@@ -1225,12 +1215,7 @@ func (s *SDKServer) updateList(ctx context.Context) error {
 		names = append(names, name)
 	}
 
-	patch, err := gs.Patch(gsCopy)
-	if err != nil {
-		return err
-	}
-
-	_, err = s.gameServerGetter.GameServers(s.namespace).Patch(ctx, gs.GetObjectMeta().GetName(), types.JSONPatchType, patch, metav1.PatchOptions{})
+	_, err = s.patchGameServer(ctx, gs, gsCopy)
 	if err != nil {
 		return err
 	}
@@ -1383,12 +1368,7 @@ func (s *SDKServer) updatePlayerCapacity(ctx context.Context) error {
 	gsCopy.Status.Players.Capacity = s.gsPlayerCapacity
 	s.gsUpdateMutex.RUnlock()
 
-	patch, err := gs.Patch(gsCopy)
-	if err != nil {
-		return err
-	}
-
-	gs, err = s.gameServerGetter.GameServers(s.namespace).Patch(ctx, gs.GetObjectMeta().GetName(), types.JSONPatchType, patch, metav1.PatchOptions{})
+	gs, err = s.patchGameServer(ctx, gs, gsCopy)
 	if err == nil {
 		s.recorder.Event(gs, corev1.EventTypeNormal, "PlayerCapacity", fmt.Sprintf("Set to %d", gs.Status.Players.Capacity))
 	}
@@ -1421,12 +1401,7 @@ func (s *SDKServer) updateConnectedPlayers(ctx context.Context) error {
 		return nil
 	}
 
-	patch, err := gs.Patch(gsCopy)
-	if err != nil {
-		return err
-	}
-
-	gs, err = s.gameServerGetter.GameServers(s.namespace).Patch(ctx, gs.GetObjectMeta().GetName(), types.JSONPatchType, patch, metav1.PatchOptions{})
+	gs, err = s.patchGameServer(ctx, gs, gsCopy)
 	if err == nil {
 		s.recorder.Event(gs, corev1.EventTypeNormal, "PlayerCount", fmt.Sprintf("Set to %d", gs.Status.Players.Count))
 	}

diff --git a/pkg/sdkserver/sdkserver_test.go b/pkg/sdkserver/sdkserver_test.go
@@ -46,9 +46,9 @@ import (
 	testclocks "k8s.io/utils/clock/testing"
 )
 
-// PatchGameServer is a helper function for the AddReactor "patch" that creates and applies a patch
+// patchGameServer is a helper function for the AddReactor "patch" that creates and applies a patch
 // to a gameserver. Returns a patched copy and does not modify the original game server.
-func PatchGameServer(t *testing.T, action k8stesting.Action, gs *agonesv1.GameServer) *agonesv1.GameServer {
+func patchGameServer(t *testing.T, action k8stesting.Action, gs *agonesv1.GameServer) *agonesv1.GameServer {
 	pa := action.(k8stesting.PatchAction)
 	patchJSON := pa.GetPatch()
 	patch, err := jsonpatch.DecodePatch(patchJSON)
@@ -190,7 +190,7 @@ func TestSidecarRun(t *testing.T) {
 			m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
 				defer close(done)
 
-				gsCopy := PatchGameServer(t, action, &gs)
+				gsCopy := patchGameServer(t, action, &gs)
 
 				if v.expected.state != "" {
 					assert.Equal(t, v.expected.state, gsCopy.Status.State)
@@ -318,7 +318,7 @@ func TestSDKServerSyncGameServer(t *testing.T) {
 			})
 
 			m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-				gsCopy := PatchGameServer(t, action, &gs)
+				gsCopy := patchGameServer(t, action, &gs)
 
 				if v.expected.state != "" {
 					assert.Equal(t, v.expected.state, gsCopy.Status.State)
@@ -480,7 +480,7 @@ func TestSidecarUnhealthyMessage(t *testing.T) {
 	})
 
 	m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-		gsCopy := PatchGameServer(t, action, &gs)
+		gsCopy := patchGameServer(t, action, &gs)
 
 		return true, gsCopy, nil
 	})
@@ -955,7 +955,7 @@ func TestSDKServerReserveTimeoutOnRun(t *testing.T) {
 	})
 
 	m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-		gsCopy := PatchGameServer(t, action, &gs)
+		gsCopy := patchGameServer(t, action, &gs)
 
 		updated <- gsCopy.Status
 
@@ -1011,7 +1011,7 @@ func TestSDKServerReserveTimeout(t *testing.T) {
 	})
 
 	m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-		gsCopy := PatchGameServer(t, action, &gs)
+		gsCopy := patchGameServer(t, action, &gs)
 
 		state <- gsCopy.Status
 		return true, gsCopy, nil
@@ -1297,7 +1297,7 @@ func TestSDKServerUpdateCounter(t *testing.T) {
 			updated := make(chan map[string]agonesv1.CounterStatus, 10)
 
 			m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-				gsCopy := PatchGameServer(t, action, &gs)
+				gsCopy := patchGameServer(t, action, &gs)
 
 				updated <- gsCopy.Status.Counters
 				return true, gsCopy, nil
@@ -1450,7 +1450,7 @@ func TestSDKServerAddListValue(t *testing.T) {
 			updated := make(chan map[string]agonesv1.ListStatus, 10)
 
 			m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-				gsCopy := PatchGameServer(t, action, &gs)
+				gsCopy := patchGameServer(t, action, &gs)
 
 				updated <- gsCopy.Status.Lists
 				return true, gsCopy, nil
@@ -1599,7 +1599,7 @@ func TestSDKServerRemoveListValue(t *testing.T) {
 			updated := make(chan map[string]agonesv1.ListStatus, 10)
 
 			m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-				gsCopy := PatchGameServer(t, action, &gs)
+				gsCopy := patchGameServer(t, action, &gs)
 
 				updated <- gsCopy.Status.Lists
 				return true, gsCopy, nil
@@ -1757,7 +1757,7 @@ func TestSDKServerUpdateList(t *testing.T) {
 			updated := make(chan map[string]agonesv1.ListStatus, 10)
 
 			m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-				gsCopy := PatchGameServer(t, action, &gs)
+				gsCopy := patchGameServer(t, action, &gs)
 
 				updated <- gsCopy.Status.Lists
 				return true, gsCopy, nil
@@ -1885,7 +1885,7 @@ func TestSDKServerPlayerCapacity(t *testing.T) {
 	updated := make(chan int64, 10)
 	m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
 
-		gsCopy := PatchGameServer(t, action, &gs)
+		gsCopy := patchGameServer(t, action, &gs)
 
 		updated <- gsCopy.Status.Players.Capacity
 		return true, gsCopy, nil
@@ -2038,7 +2038,7 @@ func TestSDKServerPlayerConnectAndDisconnect(t *testing.T) {
 
 	updated := make(chan *agonesv1.PlayerStatus, 10)
 	m.AgonesClient.AddReactor("patch", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
-		gsCopy := PatchGameServer(t, action, &gs)
+		gsCopy := patchGameServer(t, action, &gs)
 		updated <- gsCopy.Status.Players
 		return true, gsCopy, nil
 	})