[EPMDEDP-6891]: Prevent saving an empty slave to DB

Change-Id: I96d839c8838491ca3890d1a1b80ed9e9e24f1ddf
(cherry picked from commit ef4386c)

pkg/controller/jenkins-slave/jenkins_slave_controller.go

@@ -67,26 +67,23 @@ func (r *ReconcileJenkinsSlave) Reconcile(ctx context.Context, request reconcile
 	log := r.log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
 	log.Info("Reconciling Jenkins")
 
-	instance := &jenkinsApi.Jenkins{}
-	if err := r.client.Get(ctx, request.NamespacedName, instance); err != nil {
+	jenkins := &jenkinsApi.Jenkins{}
+	if err := r.client.Get(ctx, request.NamespacedName, jenkins); err != nil {
 		if errors.IsNotFound(err) {
 			return reconcile.Result{}, nil
 		}
 		return reconcile.Result{}, err
 	}
+	log.WithValues("Jenkins", jenkins)
 
-	log.WithValues("Jenkins", instance)
-
-	cs := instance.Status.Slaves
-
-	edpN, err := helper.GetEDPName(r.client, instance.Namespace)
+	edpN, err := helper.GetEDPName(r.client, jenkins.Namespace)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
-	err = r.jenkinsSlave.CreateSlavesOrDoNothing(cs, *edpN)
-	if err != nil {
+
+	if err := r.jenkinsSlave.CreateSlavesOrDoNothing(jenkins.Status.Slaves, *edpN); err != nil {
 		return reconcile.Result{RequeueAfter: time.Second * 120},
-			errWrap.Wrapf(err, "an error has occurred while adding {%v} slaves into DB", cs)
+			errWrap.Wrapf(err, "an error has occurred while adding {%v} slaves into DB", jenkins.Status.Slaves)
 	}
 
 	return reconcile.Result{}, nil

pkg/service/jenkins-slave/jenkins_slave.go

@@ -20,11 +20,15 @@ func (s JenkinsSlaveService) CreateSlavesOrDoNothing(slaves []jenkinsV2Api.Slave
 	if err != nil {
 		return err
 	}
+	defer txn.Rollback()
 
 	for _, s := range slaves {
+		if len(s.Name) == 0 {
+			continue
+		}
+
 		id, err := jenkins_slave.SelectJenkinsSlave(*txn, s.Name, schemaName)
 		if err != nil {
-			_ = txn.Rollback()
 			return err
 		}
 
@@ -33,15 +37,12 @@ func (s JenkinsSlaveService) CreateSlavesOrDoNothing(slaves []jenkinsV2Api.Slave
 			continue
 		}
 
-		err = jenkins_slave.CreateJenkinsSlave(*txn, s.Name, schemaName)
-		if err != nil {
-			_ = txn.Rollback()
+		if err := jenkins_slave.CreateJenkinsSlave(*txn, s.Name, schemaName); err != nil {
 			return err
 		}
 	}
 
-	err = txn.Commit()
-	if err != nil {
+	if err := txn.Commit(); err != nil {
 		return err
 	}