Merge pull request #2865 from baude/pr/2864

Revert "Switch to golangci-lint"

Author: openshift-merge-robot

.cirrus.yml

@@ -121,6 +121,7 @@ gating_task:
 
     gate_script:
         # N/B: entrypoint.sh resets $GOSRC (same as make clean)
+        - '/usr/local/bin/entrypoint.sh install.tools'
         - '/usr/local/bin/entrypoint.sh validate'
         - '/usr/local/bin/entrypoint.sh lint'
         - '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/test/test_dot_cirrus_yaml.py'

.golangci.yml

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# Create the linter path for use later
+LINTER=${GOPATH}/bin/gometalinter
+
+# Make sure gometalinter is installed
+if [ ! -f ${LINTER} ]; then
+	echo >&2 "gometalinter must be installed. Please run 'make install.tools' and try again"
+	exit 1
+fi
+
+PKGS=$(find . -type d -not -path . -a -not -iwholename '*.git*' -a -not -iname '.tool' -a -not -iwholename '*vendor*' -a -not -iname 'hack' -a -not -iwholename '*.artifacts*' -a -not -iwholename '*contrib*' -a -not -iwholename '*test*' -a -not -iwholename '*logo*' -a -not -iwholename '*conmon*' -a -not -iwholename '*completions*' -a -not -iwholename '*docs*' -a -not -iwholename '*pause*' -a -not -iwholename './_output*' -a -not -iwholename '*ioprojectatomicpodman.go')
+
+echo $PKGS
+
+# Execute the linter
+${LINTER} \
+	--concurrency=4\
+	--enable-gc\
+	--vendored-linters\
+	--deadline=600s --disable-all\
+	--enable=deadcode\
+	--enable=errcheck\
+	--enable=goconst\
+	--enable=gofmt\
+	--enable=golint\
+	--enable=ineffassign\
+	--enable=megacheck\
+	--enable=misspell\
+	--enable=structcheck\
+	--enable=varcheck\
+	--enable=vet\
+	--enable=vetshadow\
+	--exclude='error return value not checked.*\(errcheck\)$'\
+	--exclude='declaration of.*err.*shadows declaration.*\(vetshadow\)$'\
+	--exclude='.*_test\.go:.*error return value not checked.*\(errcheck\)$'\
+	--exclude='duplicate of.*_test.go.*\(dupl\)$'\
+	--exclude='cmd\/client\/.*\.go.*\(dupl\)$'\
+	--exclude='libpod\/.*_easyjson.go:.*'\
+	--exclude='.* other occurrence\(s\) of "(container|host|tmpfs|unknown)" found in: .*\(goconst\)$'\
+	--exclude='vendor\/.*'\
+	--exclude='podman\/.*'\
+	--exclude='server\/seccomp\/.*\.go.*$'\
+	${PKGS[@]}

.tool/lint

@@ -98,7 +98,8 @@ endif
 	touch $@
 
 lint: .gopathok varlink_generate ## Execute the source code linter
-	golangci-lint run --build-tags="$(BUILDTAGS)"
+	@echo "checking lint"
+	@./.tool/lint
 
 gofmt: ## Verify the source code gofmt
 	find . -name '*.go' ! -path './vendor/*' -exec gofmt -s -w {} \+
@@ -279,7 +280,7 @@ uninstall:
 
 .PHONY: install.tools
 
-install.tools: .install.gitvalidation .install.golangci-lint .install.md2man .install.ginkgo ## Install needed tools
+install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo ## Install needed tools
 
 .install.vndr: .gopathok
 	$(GO) get -u github.com/LK4D4/vndr
@@ -294,10 +295,13 @@ install.tools: .install.gitvalidation .install.golangci-lint .install.md2man .in
 		$(GO) get -u github.com/vbatts/git-validation; \
 	fi
 
-.install.golangci-lint: .gopathok
-	if [ ! -x "$(GOBIN)/golangci-lint" ]; then \
-		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh |\
-			sh -s -- -b $(GOBIN) v1.15.0 ;\
+.install.gometalinter: .gopathok
+	if [ ! -x "$(GOBIN)/gometalinter" ]; then \
+		$(GO) get -u github.com/alecthomas/gometalinter; \
+		cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \
+		git checkout e8d801238da6f0dfd14078d68f9b53fa50a7eeb5; \
+		$(GO) install github.com/alecthomas/gometalinter; \
+		$(GOBIN)/gometalinter --install; \
 	fi
 
 .install.md2man: .gopathok

Makefile

@@ -10,13 +10,17 @@ import (
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/storage"
 	"github.com/fatih/camelcase"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
+var (
+	stores = make(map[storage.Store]struct{})
+	json   = jsoniter.ConfigCompatibleWithStandardLibrary
+)
 
 const (
 	idTruncLength = 12

cmd/podman/common.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"os/user"
+	"testing"
+)
+
+func skipTestIfNotRoot(t *testing.T) {
+	u, err := user.Current()
+	if err != nil {
+		t.Skip("Could not determine user.  Running without root may cause tests to fail")
+	} else if u.Uid != "0" {
+		t.Skip("tests will fail unless run as root")
+	}
+}

cmd/podman/common_test.go

@@ -20,6 +20,7 @@ import (
 )
 
 const (
+	STOPPED      = "Stopped"
 	RUNNING      = "Running"
 	PAUSED       = "Paused"
 	EXITED       = "Exited"

cmd/podman/pod_ps.go

@@ -298,3 +298,17 @@ func outputJson(stats []*adapter.PodContainerStats) error {
 	fmt.Println(string(b))
 	return nil
 }
+
+func getPodsByList(podList []string, r *libpod.Runtime) ([]*libpod.Pod, error) {
+	var (
+		pods []*libpod.Pod
+	)
+	for _, p := range podList {
+		pod, err := r.LookupPod(p)
+		if err != nil {
+			return nil, err
+		}
+		pods = append(pods, pod)
+	}
+	return pods, nil
+}

cmd/podman/pod_stats.go

@@ -18,31 +18,35 @@ import (
 	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/util"
+	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/go-units"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/fields"
 )
 
 const (
-	hid      = "CONTAINER ID"
-	himage   = "IMAGE"
-	hcommand = "COMMAND"
-	hcreated = "CREATED"
-	hstatus  = "STATUS"
-	hports   = "PORTS"
-	hnames   = "NAMES"
-	hsize    = "SIZE"
-	hpod     = "POD"
-	nspid    = "PID"
-	nscgroup = "CGROUPNS"
-	nsipc    = "IPC"
-	nsmnt    = "MNT"
-	nsnet    = "NET"
-	nspidns  = "PIDNS"
-	nsuserns = "USERNS"
-	nsuts    = "UTS"
+	mountTruncLength = 12
+	hid              = "CONTAINER ID"
+	himage           = "IMAGE"
+	hcommand         = "COMMAND"
+	hcreated         = "CREATED"
+	hstatus          = "STATUS"
+	hports           = "PORTS"
+	hnames           = "NAMES"
+	hsize            = "SIZE"
+	hinfra           = "IS INFRA"
+	hpod             = "POD"
+	nspid            = "PID"
+	nscgroup         = "CGROUPNS"
+	nsipc            = "IPC"
+	nsmnt            = "MNT"
+	nsnet            = "NET"
+	nspidns          = "PIDNS"
+	nsuserns         = "USERNS"
+	nsuts            = "UTS"
 )
 
 type psTemplateParams struct {
@@ -69,6 +73,34 @@ type psTemplateParams struct {
 	IsInfra       bool
 }
 
+// psJSONParams is used as a base structure for the psParams
+// If template output is requested, psJSONParams will be converted to
+// psTemplateParams.
+// psJSONParams will be populated by data from libpod.Container,
+// the members of the struct are the sama data types as their sources.
+type psJSONParams struct {
+	ID               string                `json:"id"`
+	Image            string                `json:"image"`
+	ImageID          string                `json:"image_id"`
+	Command          []string              `json:"command"`
+	ExitCode         int32                 `json:"exitCode"`
+	Exited           bool                  `json:"exited"`
+	CreatedAt        time.Time             `json:"createdAt"`
+	StartedAt        time.Time             `json:"startedAt"`
+	ExitedAt         time.Time             `json:"exitedAt"`
+	Status           string                `json:"status"`
+	PID              int                   `json:"PID"`
+	Ports            []ocicni.PortMapping  `json:"ports"`
+	Size             *shared.ContainerSize `json:"size,omitempty"`
+	Names            string                `json:"names"`
+	Labels           fields.Set            `json:"labels"`
+	Mounts           []string              `json:"mounts"`
+	ContainerRunning bool                  `json:"ctrRunning"`
+	Namespaces       *shared.Namespace     `json:"namespace,omitempty"`
+	Pod              string                `json:"pod,omitempty"`
+	IsInfra          bool                  `json:"infra"`
+}
+
 // Type declaration and functions for sorting the PS output
 type psSorted []shared.PsContainerOutput
 
@@ -411,6 +443,57 @@ func sortPsOutput(sortBy string, psOutput psSorted) (psSorted, error) {
 	return psOutput, nil
 }
 
+// getLabels converts the labels to a string of the form "key=value, key2=value2"
+func formatLabels(labels map[string]string) string {
+	var arr []string
+	if len(labels) > 0 {
+		for key, val := range labels {
+			temp := key + "=" + val
+			arr = append(arr, temp)
+		}
+		return strings.Join(arr, ",")
+	}
+	return ""
+}
+
+// getMounts converts the volumes mounted to a string of the form "mount1, mount2"
+// it truncates it if noTrunc is false
+func getMounts(mounts []string, noTrunc bool) string {
+	return strings.Join(getMountsArray(mounts, noTrunc), ",")
+}
+
+func getMountsArray(mounts []string, noTrunc bool) []string {
+	var arr []string
+	if len(mounts) == 0 {
+		return mounts
+	}
+	for _, mount := range mounts {
+		splitArr := strings.Split(mount, ":")
+		if len(splitArr[0]) > mountTruncLength && !noTrunc {
+			arr = append(arr, splitArr[0][:mountTruncLength]+"...")
+			continue
+		}
+		arr = append(arr, splitArr[0])
+	}
+	return arr
+}
+
+// portsToString converts the ports used to a string of the from "port1, port2"
+func portsToString(ports []ocicni.PortMapping) string {
+	var portDisplay []string
+	if len(ports) == 0 {
+		return ""
+	}
+	for _, v := range ports {
+		hostIP := v.HostIP
+		if hostIP == "" {
+			hostIP = "0.0.0.0"
+		}
+		portDisplay = append(portDisplay, fmt.Sprintf("%s:%d->%d/%s", hostIP, v.HostPort, v.ContainerPort, v.Protocol))
+	}
+	return strings.Join(portDisplay, ", ")
+}
+
 func printFormat(format string, containers []shared.PsContainerOutput) error {
 	// return immediately if no containers are present
 	if len(containers) == 0 {

cmd/podman/ps.go

@@ -18,6 +18,7 @@ import (
 
 var (
 	sysInfo = sysinfo.New(true)
+	cmd     = []string{"podman", "test", "alpine"}
 	CLI     *cliconfig.PodmanCommand
 )