diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-14 10:28:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-14 10:28:33 -0400 |
commit | 33d808108f837e70dc7cc0803bfa4684953fe05e (patch) | |
tree | 914de1eee188ef2eda9a3366a1c4c07f3ec5d47e | |
parent | 219f1162407b8f4c2c05aa07166b999d64ead113 (diff) | |
parent | 217197340c8f7a2df61c54a901c127bf1ba54cb2 (diff) | |
download | podman-33d808108f837e70dc7cc0803bfa4684953fe05e.tar.gz podman-33d808108f837e70dc7cc0803bfa4684953fe05e.tar.bz2 podman-33d808108f837e70dc7cc0803bfa4684953fe05e.zip |
Merge pull request #13499 from rst0git/fix-typo
Fix typo
-rw-r--r-- | pkg/bindings/containers/checkpoint.go | 2 | ||||
-rw-r--r-- | pkg/bindings/containers/types.go | 2 | ||||
-rw-r--r-- | pkg/bindings/containers/types_restore_options.go | 14 | ||||
-rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/pkg/bindings/containers/checkpoint.go b/pkg/bindings/containers/checkpoint.go index 1d8c34b33..84590d052 100644 --- a/pkg/bindings/containers/checkpoint.go +++ b/pkg/bindings/containers/checkpoint.go @@ -79,7 +79,7 @@ func Restore(ctx context.Context, nameOrID string, options *RestoreOptions) (*en // Open the to-be-imported archive if needed. var r io.Reader - if i := options.GetImportAchive(); i != "" { + if i := options.GetImportArchive(); i != "" { params.Set("import", "true") r, err = os.Open(i) if err != nil { diff --git a/pkg/bindings/containers/types.go b/pkg/bindings/containers/types.go index 66b90af9b..3c8b1eefa 100644 --- a/pkg/bindings/containers/types.go +++ b/pkg/bindings/containers/types.go @@ -64,7 +64,7 @@ type RestoreOptions struct { IgnoreVolumes *bool IgnoreStaticIP *bool IgnoreStaticMAC *bool - ImportAchive *string + ImportArchive *string Keep *bool Name *string TCPEstablished *bool diff --git a/pkg/bindings/containers/types_restore_options.go b/pkg/bindings/containers/types_restore_options.go index d2778396a..e8a0e236c 100644 --- a/pkg/bindings/containers/types_restore_options.go +++ b/pkg/bindings/containers/types_restore_options.go @@ -77,19 +77,19 @@ func (o *RestoreOptions) GetIgnoreStaticMAC() bool { return *o.IgnoreStaticMAC } -// WithImportAchive set field ImportAchive to given value -func (o *RestoreOptions) WithImportAchive(value string) *RestoreOptions { - o.ImportAchive = &value +// WithImportArchive set field ImportArchive to given value +func (o *RestoreOptions) WithImportArchive(value string) *RestoreOptions { + o.ImportArchive = &value return o } -// GetImportAchive returns value of field ImportAchive -func (o *RestoreOptions) GetImportAchive() string { - if o.ImportAchive == nil { +// GetImportArchive returns value of field ImportArchive +func (o *RestoreOptions) GetImportArchive() string { + if o.ImportArchive == nil { var z string return z } - return *o.ImportAchive + return *o.ImportArchive } // WithKeep set field Keep to given value diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index fe986361b..046c2509d 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -390,7 +390,7 @@ func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []st options.WithPublishPorts(opts.PublishPorts) if opts.Import != "" { - options.WithImportAchive(opts.Import) + options.WithImportArchive(opts.Import) report, err := containers.Restore(ic.ClientCtx, "", options) return []*entities.RestoreReport{report}, err } |