address changes requested by @robertvolkmann

Author: mac641

cmd/root.go

@@ -227,29 +227,30 @@ func initConfigWithViperCtx(c *config) error {
 	certificateAuthorityData := viper.GetString("certificate-authority-data")
 
 	var (
-		client    metalgo.Client
-		err       error
-		transport *http.Transport
+		client        metalgo.Client
+		clientOptions []metalgo.ClientOption
+		err           error
+		transport     *http.Transport
 	)
 
-	if certificateAuthorityData == "" {
-		if hmacAuthType == "" {
-			client, err = metalgo.NewClient(driverURL, metalgo.BearerToken(apiToken), metalgo.HMACAuth(hmacKey, "Metal-Admin"))
-		} else {
-			client, err = metalgo.NewClient(driverURL, metalgo.BearerToken(apiToken), metalgo.HMACAuth(hmacKey, hmacAuthType))
-		}
-	} else {
+	clientOptions = append(clientOptions, metalgo.BearerToken(apiToken))
+
+	if certificateAuthorityData != "" {
 		transport, err = createTLSTransport(certificateAuthorityData)
 		if err != nil {
 			return err
 		}
 
-		if hmacAuthType == "" {
-			client, err = metalgo.NewClient(driverURL, metalgo.BearerToken(apiToken), metalgo.HMACAuth(hmacKey, "Metal-Admin"), metalgo.Transport(transport))
-		} else {
-			client, err = metalgo.NewClient(driverURL, metalgo.BearerToken(apiToken), metalgo.HMACAuth(hmacKey, hmacAuthType), metalgo.Transport(transport))
-		}
+		clientOptions = append(clientOptions, metalgo.Transport(transport))
 	}
+
+	if hmacAuthType != "" {
+		clientOptions = append(clientOptions, metalgo.HMACAuth(hmacKey, hmacAuthType))
+	} else {
+		clientOptions = append(clientOptions, metalgo.HMACAuth(hmacKey, "Metal-Admin"))
+	}
+
+	client, err = metalgo.NewClient(driverURL, clientOptions...)
 	if err != nil {
 		return err
 	}

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/go-openapi/strfmt v0.23.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
-	github.com/metal-stack/metal-go v0.40.5-0.20250307164026-7ca4478eda1e
+	github.com/metal-stack/metal-go v0.40.5-0.20250313114338-fa345040acf7
 	github.com/metal-stack/metal-lib v0.20.1
 	github.com/metal-stack/updater v1.2.2
 	github.com/metal-stack/v v1.0.3

go.sum

@@ -248,6 +248,8 @@ github.com/metal-stack/metal-go v0.40.3 h1:ekgdTY23zHs/XGOg8bUJQFYPTX1GnaqgaT/lg
 github.com/metal-stack/metal-go v0.40.3/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
 github.com/metal-stack/metal-go v0.40.5-0.20250307164026-7ca4478eda1e h1:m13vaYr/nv/QxIa7G2V3jr1qqLQ/xACNCTR40cEmz5A=
 github.com/metal-stack/metal-go v0.40.5-0.20250307164026-7ca4478eda1e/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
+github.com/metal-stack/metal-go v0.40.5-0.20250313114338-fa345040acf7 h1:Wkt5JRTXIRlFOJ+Fs5L4XeVQEVWNaL7txuzEHG+Po60=
+github.com/metal-stack/metal-go v0.40.5-0.20250313114338-fa345040acf7/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
 github.com/metal-stack/metal-lib v0.20.1 h1:gxNg512dS5yzDebELtPZjmoWond0Gw0HHEkSVIAOWRE=
 github.com/metal-stack/metal-lib v0.20.1/go.mod h1:zYzXYpNA4nQ+ANx19s/+1Yb/Q6xhS1nQK2yK2/ryXZM=
 github.com/metal-stack/security v0.9.3 h1:ZF5rGeZ4fIFe0DFFQWkXsUDCzODyjdrpvKmeaLOz9lo=

pkg/api/context.go

@@ -19,14 +19,14 @@ type Contexts struct {
 // Context configure metalctl behaviour
 type Context struct {
 	ApiURL                   string  `yaml:"url"`
+	CertificateAuthorityData string  `yaml:"certificate_authority_data,omitempty"`
 	IssuerURL                string  `yaml:"issuer_url"`
 	IssuerType               string  `yaml:"issuer_type"`
 	CustomScopes             string  `yaml:"custom_scopes"`
 	ClientID                 string  `yaml:"client_id"`
 	ClientSecret             string  `yaml:"client_secret"`
 	HMAC                     *string `yaml:"hmac"`
 	HMACAuthType             string  `yaml:"hmac_auth_type,omitempty"`
-	CertificateAuthorityData string  `yaml:"certificate_authority_data,omitempty"`
 }
 
 var defaultCtx = Context{