test for cluster webhooks were implemented & cluster webhooks were re…

…factored
instaclustr · Mar 5, 2024 · 82145c5 · 82145c5
1 parent 2b72599
commit 82145c5
Show file tree

Hide file tree

Showing 26 changed files with 4,721 additions and 681 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
diff --git a/apis/clusters/v1beta1/cadence_webhook.go b/apis/clusters/v1beta1/cadence_webhook.go
@@ -196,8 +196,7 @@ func (cv *cadenceValidator) ValidateUpdate(ctx context.Context, old runtime.Obje
 		}
 	}
 
-	// ensuring if the cluster is ready for the spec updating
-	if (c.Status.CurrentClusterOperationStatus != models.NoOperation || c.Status.State != models.RunningStatus) && c.Generation != oldCluster.Generation {
+	if IsClusterNotReadyForSpecUpdate(c.Status.CurrentClusterOperationStatus, c.Status.State, c.Generation, oldCluster.Generation) {
 		return models.ErrClusterIsNotReadyToUpdate
 	}
 

diff --git a/apis/clusters/v1beta1/cassandra_types.go b/apis/clusters/v1beta1/cassandra_types.go
@@ -55,7 +55,7 @@ type CassandraSpec struct {
 	GenericClusterSpec `json:",inline"`
 
 	RestoreFrom         *CassandraRestoreFrom  `json:"restoreFrom,omitempty" dcomparisonSkip:"true"`
-	DataCentres         []*CassandraDataCentre `json:"dataCentres,omitempty"`
+	DataCentres         []*CassandraDataCentre `json:"dataCentres"`
 	LuceneEnabled       bool                   `json:"luceneEnabled,omitempty"`
 	PasswordAndUserAuth bool                   `json:"passwordAndUserAuth,omitempty"`
 	BundledUseOnly      bool                   `json:"bundledUseOnly,omitempty"`

diff --git a/apis/clusters/v1beta1/cassandra_webhook.go b/apis/clusters/v1beta1/cassandra_webhook.go
@@ -84,11 +84,7 @@ func (cv *cassandraValidator) ValidateCreate(ctx context.Context, obj runtime.Ob
 	}
 
 	if c.Spec.RestoreFrom != nil {
-		if c.Spec.RestoreFrom.ClusterID == "" {
-			return fmt.Errorf("restore clusterID field is empty")
-		} else {
-			return nil
-		}
+		return nil
 	}
 
 	err = c.Spec.GenericClusterSpec.ValidateCreation()
@@ -107,10 +103,6 @@ func (cv *cassandraValidator) ValidateCreate(ctx context.Context, obj runtime.Ob
 		return err
 	}
 
-	if len(c.Spec.DataCentres) == 0 {
-		return fmt.Errorf("data centres field is empty")
-	}
-
 	for _, dc := range c.Spec.DataCentres {
 		//TODO: add support of multiple DCs for OnPrem clusters
 		if len(c.Spec.DataCentres) > 1 && dc.CloudProvider == models.ONPREMISES {
@@ -180,11 +172,9 @@ func (cv *cassandraValidator) ValidateUpdate(ctx context.Context, old runtime.Ob
 		return fmt.Errorf("cannot update immutable fields: %v", err)
 	}
 
-	// ensuring if the cluster is ready for the spec updating
-	if (c.Status.CurrentClusterOperationStatus != models.NoOperation || c.Status.State != models.RunningStatus) && c.Generation != oldCluster.Generation {
+	if IsClusterNotReadyForSpecUpdate(c.Status.CurrentClusterOperationStatus, c.Status.State, c.Generation, oldCluster.Generation) {
 		return models.ErrClusterIsNotReadyToUpdate
 	}
-
 	return nil
 }
 
@@ -297,6 +287,7 @@ func (cs *CassandraSpec) validateDataCentresUpdate(oldSpec CassandraSpec) error
 				return fmt.Errorf("number of nodes must be a multiple of replication factor: %v", newDC.ReplicationFactor)
 			}
 
+			continue
 		}
 
 		newDCImmutableFields := newDC.newImmutableFields()