diff options
author | Tino Rusch <tino.rusch@gmail.com> | 2021-06-25 08:33:15 +0200 |
---|---|---|
committer | Tino Rusch <tino.rusch@gmail.com> | 2021-06-25 08:33:15 +0200 |
commit | e7507fe7cf2f35e332f58ae632882f29395e4c59 (patch) | |
tree | f071ec9af376e59bdef22cab56b096ed9b70ac36 /pkg/domain/infra | |
parent | b56b4b53744c59cad942278ff34a0b0616a7aa60 (diff) | |
download | podman-e7507fe7cf2f35e332f58ae632882f29395e4c59.tar.gz podman-e7507fe7cf2f35e332f58ae632882f29395e4c59.tar.bz2 podman-e7507fe7cf2f35e332f58ae632882f29395e4c59.zip |
make DriverOpts name consistent.
Signed-off-by: Tino Rusch <tino.rusch@gmail.com>
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r-- | pkg/domain/infra/abi/secrets.go | 14 | ||||
-rw-r--r-- | pkg/domain/infra/tunnel/secrets.go | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go index fa28a9b51..0bdb4ce60 100644 --- a/pkg/domain/infra/abi/secrets.go +++ b/pkg/domain/infra/abi/secrets.go @@ -27,20 +27,20 @@ func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader if options.Driver == "" { options.Driver = cfg.Secrets.Driver } - if len(options.Opts) == 0 { - options.Opts = cfg.Secrets.Opts + if len(options.DriverOpts) == 0 { + options.DriverOpts = cfg.Secrets.Opts } - if options.Opts == nil { - options.Opts = make(map[string]string) + if options.DriverOpts == nil { + options.DriverOpts = make(map[string]string) } if options.Driver == "file" { - if _, ok := options.Opts["path"]; !ok { - options.Opts["path"] = filepath.Join(secretsPath, "filedriver") + if _, ok := options.DriverOpts["path"]; !ok { + options.DriverOpts["path"] = filepath.Join(secretsPath, "filedriver") } } - secretID, err := manager.Store(name, data, options.Driver, options.Opts) + secretID, err := manager.Store(name, data, options.Driver, options.DriverOpts) if err != nil { return nil, err } diff --git a/pkg/domain/infra/tunnel/secrets.go b/pkg/domain/infra/tunnel/secrets.go index 8cdc220a4..ecbb80931 100644 --- a/pkg/domain/infra/tunnel/secrets.go +++ b/pkg/domain/infra/tunnel/secrets.go @@ -13,7 +13,7 @@ import ( func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader io.Reader, options entities.SecretCreateOptions) (*entities.SecretCreateReport, error) { opts := new(secrets.CreateOptions). WithDriver(options.Driver). - WithDriverOpts(options.Opts). + WithDriverOpts(options.DriverOpts). WithName(name) created, err := secrets.Create(ic.ClientCtx, reader, opts) if err != nil { |