Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-06-07 06:03:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixup after rebase

Browse source
This commit is contained in:
miampf 2024-01-10 13:35:22 +01:00
parent d61f616c85
commit e40a99ca3a
No known key found for this signature in database
GPG key ID: 376EAC0E5307A669
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bootstrapper/cmd/bootstrapper/main.go
View file

@ -51,7 +51,7 @@ func main() {
logger.ReplaceGRPCLogger(log.WithGroup("gRPC")) logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
} else { } else {
//TODO(miampf): Find a good way to dynamically increase slog logLevel //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()) ctx, cancel := context.WithCancel(context.Background())
@ -66,12 +66,12 @@ func main() {
attestVariant, err := variant.FromString(os.Getenv(constants.AttestationVariant)) attestVariant, err := variant.FromString(os.Getenv(constants.AttestationVariant))
if err != nil { 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) os.Exit(1)
} }
issuer, err := choose.Issuer(attestVariant, log) issuer, err := choose.Issuer(attestVariant, log)
if err != nil { 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) os.Exit(1)
} }
@ -79,7 +79,7 @@ func main() {
case cloudprovider.AWS: case cloudprovider.AWS:
metadata, err := awscloud.New(ctx) metadata, err := awscloud.New(ctx)
if err != nil { 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) os.Exit(1)
} }
metadataAPI = metadata metadataAPI = metadata
@ -94,7 +94,7 @@ func main() {
case cloudprovider.GCP: case cloudprovider.GCP:
metadata, err := gcpcloud.New(ctx) metadata, err := gcpcloud.New(ctx)
if err != nil { 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) os.Exit(1)
} }
defer metadata.Close() defer metadata.Close()

28
hack/cli-k8s-compatibility/main.go
View file

@ -13,11 +13,9 @@ import (
"log/slog" "log/slog"
"os" "os"
"github.com/edgelesssys/constellation/v2/internal/api/versionsapi" "github.com/edgelesssys/constellation/v2/internal/api/versionsapi"
"github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/constants"
"github.com/edgelesssys/constellation/v2/internal/logger" "github.com/edgelesssys/constellation/v2/internal/versions"
"github.com/edgelesssys/constellation/v2/internal/versions"
"go.uber.org/zap/zapcore"
) )
var ( var (
@ -55,15 +53,17 @@ func main() {
cliInfo.Kubernetes = append(cliInfo.Kubernetes, v.ClusterVersion) cliInfo.Kubernetes = append(cliInfo.Kubernetes, v.ClusterVersion)
} }
c, cclose, err := versionsapi.NewClient(ctx, "eu-central-1", "cdn-constellation-backend", constants.CDNDefaultDistributionID, false, log) c, cclose, err := versionsapi.NewClient(ctx, "eu-central-1", "cdn-constellation-backend", constants.CDNDefaultDistributionID, false, log)
if err != nil { if err != nil {
log.Fatalf("creating s3 client: %w", err) log.Error("creating s3 client: %w", err)
} os.Exit(1)
defer func() { }
if err := cclose(ctx); err != nil { defer func() {
log.Fatalf("invalidating cache: %w", err) if err := cclose(ctx); err != nil {
} log.Error("invalidating cache: %w", err)
}() os.Exit(1)
}
}()
if err := c.UpdateCLIInfo(ctx, cliInfo); err != nil { if err := c.UpdateCLIInfo(ctx, cliInfo); err != nil {
log.Error("updating cli info: %w", err) log.Error("updating cli info: %w", err)