From e40a99ca3a826c46d395cfe29f3721cbc9c9e51d Mon Sep 17 00:00:00 2001
From: miampf <miampf@proton.me>
Date: Wed, 10 Jan 2024 13:35:22 +0100
Subject: [PATCH] fixup after rebase

---
 bootstrapper/cmd/bootstrapper/main.go | 10 +++++-----
 hack/cli-k8s-compatibility/main.go    | 28 +++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bootstrapper/cmd/bootstrapper/main.go b/bootstrapper/cmd/bootstrapper/main.go
index 75c1c142f..f2cf91f5c 100644
--- a/bootstrapper/cmd/bootstrapper/main.go
+++ b/bootstrapper/cmd/bootstrapper/main.go
@@ -51,7 +51,7 @@ func main() {
     logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
   } else {
     //TODO(miampf): Find a good way to dynamically increase slog logLevel
-    logger.ReplaceGRPCLogger(log.WithGroup("gRPC").WithIncreasedLevel(slog.LevelWarn))
+    logger.ReplaceGRPCLogger(log.WithGroup("gRPC")).WithIncreasedLevel(slog.LevelWarn)
   }
 
   ctx, cancel := context.WithCancel(context.Background())
@@ -66,12 +66,12 @@ func main() {
 
   attestVariant, err := variant.FromString(os.Getenv(constants.AttestationVariant))
   if err != nil {
-    log.With(slog.Any("error", err).Error("Failed to parse attestation variant")
+    log.With(slog.Any("error", err)).Error("Failed to parse attestation variant")
     os.Exit(1)
   }
   issuer, err := choose.Issuer(attestVariant, log)
   if err != nil {
-    log.With(slog.Any("error", err).Error("Failed to select issuer")
+    log.With(slog.Any("error", err)).Error("Failed to select issuer")
     os.Exit(1)
   }
 
@@ -79,7 +79,7 @@ func main() {
   case cloudprovider.AWS:
     metadata, err := awscloud.New(ctx)
     if err != nil {
-      log.With(slog.Any("error", err).Error("Failed to set up AWS metadata API")
+      log.With(slog.Any("error", err)).Error("Failed to set up AWS metadata API")
       os.Exit(1)
     }
     metadataAPI = metadata
@@ -94,7 +94,7 @@ func main() {
   case cloudprovider.GCP:
     metadata, err := gcpcloud.New(ctx)
     if err != nil {
-      log.With(slog.Any("error", err).Error("Failed to create GCP metadata client")
+      log.With(slog.Any("error", err)).Error("Failed to create GCP metadata client")
       os.Exit(1)
     }
     defer metadata.Close()
diff --git a/hack/cli-k8s-compatibility/main.go b/hack/cli-k8s-compatibility/main.go
index d72f9cf53..ea8f2c5ac 100644
--- a/hack/cli-k8s-compatibility/main.go
+++ b/hack/cli-k8s-compatibility/main.go
@@ -13,11 +13,9 @@ import (
   "log/slog"
   "os"
 
-	"github.com/edgelesssys/constellation/v2/internal/api/versionsapi"
-	"github.com/edgelesssys/constellation/v2/internal/constants"
-	"github.com/edgelesssys/constellation/v2/internal/logger"
-	"github.com/edgelesssys/constellation/v2/internal/versions"
-	"go.uber.org/zap/zapcore"
+  "github.com/edgelesssys/constellation/v2/internal/api/versionsapi"
+  "github.com/edgelesssys/constellation/v2/internal/constants"
+  "github.com/edgelesssys/constellation/v2/internal/versions"
 )
 
 var (
@@ -55,15 +53,17 @@ func main() {
     cliInfo.Kubernetes = append(cliInfo.Kubernetes, v.ClusterVersion)
   }
 
-	c, cclose, err := versionsapi.NewClient(ctx, "eu-central-1", "cdn-constellation-backend", constants.CDNDefaultDistributionID, false, log)
-	if err != nil {
-		log.Fatalf("creating s3 client: %w", err)
-	}
-	defer func() {
-		if err := cclose(ctx); err != nil {
-			log.Fatalf("invalidating cache: %w", err)
-		}
-	}()
+  c, cclose, err := versionsapi.NewClient(ctx, "eu-central-1", "cdn-constellation-backend", constants.CDNDefaultDistributionID, false, log)
+  if err != nil {
+    log.Error("creating s3 client: %w", err)
+    os.Exit(1)
+  }
+  defer func() {
+    if err := cclose(ctx); err != nil {
+      log.Error("invalidating cache: %w", err)
+      os.Exit(1)
+    }
+  }()
 
   if err := c.UpdateCLIInfo(ctx, cliInfo); err != nil {
     log.Error("updating cli info: %w", err)