summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-04-23 06:32:41 -0400
committerGitHub <noreply@github.com>2022-04-23 06:32:41 -0400
commit2df9bdc00948e24855f3da42e31a6d273861e380 (patch)
treea2b25921510922eb921c24bc13fb95228d41e0b7
parent31231ffd748d10048e6541b18fd863a66342c6c7 (diff)
parent5b4af0584d1c66b4f8d3d721374541fb76b5b395 (diff)
downloadpodman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.gz
podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.bz2
podman-2df9bdc00948e24855f3da42e31a6d273861e380.zip
Merge pull request #13973 from Luap99/linter-revive
replace golint with revive linter
-rw-r--r--.golangci.yml5
-rw-r--r--cmd/podman/images/list.go2
-rw-r--r--cmd/podman/images/load.go2
-rw-r--r--cmd/podman/validate/args.go4
-rw-r--r--libpod/container_exec.go4
-rw-r--r--libpod/container_internal.go2
-rw-r--r--libpod/container_internal_linux.go2
-rw-r--r--libpod/kube.go2
-rw-r--r--libpod/lock/in_memory_locks.go2
-rw-r--r--pkg/api/handlers/compat/containers_archive.go3
-rw-r--r--pkg/api/handlers/libpod/containers_create.go2
-rw-r--r--pkg/bindings/connection.go2
-rw-r--r--pkg/bindings/test/common_test.go2
-rw-r--r--pkg/domain/entities/network.go2
-rw-r--r--pkg/domain/filters/containers.go2
-rw-r--r--pkg/domain/infra/abi/manifest.go4
-rw-r--r--pkg/domain/infra/abi/trust.go2
-rw-r--r--pkg/k8s.io/api/core/v1/resource.go2
-rw-r--r--pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go2
-rw-r--r--pkg/machine/fcos.go4
-rw-r--r--pkg/machine/qemu/config.go2
-rw-r--r--pkg/machine/qemu/machine.go2
-rw-r--r--pkg/specgen/generate/kube/seccomp.go2
-rw-r--r--pkg/specgen/generate/kube/volume.go4
-rw-r--r--pkg/specgen/namespaces.go12
-rw-r--r--test/e2e/common_test.go10
-rw-r--r--test/e2e/config_amd64.go16
-rw-r--r--test/system/450-interactive.bats2
-rw-r--r--test/testvol/main.go2
-rw-r--r--test/utils/matchers.go2
-rw-r--r--test/utils/utils.go6
31 files changed, 59 insertions, 53 deletions
diff --git a/.golangci.yml b/.golangci.yml
index 8a922775a..4d60bc848 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -51,7 +51,6 @@ linters:
- gosec
- maligned
- gomoddirectives
- - revive
- containedctx
- contextcheck
- cyclop
@@ -61,6 +60,10 @@ linters:
- varnamelen
- maintidx
- nilnil
+ # deprecated linters
+ - golint # replaced by revive
+ - scopelint # replaced by exportloopref
+ - interfacer
linters-settings:
errcheck:
check-blank: false
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 9bddf1cff..58fb3e919 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -225,7 +225,7 @@ func sortImages(imageS []*entities.ImageSummary) ([]imageReporter, error) {
h.ImageSummary = *e
h.Repository, h.Tag, err = tokenRepoTag(tag)
if err != nil {
- return nil, errors.Wrapf(err, "error parsing repository tag %q:", tag)
+ return nil, errors.Wrapf(err, "error parsing repository tag: %q", tag)
}
if h.Tag == "<none>" {
untagged = append(untagged, h)
diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go
index 6f85fb7e7..dbb7c32fa 100644
--- a/cmd/podman/images/load.go
+++ b/cmd/podman/images/load.go
@@ -91,7 +91,7 @@ func load(cmd *cobra.Command, args []string) error {
}
} else {
if term.IsTerminal(int(os.Stdin.Fd())) {
- return errors.Errorf("cannot read from terminal. Use command-line redirection or the --input flag.")
+ return errors.Errorf("cannot read from terminal, use command-line redirection or the --input flag")
}
outFile, err := ioutil.TempFile(util.Tmpdir(), "podman")
if err != nil {
diff --git a/cmd/podman/validate/args.go b/cmd/podman/validate/args.go
index 743ee1837..669456bd3 100644
--- a/cmd/podman/validate/args.go
+++ b/cmd/podman/validate/args.go
@@ -23,9 +23,9 @@ func SubCommandExists(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
suggestions := cmd.SuggestionsFor(args[0])
if len(suggestions) == 0 {
- return errors.Errorf("unrecognized command `%[1]s %[2]s`\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0])
+ return errors.Errorf("unrecognized command `%[1]s %[2]s`\nTry '%[1]s --help' for more information", cmd.CommandPath(), args[0])
}
- return errors.Errorf("unrecognized command `%[1]s %[2]s`\n\nDid you mean this?\n\t%[3]s\n\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0], strings.Join(suggestions, "\n\t"))
+ return errors.Errorf("unrecognized command `%[1]s %[2]s`\n\nDid you mean this?\n\t%[3]s\n\nTry '%[1]s --help' for more information", cmd.CommandPath(), args[0], strings.Join(suggestions, "\n\t"))
}
cmd.Help() // nolint: errcheck
return errors.Errorf("missing command '%[1]s COMMAND'", cmd.CommandPath())
diff --git a/libpod/container_exec.go b/libpod/container_exec.go
index 140267f28..d782bebf8 100644
--- a/libpod/container_exec.go
+++ b/libpod/container_exec.go
@@ -79,11 +79,11 @@ type ExecConfig struct {
type ExecSession struct {
// Id is the ID of the exec session.
// Named somewhat strangely to not conflict with ID().
- // nolint:stylecheck,golint
+ // nolint:stylecheck,revive
Id string `json:"id"`
// ContainerId is the ID of the container this exec session belongs to.
// Named somewhat strangely to not conflict with ContainerID().
- // nolint:stylecheck,golint
+ // nolint:stylecheck,revive
ContainerId string `json:"containerId"`
// State is the state of the exec session.
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 6c0d51df3..5c6719bdf 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -266,7 +266,7 @@ func (c *Container) handleRestartPolicy(ctx context.Context) (_ bool, retErr err
if c.ensureState(define.ContainerStateRunning, define.ContainerStatePaused) {
return false, nil
} else if c.state.State == define.ContainerStateUnknown {
- return false, errors.Wrapf(define.ErrInternal, "invalid container state encountered in restart attempt!")
+ return false, errors.Wrapf(define.ErrInternal, "invalid container state encountered in restart attempt")
}
c.newContainerEvent(events.Restart)
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 9d0c8ff8c..ead58b373 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -3134,7 +3134,7 @@ func (c *Container) getOCICgroupPath() (string, error) {
}
func (c *Container) copyTimezoneFile(zonePath string) (string, error) {
- var localtimeCopy string = filepath.Join(c.state.RunDir, "localtime")
+ localtimeCopy := filepath.Join(c.state.RunDir, "localtime")
file, err := os.Stat(zonePath)
if err != nil {
return "", err
diff --git a/libpod/kube.go b/libpod/kube.go
index 22fbb5f9f..5e5260dd5 100644
--- a/libpod/kube.go
+++ b/libpod/kube.go
@@ -213,7 +213,7 @@ type YAMLContainer struct {
func ConvertV1PodToYAMLPod(pod *v1.Pod) *YAMLPod {
cs := []*YAMLContainer{}
for _, cc := range pod.Spec.Containers {
- var res *v1.ResourceRequirements = nil
+ var res *v1.ResourceRequirements
if len(cc.Resources.Limits) > 0 || len(cc.Resources.Requests) > 0 {
res = &cc.Resources
}
diff --git a/libpod/lock/in_memory_locks.go b/libpod/lock/in_memory_locks.go
index f3c842f89..f7f47760c 100644
--- a/libpod/lock/in_memory_locks.go
+++ b/libpod/lock/in_memory_locks.go
@@ -49,7 +49,7 @@ type InMemoryManager struct {
// of locks.
func NewInMemoryManager(numLocks uint32) (Manager, error) {
if numLocks == 0 {
- return nil, errors.Errorf("must provide a non-zero number of locks!")
+ return nil, errors.Errorf("must provide a non-zero number of locks")
}
manager := new(InMemoryManager)
diff --git a/pkg/api/handlers/compat/containers_archive.go b/pkg/api/handlers/compat/containers_archive.go
index f2ff4d100..45b13818b 100644
--- a/pkg/api/handlers/compat/containers_archive.go
+++ b/pkg/api/handlers/compat/containers_archive.go
@@ -2,7 +2,6 @@ package compat
import (
"encoding/json"
- "fmt"
"net/http"
"os"
@@ -28,7 +27,7 @@ func Archive(w http.ResponseWriter, r *http.Request) {
case http.MethodHead, http.MethodGet:
handleHeadAndGet(w, r, decoder, runtime)
default:
- utils.Error(w, http.StatusNotImplemented, errors.New(fmt.Sprintf("unsupported method: %v", r.Method)))
+ utils.Error(w, http.StatusNotImplemented, errors.Errorf("unsupported method: %v", r.Method))
}
}
diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go
index 1043dec4d..4fff9e345 100644
--- a/pkg/api/handlers/libpod/containers_create.go
+++ b/pkg/api/handlers/libpod/containers_create.go
@@ -45,7 +45,7 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
// need to check for memory limit to adjust swap
if sg.ResourceLimits != nil && sg.ResourceLimits.Memory != nil {
s := ""
- var l int64 = 0
+ var l int64
if sg.ResourceLimits.Memory.Swap != nil {
s = strconv.Itoa(int(*sg.ResourceLimits.Memory.Swap))
}
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index 36e47e5ed..3739ec404 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -289,7 +289,7 @@ func sshClient(_url *url.URL, secure bool, passPhrase string, identity string) (
},
)
if err != nil {
- return Connection{}, errors.Wrapf(err, "Connection to bastion host (%s) failed.", _url.String())
+ return Connection{}, errors.Wrapf(err, "connection to bastion host (%s) failed", _url.String())
}
connection := Connection{URI: _url}
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
index f2602967b..950fd21e6 100644
--- a/pkg/bindings/test/common_test.go
+++ b/pkg/bindings/test/common_test.go
@@ -51,7 +51,7 @@ var (
shortName: "busybox",
tarballName: "busybox.tar",
}
- CACHE_IMAGES = []testImage{alpine, busybox} //nolint:golint,stylecheck
+ CACHE_IMAGES = []testImage{alpine, busybox} //nolint:revive,stylecheck
)
type bindingTest struct {
diff --git a/pkg/domain/entities/network.go b/pkg/domain/entities/network.go
index a057640b3..134ad126a 100644
--- a/pkg/domain/entities/network.go
+++ b/pkg/domain/entities/network.go
@@ -22,7 +22,7 @@ type NetworkReloadOptions struct {
// NetworkReloadReport describes the results of reloading a container network.
type NetworkReloadReport struct {
- // nolint:stylecheck,golint
+ // nolint:stylecheck,revive
Id string
Err error
}
diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go
index 4c6964a00..0557e75d6 100644
--- a/pkg/domain/filters/containers.go
+++ b/pkg/domain/filters/containers.go
@@ -270,7 +270,7 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
invalidPolicyNames = append(invalidPolicyNames, policy)
}
}
- var filterValueError error = nil
+ var filterValueError error
if len(invalidPolicyNames) > 0 {
errPrefix := "invalid restart policy"
if len(invalidPolicyNames) > 1 {
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index 0e999a019..8b52c335c 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -110,6 +110,10 @@ func (ir *ImageEngine) remoteManifestInspect(ctx context.Context, name string) (
if latestErr == nil {
latestErr = e
} else {
+ // FIXME should we use multierror package instead?
+
+ // we want the new line here so ignore the linter
+ //nolint:revive
latestErr = errors.Wrapf(latestErr, "tried %v\n", e)
}
}
diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go
index df4081349..d53fe16d1 100644
--- a/pkg/domain/infra/abi/trust.go
+++ b/pkg/domain/infra/abi/trust.go
@@ -84,7 +84,7 @@ func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options enti
policyContentStruct.Default = newReposContent
} else {
if len(policyContentStruct.Default) == 0 {
- return errors.Errorf("Default trust policy must be set.")
+ return errors.Errorf("default trust policy must be set")
}
registryExists := false
for transport, transportval := range policyContentStruct.Transports {
diff --git a/pkg/k8s.io/api/core/v1/resource.go b/pkg/k8s.io/api/core/v1/resource.go
index 9270054b3..2fbb663c7 100644
--- a/pkg/k8s.io/api/core/v1/resource.go
+++ b/pkg/k8s.io/api/core/v1/resource.go
@@ -26,7 +26,7 @@ func (rn ResourceName) String() string {
}
// Cpu returns the Cpu limit if specified.
-// nolint:golint,stylecheck
+//nolint:revive,stylecheck
func (rl *ResourceList) Cpu() *resource.Quantity {
return rl.Name(ResourceCPU, resource.DecimalSI)
}
diff --git a/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
index 352cc028f..965d2ccaf 100644
--- a/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
@@ -138,7 +138,7 @@ const (
var (
// Errors that could happen while parsing a string.
- // nolint:golint
+ //nolint:revive
ErrFormatWrong = errors.New("quantities must match the regular expression '" + splitREString + "'")
ErrNumeric = errors.New("unable to parse numeric part of quantity")
ErrSuffix = errors.New("unable to parse quantity's suffix")
diff --git a/pkg/machine/fcos.go b/pkg/machine/fcos.go
index ad1be15c7..d8516dd59 100644
--- a/pkg/machine/fcos.go
+++ b/pkg/machine/fcos.go
@@ -26,8 +26,8 @@ import (
// These should eventually be moved into machine/qemu as
// they are specific to running qemu
var (
- artifact string = "qemu"
- Format string = "qcow2.xz"
+ artifact = "qemu"
+ Format = "qcow2.xz"
)
const (
diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go
index 6ab25b951..e9416dc36 100644
--- a/pkg/machine/qemu/config.go
+++ b/pkg/machine/qemu/config.go
@@ -162,7 +162,7 @@ type Monitor struct {
var (
// defaultQMPTimeout is the timeout duration for the
// qmp monitor interactions.
- defaultQMPTimeout time.Duration = 2 * time.Second
+ defaultQMPTimeout = 2 * time.Second
)
// GetPath returns the working path for a machinefile. it returns
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 4cfd4e8b0..66f5291c1 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -907,7 +907,7 @@ func (v *MachineVM) SSH(_ string, opts machine.SSHOptions) error {
return err
}
if state != machine.Running {
- return errors.Errorf("vm %q is not running.", v.Name)
+ return errors.Errorf("vm %q is not running", v.Name)
}
username := opts.Username
diff --git a/pkg/specgen/generate/kube/seccomp.go b/pkg/specgen/generate/kube/seccomp.go
index 1e681e977..8f93b34ff 100644
--- a/pkg/specgen/generate/kube/seccomp.go
+++ b/pkg/specgen/generate/kube/seccomp.go
@@ -11,7 +11,7 @@ import (
// KubeSeccompPaths holds information about a pod YAML's seccomp configuration
// it holds both container and pod seccomp paths
-// nolint:golint
+//nolint:revive
type KubeSeccompPaths struct {
containerPaths map[string]string
podPath string
diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go
index 987f11569..27881e77a 100644
--- a/pkg/specgen/generate/kube/volume.go
+++ b/pkg/specgen/generate/kube/volume.go
@@ -17,7 +17,7 @@ const (
kubeFilePermission = 0644
)
-// nolint:golint
+//nolint:revive
type KubeVolumeType int
const (
@@ -26,7 +26,7 @@ const (
KubeVolumeTypeConfigMap KubeVolumeType = iota
)
-// nolint:golint
+//nolint:revive
type KubeVolume struct {
// Type of volume to create
Type KubeVolumeType
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
index eaf2daad9..7a7ca2706 100644
--- a/pkg/specgen/namespaces.go
+++ b/pkg/specgen/namespaces.go
@@ -231,14 +231,14 @@ func ParseNamespace(ns string) (Namespace, error) {
case strings.HasPrefix(ns, "ns:"):
split := strings.SplitN(ns, ":", 2)
if len(split) != 2 {
- return toReturn, errors.Errorf("must provide a path to a namespace when specifying ns:")
+ return toReturn, errors.Errorf("must provide a path to a namespace when specifying \"ns:\"")
}
toReturn.NSMode = Path
toReturn.Value = split[1]
case strings.HasPrefix(ns, "container:"):
split := strings.SplitN(ns, ":", 2)
if len(split) != 2 {
- return toReturn, errors.Errorf("must provide name or ID or a container when specifying container:")
+ return toReturn, errors.Errorf("must provide name or ID or a container when specifying \"container:\"")
}
toReturn.NSMode = FromContainer
toReturn.Value = split[1]
@@ -349,14 +349,14 @@ func ParseNetworkNamespace(ns string, rootlessDefaultCNI bool) (Namespace, map[s
case strings.HasPrefix(ns, "ns:"):
split := strings.SplitN(ns, ":", 2)
if len(split) != 2 {
- return toReturn, nil, errors.Errorf("must provide a path to a namespace when specifying ns:")
+ return toReturn, nil, errors.Errorf("must provide a path to a namespace when specifying \"ns:\"")
}
toReturn.NSMode = Path
toReturn.Value = split[1]
case strings.HasPrefix(ns, string(FromContainer)+":"):
split := strings.SplitN(ns, ":", 2)
if len(split) != 2 {
- return toReturn, nil, errors.Errorf("must provide name or ID or a container when specifying container:")
+ return toReturn, nil, errors.Errorf("must provide name or ID or a container when specifying \"container:\"")
}
toReturn.NSMode = FromContainer
toReturn.Value = split[1]
@@ -427,14 +427,14 @@ func ParseNetworkFlag(networks []string) (Namespace, map[string]types.PerNetwork
case strings.HasPrefix(ns, "ns:"):
split := strings.SplitN(ns, ":", 2)
if len(split) != 2 {
- return toReturn, nil, nil, errors.Errorf("must provide a path to a namespace when specifying ns:")
+ return toReturn, nil, nil, errors.Errorf("must provide a path to a namespace when specifying \"ns:\"")
}
toReturn.NSMode = Path
toReturn.Value = split[1]
case strings.HasPrefix(ns, string(FromContainer)+":"):
split := strings.SplitN(ns, ":", 2)
if len(split) != 2 {
- return toReturn, nil, nil, errors.Errorf("must provide name or ID or a container when specifying container:")
+ return toReturn, nil, nil, errors.Errorf("must provide name or ID or a container when specifying \"container:\"")
}
toReturn.NSMode = FromContainer
toReturn.Value = split[1]
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index f808eb2b6..5e0c6e837 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -35,12 +35,12 @@ import (
var (
//lint:ignore ST1003
- PODMAN_BINARY string //nolint:golint,stylecheck
- INTEGRATION_ROOT string //nolint:golint,stylecheck
- CGROUP_MANAGER = "systemd" //nolint:golint,stylecheck
- RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:golint,stylecheck
+ PODMAN_BINARY string //nolint:revive,stylecheck
+ INTEGRATION_ROOT string //nolint:revive,stylecheck
+ CGROUP_MANAGER = "systemd" //nolint:revive,stylecheck
+ RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:revive,stylecheck
defaultWaitTimeout = 90
- CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:golint,stylecheck
+ CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:revive,stylecheck
)
// PodmanTestIntegration struct for command line options
diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go
index 9293fdd44..c4cb97b2e 100644
--- a/test/e2e/config_amd64.go
+++ b/test/e2e/config_amd64.go
@@ -1,16 +1,16 @@
package integration
var (
- STORAGE_FS = "vfs" //nolint:golint,stylecheck
- STORAGE_OPTIONS = "--storage-driver vfs" //nolint:golint,stylecheck
- ROOTLESS_STORAGE_FS = "vfs" //nolint:golint,stylecheck
- ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" //nolint:golint,stylecheck
- CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:golint,stylecheck
+ STORAGE_FS = "vfs" //nolint:revive,stylecheck
+ STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck
+ ROOTLESS_STORAGE_FS = "vfs" //nolint:revive,stylecheck
+ ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck
+ CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:revive,stylecheck
nginx = "quay.io/libpod/alpine_nginx:latest"
- BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:golint,stylecheck
+ BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck
registry = "quay.io/libpod/registry:2.6"
labels = "quay.io/libpod/alpine_labels:latest"
- UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:golint,stylecheck
- UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:golint,stylecheck
+ UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:revive,stylecheck
+ UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:revive,stylecheck
cirros = "quay.io/libpod/cirros:latest"
)
diff --git a/test/system/450-interactive.bats b/test/system/450-interactive.bats
index a642a2e95..e6e67a8a7 100644
--- a/test/system/450-interactive.bats
+++ b/test/system/450-interactive.bats
@@ -75,7 +75,7 @@ function teardown() {
@test "podman load - will not read from tty" {
run_podman 125 load <$PODMAN_TEST_PTY
is "$output" \
- "Error: cannot read from terminal. Use command-line redirection or the --input flag." \
+ "Error: cannot read from terminal, use command-line redirection or the --input flag" \
"Diagnostic from 'podman load' without redirection or -i"
}
diff --git a/test/testvol/main.go b/test/testvol/main.go
index d15bf00cd..883f55f82 100644
--- a/test/testvol/main.go
+++ b/test/testvol/main.go
@@ -31,7 +31,7 @@ type cliConfig struct {
}
// Default configuration is stored here. Will be overwritten by flags.
-var config cliConfig = cliConfig{
+var config = cliConfig{
logLevel: "error",
sockName: "test-volume-plugin",
}
diff --git a/test/utils/matchers.go b/test/utils/matchers.go
index 0c0948e4b..c56bd55c3 100644
--- a/test/utils/matchers.go
+++ b/test/utils/matchers.go
@@ -6,7 +6,7 @@ import (
"net/url"
"github.com/containers/common/pkg/config"
- . "github.com/onsi/gomega" //nolint:golint,stylecheck
+ . "github.com/onsi/gomega" //nolint:revive,stylecheck
"github.com/onsi/gomega/format"
"github.com/onsi/gomega/gexec"
"github.com/onsi/gomega/matchers"
diff --git a/test/utils/utils.go b/test/utils/utils.go
index 9695835e5..0867570c1 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -15,9 +15,9 @@ import (
"github.com/sirupsen/logrus"
"github.com/containers/storage/pkg/parsers/kernel"
- . "github.com/onsi/ginkgo" //nolint:golint,stylecheck
- . "github.com/onsi/gomega" //nolint:golint,stylecheck
- . "github.com/onsi/gomega/gexec" //nolint:golint,stylecheck
+ . "github.com/onsi/ginkgo" //nolint:revive,stylecheck
+ . "github.com/onsi/gomega" //nolint:revive,stylecheck
+ . "github.com/onsi/gomega/gexec" //nolint:revive,stylecheck
)
type NetworkBackend int