fix logic

Signed-off-by: Pavel Tishkov <[email protected]>

Author: fl64

images/hooks/pkg/hooks/create-generic-vmclass/hook.go

@@ -96,7 +96,7 @@ func Reconcile(_ context.Context, input *pkg.HookInput) error {
 					if decodedBytes, err := base64.StdEncoding.DecodeString(encodedStr); err == nil {
 						if string(decodedBytes) == "true" {
 							shouldCreateVMClass = true
-							input.Logger.Info("Found record in module-state that generic vmclass was created previously")
+							input.Logger.Info("Found record in module-state that generic VirtualMachineClass was created previously")
 						}
 					}
 				}
@@ -107,7 +107,7 @@ func Reconcile(_ context.Context, input *pkg.HookInput) error {
 	vmClassExists := len(vmClasses) > 0
 
 	if shouldCreateVMClass && !vmClassExists {
-		input.Logger.Info("Creating generic VirtualMachineClass as it was previously created but is now missing")
+		input.Logger.Info("Creating generic VirtualMachineClass")
 
 		vmClass := &v1alpha2.VirtualMachineClass{
 			TypeMeta: metav1.TypeMeta{
@@ -168,7 +168,7 @@ func Reconcile(_ context.Context, input *pkg.HookInput) error {
 	} else if shouldCreateVMClass && vmClassExists {
 		input.Logger.Info("Generic VirtualMachineClass already exists, no action needed")
 	} else if !shouldCreateVMClass && !vmClassExists {
-		input.Logger.Info("No record of generic vmclass creation in module-state, skipping creation")
+		input.Logger.Info("No record of generic VirtualMachineClass creation in module-state, skipping creation")
 	}
 
 	return nil

images/hooks/pkg/hooks/update-module-state/hook.go

@@ -134,15 +134,14 @@ func Reconcile(_ context.Context, input *pkg.HookInput) error {
 		needsUpdate = true
 		input.Logger.Info("Generic VirtualMachineClass exists but module-state doesn't reflect this, updating secret")
 	} else if !vmClassExists && currentState {
-		needsUpdate = true
-		input.Logger.Info("Generic VirtualMachineClass doesn't exist but module-state indicates it was created, updating secret")
+		input.Logger.Info("Generic VirtualMachineClass doesn't exist but module-state indicates it was created previously - keeping historical record")
 	} else if len(moduleStateSecrets) == 0 {
 		needsUpdate = true
 		input.Logger.Info("Module-state secret doesn't exist, creating it")
 	} else if vmClassExists && currentState {
-		input.Logger.Info("Module-state correctly reflects that generic vmclass exists")
+		input.Logger.Info("Module-state correctly reflects that generic VirtualMachineClass exists")
 	} else {
-		input.Logger.Info("Module-state correctly reflects that generic vmclass doesn't exist")
+		input.Logger.Info("Module-state correctly reflects that generic VirtualMachineClass doesn't exist")
 	}
 
 	if needsUpdate {

images/hooks/pkg/hooks/update-module-state/hook_test.go

@@ -175,7 +175,7 @@ var _ = Describe("Update Module State hook", func() {
 			Expect(patchCollector.PatchWithMergeMock.Calls()).To(HaveLen(0))
 		})
 
-		It("should update module-state secret when it exists but has wrong value", func() {
+		It("should keep historical record when vmclass doesn't exist but module-state indicates it was created", func() {
 			moduleStateData := map[string]interface{}{
 				"generic-vmclass-created": base64.StdEncoding.EncodeToString([]byte("true")),
 			}
@@ -189,24 +189,11 @@ var _ = Describe("Update Module State hook", func() {
 				}),
 			})
 
-			patchCollector.PatchWithMergeMock.Set(func(obj interface{}, apiVersion, kind, namespace, name string, opts ...pkg.PatchCollectorOption) {
-				patchData, ok := obj.(map[string]interface{})
-				Expect(ok).To(BeTrue())
-				Expect(patchData).To(HaveKey("data"))
-
-				data, ok := patchData["data"].(map[string]string)
-				Expect(ok).To(BeTrue())
-				Expect(data).To(HaveKey("generic-vmclass-created"))
-
-				decoded, err := base64.StdEncoding.DecodeString(data["generic-vmclass-created"])
-				Expect(err).ToNot(HaveOccurred())
-				Expect(string(decoded)).To(Equal("false"))
-			})
-
+			patchCollector.PatchWithMergeMock.Optional()
 			patchCollector.CreateMock.Optional()
 
 			Expect(Reconcile(context.Background(), newInput())).To(Succeed())
-			Expect(patchCollector.PatchWithMergeMock.Calls()).To(HaveLen(1))
+			Expect(patchCollector.PatchWithMergeMock.Calls()).To(HaveLen(0))
 			Expect(patchCollector.CreateMock.Calls()).To(HaveLen(0))
 		})
 	})