Merge pull request #51 from olivercodes/patch-1

Lint cleanup and cmd/cyclonus fmt fixes

Author: k8s-ci-robot

.golangci.yml

@@ -15,8 +15,14 @@ linters:
   - govet
   - misspell
   - exportloopref
+  - unused
   disable:
   - scopelint
+  - deadcode
+  - structcheck
+  - varcheck
+  - rowserrcheck
+  - sqlclosecheck
   disable-all: false
   presets:
   - bugs

cmd/cyclonus/pkg/cli/analyze.go

@@ -166,7 +166,8 @@ func Lint(kubePolicies []*networkingv1.NetworkPolicy) {
 }
 
 // QueryTargetPod matches targets; targets exist in only a single namespace and can't be matched by namespace
-//   label, therefore we match by exact namespace and by pod labels.
+//
+//	label, therefore we match by exact namespace and by pod labels.
 type QueryTargetPod struct {
 	Namespace string
 	Labels    map[string]string

cmd/cyclonus/pkg/connectivity/testcasestate.go

@@ -1,13 +1,14 @@
 package connectivity
 
 import (
+	"time"
+
 	"github.com/mattfenwick/cyclonus/pkg/connectivity/probe"
 	"github.com/mattfenwick/cyclonus/pkg/kube"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
-	"time"
 )
 
 type TestCaseState struct {
@@ -272,7 +273,7 @@ func NewLabelsDiff(actual map[string]string, expected map[string]string) *Labels
 			ld.Same = append(ld.Same, k)
 		}
 	}
-	for k, _ := range expected {
+	for k := range expected {
 		if _, ok := actual[k]; !ok {
 			ld.Missing = append(ld.Missing, k)
 		}

cmd/cyclonus/pkg/generator/testcase.go

@@ -135,7 +135,8 @@ func ParseProbeMode(mode string) (ProbeMode, error) {
 }
 
 // ProbeConfig: exactly one field must be non-null (or, in AllAvailable's case, non-false).  This
-//   models a discriminated union (sum type).
+//
+//	models a discriminated union (sum type).
 type ProbeConfig struct {
 	AllAvailable bool
 	PortProtocol *PortProtocol

cmd/cyclonus/pkg/generator/testcasegenerator.go

@@ -5,30 +5,31 @@ TODO
 Test cases:
 
 1 policy with ingress:
- - empty ingress
- - ingress with 1 rule
-   - empty
-   - 1 port
-     - empty
-     - protocol
-     - port
-     - port + protocol
-   - 2 ports
-   - 1 from
-     - 8 combos: (nil + nil => might mean ipblock must be non-nil)
-       - pod sel: nil, empty, non-empty
-       - ns sel: nil, empty, non-empty
-     - ipblock
-       - no except
-       - yes except
-   - 2 froms
-     - 1 pod/ns, 1 ipblock
-     - 2 pod/ns
-     - 2 ipblocks
-   - 1 port, 1 from
-   - 2 ports, 2 froms
- - ingress with 2 rules
- - ingress with 3 rules
+  - empty ingress
+  - ingress with 1 rule
+  - empty
+  - 1 port
+  - empty
+  - protocol
+  - port
+  - port + protocol
+  - 2 ports
+  - 1 from
+  - 8 combos: (nil + nil => might mean ipblock must be non-nil)
+  - pod sel: nil, empty, non-empty
+  - ns sel: nil, empty, non-empty
+  - ipblock
+  - no except
+  - yes except
+  - 2 froms
+  - 1 pod/ns, 1 ipblock
+  - 2 pod/ns
+  - 2 ipblocks
+  - 1 port, 1 from
+  - 2 ports, 2 froms
+  - ingress with 2 rules
+  - ingress with 3 rules
+
 2 policies with ingress
 1 policy with egress
 2 policies with egress

cmd/cyclonus/pkg/kube/labelselector.go

@@ -11,9 +11,10 @@ import (
 
 // IsNameMatch follows the kube pattern of "empty string means matches All"
 // It will return:
-//   if matcher is empty: true
-//   if objectName and matcher are the same: true
-//   otherwise false
+//
+//	if matcher is empty: true
+//	if objectName and matcher are the same: true
+//	otherwise false
 func IsNameMatch(objectName string, matcher string) bool {
 	if matcher == "" {
 		return true

cmd/cyclonus/pkg/kube/netpol/policies.go

@@ -246,14 +246,17 @@ func AllowAllTo_Version2(namespace string, targetLabels map[string]string) *netw
 kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
-  Namespace: secondary
-  name: web-allow-all-namespaces
+
+	Namespace: secondary
+	name: web-allow-all-namespaces
+
 spec:
-  podSelector:
-    matchLabels:
-      app: web
-  ingress:
-  - from:
+
+	podSelector:
+	  matchLabels:
+	    app: web
+	ingress:
+	- from:
 */
 func AllowAllTo_Version3(namespace string, targetLabels map[string]string) *networkingv1.NetworkPolicy {
 	return &networkingv1.NetworkPolicy{
@@ -543,20 +546,23 @@ func AllowNoEgressFromLabels(namespace string, targetLabels map[string]string) *
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: foo-deny-egress
+
+	name: foo-deny-egress
+
 spec:
-  podSelector:
-    matchLabels:
-      app: foo
-  policyTypes:
-  - Egress
-  egress:
-  # allow DNS resolution
-  - ports:
-    - port: 53
-      protocol: UDP
-    - port: 53
-      protocol: TCP
+
+	podSelector:
+	  matchLabels:
+	    app: foo
+	policyTypes:
+	- Egress
+	egress:
+	# allow DNS resolution
+	- ports:
+	  - port: 53
+	    protocol: UDP
+	  - port: 53
+	    protocol: TCP
 */
 func AllowEgressOnPort(namespace string, targetLabels map[string]string, port int) *networkingv1.NetworkPolicy {
 	tcp := v1.ProtocolTCP
@@ -667,14 +673,17 @@ func AllowEgressToAllNamespacesOnPort(namespace string, targetLabels map[string]
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: allow-nothing
+
+	name: allow-nothing
+
 spec:
-  podSelector:
-    matchLabels:
-      app: foo
-  policyTypes:
-  - Egress
-  - Ingress
+
+	podSelector:
+	  matchLabels:
+	    app: foo
+	policyTypes:
+	- Egress
+	- Ingress
 */
 func AllowNoIngressNorEgress(namespace string, targetLabels map[string]string) *networkingv1.NetworkPolicy {
 	return &networkingv1.NetworkPolicy{

cmd/cyclonus/pkg/kube/service.go

@@ -4,8 +4,9 @@ import "fmt"
 
 // QualifiedServiceAddress returns the address that can be used to hit a service from
 // any namespace in the cluster
-//func QualifiedServiceAddress(serviceName string, namespace string, dnsDomain string) string {
-//	return fmt.Sprintf("%s.%s.svc.%s", serviceName, namespace, dnsDomain)
+//
+//	func QualifiedServiceAddress(serviceName string, namespace string, dnsDomain string) string {
+//		return fmt.Sprintf("%s.%s.svc.%s", serviceName, namespace, dnsDomain)
 func QualifiedServiceAddress(serviceName string, namespace string) string {
 	return fmt.Sprintf("%s.%s.svc.cluster.local", serviceName, namespace)
 }

hack/verify-gofmt.sh

@@ -18,7 +18,7 @@ set -euo pipefail
 
 echo "Verifying gofmt"
 
-diff=$(find . -name "*.go" | grep -v "\/vendor\/" | grep -v "\/cmd\/cyclonus\/" | xargs gofmt -s -d 2>&1)
+diff=$(find . -name "*.go" | grep -v "\/vendor\/" | xargs gofmt -s -d 2>&1)
 if [[ -n "${diff}" ]]; then
   echo "${diff}"
   echo