Fix a missed map initialization. Also defend against this error in depth.

Evan Anderson · Evan Anderson · commit 57ecc28c21bd · 2023-02-13T10:11:49.000-08:00
Signed-off-by: Evan Anderson &lt;evana@vmware.com&gt;
diff --git a/pkg/imgpkg/registry/registry.go b/pkg/imgpkg/registry/registry.go
@@ -234,6 +234,7 @@ func (r SimpleRegistry) CloneWithLogger(_ util.ProgressLogger) Registry {
 		refOpts:         r.refOpts,
 		keychain:        r.keychain,
 		roundTrippers:   r.roundTrippers,
+		authn:           map[string]regauthn.Authenticator{},
 		transportAccess: &sync.Mutex{},
 	}
 }
@@ -276,6 +277,10 @@ func (r *SimpleRegistry) transport(ref regname.Reference, scope string) (http.Ro
 		}
 	}
 
+	if r.authn == nil {
+		// This shouldn't happen, but let's defend in depth
+		r.authn = map[string]regauthn.Authenticator{}
+	}
 	auth, ok := r.authn[registry.Name()]
 	if !ok {
 		regauth, err := r.keychain.Resolve(registry)

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,7 @@ func (r SimpleRegistry) CloneWithLogger(_ util.ProgressLogger) Registry {`
`234`	`234`	`refOpts: r.refOpts,`
`235`	`235`	`keychain: r.keychain,`
`236`	`236`	`roundTrippers: r.roundTrippers,`
	`237`	`+ authn: map[string]regauthn.Authenticator{},`
`237`	`238`	`transportAccess: &sync.Mutex{},`
`238`	`239`	`}`
`239`	`240`	`}`
`@@ -276,6 +277,10 @@ func (r *SimpleRegistry) transport(ref regname.Reference, scope string) (http.Ro`
`276`	`277`	`}`
`277`	`278`	`}`
`278`	`279`
	`280`	`+ if r.authn == nil {`
	`281`	`+ // This shouldn't happen, but let's defend in depth`
	`282`	`+ r.authn = map[string]regauthn.Authenticator{}`
	`283`	`+ }`
`279`	`284`	`auth, ok := r.authn[registry.Name()]`
`280`	`285`	`if !ok {`
`281`	`286`	`regauth, err := r.keychain.Resolve(registry)`