refactor(grpccmd): make oci config use yaml file in order to specify configs

- mainly to increase readability and overall code quality

Author: mac641

api/api.go

@@ -14,7 +14,7 @@ type MetalConfig struct {
 	Partition   string   `json:"partition"`
 	// Logging contains logging configurations passed to metal-hammer
 	Logging   *Logging                   `json:"logging,omitempty"`
-	OciConfigs map[string]*OciCredentials `json:"oci_config,omitempty"`
+	OciConfigs map[string]*OciCredentials `json:"oci_configs,omitempty"`
 }
 
 type Logging struct {
@@ -48,9 +48,9 @@ type CertificateAuth struct {
 
 type OciCredentials struct {
 	// Username that is capable of logging in to the registry
-	Username string `json:"username,omitempty"`
+	Username string `json:"username,omitempty" yaml:"username,omitempty"`
 	// Password for the user
-	Password string `json:"password,omitempty"`
+	Password string `json:"password,omitempty" yaml:"password,omitempty"`
 }
 
 // LogType defines which logging backend should be used

go.mod

@@ -3,6 +3,7 @@ module github.com/metal-stack/pixie
 go 1.25
 
 require (
+	github.com/goccy/go-yaml v1.19.2
 	github.com/metal-stack/metal-api v0.42.4
 	github.com/metal-stack/v v1.0.3
 	github.com/pin/tftp/v3 v3.1.0

go.sum

@@ -15,6 +15,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
+github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=

pixiecore/cli/grpccmd.go

@@ -20,6 +20,7 @@ import (
 	"os"
 	"strings"
 
+	yaml "github.com/goccy/go-yaml"
 	"github.com/metal-stack/pixie/api"
 	"github.com/metal-stack/pixie/pixiecore"
 	"github.com/spf13/cobra"
@@ -222,44 +223,38 @@ func getMetalAPIConfig(cmd *cobra.Command) (*api.MetalConfig, error) {
 		}
 	}
 
-	metalHammerOciConfigs, err := cmd.Flags().GetStringSlice("metal-hammer-oci-configs")
+	metalHammerOciConfigFilePath, err := cmd.Flags().GetString("metal-hammer-oci-config-file-path")
 	if err != nil {
 		return nil, fmt.Errorf("error reading flag: %w", err)
 	}
 
 	ociConfigs := make(map[string]*api.OciCredentials)
+	if metalHammerOciConfigFilePath != "" {
+		metalHammerOciConfigFileContent, err := os.ReadFile(metalHammerOciConfigFilePath)
+		if err != nil {
+			return nil, fmt.Errorf("error retrieving oci configs file: %w", err)
+		}
 
-	for _, c := range metalHammerOciConfigs {
-		var (
-			ociCredentials *api.OciCredentials
-			registryURL    string
-		)
+		type MetalHammerOciConfig struct {
+			RegistryURL string `yaml:"registry-url"`
+			Credentials *api.OciCredentials
+		}
+		type MetalHammerOciConfigs struct {
+			OciConfigs []MetalHammerOciConfig `yaml:"oci-configs"`
+		}
+		var metalHammerOciConfigs MetalHammerOciConfigs
+		err = yaml.Unmarshal(metalHammerOciConfigFileContent, &metalHammerOciConfigs)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing oci configs: %w", err)
+		}
 
-		parts := strings.SplitSeq(c, ",")
-		for p := range parts {
-			kv := strings.SplitN(strings.TrimSpace(p), "=", 2)
-			if len(kv) != 2 {
-				return nil, fmt.Errorf("invalid key-value pair in OCI config: %q", p)
+		for _, config := range metalHammerOciConfigs.OciConfigs {
+			if config.RegistryURL == "" {
+				return nil, fmt.Errorf("no registry url specified for oci config: %+v", config)
 			}
 
-			k := strings.ToLower(strings.TrimSpace(kv[0]))
-			v := strings.TrimSpace(kv[1])
-			switch k {
-			case "registry_url":
-				if v == "" {
-					return nil, fmt.Errorf("no registry url specified for oci config: %s", c)
-				}
-				registryURL = v
-			case "username":
-				ociCredentials.Username = v
-			case "password":
-				ociCredentials.Password = v
-			default:
-				return nil, fmt.Errorf("unknown key %q in OCI config", k)
-			}
+			ociConfigs[config.RegistryURL] = config.Credentials
 		}
-
-		ociConfigs[registryURL] = ociCredentials
 	}
 
 	return &api.MetalConfig{