From 7a6a0766e8d26ab2934c8dfd1fe618e73407c19f Mon Sep 17 00:00:00 2001 From: Leonard Cohnen Date: Sun, 30 Oct 2022 03:46:56 +0100 Subject: [PATCH] undefine more -v flags due to glog --- disk-mapper/cmd/main.go | 6 ++++-- joinservice/cmd/main.go | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/disk-mapper/cmd/main.go b/disk-mapper/cmd/main.go index 61fcce8f8..ae6a976de 100644 --- a/disk-mapper/cmd/main.go +++ b/disk-mapper/cmd/main.go @@ -50,10 +50,12 @@ const ( func main() { csp := flag.String("csp", "", "Cloud Service Provider the image is running on") - verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription) + // FIXME: define flag again once its definition no longer collides with glog. + // This should happen as soon as https://github.com/google/go-sev-guest/issues/23 is merged and consumed by us. + verbosity := 0 // flag.Int("v", 0, logger.CmdLineVerbosityDescription) flag.Parse() - log := logger.New(logger.JSONLog, logger.VerbosityFromInt(*verbosity)) + log := logger.New(logger.JSONLog, logger.VerbosityFromInt(verbosity)) log.With(zap.String("version", constants.VersionInfo), zap.String("cloudProvider", *csp)). Infof("Starting disk-mapper") diff --git a/joinservice/cmd/main.go b/joinservice/cmd/main.go index 1b96bf198..93cc30c3b 100644 --- a/joinservice/cmd/main.go +++ b/joinservice/cmd/main.go @@ -40,10 +40,12 @@ const vpcIPTimeout = 30 * time.Second func main() { provider := flag.String("cloud-provider", "", "cloud service provider this binary is running on") kmsEndpoint := flag.String("kms-endpoint", "", "endpoint of Constellations key management service") - verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription) + // FIXME: define flag again once its definition no longer collides with glog. + // This should happen as soon as https://github.com/google/go-sev-guest/issues/23 is merged and consumed by us. + verbosity := 0 // flag.Int("v", 0, logger.CmdLineVerbosityDescription) flag.Parse() - log := logger.New(logger.JSONLog, logger.VerbosityFromInt(*verbosity)) + log := logger.New(logger.JSONLog, logger.VerbosityFromInt(verbosity)) log.With(zap.String("version", constants.VersionInfo), zap.String("cloudProvider", *provider)). Infof("Constellation Node Join Service")