refactor(api): introduce map of registryURL -> ociCredentials as suggested by @majst01

Author: mac641

api/api.go

@@ -13,8 +13,8 @@ type MetalConfig struct {
 	NTPServers  []string `json:"ntp_servers,omitempty"`
 	Partition   string   `json:"partition"`
 	// Logging contains logging configurations passed to metal-hammer
-	Logging   *Logging     `json:"logging,omitempty"`
-	OciConfig []*OciConfig `json:"oci_config,omitempty"`
+	Logging   *Logging                   `json:"logging,omitempty"`
+	OciConfig map[string]*OciCredentials `json:"oci_config,omitempty"`
 }
 
 type Logging struct {
@@ -46,9 +46,7 @@ type CertificateAuth struct {
 	InsecureSkipVerify bool `json:"insecure_skip_verify,omitempty"`
 }
 
-type OciConfig struct {
-	// URL pointing to the oci registry
-	RegistryURL string `json:"registry_url,omitempty"`
+type OciCredentials struct {
 	// Username that is capable of logging in to the registry
 	Username string `json:"username,omitempty"`
 	// Password for the user

pixiecore/cli/grpccmd.go

@@ -227,10 +227,13 @@ func getMetalAPIConfig(cmd *cobra.Command) (*api.MetalConfig, error) {
 		return nil, fmt.Errorf("error reading flag: %w", err)
 	}
 
-	var ociConfigs []*api.OciConfig
+	ociConfigs := make(map[string]*api.OciCredentials)
 
 	for _, c := range metalHammerOciConfigs {
-		var ociConfig *api.OciConfig
+		var (
+			ociCredentials *api.OciCredentials
+			registryURL    string
+		)
 
 		parts := strings.SplitSeq(c, ",")
 		for p := range parts {
@@ -246,17 +249,17 @@ func getMetalAPIConfig(cmd *cobra.Command) (*api.MetalConfig, error) {
 				if v == "" {
 					return nil, fmt.Errorf("no registry url specified for oci config: %s", c)
 				}
-				ociConfig.RegistryURL = v
+				registryURL = v
 			case "username":
-				ociConfig.Username = v
+				ociCredentials.Username = v
 			case "password":
-				ociConfig.Password = v
+				ociCredentials.Password = v
 			default:
 				return nil, fmt.Errorf("unknown key %q in OCI config", k)
 			}
 		}
 
-		ociConfigs = append(ociConfigs, ociConfig)
+		ociConfigs[registryURL] = ociCredentials
 	}
 
 	return &api.MetalConfig{