summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-03-20 13:00:37 -0500
committerBrent Baude <bbaude@redhat.com>2020-03-20 13:01:24 -0500
commitbaf3a9b3a72e4d98ad30ee56a7dd81812fb1fd21 (patch)
tree45e486ec8c793fda0f05d39bfaf9ce1d9016b02e /pkg/domain/infra
parent87293028e61d0c88c258ed9f4a82c4be7f0bc896 (diff)
downloadpodman-baf3a9b3a72e4d98ad30ee56a7dd81812fb1fd21.tar.gz
podman-baf3a9b3a72e4d98ad30ee56a7dd81812fb1fd21.tar.bz2
podman-baf3a9b3a72e4d98ad30ee56a7dd81812fb1fd21.zip
use boolreport for containerexists response
in the case of exists, use a boolreport structure so that responses can be consistent pointer and error Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/containers.go6
-rw-r--r--pkg/domain/infra/tunnel/containers.go5
2 files changed, 6 insertions, 5 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 618e9a111..2332c2874 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -12,12 +12,12 @@ import (
)
// TODO: Should return *entities.ContainerExistsReport, error
-func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (bool, error) {
+func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) {
_, err := ic.Libpod.LookupContainer(nameOrId)
if err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
- return false, err
+ return nil, err
}
- return err == nil, nil
+ return &entities.BoolReport{Value: err == nil}, nil
}
func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []string, options entities.WaitOptions) ([]entities.WaitReport, error) {
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 84b6f2906..c869ad2f3 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -7,8 +7,9 @@ import (
"github.com/containers/libpod/pkg/domain/entities"
)
-func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (bool, error) {
- return containers.Exists(ctx, nameOrId)
+func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) {
+ exists, err := containers.Exists(ctx, nameOrId)
+ return &entities.BoolReport{Value: exists}, err
}
func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []string, options entities.WaitOptions) ([]entities.WaitReport, error) {