network regex validation

Author: carmal891

api/v1beta2/ibmpowervscluster_webhook.go

@@ -96,14 +96,20 @@ func (r *IBMPowerVSCluster) validateIBMPowerVSCluster() (admission.Warnings, err
 }
 
 func (r *IBMPowerVSCluster) validateNetworkRegex() (bool, *field.Error) {
-	if r.Spec.Network.RegEx != nil && *r.Spec.DHCPServer.Name != "" && r.GetObjectMeta().GetName() != "" {
+	if r.Spec.Network.RegEx != nil {
 		var targetName string
 		var validationMessage string
 
 		if *r.Spec.DHCPServer.Name != "" {
 			targetName = *r.Spec.DHCPServer.Name
 			validationMessage = "The RegEx should match the DHCP server name when the DHCP server is set"
 		} else {
+			if r.GetObjectMeta().GetName() == "" {
+				return false, field.Required(
+					field.NewPath("metadata", "name"),
+					"Cluster name must be set when Network.RegEx is provided and DHCP server name is not set",
+				)
+			}
 			targetName = r.GetObjectMeta().GetName()
 			validationMessage = "The RegEx should match the cluster name when the DHCP server is not set"
 		}
@@ -116,6 +122,7 @@ func (r *IBMPowerVSCluster) validateNetworkRegex() (bool, *field.Error) {
 			)
 		}
 	}
+
 	return true, nil
 }
 

api/v1beta2/ibmpowervscluster_webhook_test.go

@@ -68,6 +68,36 @@ func TestIBMPowerVSCluster_create(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "Should error network regex and dhcp server name is set but does not match dhcp server name",
+			powervsCluster: &IBMPowerVSCluster{
+				Spec: IBMPowerVSClusterSpec{
+					ServiceInstanceID: "capi-si-id",
+					Network: IBMPowerVSResourceReference{
+						RegEx: ptr.To("^capi$"),
+					},
+					DHCPServer: &DHCPServer{
+						Name: ptr.To("test"),
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "Should error if only network regex is set, dhcp server name is not set and does not match cluster name",
+			powervsCluster: &IBMPowerVSCluster{
+				Spec: IBMPowerVSClusterSpec{
+					ServiceInstanceID: "capi-si-id",
+					Network: IBMPowerVSResourceReference{
+						RegEx: ptr.To("^capi$"),
+					},
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test",
+				},
+			},
+			wantErr: true,
+		},
 	}
 
 	for _, tc := range tests {
@@ -141,6 +171,9 @@ func TestIBMPowerVSCluster_update(t *testing.T) {
 					Network: IBMPowerVSResourceReference{
 						RegEx: ptr.To("^capi-net-id$"),
 					},
+					DHCPServer: &DHCPServer{
+						Name: ptr.To("capi-net-id"),
+					},
 				},
 			},
 			newPowervsCluster: &IBMPowerVSCluster{
@@ -149,6 +182,9 @@ func TestIBMPowerVSCluster_update(t *testing.T) {
 					Network: IBMPowerVSResourceReference{
 						RegEx: ptr.To("^capi-net-id$"),
 					},
+					DHCPServer: &DHCPServer{
+						Name: ptr.To("capi-net-id"),
+					},
 				},
 			},
 			wantErr: false,
@@ -175,6 +211,58 @@ func TestIBMPowerVSCluster_update(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "Should error if network regex and dhcp server name is set but network regex does not match dhcp server name",
+			oldPowervsCluster: &IBMPowerVSCluster{
+				Spec: IBMPowerVSClusterSpec{
+					ServiceInstanceID: "capi-si-id",
+					Network: IBMPowerVSResourceReference{
+						RegEx: ptr.To("^capi$"),
+					},
+					DHCPServer: &DHCPServer{
+						Name: ptr.To("capi"),
+					},
+				},
+			},
+			newPowervsCluster: &IBMPowerVSCluster{
+				Spec: IBMPowerVSClusterSpec{
+					ServiceInstanceID: "capi-si-id",
+					Network: IBMPowerVSResourceReference{
+						RegEx: ptr.To("^capi$"),
+					},
+					DHCPServer: &DHCPServer{
+						Name: ptr.To("test"),
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "Should error if network regex is set, dhcp server name is not set and network regex does not match cluster name",
+			oldPowervsCluster: &IBMPowerVSCluster{
+				Spec: IBMPowerVSClusterSpec{
+					ServiceInstanceID: "capi-si-id",
+					Network: IBMPowerVSResourceReference{
+						RegEx: ptr.To("^capi$"),
+					},
+					DHCPServer: &DHCPServer{
+						Name: ptr.To("capi"),
+					},
+				},
+			},
+			newPowervsCluster: &IBMPowerVSCluster{
+				Spec: IBMPowerVSClusterSpec{
+					ServiceInstanceID: "capi-si-id",
+					Network: IBMPowerVSResourceReference{
+						RegEx: ptr.To("^capi$"),
+					},
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "capi",
+				},
+			},
+			wantErr: true,
+		},
 	}
 
 	for _, tc := range tests {