diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-25 12:45:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-25 12:45:53 -0400 |
commit | 0a0ade3cc00c3779bbf68ddd103d3efd10b5c25b (patch) | |
tree | 7a14316df448918e2e54dce77cade7b5cac381b3 /pkg/bindings | |
parent | b4767817012a3aedaf05dc7a32bd823fcd3776f4 (diff) | |
parent | e7507fe7cf2f35e332f58ae632882f29395e4c59 (diff) | |
download | podman-0a0ade3cc00c3779bbf68ddd103d3efd10b5c25b.tar.gz podman-0a0ade3cc00c3779bbf68ddd103d3efd10b5c25b.tar.bz2 podman-0a0ade3cc00c3779bbf68ddd103d3efd10b5c25b.zip |
Merge pull request #10736 from trusch/feature-use-secret-config
read secret config from config file if no user data.
Diffstat (limited to 'pkg/bindings')
-rw-r--r-- | pkg/bindings/internal/util/util.go | 4 | ||||
-rw-r--r-- | pkg/bindings/secrets/types.go | 5 | ||||
-rw-r--r-- | pkg/bindings/secrets/types_create_options.go | 36 |
3 files changed, 31 insertions, 14 deletions
diff --git a/pkg/bindings/internal/util/util.go b/pkg/bindings/internal/util/util.go index c1961308e..ef93d6e25 100644 --- a/pkg/bindings/internal/util/util.go +++ b/pkg/bindings/internal/util/util.go @@ -85,10 +85,10 @@ func ToParams(o interface{}) (url.Values, error) { } } case f.Kind() == reflect.Map: - lowerCaseKeys := make(map[string][]string) + lowerCaseKeys := make(map[string]interface{}) iter := f.MapRange() for iter.Next() { - lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface().([]string) + lowerCaseKeys[iter.Key().Interface().(string)] = iter.Value().Interface() } s, err := json.MarshalToString(lowerCaseKeys) if err != nil { 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 } |