sam_oneal/pulumi-docker-build
1
0
Fork 0
Code Actions Packages Releases Wiki Activity

Fix host auth key format

Browse Source
This commit is contained in:
Bryce Lampe
2024-04-22 12:44:24 -07:00
parent 0f23201468
commit 7597ca32ca
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
provider/internal/cli.go
View File

@@ -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,

6
provider/internal/cli_test.go
View File

@@ -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)