Merge pull request #4850 from vrothberg/fix-linting

Fix linting

3 files changed, 13 insertions, 13 deletions

diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go
index 5f8df2e10..9459247ed 100644
--- a/cmd/podman/shared/container.go
+++ b/cmd/podman/shared/container.go
@@ -650,10 +650,7 @@ func getNamespaceInfo(path string) (string, error) {
 
 // getStrFromSquareBrackets gets the string inside [] from a string.
 func getStrFromSquareBrackets(cmd string) string {
-	reg, err := regexp.Compile(`.*\[|\].*`)
-	if err != nil {
-		return ""
-	}
+	reg := regexp.MustCompile(`.*\[|\].*`)
 	arr := strings.Split(reg.ReplaceAllLiteralString(cmd, ""), ",")
 	return strings.Join(arr, ",")
 }
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 58cf56eea..05a3f5598 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -444,11 +444,12 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 	// USER
 	user := c.String("user")
 	if user == "" {
-		if usernsMode.IsKeepID() {
+		switch {
+		case usernsMode.IsKeepID():
 			user = fmt.Sprintf("%d:%d", rootless.GetRootlessUID(), rootless.GetRootlessGID())
-		} else if data == nil {
+		case data == nil:
 			user = "0"
-		} else {
+		default:
 			user = data.Config.User
 		}
 	}
diff --git a/cmd/podman/shared/pod.go b/cmd/podman/shared/pod.go
index ab6d1f144..d8d69c8fc 100644
--- a/cmd/podman/shared/pod.go
+++ b/cmd/podman/shared/pod.go
@@ -59,18 +59,20 @@ func CreatePodStatusResults(ctrStatuses map[string]define.ContainerStatus) (stri
 		}
 	}
 
-	if statuses[PodStateRunning] > 0 {
+	switch {
+	case statuses[PodStateRunning] > 0:
 		return PodStateRunning, nil
-	} else if statuses[PodStatePaused] == ctrNum {
+	case statuses[PodStatePaused] == ctrNum:
 		return PodStatePaused, nil
-	} else if statuses[PodStateStopped] == ctrNum {
+	case statuses[PodStateStopped] == ctrNum:
 		return PodStateExited, nil
-	} else if statuses[PodStateStopped] > 0 {
+	case statuses[PodStateStopped] > 0:
 		return PodStateStopped, nil
-	} else if statuses[PodStateErrored] > 0 {
+	case statuses[PodStateErrored] > 0:
 		return PodStateErrored, nil
+	default:
+		return PodStateCreated, nil
 	}
-	return PodStateCreated, nil
 }
 
 // GetNamespaceOptions transforms a slice of kernel namespaces