Fix reconcile logic dependent on password (#285)

lunarway · Mar 15, 2024 · c4cb5e5 · c4cb5e5
1 parent d237f3a
commit c4cb5e5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/api/v1alpha1/postgresqldatabase_types.go b/api/v1alpha1/postgresqldatabase_types.go
@@ -38,7 +38,7 @@ type PostgreSQLDatabaseSpec struct {
 
 	// Password used with the User name to connect to the database
 	// +optional
-	Password ResourceVar `json:"password"`
+	Password *ResourceVar `json:"password"`
 
 	// IsShared indicates whether the database is shared between multiple
 	// PostgreSQLDatabase objects. The controller will not grant ownership of the

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/postgresqldatabase_controller.go b/controllers/postgresqldatabase_controller.go
@@ -121,9 +121,12 @@ func (r *PostgreSQLDatabaseReconciler) reconcile(ctx context.Context, reqLogger
 	}
 	status.user = user
 	reqLogger = reqLogger.WithValues("user", user)
-	password, err := kube.ResourceValue(r.Client, database.Spec.Password, request.Namespace)
-	if err != nil {
-		return status, fmt.Errorf("resolve password reference: %w", err)
+	password := ""
+	if database.Spec.Password != nil {
+		password, err = kube.ResourceValue(r.Client, *database.Spec.Password, request.Namespace)
+		if err != nil {
+			return status, fmt.Errorf("resolve password reference: %w", err)
+		}
 	}
 	isShared := database.Spec.IsShared
 

diff --git a/controllers/postgresqldatabase_controller_test.go b/controllers/postgresqldatabase_controller_test.go
@@ -207,7 +207,7 @@ func TestPostgreSQLDatabase_Reconcile_hostCredentialsResourceReference(t *testin
 			Spec: lunarwayv1alpha1.PostgreSQLDatabaseSpec{
 				Name:            databaseName,
 				HostCredentials: hostCredentialsName,
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: "123456",
 				},
 				User: lunarwayv1alpha1.ResourceVar{
@@ -369,7 +369,7 @@ func TestPostgreSQLDatabase_Reconcile_unknownHostCredentialsResourceReference(t
 			Spec: lunarwayv1alpha1.PostgreSQLDatabaseSpec{
 				Name:            databaseName,
 				HostCredentials: "unknown",
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: "123456",
 				},
 				User: lunarwayv1alpha1.ResourceVar{

diff --git a/controllers/postgresqluser_controller_test.go b/controllers/postgresqluser_controller_test.go
@@ -78,7 +78,7 @@ func TestReconcile_badConfigmapReference(t *testing.T) {
 				Host: lunarwayv1alpha1.ResourceVar{
 					Value: host,
 				},
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: "user_password",
 				},
 				User: lunarwayv1alpha1.ResourceVar{
@@ -102,7 +102,7 @@ func TestReconcile_badConfigmapReference(t *testing.T) {
 						},
 					},
 				},
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: "12346",
 				},
 				User: lunarwayv1alpha1.ResourceVar{
@@ -216,7 +216,7 @@ func TestReconcile_rolePrefix(t *testing.T) {
 				Host: lunarwayv1alpha1.ResourceVar{
 					Value: host,
 				},
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: database1Name,
 				},
 				User: lunarwayv1alpha1.ResourceVar{
@@ -335,7 +335,7 @@ func TestReconcile_dotInName(t *testing.T) {
 				Host: lunarwayv1alpha1.ResourceVar{
 					Value: host,
 				},
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: "user_password",
 				},
 				User: lunarwayv1alpha1.ResourceVar{
@@ -462,7 +462,7 @@ func TestReconcile_multipleDatabaseResources(t *testing.T) {
 				Host: lunarwayv1alpha1.ResourceVar{
 					Value: host,
 				},
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: "user_password",
 				},
 				User: lunarwayv1alpha1.ResourceVar{
@@ -483,7 +483,7 @@ func TestReconcile_multipleDatabaseResources(t *testing.T) {
 				Host: lunarwayv1alpha1.ResourceVar{
 					Value: host,
 				},
-				Password: lunarwayv1alpha1.ResourceVar{
+				Password: &lunarwayv1alpha1.ResourceVar{
 					Value: "user_password",
 				},
 				User: lunarwayv1alpha1.ResourceVar{