diff options
Diffstat (limited to 'cmd/podman/secrets')
-rw-r--r-- | cmd/podman/secrets/create.go | 9 | ||||
-rw-r--r-- | cmd/podman/secrets/inspect.go | 8 | ||||
-rw-r--r-- | cmd/podman/secrets/list.go | 12 | ||||
-rw-r--r-- | cmd/podman/secrets/rm.go | 8 | ||||
-rw-r--r-- | cmd/podman/secrets/secret.go | 6 |
5 files changed, 20 insertions, 23 deletions
diff --git a/cmd/podman/secrets/create.go b/cmd/podman/secrets/create.go index e58ab57cd..7374b682b 100644 --- a/cmd/podman/secrets/create.go +++ b/cmd/podman/secrets/create.go @@ -8,15 +8,15 @@ import ( "os" "github.com/containers/common/pkg/completion" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) var ( createCmd = &cobra.Command{ - Use: "create [options] SECRET FILE|-", + Use: "create [options] NAME FILE|-", Short: "Create a new secret", Long: "Create a secret. Input can be a path to a file or \"-\" (read from stdin). Default driver is file (unencrypted).", RunE: create, @@ -59,7 +59,6 @@ func create(cmd *cobra.Command, args []string) error { } if (stat.Mode() & os.ModeNamedPipe) == 0 { return errors.New("if `-` is used, data must be passed into stdin") - } reader = os.Stdin } else { diff --git a/cmd/podman/secrets/inspect.go b/cmd/podman/secrets/inspect.go index f38ba7f65..4036291ec 100644 --- a/cmd/podman/secrets/inspect.go +++ b/cmd/podman/secrets/inspect.go @@ -9,10 +9,10 @@ import ( "text/tabwriter" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/list.go b/cmd/podman/secrets/list.go index dff4bfdca..849a8418e 100644 --- a/cmd/podman/secrets/list.go +++ b/cmd/podman/secrets/list.go @@ -9,11 +9,11 @@ import ( "github.com/containers/common/pkg/completion" "github.com/containers/common/pkg/report" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/parse" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/parse" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/docker/go-units" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -48,7 +48,6 @@ func init() { formatFlagName := "format" flags.StringVar(&listFlag.format, formatFlagName, "{{.ID}}\t{{.Name}}\t{{.Driver}}\t{{.CreatedAt}}\t{{.UpdatedAt}}\t\n", "Format volume output using Go template") _ = lsCmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteJSONFormat) - } func ls(cmd *cobra.Command, args []string) error { @@ -65,7 +64,6 @@ func ls(cmd *cobra.Command, args []string) error { UpdatedAt: units.HumanDuration(time.Since(response.UpdatedAt)) + " ago", Driver: response.Spec.Driver.Name, }) - } return outputTemplate(cmd, listed) } diff --git a/cmd/podman/secrets/rm.go b/cmd/podman/secrets/rm.go index c72a3c171..ade015b10 100644 --- a/cmd/podman/secrets/rm.go +++ b/cmd/podman/secrets/rm.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/containers/podman/v2/cmd/podman/common" - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/utils" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/common" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/utils" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) diff --git a/cmd/podman/secrets/secret.go b/cmd/podman/secrets/secret.go index 4e6b6ec7b..139997b87 100644 --- a/cmd/podman/secrets/secret.go +++ b/cmd/podman/secrets/secret.go @@ -1,9 +1,9 @@ package secrets import ( - "github.com/containers/podman/v2/cmd/podman/registry" - "github.com/containers/podman/v2/cmd/podman/validate" - "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/cmd/podman/validate" + "github.com/containers/podman/v3/pkg/domain/entities" "github.com/spf13/cobra" ) |