Errors handling were fixed for peerings validation

apis/clusterresources/v1beta1/azurevnetpeering_types.go

@@ -77,14 +77,20 @@ func init() {
 
 func (azure *AzureVNetPeeringSpec) Validate() error {
 	dataCentreIDMatched, err := regexp.Match(models.UUIDStringRegExp, []byte(azure.DataCentreID))
-	if !dataCentreIDMatched || err != nil {
-		return fmt.Errorf("data centre ID is a UUID formated string. It must fit the pattern: %s. %s", models.UUIDStringRegExp, err.Error())
+	if err != nil {
+		return err
+	}
+	if !dataCentreIDMatched {
+		return fmt.Errorf("data centre ID is a UUID formated string. It must fit the pattern: %s", models.UUIDStringRegExp)
 	}
 
 	for _, subnet := range azure.PeerSubnets {
 		peerSubnetMatched, err := regexp.Match(models.PeerSubnetsRegExp, []byte(subnet))
-		if !peerSubnetMatched || err != nil {
-			return fmt.Errorf("the provided CIDR: %s must contain four dot separated parts and form the Private IP address. All bits in the host part of the CIDR must be 0. Suffix must be between 16-28. %s", subnet, err.Error())
+		if err != nil {
+			return err
+		}
+		if !peerSubnetMatched {
+			return fmt.Errorf("the provided CIDR: %s must contain four dot separated parts and form the Private IP address. All bits in the host part of the CIDR must be 0. Suffix must be between 16-28", subnet)
 		}
 	}
 

apis/clusterresources/v1beta1/gcpvpcpeering_types.go

@@ -75,14 +75,20 @@ func init() {
 
 func (gcp *GCPVPCPeeringSpec) Validate() error {
 	dataCentreIDMatched, err := regexp.Match(models.UUIDStringRegExp, []byte(gcp.DataCentreID))
-	if !dataCentreIDMatched || err != nil {
-		return fmt.Errorf("data centre ID is a UUID formated string. It must fit the pattern: %s. %s", models.UUIDStringRegExp, err.Error())
+	if err != nil {
+		return err
+	}
+	if !dataCentreIDMatched {
+		return fmt.Errorf("data centre ID is a UUID formated string. It must fit the pattern: %s", models.UUIDStringRegExp)
 	}
 
 	for _, subnet := range gcp.PeerSubnets {
 		peerSubnetMatched, err := regexp.Match(models.PeerSubnetsRegExp, []byte(subnet))
-		if !peerSubnetMatched || err != nil {
-			return fmt.Errorf("the provided CIDR: %s must contain four dot separated parts and form the Private IP address. All bits in the host part of the CIDR must be 0. Suffix must be between 16-28. %s", subnet, err.Error())
+		if err != nil {
+			return err
+		}
+		if !peerSubnetMatched {
+			return fmt.Errorf("the provided CIDR: %s must contain four dot separated parts and form the Private IP address. All bits in the host part of the CIDR must be 0. Suffix must be between 16-28", subnet)
 		}
 	}
 

apis/kafkamanagement/v1beta1/validation.go

@@ -32,10 +32,12 @@ func (kacl *KafkaACL) validateCreate() error {
 
 	for _, acl := range kacl.Spec.ACLs {
 		principalMatched, err := regexp.Match(models.ACLPrincipalRegExp, []byte(acl.Principal))
-		if !principalMatched || err != nil {
-			return fmt.Errorf("acl principal should fit pattern: %s, err: %s",
-				models.ACLPrincipalRegExp,
-				err.Error())
+		if err != nil {
+			return err
+		}
+		if !principalMatched {
+			return fmt.Errorf("acl principal should fit pattern: %s",
+				models.ACLPrincipalRegExp)
 		}
 
 		err = validate(acl)

config/crd/bases/clusters.instaclustr.com_cassandras.yaml

@@ -172,7 +172,7 @@ spec:
                   - email
                   type: object
                 type: array
-              userRef:
+              userRefs:
                 items:
                   properties:
                     name:

config/samples/clusterresources_v1beta1_azurevnetpeering.yaml

@@ -3,10 +3,9 @@ kind: AzureVNetPeering
 metadata:
   name: azurevnetpeering-sample
 spec:
-  cdcId: 9e2499cb-8db4-48c7-b8b0-c1ce7f1fab63
+  cdcId: f8581465-098c-4576-9e52-ea8308a27d8a
   peerResourceGroup: rnd
   peerSubnets:
-    - 192.168.0.0/16
-    - 172.16.0.0/16
+    - 10.224.0.0/16
   peerSubscriptionId: 1a2f3ab8-6815-49c5-a47e-b1a354b51240
-  peerVirtualNetworkName: rnd-vn
+  peerVirtualNetworkName: aks-vnet-17973335