bring up to speed with main, fix ZoneSyncPort test

Author: AlexFenlon

internal/configs/configmaps.go

@@ -403,15 +403,15 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
 	if zoneSync, exists, err := GetMapKeyAsBool(cfgm.Data, "zone-sync", cfgm); exists {
 		if err != nil {
 			nl.Error(l, err)
-			eventLog.Event(cfgm, v1.EventTypeWarning, invalidValueReason, err.Error())
+			eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, err.Error())
 			configOk = false
 		} else {
 			if nginxPlus {
 				cfgParams.ZoneSync.EnableZoneSync = zoneSync
 			} else {
 				errorText := fmt.Sprintf("ConfigMap %s/%s key %s requires NGINX Plus", cfgm.Namespace, cfgm.Name, "zone-sync")
 				nl.Warn(l, errorText)
-				eventLog.Event(cfgm, v1.EventTypeWarning, invalidValueReason, errorText)
+				eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, errorText)
 				configOk = false
 			}
 		}
@@ -420,22 +420,22 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
 	if zoneSyncPort, exists, err := GetMapKeyAsInt(cfgm.Data, "zone-sync-port", cfgm); exists {
 		if err != nil {
 			nl.Error(l, err)
-			eventLog.Event(cfgm, v1.EventTypeWarning, invalidValueReason, err.Error())
+			eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, err.Error())
 			configOk = false
 		} else {
 			if cfgParams.ZoneSync.EnableZoneSync {
 				portValidationError := validation.ValidatePort(zoneSyncPort)
 				if portValidationError != nil {
 					nl.Error(l, portValidationError)
-					eventLog.Event(cfgm, v1.EventTypeWarning, invalidValueReason, portValidationError.Error())
+					eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, portValidationError.Error())
 					configOk = false
 				} else {
 					cfgParams.ZoneSync.Port = zoneSyncPort
 				}
 			} else {
 				errorText := fmt.Sprintf("ConfigMap %s/%s key %s requires 'zone-sync' to be enabled", cfgm.Namespace, cfgm.Name, "zone-sync-port")
 				nl.Warn(l, errorText)
-				eventLog.Event(cfgm, v1.EventTypeWarning, invalidValueReason, errorText)
+				eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, errorText)
 				configOk = false
 			}
 		}

internal/configs/configmaps_test.go

@@ -843,11 +843,13 @@ func TestParseZoneSyncPort(t *testing.T) {
 		{
 			configMap: &v1.ConfigMap{
 				Data: map[string]string{
+					"zone-sync":      "true",
 					"zone-sync-port": "1234",
 				},
 			},
 			want: &ZoneSync{
-				Port: 1234,
+				EnableZoneSync: true,
+				Port:           1234,
 			},
 			msg: "zone-sync-port set to 1234",
 		},
@@ -862,7 +864,7 @@ func TestParseZoneSyncPort(t *testing.T) {
 		t.Run(test.msg, func(t *testing.T) {
 			result, _ := ParseConfigMap(context.Background(), test.configMap, nginxPlus, hasAppProtect, hasAppProtectDos, hasTLSPassthrough, makeEventLogger())
 			if result.ZoneSync.Port != test.want.Port {
-				t.Errorf("Port: want %v, got %v", test.want.Port, result.ZoneSync.EnableZoneSync)
+				t.Errorf("Port: want %v, got %v", test.want.Port, result.ZoneSync.Port)
 			}
 		})
 	}