[image-builder] Use Additional auth to override existing base auth

Prince Rachit Sinha · Prince Rachit Sinha · commit 7d755928ed6f · 2022-05-25T06:47:21.000Z
diff --git a/components/image-builder-bob/cmd/proxy.go b/components/image-builder-bob/cmd/proxy.go
@@ -39,7 +39,7 @@ var proxyCmd = &cobra.Command{
 		if err != nil {
 			log.WithError(err).WithField("auth", proxyOpts.Auth).Fatal("cannot unmarshal auth")
 		}
-		authP = authP.AddIfNotExists(authA)
+		authP = authP.OverrideWith(authA)
 
 		baseref, err := reference.ParseNormalizedNamed(proxyOpts.BaseRef)
 		if err != nil {
diff --git a/components/image-builder-bob/pkg/proxy/auth.go b/components/image-builder-bob/pkg/proxy/auth.go
@@ -54,7 +54,7 @@ func (a MapAuthorizer) Authorize(host string) (user, pass string, err error) {
 	return
 }
 
-func (a MapAuthorizer) AddIfNotExists(other MapAuthorizer) MapAuthorizer {
+func (a MapAuthorizer) OverrideWith(other MapAuthorizer) MapAuthorizer {
 	res := make(map[string]authConfig)
 	for k, v := range a {
 		res[k] = v

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ var proxyCmd = &cobra.Command{`
`39`	`39`	`if err != nil {`
`40`	`40`	`log.WithError(err).WithField("auth", proxyOpts.Auth).Fatal("cannot unmarshal auth")`
`41`	`41`	`}`
`42`		`- authP = authP.AddIfNotExists(authA)`
	`42`	`+ authP = authP.OverrideWith(authA)`
`43`	`43`
`44`	`44`	`baseref, err := reference.ParseNormalizedNamed(proxyOpts.BaseRef)`
`45`	`45`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (a MapAuthorizer) Authorize(host string) (user, pass string, err error) {`
`54`	`54`	`return`
`55`	`55`	`}`
`56`	`56`
`57`		`-func (a MapAuthorizer) AddIfNotExists(other MapAuthorizer) MapAuthorizer {`
	`57`	`+func (a MapAuthorizer) OverrideWith(other MapAuthorizer) MapAuthorizer {`
`58`	`58`	`res := make(map[string]authConfig)`
`59`	`59`	`for k, v := range a {`
`60`	`60`	`res[k] = v`