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

rewrote packages

Browse source 
keyservice
joinservice
upgrade-agent
measurement-reader
debugd
disk-mapper

rewrote joinservice main

rewrote some unit tests

rewrote upgrade-agent + some grpc functions

rewrote measurement-reader

rewrote debugd

removed unused import

removed forgotten zap reference in measurements reader

rewrote disk-mapper + tests

rewrote packages

verify
disk-mapper
malicious join
bootstrapper
attestationconfigapi
versionapi
internal/cloud/azure
disk-mapper tests
image/upload/internal/cmd

rewrote verify (WIP with loglevel increase)

rewrote forgotten zap references in disk-mapper

rewrote malicious join

rewrote bootstrapper

rewrote parts of internal/

rewrote attestationconfigapi (WIP)

rewrote versionapi cli

rewrote internal/cloud/azure

rewrote disk-mapper tests (untested by me rn)

rewrote image/upload/internal/cmd

removed forgotten zap references in verify/cmd

rewrote packages

hack/oci-pin
hack/qemu-metadata-api
debugd/internal/debugd/deploy
hack/bazel-deps-mirror
cli/internal/cmd
cli-k8s-compatibility

rewrote hack/qemu-metadata-api/server

rewrote debugd/internal/debugd/deploy

rewrote hack/bazel-deps-mirror

rewrote rest of hack/qemu-metadata-api

rewrote forgotten zap references in joinservice server

rewrote cli/internal/cmd

rewrote cli-k8s-compatibility

rewrote packages

internal/staticupload
e2d/internal/upgrade
internal/constellation/helm
internal/attestation/aws/snp
internal/attestation/azure/trustedlaunch
joinservice/internal/certcache/amkds

some missed unit tests

rewrote e2e/internal/upgrade

rewrote internal/constellation/helm

internal/attestation/aws/snp

internal/attestation/azure/trustedlaunch

joinservice/internal/certcache/amkds

search and replace test logging over all left *_test.go
This commit is contained in:
miampf 2023-12-29 15:18:59 +01:00
parent 48d5a157dd
commit f16ccf5679
No known key found for this signature in database
GPG key ID: 376EAC0E5307A669
158 changed files with 3400 additions and 1278 deletions
Download patch file Download diff file Expand all files Collapse all files

61
joinservice/cmd/main.go
View file

@ -10,7 +10,9 @@ import (
"context"
"errors"
"flag"
"log/slog"
"net"
"os"
"path/filepath"
"strconv"
"time"
@ -36,7 +38,6 @@ import (
"github.com/edgelesssys/constellation/v2/joinservice/internal/server"
"github.com/edgelesssys/constellation/v2/joinservice/internal/watcher"
"github.com/spf13/afero"
"go.uber.org/zap"
)
// vpcIPTimeout is the maximum amount of time to wait for retrieval of the VPC ip.
@ -49,35 +50,39 @@ func main() {
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
flag.Parse()
log := logger.New(logger.JSONLog, logger.VerbosityFromInt(*verbosity))
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logger.VerbosityFromInt(*verbosity)}))
log.With(
zap.String("version", constants.BinaryVersion().String()),
zap.String("cloudProvider", *provider),
zap.String("attestationVariant", *attestationVariant),
).Infof("Constellation Node Join Service")
slog.String("version", constants.BinaryVersion().String()),
slog.String("cloudProvider", *provider),
slog.String("attestationVariant", *attestationVariant),
).Info("Constellation Node Join Service")
handler := file.NewHandler(afero.NewOsFs())
kubeClient, err := kubernetes.New()
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to create Kubernetes client")
log.With(slog.Any("error", err)).Error("Failed to create Kubernetes client")
os.Exit(1)
}
attVariant, err := variant.FromString(*attestationVariant)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to parse attestation variant")
log.With(slog.Any("error", err)).Error("Failed to parse attestation variant")
os.Exit(1)
}
certCacheClient := certcache.NewClient(log.Named("certcache"), kubeClient, attVariant)
certCacheClient := certcache.NewClient(log.WithGroup("certcache"), kubeClient, attVariant)
cachedCerts, err := certCacheClient.CreateCertChainCache(context.Background())
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to create certificate chain cache")
log.With(slog.Any("error", err)).Error("Failed to create certificate chain cache")
os.Exit(1)
}
validator, err := watcher.NewValidator(log.Named("validator"), attVariant, handler, cachedCerts)
validator, err := watcher.NewValidator(log.WithGroup("validator"), attVariant, handler, cachedCerts)
if err != nil {
flag.Usage()
log.With(zap.Error(err)).Fatalf("Failed to create validator")
log.With(slog.Any("error", err)).Error("Failed to create validator")
os.Exit(1)
}
creds := atlscredentials.New(nil, []atls.Validator{validator})
@ -87,47 +92,53 @@ func main() {
vpcIP, err := getVPCIP(vpcCtx, *provider)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to get IP in VPC")
log.With(slog.Any("error", err)).Error("Failed to get IP in VPC")
os.Exit(1)
}
apiServerEndpoint := net.JoinHostPort(vpcIP, strconv.Itoa(constants.KubernetesPort))
kubeadm, err := kubeadm.New(apiServerEndpoint, log.Named("kubeadm"))
kubeadm, err := kubeadm.New(apiServerEndpoint, log.WithGroup("kubeadm"))
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to create kubeadm")
log.With(slog.Any("error", err)).Error("Failed to create kubeadm")
}
keyServiceClient := kms.New(log.Named("keyServiceClient"), *keyServiceEndpoint)
keyServiceClient := kms.New(log.WithGroup("keyServiceClient"), *keyServiceEndpoint)
measurementSalt, err := handler.Read(filepath.Join(constants.ServiceBasePath, constants.MeasurementSaltFilename))
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to read measurement salt")
log.With(slog.Any("error", err)).Error("Failed to read measurement salt")
os.Exit(1)
}
server, err := server.New(
measurementSalt,
kubernetesca.New(log.Named("certificateAuthority"), handler),
kubernetesca.New(log.WithGroup("certificateAuthority"), handler),
kubeadm,
keyServiceClient,
kubeClient,
log.Named("server"),
log.WithGroup("server"),
)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to create server")
log.With(slog.Any("error", err)).Error("Failed to create server")
os.Exit(1)
}
watcher, err := watcher.New(log.Named("fileWatcher"), validator)
watcher, err := watcher.New(log.WithGroup("fileWatcher"), validator)
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to create watcher for measurements updates")
log.With(slog.Any("error", err)).Error("Failed to create watcher for measurements updates")
os.Exit(1)
}
defer watcher.Close()
go func() {
log.Infof("starting file watcher for measurements file %s", filepath.Join(constants.ServiceBasePath, constants.AttestationConfigFilename))
log.Info("starting file watcher for measurements file %s", filepath.Join(constants.ServiceBasePath, constants.AttestationConfigFilename))
if err := watcher.Watch(filepath.Join(constants.ServiceBasePath, constants.AttestationConfigFilename)); err != nil {
log.With(zap.Error(err)).Fatalf("Failed to watch measurements file")
log.With(slog.Any("error", err)).Error("Failed to watch measurements file")
os.Exit(1)
}
}()
if err := server.Run(creds, strconv.Itoa(constants.JoinServicePort)); err != nil {
log.With(zap.Error(err)).Fatalf("Failed to run server")
log.With(slog.Any("error", err)).Error("Failed to run server")
os.Exit(1)
}
}