summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-04-22 13:38:41 +0200
committerPaul Holzinger <pholzing@redhat.com>2022-04-22 15:12:33 +0200
commit5b4af0584d1c66b4f8d3d721374541fb76b5b395 (patch)
tree0c3a0aa6323ed1a0998784476bfe24c126da5e3a /pkg/domain/infra
parent22500d797aba09eada894a69ad88f2699a560d02 (diff)
downloadpodman-5b4af0584d1c66b4f8d3d721374541fb76b5b395.tar.gz
podman-5b4af0584d1c66b4f8d3d721374541fb76b5b395.tar.bz2
podman-5b4af0584d1c66b4f8d3d721374541fb76b5b395.zip
replace golint with revive linter
golint, scopelint and interfacer are deprecated. golint is replaced by revive. This linter is better because it will also check for our error style: `error strings should not be capitalized or end with punctuation or a newline` scopelint is replaced by exportloopref (already endabled) interfacer has no replacement but I do not think this linter is important. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/manifest.go4
-rw-r--r--pkg/domain/infra/abi/trust.go2
2 files changed, 5 insertions, 1 deletions
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 {