From b56b4b53744c59cad942278ff34a0b0616a7aa60 Mon Sep 17 00:00:00 2001 From: Tino Rusch Date: Sun, 20 Jun 2021 16:11:54 +0200 Subject: read secret config from config file if no user data. feat: read secret config from config file if the user hasn't entered explicit config values feat: allow to specify `--driver-opts opt1=val1,opt2=val2` in the secret create command to allow overriding the default values fix: show driver options in `podman secret inspect` Signed-off-by: Tino Rusch --- pkg/bindings/secrets/types.go | 5 ++-- pkg/bindings/secrets/types_create_options.go | 36 ++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 12 deletions(-) (limited to 'pkg/bindings/secrets') diff --git a/pkg/bindings/secrets/types.go b/pkg/bindings/secrets/types.go index a98e894dc..a64dea1b4 100644 --- a/pkg/bindings/secrets/types.go +++ b/pkg/bindings/secrets/types.go @@ -18,6 +18,7 @@ type RemoveOptions struct { //go:generate go run ../generator/generator.go CreateOptions // CreateOptions are optional options for Creating secrets type CreateOptions struct { - Driver *string - Name *string + Name *string + Driver *string + DriverOpts map[string]string } diff --git a/pkg/bindings/secrets/types_create_options.go b/pkg/bindings/secrets/types_create_options.go index ea5bd3039..28d0c4e83 100644 --- a/pkg/bindings/secrets/types_create_options.go +++ b/pkg/bindings/secrets/types_create_options.go @@ -20,6 +20,22 @@ func (o *CreateOptions) ToParams() (url.Values, error) { return util.ToParams(o) } +// WithName +func (o *CreateOptions) WithName(value string) *CreateOptions { + v := &value + o.Name = v + return o +} + +// GetName +func (o *CreateOptions) GetName() string { + var name string + if o.Name == nil { + return name + } + return *o.Name +} + // WithDriver func (o *CreateOptions) WithDriver(value string) *CreateOptions { v := &value @@ -36,18 +52,18 @@ func (o *CreateOptions) GetDriver() string { return *o.Driver } -// WithName -func (o *CreateOptions) WithName(value string) *CreateOptions { - v := &value - o.Name = v +// WithDriverOpts +func (o *CreateOptions) WithDriverOpts(value map[string]string) *CreateOptions { + v := value + o.DriverOpts = v return o } -// GetName -func (o *CreateOptions) GetName() string { - var name string - if o.Name == nil { - return name +// GetDriverOpts +func (o *CreateOptions) GetDriverOpts() map[string]string { + var driverOpts map[string]string + if o.DriverOpts == nil { + return driverOpts } - return *o.Name + return o.DriverOpts } -- cgit v1.2.3-54-g00ecf