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

deps: convert zap to slog (#2825)

Browse source
This commit is contained in:
miampf 2024-02-08 14:20:01 +00:00 • committed by GitHub
parent 3765cb0762
commit 54cce77bab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
182 changed files with 1474 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

17
measurement-reader/cmd/main.go
View file

@ -8,6 +8,7 @@ package main
import (
"fmt"
"log/slog"
"os"
"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
@ -16,16 +17,15 @@ import (
"github.com/edgelesssys/constellation/v2/measurement-reader/internal/sorted"
"github.com/edgelesssys/constellation/v2/measurement-reader/internal/tdx"
"github.com/edgelesssys/constellation/v2/measurement-reader/internal/tpm"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
func main() {
log := logger.New(logger.JSONLog, zapcore.InfoLevel)
log := logger.NewJSONLogger(slog.LevelInfo)
variantString := os.Getenv(constants.AttestationVariant)
attestationVariant, err := variant.FromString(variantString)
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)
}
var m []sorted.Measurement
@ -33,15 +33,18 @@ func main() {
case variant.AWSNitroTPM{}, variant.AWSSEVSNP{}, variant.AzureSEVSNP{}, variant.AzureTrustedLaunch{}, variant.GCPSEVES{}, variant.QEMUVTPM{}:
m, err = tpm.Measurements()
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to read TPM measurements")
log.With(slog.Any("error", err)).Error("Failed to read TPM measurements")
os.Exit(1)
}
case variant.QEMUTDX{}:
m, err = tdx.Measurements()
if err != nil {
log.With(zap.Error(err)).Fatalf("Failed to read Intel TDX measurements")
log.With(slog.Any("error", err)).Error("Failed to read Intel TDX measurements")
os.Exit(1)
}
default:
log.With(zap.String("attestationVariant", variantString)).Fatalf("Unsupported attestation variant")
log.With(slog.String("attestationVariant", variantString)).Error("Unsupported attestation variant")
os.Exit(1)
}
fmt.Println("Measurements:")