diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2021-10-21 21:31:22 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2021-12-10 18:16:27 +0100 |
| commit | 3cfefa1248feb9de8041b9fc67987b508d4c3fcb (patch) | |
| tree | 3d426ef42c91b6d32c5f2607a1dadf9929ec3c5d /pkg/bindings/play | |
| parent | d79414c54ff89c3deea84e2ac600525744fc75c5 (diff) | |
| download | podman-3cfefa1248feb9de8041b9fc67987b508d4c3fcb.tar.gz podman-3cfefa1248feb9de8041b9fc67987b508d4c3fcb.tar.bz2 podman-3cfefa1248feb9de8041b9fc67987b508d4c3fcb.zip | |
Remove the authfile parameter of MakeXRegistryAuthHeader
Having a parameter that modifies the provides types.SystemContext
seems rather unexpected and risky to have around - and the only
user of that is actually a no-op, others only provide a nil
SystemContext; so, remove that option and simplify (well, somewhat;
many callers now have extra &types.SystemContext{AuthFilePath}
boilerplate; at least that's consistent with that code carrying
a TODO to create a larger-scope SystemContext).
Should not change behavior.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'pkg/bindings/play')
| -rw-r--r-- | pkg/bindings/play/play.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/bindings/play/play.go b/pkg/bindings/play/play.go index 64a2ae6ae..111a25cac 100644 --- a/pkg/bindings/play/play.go +++ b/pkg/bindings/play/play.go @@ -6,6 +6,7 @@ import ( "os" "strconv" + "github.com/containers/image/v5/types" "github.com/containers/podman/v3/pkg/auth" "github.com/containers/podman/v3/pkg/bindings" "github.com/containers/podman/v3/pkg/domain/entities" @@ -40,7 +41,7 @@ func Kube(ctx context.Context, path string, options *KubeOptions) (*entities.Pla } // TODO: have a global system context we can pass around (1st argument) - header, err := auth.MakeXRegistryAuthHeader(nil, options.GetAuthfile(), options.GetUsername(), options.GetPassword()) + header, err := auth.MakeXRegistryAuthHeader(&types.SystemContext{AuthFilePath: options.GetAuthfile()}, options.GetUsername(), options.GetPassword()) if err != nil { return nil, err } |