refactor: use central logger

pkg/upstream/stack/loader.go

@@ -7,10 +7,10 @@ import (
 	"sort"
 	"strings"
 
+	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/cli/cli/compose/loader"
 	"github.com/docker/cli/cli/compose/schema"
 	composetypes "github.com/docker/cli/cli/compose/types"
-	"github.com/sirupsen/logrus"
 )
 
 // DontSkipValidation ensures validation is done for compose file loading
@@ -51,13 +51,13 @@ func LoadComposefile(opts Deploy, appEnv map[string]string, options ...func(*loa
 
 	unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
 	if len(unsupportedProperties) > 0 {
-		logrus.Warnf("%s: ignoring unsupported options: %s",
+		log.Warnf("%s: ignoring unsupported options: %s",
 			recipeName, strings.Join(unsupportedProperties, ", "))
 	}
 
 	deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
 	if len(deprecatedProperties) > 0 {
-		logrus.Warnf("%s: ignoring deprecated options: %s",
+		log.Warnf("%s: ignoring deprecated options: %s",
 			recipeName, propertyWarnings(deprecatedProperties))
 	}
 	return config, nil

pkg/upstream/stack/remove.go

@@ -6,13 +6,13 @@ import (
 	"sort"
 	"strings"
 
+	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
 	apiclient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 )
 
 // RunRemove is the swarm implementation of docker stack remove
@@ -46,7 +46,7 @@ func RunRemove(ctx context.Context, client *apiclient.Client, opts Remove) error
 		}
 
 		if len(services)+len(networks)+len(secrets)+len(configs) == 0 {
-			logrus.Warning(fmt.Errorf("nothing found in stack: %s", namespace))
+			log.Warnf("nothing found in stack: %s", namespace)
 			continue
 		}
 
@@ -87,10 +87,10 @@ func removeServices(
 	var hasError bool
 	sort.Slice(services, sortServiceByName(services))
 	for _, service := range services {
-		logrus.Infof("removing service %s\n", service.Spec.Name)
+		log.Infof("removing service %s\n", service.Spec.Name)
 		if err := client.ServiceRemove(ctx, service.ID); err != nil {
 			hasError = true
-			logrus.Fatalf("failed to remove service %s: %s", service.ID, err)
+			log.Fatalf("failed to remove service %s: %s", service.ID, err)
 		}
 	}
 	return hasError
@@ -103,10 +103,10 @@ func removeNetworks(
 ) bool {
 	var hasError bool
 	for _, network := range networks {
-		logrus.Infof("removing network %s\n", network.Name)
+		log.Infof("removing network %s\n", network.Name)
 		if err := client.NetworkRemove(ctx, network.ID); err != nil {
 			hasError = true
-			logrus.Fatalf("failed to remove network %s: %s", network.ID, err)
+			log.Fatalf("failed to remove network %s: %s", network.ID, err)
 		}
 	}
 	return hasError
@@ -119,10 +119,10 @@ func removeSecrets(
 ) bool {
 	var hasError bool
 	for _, secret := range secrets {
-		logrus.Infof("Removing secret %s\n", secret.Spec.Name)
+		log.Infof("Removing secret %s\n", secret.Spec.Name)
 		if err := client.SecretRemove(ctx, secret.ID); err != nil {
 			hasError = true
-			logrus.Fatalf("Failed to remove secret %s: %s", secret.ID, err)
+			log.Fatalf("Failed to remove secret %s: %s", secret.ID, err)
 		}
 	}
 	return hasError
@@ -135,10 +135,10 @@ func removeConfigs(
 ) bool {
 	var hasError bool
 	for _, config := range configs {
-		logrus.Infof("removing config %s\n", config.Spec.Name)
+		log.Infof("removing config %s\n", config.Spec.Name)
 		if err := client.ConfigRemove(ctx, config.ID); err != nil {
 			hasError = true
-			logrus.Fatalf("failed to remove config %s: %s", config.ID, err)
+			log.Fatalf("failed to remove config %s: %s", config.ID, err)
 		}
 	}
 	return hasError

pkg/upstream/stack/stack.go

@@ -11,6 +11,7 @@ import (
 
 	stdlibErr "errors"
 
+	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/convert"
 	"github.com/docker/cli/cli/command/service/progress"
 	"github.com/docker/cli/cli/command/stack/formatter"
@@ -23,7 +24,6 @@ import (
 	"github.com/docker/docker/client"
 	dockerClient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 )
 
 // Resolve image constants
@@ -118,12 +118,12 @@ func IsDeployed(ctx context.Context, cl *dockerClient.Client, stackName string)
 			}
 		}
 
-		logrus.Debugf("%s has been detected as deployed with version %s", stackName, version)
+		log.Debugf("%s has been detected as deployed with version %s", stackName, version)
 
 		return true, version, nil
 	}
 
-	logrus.Debugf("%s has been detected as not deployed", stackName)
+	log.Debugf("%s has been detected as not deployed", stackName)
 	return isDeployed, version, nil
 }
 
@@ -131,7 +131,7 @@ func IsDeployed(ctx context.Context, cl *dockerClient.Client, stackName string)
 func pruneServices(ctx context.Context, cl *dockerClient.Client, namespace convert.Namespace, services map[string]struct{}) {
 	oldServices, err := GetStackServices(ctx, cl, namespace.Name())
 	if err != nil {
-		logrus.Infof("failed to list services: %s\n", err)
+		log.Infof("failed to list services: %s\n", err)
 	}
 
 	pruneServices := []swarm.Service{}
@@ -213,9 +213,9 @@ func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, co
 		return err
 	}
 
-	logrus.Infof("waiting for %s to deploy... please hold 🤚", appName)
+	log.Infof("waiting for %s to deploy... please hold 🤚", appName)
 	if err := waitOnServices(ctx, cl, serviceIDs, appName); err == nil {
-		logrus.Infof("Successfully deployed %s", appName)
+		log.Infof("Successfully deployed %s", appName)
 	}
 	return err
 }
@@ -265,7 +265,7 @@ func createSecrets(ctx context.Context, cl *dockerClient.Client, secrets []swarm
 			}
 		case dockerClient.IsErrNotFound(err):
 			// secret does not exist, then we create a new one.
-			logrus.Infof("Creating secret %s\n", secretSpec.Name)
+			log.Infof("Creating secret %s\n", secretSpec.Name)
 			if _, err := cl.SecretCreate(ctx, secretSpec); err != nil {
 				return errors.Wrapf(err, "failed to create secret %s", secretSpec.Name)
 			}
@@ -287,7 +287,7 @@ func createConfigs(ctx context.Context, cl *dockerClient.Client, configs []swarm
 			}
 		case dockerClient.IsErrNotFound(err):
 			// config does not exist, then we create a new one.
-			logrus.Infof("creating config %s\n", configSpec.Name)
+			log.Infof("creating config %s\n", configSpec.Name)
 			if _, err := cl.ConfigCreate(ctx, configSpec); err != nil {
 				return errors.Wrapf(err, "failed to create config %s", configSpec.Name)
 			}
@@ -318,7 +318,7 @@ func createNetworks(ctx context.Context, cl *dockerClient.Client, namespace conv
 			createOpts.Driver = defaultNetworkDriver
 		}
 
-		logrus.Infof("creating network %s\n", name)
+		log.Infof("creating network %s\n", name)
 		if _, err := cl.NetworkCreate(ctx, name, createOpts); err != nil {
 			return errors.Wrapf(err, "failed to create network %s", name)
 		}
@@ -355,7 +355,7 @@ func deployServices(
 		)
 
 		if service, exists := existingServiceMap[name]; exists {
-			logrus.Infof("Updating service %s (id: %s)\n", name, service.ID)
+			log.Infof("Updating service %s (id: %s)\n", name, service.ID)
 
 			updateOpts := types.ServiceUpdateOptions{EncodedRegistryAuth: encodedAuth}
 
@@ -394,12 +394,12 @@ func deployServices(
 			}
 
 			for _, warning := range response.Warnings {
-				logrus.Warn(warning)
+				log.Warn(warning)
 			}
 
 			serviceIDs = append(serviceIDs, service.ID)
 		} else {
-			logrus.Infof("creating service %s\n", name)
+			log.Infof("creating service %s\n", name)
 
 			createOpts := types.ServiceCreateOptions{EncodedRegistryAuth: encodedAuth}
 
@@ -418,7 +418,7 @@ func deployServices(
 	}
 
 	if dontWait {
-		logrus.Warn("skipping converge logic checks")
+		log.Warn("skipping converge logic checks")
 		return nil, nil
 	}