Use proxy registry custom domain not replicated app domain in LicenseDockerCfg template function (#2994)

Author: sgalsaleh

api/pkg/template/license.go

@@ -4,12 +4,10 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"net/url"
 
 	"github.com/replicatedhq/embedded-cluster/api/internal/utils"
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
-	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 )
 
 func (e *Engine) licenseFieldValue(name string) string {
@@ -80,7 +78,7 @@ func (e *Engine) licenseDockerCfg() (string, error) {
 	auth := fmt.Sprintf("%s:%s", e.license.Spec.LicenseID, e.license.Spec.LicenseID)
 	encodedAuth := base64.StdEncoding.EncodeToString([]byte(auth))
 
-	registryProxyInfo := getRegistryProxyInfo(e.license, e.releaseData)
+	registryProxyInfo := getRegistryProxyInfo(e.releaseData)
 
 	dockercfg := map[string]any{
 		"auths": map[string]any{
@@ -104,41 +102,12 @@ func (e *Engine) licenseDockerCfg() (string, error) {
 type registryProxyInfo struct {
 	Registry string
 	Proxy    string
-	Upstream string
 }
 
-func getRegistryProxyInfo(license *kotsv1beta1.License, releaseData *release.ReleaseData) *registryProxyInfo {
-	registryProxyInfo := getRegistryProxyInfoFromLicense(license)
-
+func getRegistryProxyInfo(releaseData *release.ReleaseData) *registryProxyInfo {
 	ecDomains := utils.GetDomains(releaseData)
-	registryProxyInfo.Proxy = ecDomains.ReplicatedAppDomain
-	registryProxyInfo.Registry = ecDomains.ReplicatedRegistryDomain
-	return registryProxyInfo
-}
-
-func getRegistryProxyInfoFromLicense(license *kotsv1beta1.License) *registryProxyInfo {
-	defaultInfo := &registryProxyInfo{
-		Upstream: "registry.replicated.com",
-		Registry: "registry.replicated.com",
-		Proxy:    "proxy.replicated.com",
-	}
-
-	if license == nil {
-		return defaultInfo
-	}
-
-	u, err := url.Parse(license.Spec.Endpoint)
-	if err != nil {
-		return defaultInfo
-	}
-
-	if u.Hostname() == "staging.replicated.app" {
-		return &registryProxyInfo{
-			Upstream: "registry.staging.replicated.com",
-			Registry: "registry.staging.replicated.com",
-			Proxy:    "proxy.staging.replicated.com",
-		}
+	return &registryProxyInfo{
+		Proxy:    ecDomains.ProxyRegistryDomain,
+		Registry: ecDomains.ReplicatedRegistryDomain,
 	}
-
-	return defaultInfo
 }

api/pkg/template/license_test.go

@@ -214,6 +214,7 @@ func TestEngine_LicenseDockerCfg(t *testing.T) {
 			DefaultDomains: release.Domains{
 				ReplicatedAppDomain:      "my-app.example.com",
 				ReplicatedRegistryDomain: "registry.my-app.example.com",
+				ProxyRegistryDomain:      "proxy.my-app.example.com",
 			},
 		},
 	}
@@ -239,7 +240,7 @@ func TestEngine_LicenseDockerCfg(t *testing.T) {
 	require.True(t, ok, "auths should be a map")
 
 	// Check that both proxy and registry domains are present
-	proxyAuth, ok := auths["my-app.example.com"].(map[string]interface{})
+	proxyAuth, ok := auths["proxy.my-app.example.com"].(map[string]interface{})
 	require.True(t, ok, "proxy auth should exist")
 	require.Contains(t, proxyAuth, "auth")
 
@@ -322,12 +323,8 @@ func TestEngine_LicenseDockerCfgStagingEndpoint(t *testing.T) {
 	auths, ok := dockercfg["auths"].(map[string]interface{})
 	require.True(t, ok, "auths should be a map")
 
-	// With staging endpoint, should use staging domains:
-	// - Proxy: ReplicatedAppDomain (default: "replicated.app") - not affected by staging
-	// - Registry: ReplicatedRegistryDomain (default: "registry.replicated.com") - not affected by staging
-	// Note: The staging endpoint only affects the getRegistryProxyInfoFromLicense function,
-	// but when there's no release data, utils.GetDomains returns default domains
-	proxyAuth, ok := auths["replicated.app"].(map[string]interface{})
+	// The (staging) endpoint in license should not affect the domains being used
+	proxyAuth, ok := auths["proxy.replicated.com"].(map[string]interface{})
 	require.True(t, ok, "staging proxy auth should exist")
 	require.Contains(t, proxyAuth, "auth")
 
@@ -364,6 +361,7 @@ func TestEngine_LicenseDockerCfgStagingEndpointWithReleaseData(t *testing.T) {
 			DefaultDomains: release.Domains{
 				ReplicatedAppDomain:      "staging-app.example.com",
 				ReplicatedRegistryDomain: "staging-registry.example.com",
+				ProxyRegistryDomain:      "staging-proxy.example.com",
 			},
 		},
 	}
@@ -388,15 +386,15 @@ func TestEngine_LicenseDockerCfgStagingEndpointWithReleaseData(t *testing.T) {
 	auths, ok := dockercfg["auths"].(map[string]interface{})
 	require.True(t, ok, "auths should be a map")
 
-	// With staging endpoint and release data, should use release data domains:
-	// - Proxy: ReplicatedAppDomain from release data
+	// Domains should come from release data and not be affected by the staging endpoint in license:
+	// - Proxy: ProxyRegistryDomain from release data
 	// - Registry: ReplicatedRegistryDomain from release data
-	proxyAuth, ok := auths["staging-app.example.com"].(map[string]interface{})
-	require.True(t, ok, "staging proxy auth should exist")
+	proxyAuth, ok := auths["staging-proxy.example.com"].(map[string]interface{})
+	require.True(t, ok, "custom staging proxy auth should exist")
 	require.Contains(t, proxyAuth, "auth")
 
 	registryAuth, ok := auths["staging-registry.example.com"].(map[string]interface{})
-	require.True(t, ok, "staging registry auth should exist")
+	require.True(t, ok, "custom staging registry auth should exist")
 	require.Contains(t, registryAuth, "auth")
 
 	// Verify the auth value is base64 encoded license:license