diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-23 06:32:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 06:32:41 -0400 |
| commit | 2df9bdc00948e24855f3da42e31a6d273861e380 (patch) | |
| tree | a2b25921510922eb921c24bc13fb95228d41e0b7 /pkg/domain | |
| parent | 31231ffd748d10048e6541b18fd863a66342c6c7 (diff) | |
| parent | 5b4af0584d1c66b4f8d3d721374541fb76b5b395 (diff) | |
| download | podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.gz podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.bz2 podman-2df9bdc00948e24855f3da42e31a6d273861e380.zip | |
Merge pull request #13973 from Luap99/linter-revive
replace golint with revive linter
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/network.go | 2 | ||||
| -rw-r--r-- | pkg/domain/filters/containers.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/manifest.go | 4 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/trust.go | 2 |
4 files changed, 7 insertions, 3 deletions
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 { |