issue-711

.secrets.baseline

@@ -75,6 +75,10 @@
     {
       "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
     },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".secrets.baseline"
+    },
     {
       "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
       "min_level": 2
@@ -531,14 +535,14 @@
         "filename": "controllers/clusters/helpers.go",
         "hashed_secret": "5ffe533b830f08a0326348a9160afafc8ada44db",
         "is_verified": false,
-        "line_number": 119
+        "line_number": 120
       },
       {
         "type": "Secret Keyword",
         "filename": "controllers/clusters/helpers.go",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 124
+        "line_number": 125
       }
     ],
     "controllers/clusters/kafkaconnect_controller_test.go": [
@@ -1128,5 +1132,5 @@
       }
     ]
   },
-  "generated_at": "2024-02-28T14:20:52Z"
+  "generated_at": "2024-02-29T12:24:10Z"
 }

Makefile

@@ -87,7 +87,7 @@ test-utils:
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./pkg/utils/... -coverprofile cover.out
 
 .PHONY: test
- test: manifests generate fmt vet docker-build-server-stub run-server-stub test-utils envtest test-webhooks test-clusters test-clusterresources test-webhooks test-kafkamanagement test-users stop-server-stub
+ #test: manifests generate fmt vet docker-build-server-stub run-server-stub test-utils envtest test-webhooks test-clusters test-clusterresources test-webhooks test-kafkamanagement test-users stop-server-stub
 
 .PHONY: goimports
 goimports:

config/samples/clusters_v1beta1_cassandra.yaml

@@ -3,7 +3,7 @@ kind: Cassandra
 metadata:
   name: cassandra-cluster
 spec:
-  name: "username-cassandra" #(immutable)
+  name: "bohdan-cassandra" #(immutable)
   version: "4.1.3" #(immutable)
   privateNetwork: false #(immutable)
   dataCentres:

controllers/clusters/cassandra_controller.go

@@ -217,9 +217,23 @@ func (r *CassandraReconciler) createCluster(ctx context.Context, c *v1beta1.Cass
 	var instModel *models.CassandraCluster
 	var err error
 
-	if c.Spec.HasRestore() {
+	id, err := getClusterIDByName(r.API, c.Spec.Name)
+	if err != nil {
+		return fmt.Errorf("failed to list clusters by name %v, err: %w", c.Spec.Name, err)
+	}
+
+	if id != "" {
+		l.Info("Cluster with provided name already exists", "name", c.Spec.Name, "clusterID", id)
+		r.EventRecorder.Eventf(c, models.Warning, models.CreationFailed,
+			"Failed to create cluster. Cluster %s already exists", c.Spec.Name,
+		)
+		return fmt.Errorf("cluster %s already exists", c.Spec.Name)
+	}
+
+	switch {
+	case c.Spec.HasRestore():
 		instModel, err = r.createCassandraFromRestore(c, l)
-	} else {
+	default:
 		instModel, err = r.createCassandra(c, l)
 	}
 	if err != nil {

controllers/clusters/helpers.go

@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	"github.com/instaclustr/operator/pkg/instaclustr"
 	"github.com/instaclustr/operator/pkg/models"
 	"github.com/instaclustr/operator/pkg/utils/dcomparison"
 )
@@ -238,3 +239,16 @@ func reconcileExternalChanges(c client.Client, r record.EventRecorder, obj Objec
 
 	return nil
 }
+
+func getClusterIDByName(api instaclustr.API, name string) (string, error) {
+	clusters, err := api.ListClustersByName(name)
+	if err != nil {
+		return "", err
+	}
+
+	if len(clusters) == 0 {
+		return "", nil
+	}
+
+	return clusters[0].ID, nil
+}

pkg/instaclustr/client.go

@@ -2112,8 +2112,8 @@ func (c *Client) UpdatePostgreSQLDefaultUserPassword(id, password string) error
 	return nil
 }
 
-func (c *Client) ListClusters() ([]*models.ActiveClusters, error) {
-	url := c.serverHostname + ClustersEndpoint
+func (c *Client) ListClustersByName(name string) ([]*models.ActiveCluster, error) {
+	url := c.serverHostname + ClustersEndpoint + "?search=name:" + name
 	resp, err := c.DoRequest(url, http.MethodGet, nil)
 	if err != nil {
 		return nil, err
@@ -2135,7 +2135,7 @@ func (c *Client) ListClusters() ([]*models.ActiveClusters, error) {
 		return nil, err
 	}
 
-	return response, nil
+	return response[0].Clusters, nil
 }
 
 func (c *Client) CreateEncryptionKey(

pkg/instaclustr/interfaces.go

@@ -94,7 +94,7 @@ type API interface {
 	ResetPostgreSQLConfiguration(id, name string) error
 	GetCadence(id string) (*models.CadenceCluster, error)
 	UpdatePostgreSQLDefaultUserPassword(id, password string) error
-	ListClusters() ([]*models.ActiveClusters, error)
+	ListClustersByName(name string) ([]*models.ActiveCluster, error)
 	CreateEncryptionKey(encryptionKeySpec any) (*clusterresourcesv1beta1.AWSEncryptionKeyStatus, error)
 	GetEncryptionKeyStatus(encryptionKeyID string, encryptionKeyEndpoint string) (*clusterresourcesv1beta1.AWSEncryptionKeyStatus, error)
 	DeleteEncryptionKey(encryptionKeyID string) error

pkg/instaclustr/mock/client.go

@@ -358,8 +358,8 @@ func (c *mockClient) UpdateKafkaConnect(id string, kc models.KafkaConnectAPIUpda
 	panic("UpdateKafkaConnect: is not implemented")
 }
 
-func (c *mockClient) ListClusters() ([]*models.ActiveClusters, error) {
-	panic("ListClusters: is not implemented")
+func (c *mockClient) ListClustersByName(name string) ([]*models.ActiveCluster, error) {
+	panic("ListClustersByName: is not implemented")
 }
 
 func (c *mockClient) CreateRedisUser(user *models.RedisUser) (string, error) {