summaryrefslogtreecommitdiff
path: root/pkg/specgenutil
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-04-25 15:15:52 +0200
committerPaul Holzinger <pholzing@redhat.com>2022-04-26 18:12:22 +0200
commit51fbf3da9ee34a8143df5baeda6032c1747446d2 (patch)
treef5edbd047f5e4aea72b710403a0aa208b238c83b /pkg/specgenutil
parent216d9243077f478a9c7ffda1c6e0b1fcbad9ee76 (diff)
downloadpodman-51fbf3da9ee34a8143df5baeda6032c1747446d2.tar.gz
podman-51fbf3da9ee34a8143df5baeda6032c1747446d2.tar.bz2
podman-51fbf3da9ee34a8143df5baeda6032c1747446d2.zip
enable gocritic linter
The linter ensures a common code style. - use switch/case instead of else if - use if instead of switch/case for single case statement - add space between comment and text - detect the use of defer with os.Exit() - use short form var += "..." instead of var = var + "..." - detect problems with append() ``` newSlice := append(orgSlice, val) ``` This could lead to nasty bugs because the orgSlice will be changed in place if it has enough capacity too hold the new elements. Thus we newSlice might not be a copy. Of course most of the changes are just cosmetic and do not cause any logic errors but I think it is a good idea to enforce a common style. This should help maintainability. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/specgenutil')
-rw-r--r--pkg/specgenutil/createparse.go7
-rw-r--r--pkg/specgenutil/specgen.go6
2 files changed, 7 insertions, 6 deletions
diff --git a/pkg/specgenutil/createparse.go b/pkg/specgenutil/createparse.go
index a51396227..fb5f9c351 100644
--- a/pkg/specgenutil/createparse.go
+++ b/pkg/specgenutil/createparse.go
@@ -24,11 +24,12 @@ func validate(c *entities.ContainerCreateOptions) error {
"ignore": "",
}
if _, ok := imageVolType[c.ImageVolume]; !ok {
- if c.IsInfra {
+ switch {
+ case c.IsInfra:
c.ImageVolume = "bind"
- } else if c.IsClone { // the image volume type will be deduced later from the container we are cloning
+ case c.IsClone: // the image volume type will be deduced later from the container we are cloning
return nil
- } else {
+ default:
return errors.Errorf("invalid image-volume type %q. Pick one of bind, tmpfs, or ignore", c.ImageVolume)
}
}
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go
index f0dfcac1a..9cb2f200b 100644
--- a/pkg/specgenutil/specgen.go
+++ b/pkg/specgenutil/specgen.go
@@ -1098,9 +1098,9 @@ var cgroupDeviceType = map[string]bool{
}
var cgroupDeviceAccess = map[string]bool{
- "r": true, //read
- "w": true, //write
- "m": true, //mknod
+ "r": true, // read
+ "w": true, // write
+ "m": true, // mknod
}
// parseLinuxResourcesDeviceAccess parses the raw string passed with the --device-access-add flag