mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-08-24 06:29:19 -04:00
rewrote packages
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:
parent
48d5a157dd
commit
f16ccf5679
158 changed files with 3400 additions and 1278 deletions
|
@ -8,12 +8,11 @@ package main
|
|||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"os"
|
||||
|
||||
"github.com/edgelesssys/constellation/v2/hack/oci-pin/internal/sums"
|
||||
"github.com/edgelesssys/constellation/v2/internal/logger"
|
||||
"github.com/spf13/cobra"
|
||||
"go.uber.org/zap/zapcore"
|
||||
)
|
||||
|
||||
func newMergeCmd() *cobra.Command {
|
||||
|
@ -35,10 +34,10 @@ func runMerge(cmd *cobra.Command, _ []string) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
log := logger.New(logger.PlainLog, flags.logLevel)
|
||||
log.Debugf("Parsed flags: %+v", flags)
|
||||
log := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: flags.logLevel}))
|
||||
log.Debug("Parsed flags: %+v", flags)
|
||||
|
||||
log.Debugf("Merging sum file from %q into %q.", flags.inputs, flags.output)
|
||||
log.Debug("Merging sum file from %q into %q.", flags.inputs, flags.output)
|
||||
|
||||
var out io.Writer
|
||||
if flags.output == "-" {
|
||||
|
@ -61,7 +60,7 @@ func runMerge(cmd *cobra.Command, _ []string) error {
|
|||
return fmt.Errorf("creating merged sum file: %w", err)
|
||||
}
|
||||
|
||||
log.Debugf("Sum file created at %q 🤖", flags.output)
|
||||
log.Debug("Sum file created at %q 🤖", flags.output)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -93,7 +92,7 @@ func parseInput(input string) ([]sums.PinnedImageReference, error) {
|
|||
type mergeFlags struct {
|
||||
inputs []string
|
||||
output string
|
||||
logLevel zapcore.Level
|
||||
logLevel slog.Level
|
||||
}
|
||||
|
||||
func parseMergeFlags(cmd *cobra.Command) (mergeFlags, error) {
|
||||
|
@ -109,9 +108,9 @@ func parseMergeFlags(cmd *cobra.Command) (mergeFlags, error) {
|
|||
if err != nil {
|
||||
return mergeFlags{}, err
|
||||
}
|
||||
logLevel := zapcore.InfoLevel
|
||||
logLevel := slog.LevelInfo
|
||||
if verbose {
|
||||
logLevel = zapcore.DebugLevel
|
||||
logLevel = slog.LevelDebug
|
||||
}
|
||||
|
||||
return mergeFlags{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue