Converting databaseNames field into a pointer

nutanix-cloud-native · Jul 14, 2023 · 959ac74 · 959ac74
1 parent ca00e83
commit 959ac74
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/api/v1alpha1/database_types.go b/api/v1alpha1/database_types.go
@@ -88,7 +88,7 @@ type Instance struct {
 	// Name(s) of the database(s) to be provisiond inside the database instance
 	// default [ "database_one", "database_two", "database_three" ]
 	// +optional
-	DatabaseNames []string `json:"databaseNames"`
+	DatabaseNames *[]string `json:"databaseNames"`
 	// Name of the secret holding the credentials for the database instance (password and ssh key)
 	CredentialSecret *string `json:"credentialSecret"`
 	// Size of the database instance, minimum 10 (GBs)

diff --git a/api/v1alpha1/database_webhook.go b/api/v1alpha1/database_webhook.go
@@ -46,8 +46,8 @@ var _ webhook.Defaulter = &Database{}
 
 func instanceSpecDefaulterForCreate(r *Database) {
 
-	if len(r.Spec.Instance.DatabaseNames) == 0 {
-		r.Spec.Instance.DatabaseNames = api.DefaultDatabaseNames
+	if len(*r.Spec.Instance.DatabaseNames) == 0 {
+		r.Spec.Instance.DatabaseNames = &api.DefaultDatabaseNames
 	}
 
 	if r.Spec.Instance.TimeZone == nil {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/controller_adapters/database.go b/controller_adapters/database.go
@@ -52,7 +52,7 @@ func (d *Database) GetDBInstanceType() string {
 }
 
 func (d *Database) GetDBInstanceDatabaseNames() string {
-	return strings.Join(d.Spec.Instance.DatabaseNames, ",")
+	return strings.Join(*d.Spec.Instance.DatabaseNames, ",")
 }
 
 func (d *Database) GetDBInstanceTimeZone() string {

diff --git a/controllers/database_controller_test.go b/controllers/database_controller_test.go
@@ -91,7 +91,7 @@ var _ = Describe("Database controller", func() {
 					},
 					Instance: ndbv1alpha1.Instance{
 						DatabaseInstanceName: &DatabaseName,
-						DatabaseNames:        []string{"database_1"},
+						DatabaseNames:        &[]string{"database_1"},
 						CredentialSecret:     &instanceSecretName,
 						Size:                 &databaseSize,
 						TimeZone:             &timezoneUTC,