Code cleanup for DB/ObjStore waiting functionality

Author: gmfrasca

controllers/database.go

@@ -69,17 +69,17 @@ func (r *DSPAReconciler) isDatabaseAccessible(ctx context.Context, dsp *dspav1al
 	}
 
 	decodePass, _ := b64.StdEncoding.DecodeString(params.DBConnection.Password)
-	db_connect := ConnectAndQueryDatabase(params.DBConnection.Host,
+	dbHealthCheckPassed := ConnectAndQueryDatabase(params.DBConnection.Host,
 		params.DBConnection.Port,
 		params.DBConnection.Username,
 		string(decodePass),
 		params.DBConnection.DBName)
-	if db_connect {
+	if dbHealthCheckPassed {
 		log.Info("Database Health Check Successful")
 	} else {
 		log.Info("Unable to connect to Database")
 	}
-	return db_connect
+	return dbHealthCheckPassed
 }
 
 func (r *DSPAReconciler) ReconcileDatabase(ctx context.Context, dsp *dspav1alpha1.DataSciencePipelinesApplication,
@@ -92,11 +92,11 @@ func (r *DSPAReconciler) ReconcileDatabase(ctx context.Context, dsp *dspav1alpha
 	// By default if Database is empty, we deploy mariadb
 	externalDBSpecified := params.UsingExternalDB(dsp)
 	mariaDBSpecified := dsp.Spec.Database.MariaDB != nil
-	defaultDBRequired := (!databaseSpecified || (!externalDBSpecified && !mariaDBSpecified))
+	defaultDBRequired := !databaseSpecified || (!externalDBSpecified && !mariaDBSpecified)
 
-	deployMariaDB := (mariaDBSpecified && dsp.Spec.Database.MariaDB.Deploy)
+	deployMariaDB := mariaDBSpecified && dsp.Spec.Database.MariaDB.Deploy
 	// Default DB is currently MariaDB as well, but storing these bools seperately in case that changes
-	deployDefaultDB := (!databaseSpecified || defaultDBRequired)
+	deployDefaultDB := !databaseSpecified || defaultDBRequired
 
 	// If external db is specified, it takes precedence
 	if externalDBSpecified {

controllers/dspipeline_controller.go

@@ -221,9 +221,9 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	// Get Prereq Status (DB and ObjStore Ready)
 	dbAvailable := r.isDatabaseAccessible(ctx, dspa, params)
 	objStoreAvailable := r.isObjectStorageAccessible(ctx, dspa, params)
-	dspa_prereqs_ready := (dbAvailable && objStoreAvailable)
+	dspaPrereqsReady := (dbAvailable && objStoreAvailable)
 
-	if dspa_prereqs_ready {
+	if dspaPrereqsReady {
 		// Manage Common Manifests
 		err = r.ReconcileCommon(dspa, params)
 		if err != nil {
@@ -264,7 +264,7 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, err
 	}
 
-	conditions, err := r.GenerateStatus(ctx, dspa, params, dbAvailable, objStoreAvailable)
+	conditions, err := r.GenerateStatus(ctx, dspa, dbAvailable, objStoreAvailable)
 	if err != nil {
 		log.Info(err.Error())
 		return ctrl.Result{}, err
@@ -409,7 +409,7 @@ func (r *DSPAReconciler) handleReadyCondition(ctx context.Context, dspa *dspav1a
 
 }
 
-func (r *DSPAReconciler) GenerateStatus(ctx context.Context, dspa *dspav1alpha1.DataSciencePipelinesApplication, params *DSPAParams, dbAvailableStatus, objStoreAvailableStatus bool) ([]metav1.Condition, error) {
+func (r *DSPAReconciler) GenerateStatus(ctx context.Context, dspa *dspav1alpha1.DataSciencePipelinesApplication, dbAvailableStatus, objStoreAvailableStatus bool) ([]metav1.Condition, error) {
 	// Create Database Availability Condition
 	databaseAvailable := r.buildCondition(config.DatabaseAvailable, dspa, config.DatabaseAvailable)
 	if dbAvailableStatus {