Remove empty default tls configuration in ctr

dmcgowan · dmcgowan · commit 7c5078459169 · 2024-04-09T15:40:09.000-07:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/cmd/ctr/commands/resolver.go b/cmd/ctr/commands/resolver.go
@@ -149,6 +149,11 @@ func resolverDefaultTLS(clicontext *cli.Context) (*tls.Config, error) {
 		config.Certificates = []tls.Certificate{keyPair}
 	}
 
+	// If nothing was set, return nil rather than empty config
+	if !config.InsecureSkipVerify && config.RootCAs == nil && config.Certificates == nil {
+		return nil, nil
+	}
+
 	return config, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,11 @@ func resolverDefaultTLS(clicontext cli.Context) (tls.Config, error) {`
`149`	`149`	`config.Certificates = []tls.Certificate{keyPair}`
`150`	`150`	`}`
`151`	`151`
	`152`	`+ // If nothing was set, return nil rather than empty config`
	`153`	`+ if !config.InsecureSkipVerify && config.RootCAs == nil && config.Certificates == nil {`
	`154`	`+ return nil, nil`
	`155`	`+ }`
	`156`	`+`
`152`	`157`	`return config, nil`
`153`	`158`	`}`
`154`	`159`