diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-26 15:16:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 15:16:17 +0100 |
| commit | 8cccac54979b804d1086ff42654de07dba802a2e (patch) | |
| tree | cf1d51318e927bcccd1994a0cea880f6996a747d | |
| parent | c869b96d777d12a7d9ef191976d4131270d68858 (diff) | |
| parent | ba1d8ad2af21a1e52ce988b9f312eb3d16c9d583 (diff) | |
| download | podman-8cccac54979b804d1086ff42654de07dba802a2e.tar.gz podman-8cccac54979b804d1086ff42654de07dba802a2e.tar.bz2 podman-8cccac54979b804d1086ff42654de07dba802a2e.zip | |
Merge pull request #5612 from baude/v2enablelint
enable linting on v2
| -rw-r--r-- | .golangci.yml | 1 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/pods.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/volumes.go | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.golangci.yml b/.golangci.yml index 8b1062b4c..8af8aea91 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,6 +4,7 @@ run: - apparmor - seccomp - selinux + - ABISupport concurrency: 6 deadline: 5m skip-dirs-use-default: true diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index de22de68e..8dd7b5a0c 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -4,10 +4,10 @@ package abi import ( "context" - "github.com/pkg/errors" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/domain/entities" + "github.com/pkg/errors" ) func (ic *ContainerEngine) PodExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) { diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go index 0cc20474e..5527bb82e 100644 --- a/pkg/domain/infra/abi/volumes.go +++ b/pkg/domain/infra/abi/volumes.go @@ -107,7 +107,7 @@ func (ic *ContainerEngine) VolumeInspect(ctx context.Context, namesOrIds []strin UID: v.UID(), GID: v.GID(), } - reports = append(reports, &entities.VolumeInspectReport{&config}) + reports = append(reports, &entities.VolumeInspectReport{VolumeConfigResponse: &config}) } return reports, nil } @@ -140,7 +140,7 @@ func (ic *ContainerEngine) VolumeList(ctx context.Context, opts entities.VolumeL UID: v.UID(), GID: v.GID(), } - reports = append(reports, &entities.VolumeListReport{config}) + reports = append(reports, &entities.VolumeListReport{VolumeConfigResponse: config}) } return reports, nil } |