Some cleanup.

docker/cleanup.go

@@ -2,10 +2,10 @@ package docker
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
+	"log/slog"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/docker/docker/api/types/swarm"
@@ -20,44 +20,40 @@ func cleanup(w http.ResponseWriter, r *http.Request){
 
 	if !bearerAuth(w, r) {return;}
 
-	rawBody, err := io.ReadAll(r.Body);
-	if err != nil {
-		panic("Failed to read body!");
-	}
-
-	var bodyDecoded struct{
-		ServiceId string `json:"serviceId"`
-	};
-
-	err = json.Unmarshal(rawBody, &bodyDecoded);
-	if err != nil {
-		panic("Failed to unmarshal json."+ err.Error());
-	}
-
 	listResoult, err := ApiClient.ServiceList(context.Background(), swarm.ServiceListOptions{});
 	if err != nil {
-		panic("Failed to list services."+ err.Error());
+		slog.Error("Failed to list services", slog.Any("propagatedError", err));
+		os.Exit(1);
 	}
 
 	var helperServiceId string;
+	var helperServices int;
 
 	for _, service := range listResoult{
 		if service.Spec.Labels["blazena.helper"] != "true" {
 			continue;
 		}
 		helperServiceId = service.ID;
-		break;
+		helperServices ++;
 	}
 
 	if helperServiceId == ""{
-		panic("Helper service not found!");
+		slog.Warn("Helper service wasn't found");
+		http.Error(w, "Internal Server Error", http.StatusInternalServerError);
+		return;
+	}
+
+	if helperServices > 1{
+		slog.Error("There are more than 1 helper service.");
+		os.Exit(1);
 	}
 
 	err = ApiClient.ServiceRemove(context.Background(), helperServiceId);
 	if err != nil {
 		panic("Failed to remove helper service."+ err.Error());
 	}
+	//TODO: add proper wait system
 	time.Sleep(7*time.Second);
 
-	fmt.Fprint(w, bodyDecoded.ServiceId);
+	fmt.Fprint(w, helperServiceId);
 }

docker/keys.go

@@ -1,11 +1,14 @@
 package docker
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
-	"context"
+	"os"
+
 	"github.com/docker/docker/api/types/swarm"
 
 	"github.com/rony5394/blazena/shared"
@@ -32,23 +35,35 @@ func exchangeKeys(w http.ResponseWriter, r *http.Request){
 	if err != nil {
 		panic("Failed to unmarshal json."+ err.Error());
 	}
-	sshPkPem := bodyDecoded.SshPkPem;
+	sshClientPkPem := bodyDecoded.SshPkPem;
 	hostKeypair := shared.GenerateSSHKeypair();
+
 	encoded, err := json.Marshal(struct{HostPkPem string `json:"hostPkPem"`}{HostPkPem: hostKeypair.Public});
 	if err != nil {
-		panic("I wonder how. I wonder why?"+err.Error());
+		slog.Error("Failed to marshal host pk into response.", slog.Any("propagatedError", err));
+		os.Exit(42);
 	}
 
-	ApiClient.ConfigCreate(context.Background(), swarm.ConfigSpec{
-		Data: []byte(sshPkPem), 
-		Annotations: swarm.Annotations{Name: "blazenaSSHPublicKey"},
+	_, err = ApiClient.ConfigCreate(context.Background(), swarm.ConfigSpec{
+		Data: []byte(sshClientPkPem), 
+		Annotations: swarm.Annotations{Name: theConfig.Constants.SSHClientPKConfigName},
 	});
 
-	ApiClient.SecretCreate(context.Background(), swarm.SecretSpec{
+	if err != nil {
+		slog.Error("Failed to create a config.", slog.Any("propagatedError", err));
+		os.Exit(1);
+	}
+
+	_, err = ApiClient.SecretCreate(context.Background(), swarm.SecretSpec{
 		Data: []byte(hostKeypair.Private),
-		Annotations: swarm.Annotations{Name: "blazenaSSHHostPrivateKey"},
+		Annotations: swarm.Annotations{Name: theConfig.Constants.SSHHostSKSecretName}, 
 	});
 
+	if err != nil {
+		slog.Error("Failed to create a secret.", slog.Any("propagatedError", err));
+		os.Exit(1);
+	}
+
 
 	fmt.Fprint(w, string(encoded));
 }

docker/prepare.go

@@ -53,6 +53,7 @@ func prepare(w http.ResponseWriter, r *http.Request){
 	pullBlazenaImage();
 	createHelper(theConfig, labels["blazena.node"], bodyDecoded.VolumeId);
 
+	//TODO: add proper waiting system.
 	time.Sleep(7*time.Second);
 
 	fmt.Fprint(w, bodyDecoded.ServiceId);
@@ -129,7 +130,7 @@ func createHelper(Config cfg.Config, targetNode string, targetVolume string){
 	stopGracePeriod := time.Second * 5;
 	helperCommand := `/usr/sbin/sshd -h /host-key -p 2222 -D`;
 
-	sshKeyConfigId, err := getConfigIDByName(ApiClient, "blazenaSSHPublicKey");
+	sshKeyConfigId, err := getConfigIDByName(ApiClient, theConfig.Constants.SSHClientPKConfigName);
 
 	if err != nil {
 		panic("Docker needs both id and name to mount config for some reason and getting id of it failed!"+err.Error());
@@ -163,7 +164,7 @@ func createHelper(Config cfg.Config, targetNode string, targetVolume string){
 				Configs: []*swarm.ConfigReference{
 					&swarm.ConfigReference{
 						ConfigID: sshKeyConfigId, 
-						ConfigName: "blazenaSSHPublicKey",
+						ConfigName: theConfig.Constants.SSHClientPKConfigName,
 						File: &swarm.ConfigReferenceFileTarget{
 							Name: "/root/.ssh/authorized_keys",
 							Mode: 0600,
@@ -175,7 +176,7 @@ func createHelper(Config cfg.Config, targetNode string, targetVolume string){
 				Secrets: []*swarm.SecretReference{
 					&swarm.SecretReference{
 						SecretID: sshHostKeySecretId,
-						SecretName: "blazenaSSHHostPrivateKey",
+						SecretName: theConfig.Constants.SSHHostSKSecretName,
 						File: &swarm.SecretReferenceFileTarget{
 							Name: "/host-key",
 							Mode: 0600,

docker/scale.go

@@ -118,7 +118,12 @@ func scaleUp(w http.ResponseWriter, r *http.Request){
 	delete(updatedSpec.Labels, "blazena.scaledDown");
 	delete(updatedSpec.Labels, "blazena.originalScale");
 
-	ApiClient.ServiceUpdate(context.Background(), serviceId, inspectresoult.Version, updatedSpec, swarm.ServiceUpdateOptions{});
+	_, err = ApiClient.ServiceUpdate(context.Background(), serviceId, inspectresoult.Version, updatedSpec, swarm.ServiceUpdateOptions{});
+
+	if err != nil {
+		slog.Error("Failed to update/scale a service.", slog.Any("propagatedError", err), slog.String("serviceId", serviceId));
+		os.Exit(1);
+	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), theConfig.Constants.ServiceScaleTimeout);
 	defer cancel();