Add yamllint and fix issues

Fixes #10

Also adds yamllint to `make check` target.

Signed-off-by: Nick Young <ynick@vmware.com>

Makefile

@@ -27,6 +27,7 @@ Check_Targets := \
 	check-unconvert \
 	check-ineffassign \
 	check-unparam \
+	check-yamllint \
 
 .PHONY: check
 check: install $(Check_Targets) ## Run tests and CI checks
@@ -96,6 +97,10 @@ check-gofmt:
 check-vet: | check-test
 	go vet $(MODULE)/...
 
+.PHONY: check-yamllint
+check-yamllint:
+	docker run --rm -ti -v $(CURDIR):/workdir giantswarm/yamllint -c /workdir/yamllintcfg.yaml internal/translator/testdata
+
 help: ## Display this help
 	@echo Contour high performance Ingress controller for Kubernetes
 	@echo

internal/translator/testdata/basic_include/input.yaml

@@ -1,17 +1,17 @@
 ---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
-metadata: 
+metadata:
   name: delegation-root
   namespace: default
-spec: 
+spec:
   virtualhost:
     fqdn: root.bar.com
-  routes: 
+  routes:
     - match: /
-      services: 
+      services:
         - name: s1
           port: 80
-    - match: /service2  # delegate the subpath, `/service2` to the IngressRoute object in this namespace with the name `service2`
+    - match: /service2
       delegate:
-        name: service2
+        name: service2

internal/translator/testdata/basic_include/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
@@ -19,4 +20,4 @@ spec:
     fqdn: root.bar.com
 status:
   currentStatus: ""
-  description: ""
+  description: ""

internal/translator/testdata/basic_ingress/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:

internal/translator/testdata/health-checks/input.yaml

@@ -1,15 +1,15 @@
 ---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
-metadata: 
+metadata:
   name: health-check
   namespace: default
-spec: 
+spec:
   virtualhost:
     fqdn: health.bar.com
-  routes: 
+  routes:
     - match: /
-      services: 
+      services:
         - name: s1-health
           port: 80
           healthCheck:
@@ -18,5 +18,5 @@ spec:
             timeoutSeconds: 2
             unhealthyThresholdCount: 3
             healthyThresholdCount: 5
-        - name: s2-health  # no health-check defined for this service
+        - name: s2-health
           port: 80

internal/translator/testdata/health-checks/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
@@ -23,4 +24,4 @@ spec:
     fqdn: health.bar.com
 status:
   currentStatus: ""
-  description: ""
+  description: ""

internal/translator/testdata/lb-diff-strategy/input.yaml

@@ -1,18 +1,18 @@
 ---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
-metadata: 
+metadata:
   name: lb-strategy
   namespace: default
-spec: 
+spec:
   virtualhost:
     fqdn: strategy.bar.com
-  routes: 
+  routes:
     - match: /
-      services: 
+      services:
         - name: s1-strategy
           port: 80
           strategy: Random
         - name: s2-strategy
           port: 80
-          strategy: WeightedLeastRequest  # Default LB Algorithm for this Service is overridden
+          strategy: WeightedLeastRequest

internal/translator/testdata/lb-diff-strategy/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:

internal/translator/testdata/lb-strategy/input.yaml

@@ -1,18 +1,18 @@
 ---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
-metadata: 
+metadata:
   name: lb-strategy
   namespace: default
-spec: 
+spec:
   virtualhost:
     fqdn: strategy.bar.com
-  routes: 
+  routes:
     - match: /
-      services: 
+      services:
         - name: s1-strategy
           port: 80
           strategy: WeightedLeastRequest
         - name: s2-strategy
           port: 80
-          strategy: WeightedLeastRequest  # Default LB Algorithm for this Service is overridden
+          strategy: WeightedLeastRequest

internal/translator/testdata/lb-strategy/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:

internal/translator/testdata/multiple-upstreams/input.yaml

@@ -1,15 +1,15 @@
 ---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
-metadata: 
+metadata:
   name: multiple-upstreams
   namespace: default
-spec: 
+spec:
   virtualhost:
     fqdn: multi.bar.com
-  routes: 
+  routes:
     - match: /
-      services: 
+      services:
         - name: s1
           port: 80
         - name: s2

internal/translator/testdata/multiple-upstreams/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
@@ -17,4 +18,4 @@ spec:
     fqdn: multi.bar.com
 status:
   currentStatus: ""
-  description: ""
+  description: ""

internal/translator/testdata/namespace_include/input.yaml

@@ -1,18 +1,18 @@
 ---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
-metadata: 
+metadata:
   name: different-namespace
   namespace: default
-spec: 
+spec:
   virtualhost:
     fqdn: root.bar.com
-  routes: 
+  routes:
     - match: /
-      services: 
+      services:
         - name: s1
           port: 80
     - match: /service2
       delegate:
         name: service2
-        namespace: other
+        namespace: other

internal/translator/testdata/namespace_include/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
@@ -20,4 +21,4 @@ spec:
     fqdn: root.bar.com
 status:
   currentStatus: ""
-  description: ""
+  description: ""

internal/translator/testdata/request-timeout/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
@@ -18,4 +19,4 @@ spec:
     fqdn: timeout.bar.com
 status:
   currentStatus: ""
-  description: ""
+  description: ""

internal/translator/testdata/tls_ingressroute/input.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
 metadata:

internal/translator/testdata/tls_ingressroute/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
@@ -18,4 +19,3 @@ spec:
 status:
   currentStatus: ""
   description: ""
-

internal/translator/testdata/weight-shifting/input.yaml

@@ -1,15 +1,15 @@
 ---
 apiVersion: contour.heptio.com/v1beta1
 kind: IngressRoute
-metadata: 
+metadata:
   name: weight-shifting
   namespace: default
-spec: 
+spec:
   virtualhost:
     fqdn: weights.bar.com
-  routes: 
+  routes:
     - match: /
-      services: 
+      services:
         - name: s1
           port: 80
           weight: 10

internal/translator/testdata/weight-shifting/output.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: projectcontour.io/v1
 kind: HTTPProxy
 metadata:
@@ -19,4 +20,4 @@ spec:
     fqdn: weights.bar.com
 status:
   currentStatus: ""
-  description: ""
+  description: ""

internal/translator/translate_test.go

@@ -37,6 +37,7 @@ func TestTranslateIngressRoute(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
+			outputYAML = append([]byte("---\n"), outputYAML...)
 
 			translateDiff := cmp.Diff(bytes.TrimSpace(outputYAML), bytes.TrimSpace(tc.output))
 			if translateDiff != "" {

yamllintcfg.yaml

@@ -0,0 +1,6 @@
+extends: default
+
+rules:
+  indentation:
+    spaces: 2
+    indent-sequences: consistent