compute registryFQDN

Author: mbussolotto

mgradm/cmd/upgrade/podman/podman.go

@@ -70,7 +70,7 @@ func listTags(flags *podmanUpgradeFlags) error {
 
 	authFile, cleaner, err := podman.PodmanLogin(hostData, flags.Installation.SCC, flags.Image)
 	if err != nil {
-		return utils.Errorf(err, L("failed to login to %s"), flags.Image.RegistryFQDN())
+		return utils.Errorf(err, L("failed to login to %s"), flags.Image.RegistryFQDN)
 	}
 	defer cleaner()
 

mgradm/shared/utils/flags.go

@@ -130,18 +130,23 @@ func (flags *ServerFlags) setRegistryIfMissing() {
 	}
 	if flags.Coco.Image.Registry == "" {
 		flags.Coco.Image.Registry = globalRegistry
+		flags.Coco.Image.GetRegistryFQDN()
 	}
 	if flags.DBUpgradeImage.Registry == "" {
 		flags.DBUpgradeImage.Registry = globalRegistry
+		flags.DBUpgradeImage.GetRegistryFQDN()
 	}
 	if flags.HubXmlrpc.Image.Registry == "" {
 		flags.HubXmlrpc.Image.Registry = globalRegistry
+		flags.HubXmlrpc.Image.GetRegistryFQDN()
 	}
 	if flags.Pgsql.Image.Registry == "" {
 		flags.Pgsql.Image.Registry = globalRegistry
+		flags.Pgsql.Image.GetRegistryFQDN()
 	}
 	if flags.Saline.Image.Registry == "" {
-		flags.Pgsql.Image.Registry = globalRegistry
+		flags.Saline.Image.Registry = globalRegistry
+		flags.Saline.Image.GetRegistryFQDN()
 	}
 }
 

mgrpxy/shared/utils/flags.go

@@ -63,18 +63,23 @@ func (flags *ProxyImageFlags) setRegistryIfMissing() {
 	}
 	if flags.Httpd.Registry == "" {
 		flags.Httpd.Registry = globalRegistry
+		flags.Httpd.GetRegistryFQDN()
 	}
 	if flags.SSH.Registry == "" {
 		flags.SSH.Registry = globalRegistry
+		flags.SSH.GetRegistryFQDN()
 	}
 	if flags.SaltBroker.Registry == "" {
 		flags.SaltBroker.Registry = globalRegistry
+		flags.SaltBroker.GetRegistryFQDN()
 	}
 	if flags.Squid.Registry == "" {
 		flags.Squid.Registry = globalRegistry
+		flags.Squid.GetRegistryFQDN()
 	}
 	if flags.Tftpd.Registry == "" {
 		flags.Tftpd.Registry = globalRegistry
+		flags.Tftpd.GetRegistryFQDN()
 	}
 }
 

shared/podman/login.go

@@ -19,7 +19,6 @@ import (
 //
 // It returns an authentication file, a cleanup function and an error.
 func PodmanLogin(hostData *HostInspectData, scc types.SCCCredentials, image types.ImageFlags) (string, func(), error) {
-	registryFQDN := image.RegistryFQDN()
 	sccUser := hostData.SCCUsername
 	sccPassword := hostData.SCCPassword
 	if scc.User != "" && scc.Password != "" {
@@ -36,7 +35,7 @@ func PodmanLogin(hostData *HostInspectData, scc types.SCCCredentials, image type
 			"auth": "%s"
 		}
 	}
-}`, registryFQDN, token)
+}`, image.RegistryFQDN, token)
 		authFile, err := os.CreateTemp("", "mgradm-")
 		if err != nil {
 			return "", nil, err

shared/types/images.go

@@ -14,10 +14,11 @@ import (
 
 // ImageFlags represents the flags used by an image.
 type ImageFlags struct {
-	Registry   string `mapstructure:"registry"`
-	Name       string `mapstructure:"image"`
-	Tag        string `mapstructure:"tag"`
-	PullPolicy string `mapstructure:"pullPolicy"`
+	Registry     string `mapstructure:"registry"`
+	RegistryFQDN string `mapstructure:"registryFQDN"`
+	Name         string `mapstructure:"image"`
+	Tag          string `mapstructure:"tag"`
+	PullPolicy   string `mapstructure:"pullPolicy"`
 }
 
 // PgsqlFlags contains settings for Pgsql container.
@@ -46,7 +47,7 @@ type SCCCredentials struct {
 }
 
 // RegistryFQDN return the registry FQDN
-func (flags *ImageFlags) RegistryFQDN() string {
+func (flags *ImageFlags) GetRegistryFQDN() string {
 	reg := flags.Registry
 
 	hasScheme := strings.Contains(reg, "://")
@@ -58,11 +59,15 @@ func (flags *ImageFlags) RegistryFQDN() string {
 	u, err := url.Parse(toParse)
 	if err != nil {
 		log.Error().Msgf(L("Cannot extract FQDN from %s: this will be used as FQDN"))
-		return reg
+		flags.RegistryFQDN = reg
+		return flags.RegistryFQDN
 	}
 
 	if hasScheme {
-		return u.Scheme + "://" + u.Host
+		flags.RegistryFQDN = u.Scheme + "://" + u.Host
+		return flags.RegistryFQDN
 	}
-	return u.Host
+
+	flags.RegistryFQDN = u.Host
+	return flags.RegistryFQDN
 }

shared/types/images_test.go

@@ -30,7 +30,7 @@ func TestRegistryFQDN(t *testing.T) {
 	}
 	for i, testCase := range data {
 
-		actual := testCase.Input.RegistryFQDN()
+		actual := testCase.Input.GetRegistryFQDN()
 
 		if actual != testCase.Expected {
 			t.Errorf("Testcase %d: Expected %s got %s when registry %s", i, testCase.Expected, actual, testCase.Input.Registry)