From d13476fd4764f03d9bfb96f98ec91ed7ce2cb0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Wed, 29 Mar 2023 09:59:58 +0200 Subject: [PATCH] Remove warning for not setting attestationVariant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- internal/config/validation.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/config/validation.go b/internal/config/validation.go index f1f208fc4..b13bfa858 100644 --- a/internal/config/validation.go +++ b/internal/config/validation.go @@ -10,7 +10,6 @@ import ( "bytes" "errors" "fmt" - "os" "sort" "strconv" "strings" @@ -462,7 +461,8 @@ func (c *Config) translateValidAttestVariantError(ut ut.Translator, _ validator. } func (c *Config) validAttestVariant(_ validator.FieldLevel) bool { - // TODO: v2.8: remove variant fallback and make variant a required field + // TODO(AB#3040): function will be obsolete in v2.8 + // attestationVariant will be refactored into a required struct c.addMissingVariant() attestationVariant, err := variant.FromString(c.AttestationVariant) @@ -492,8 +492,6 @@ func (c *Config) addMissingVariant() { if c.AttestationVariant != "" { return } - fmt.Fprintln(os.Stderr, "WARNING: the config key `attestationVariant` is not set. This key will be required in the next version.") - switch c.GetProvider() { case cloudprovider.AWS: c.AttestationVariant = variant.AWSNitroTPM{}.String()