From 7597ca32caf4ac5941bfe77f894cb1f2d7eb2581 Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Mon, 22 Apr 2024 12:44:24 -0700
Subject: [PATCH] Fix host auth key format

---
 provider/internal/cli.go      | 7 +++----
 provider/internal/cli_test.go | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/provider/internal/cli.go b/provider/internal/cli.go
index 5394836..bf58da4 100644
--- a/provider/internal/cli.go
+++ b/provider/internal/cli.go
@@ -81,6 +81,9 @@ func wrap(host *host, registries ...Registry) (*cli, error) {
 
 	auths := map[string]cfgtypes.AuthConfig{}
 	for k, v := range host.auths {
+		if k != config.DockerRegistryAuth {
+			k = credentials.ConvertToHostname(k)
+		}
 		auths[k] = cfgtypes.AuthConfig{
 			ServerAddress: v.ServerAddress,
 			Username:      v.Username,
@@ -95,10 +98,6 @@ func wrap(host *host, registries ...Registry) (*cli, error) {
 		if key == "" {
 			key = h.Hostname
 		}
-		// Add a scheme if it's missing.
-		if !strings.Contains(key, "://") {
-			key = "https://" + key
-		}
 
 		auths[key] = cfgtypes.AuthConfig{
 			ServerAddress: h.Hostname,
diff --git a/provider/internal/cli_test.go b/provider/internal/cli_test.go
index 62afd35..1ebe642 100644
--- a/provider/internal/cli_test.go
+++ b/provider/internal/cli_test.go
@@ -90,7 +90,7 @@ func TestWrappedAuth(t *testing.T) {
 		config.DockerRegistryAuth: {
 			Username:      "resource-dockerhub-user",
 			Password:      "resource-dockerhub-password",
-			ServerAddress: config.DockerRegistryAuth,
+			ServerAddress: config.DockerRegistryDNS,
 		},
 		"misc": {
 			Username:      "host-misc-user",
@@ -99,9 +99,9 @@ func TestWrappedAuth(t *testing.T) {
 		},
 	}
 	assert.Equal(t, expected, cli.auths)
-	assert.Len(t, h.auths, 2) // Host auth is unchanged.
+	assert.Len(t, h.auths, 2) // In-memory host auth is unchanged.
 
-	// Assert that our host's auth is untouched.
+	// Assert that our on-disk host's auth is untouched.
 	realhostRefreshed, err := newHost(nil)
 	require.NoError(t, err)
 	assert.Equal(t, realhost.auths, realhostRefreshed.auths)