Get config more directly

This commit is contained in:
Bryce Lampe
2025-05-09 10:09:51 -07:00
parent 1c575b0966
commit 6b17b3fec8
3 changed files with 13 additions and 13 deletions

View File

@@ -48,6 +48,7 @@ var _indexExamples string
// Index is an OCI index or manifest list on a remote registry.
type Index struct {
docker Client
config *Config
}
// IndexArgs instantiate an Index.
@@ -349,7 +350,7 @@ func (i *Index) Diff(
// client produces a CLI client scoped to this resource and layered on top of
// any host-level credentials.
func (i *Index) client(
ctx context.Context,
_ context.Context,
_ IndexState,
args IndexArgs,
) (Client, error) {
@@ -358,16 +359,14 @@ func (i *Index) client(
return i.docker, nil
}
cfg := infer.GetConfig[Config](ctx)
// We prefer auth from args, the provider, and state in that order. We
// build a slice in reverse order because wrap() will overwrite earlier
// entries with later ones.
auths := []Registry{}
auths = append(auths, cfg.Registries...)
auths = append(auths, i.config.Registries...)
if args.Registry != nil {
auths = append(auths, *args.Registry)
}
return wrap(cfg.host, auths...)
return wrap(i.config.host, auths...)
}