Merge #172

172: gofmt -w -s . r=zegl a=zegl Co-authored-by: Gustav Westling <[email protected]>
zegl · Aug 18, 2019 · 4733785 · 4733785
2 parents 1fff23b + b13d11c
commit 4733785
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 36 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,8 +6,15 @@ jobs:
     working_directory: /go/app
     steps:
     - checkout
-    - run: go test -race -coverprofile=coverage.txt -covermode=atomic -coverpkg github.com/zegl/kube-score/... -v github.com/zegl/kube-score/...
-    - run: bash <(curl -s https://codecov.io/bash)
+    - run:
+        name: "Run go test"
+        command: go test -race -coverprofile=coverage.txt -covermode=atomic -coverpkg github.com/zegl/kube-score/... -v github.com/zegl/kube-score/...
+    - run:
+        name: "Enforce Go Formatted Code"
+        command: "! go fmt github.com/zegl/kube-score/... 2>&1 | read"
+    - run:
+        name: "Upload test coverage results"
+        command: bash <(curl -s https://codecov.io/bash)
 
 workflows:
   version: 2

diff --git a/cmd/kube-score/main.go b/cmd/kube-score/main.go
@@ -288,8 +288,6 @@ func outputHumanStep(card scorecard.TestScore, verboseOutput int, termWidth int)
 
 		fmt.Fprint(w, comment.Summary)
 
-
-
 		if len(comment.Description) > 0 {
 			wrapper := wordwrap.Wrapper(termWidth-12, false)
 			wrapped := wrapper(comment.Description)

diff --git a/cmd/kube-score/output_test.go b/cmd/kube-score/output_test.go
@@ -353,5 +353,3 @@ func TestHumanOutputLogDescription80Width(t *testing.T) {
             nisl venenatis, elementum augue a, porttitor libero.
 `, string(all))
 }
-
-
diff --git a/parser/parse.go b/parser/parse.go
@@ -269,7 +269,7 @@ func decodeItem(cnf config.Configuration, s *parsedObjects, detectedVersion sche
 		decode(fileContents, &hpa)
 		s.horizontalPodAutoscalers = append(s.horizontalPodAutoscalers, hpa)
 		s.bothMetas = append(s.bothMetas, ks.BothMeta{hpa.TypeMeta, hpa.ObjectMeta})
-		
+
 	default:
 		if cnf.VerboseOutput > 1 {
 			log.Printf("Unknown datatype: %s", detectedVersion.String())

diff --git a/score/container/container_test.go b/score/container/container_test.go
@@ -20,11 +20,11 @@ func TestOkAllTheSameContainerResourceRequestsEqualLimits(t *testing.T) {
 						Name: "foo",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 						},
@@ -47,11 +47,11 @@ func TestOkMultipleContainersContainerResourceRequestsEqualLimits(t *testing.T)
 						Name: "foo",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 						},
@@ -62,11 +62,11 @@ func TestOkMultipleContainersContainerResourceRequestsEqualLimits(t *testing.T)
 						Name: "foo",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 						},
@@ -75,11 +75,11 @@ func TestOkMultipleContainersContainerResourceRequestsEqualLimits(t *testing.T)
 						Name: "foo2",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 						},
@@ -102,11 +102,11 @@ func TestOkSameQuantityContainerResourceRequestsEqualLimits(t *testing.T) {
 						Name: "foo",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1000m"),
+								"cpu":    resource.MustParse("1000m"),
 								"memory": resource.MustParse("0.25Gi"),
 							},
 						},
@@ -129,11 +129,11 @@ func TestFailBothContainerResourceRequestsEqualLimits(t *testing.T) {
 						Name: "foo",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("2"),
+								"cpu":    resource.MustParse("2"),
 								"memory": resource.MustParse("512Mi"),
 							},
 						},
@@ -153,7 +153,6 @@ func TestFailBothContainerResourceRequestsEqualLimits(t *testing.T) {
 	assert.Equal(t, "Having equal requests and limits is recommended to avoid resource DDOS of the node during spikes. Set resources.requests.memory == resources.limits.memory", s.Comments[1].Description)
 }
 
-
 func TestFailCpuInitContainerResourceRequestsEqualLimits(t *testing.T) {
 	s := containerResourceRequestsEqualLimits(
 		corev1.PodTemplateSpec{
@@ -163,11 +162,11 @@ func TestFailCpuInitContainerResourceRequestsEqualLimits(t *testing.T) {
 						Name: "init",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("2"),
+								"cpu":    resource.MustParse("2"),
 								"memory": resource.MustParse("256Mi"),
 							},
 						},
@@ -178,11 +177,11 @@ func TestFailCpuInitContainerResourceRequestsEqualLimits(t *testing.T) {
 						Name: "foo",
 						Resources: corev1.ResourceRequirements{
 							Requests: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 							Limits: map[corev1.ResourceName]resource.Quantity{
-								"cpu": resource.MustParse("1"),
+								"cpu":    resource.MustParse("1"),
 								"memory": resource.MustParse("256Mi"),
 							},
 						},

diff --git a/score/disruptionbudget/disruptionbudget_test.go b/score/disruptionbudget/disruptionbudget_test.go
@@ -14,7 +14,7 @@ func TestStatefulSetReplicas(t *testing.T) {
 		skipped bool
 	}{
 		nil:        {scorecard.GradeCritical, false}, // failed
-		intptr(1):  {0, true},     // skipped
+		intptr(1):  {0, true},                        // skipped
 		intptr(10): {scorecard.GradeCritical, false}, // failed
 	}
 
@@ -40,7 +40,7 @@ func TestDeploymentReplicas(t *testing.T) {
 		skipped bool
 	}{
 		nil:        {scorecard.GradeCritical, false}, // failed
-		intptr(1):  {0, true},     // skipped
+		intptr(1):  {0, true},                        // skipped
 		intptr(10): {scorecard.GradeCritical, false}, // failed
 	}
 

diff --git a/score/hpa/hpa_test.go b/score/hpa/hpa_test.go
@@ -43,7 +43,7 @@ func TestHpaHasTarget(t *testing.T) {
 			},
 			allTargets: []domain.BothMeta{
 				{
-					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1",},
+					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
 					ObjectMeta: metav1.ObjectMeta{Name: "foo"},
 				},
 			},
@@ -64,14 +64,13 @@ func TestHpaHasTarget(t *testing.T) {
 			},
 			allTargets: []domain.BothMeta{
 				{
-					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1",},
+					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
 					ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "foospace"},
 				},
 			},
 			expectedGrade: scorecard.GradeAllOK,
 		},
 
-
 		// No match (namespace)
 		{
 			hpa: v1.HorizontalPodAutoscaler{
@@ -86,14 +85,13 @@ func TestHpaHasTarget(t *testing.T) {
 			},
 			allTargets: []domain.BothMeta{
 				{
-					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1",},
+					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
 					ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "foospace"},
 				},
 			},
 			expectedGrade: scorecard.GradeCritical,
 		},
 
-
 		// No match (name)
 		{
 			hpa: v1.HorizontalPodAutoscaler{
@@ -108,14 +106,13 @@ func TestHpaHasTarget(t *testing.T) {
 			},
 			allTargets: []domain.BothMeta{
 				{
-					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1",},
+					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
 					ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "foospace"},
 				},
 			},
 			expectedGrade: scorecard.GradeCritical,
 		},
 
-
 		// No match (kind)
 		{
 			hpa: v1.HorizontalPodAutoscaler{
@@ -130,14 +127,13 @@ func TestHpaHasTarget(t *testing.T) {
 			},
 			allTargets: []domain.BothMeta{
 				{
-					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1",},
+					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
 					ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "foospace"},
 				},
 			},
 			expectedGrade: scorecard.GradeCritical,
 		},
 
-
 		// No match (version)
 		{
 			hpa: v1.HorizontalPodAutoscaler{
@@ -152,7 +148,7 @@ func TestHpaHasTarget(t *testing.T) {
 			},
 			allTargets: []domain.BothMeta{
 				{
-					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1",},
+					TypeMeta:   metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
 					ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "foospace"},
 				},
 			},