diff options
author | Brent Baude <bbaude@redhat.com> | 2020-04-06 13:59:02 -0500 |
---|---|---|
committer | Brent Baude <bbaude@redhat.com> | 2020-04-07 07:15:09 -0500 |
commit | 013ecca8959f94cd97ee694676eeda6439ad38b7 (patch) | |
tree | 54c93cb14e3b2a8c384023f175e36a616f01398f /pkg | |
parent | c0e29b4a31e330927b7a980209b2aae192f9bafe (diff) | |
download | podman-013ecca8959f94cd97ee694676eeda6439ad38b7.tar.gz podman-013ecca8959f94cd97ee694676eeda6439ad38b7.tar.bz2 podman-013ecca8959f94cd97ee694676eeda6439ad38b7.zip |
podmanv2 info
add ability to run info for v2
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/bindings/system/info.go | 8 | ||||
-rw-r--r-- | pkg/domain/entities/engine_container.go | 2 | ||||
-rw-r--r-- | pkg/domain/infra/abi/system.go | 13 | ||||
-rw-r--r-- | pkg/domain/infra/tunnel/system.go | 11 |
4 files changed, 30 insertions, 4 deletions
diff --git a/pkg/bindings/system/info.go b/pkg/bindings/system/info.go index f8269cfd8..13e12645d 100644 --- a/pkg/bindings/system/info.go +++ b/pkg/bindings/system/info.go @@ -9,15 +9,15 @@ import ( ) // Info returns information about the libpod environment and its stores -func Info(ctx context.Context) (define.Info, error) { +func Info(ctx context.Context) (*define.Info, error) { info := define.Info{} conn, err := bindings.GetClient(ctx) if err != nil { - return info, err + return nil, err } response, err := conn.DoRequest(nil, http.MethodGet, "/info", nil) if err != nil { - return info, err + return nil, err } - return info, response.Process(&info) + return &info, response.Process(&info) } diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go index 576ce1658..0fc390ea2 100644 --- a/pkg/domain/entities/engine_container.go +++ b/pkg/domain/entities/engine_container.go @@ -48,4 +48,6 @@ type ContainerEngine interface { VolumeList(ctx context.Context, opts VolumeListOptions) ([]*VolumeListReport, error) VolumePrune(ctx context.Context, opts VolumePruneOptions) ([]*VolumePruneReport, error) VolumeRm(ctx context.Context, namesOrIds []string, opts VolumeRmOptions) ([]*VolumeRmReport, error) + + Info(ctx context.Context) (*define.Info, error) } diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go new file mode 100644 index 000000000..8aaa69847 --- /dev/null +++ b/pkg/domain/infra/abi/system.go @@ -0,0 +1,13 @@ +// +build ABISupport + +package abi + +import ( + "context" + + "github.com/containers/libpod/libpod/define" +) + +func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) { + return ic.Libpod.Info() +} diff --git a/pkg/domain/infra/tunnel/system.go b/pkg/domain/infra/tunnel/system.go index 5bafef1fe..5d6346234 100644 --- a/pkg/domain/infra/tunnel/system.go +++ b/pkg/domain/infra/tunnel/system.go @@ -1 +1,12 @@ package tunnel + +import ( + "context" + + "github.com/containers/libpod/libpod/define" + "github.com/containers/libpod/pkg/bindings/system" +) + +func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) { + return system.Info(ic.ClientCxt) +} |