From 077b39d7c628fe3867fee2fba9717a10bd74f39a Mon Sep 17 00:00:00 2001
From: Michael <mmatur@users.noreply.github.com>
Date: Thu, 30 Nov 2017 08:52:03 +0100
Subject: [PATCH] Add option -s to gofmt for autogen

---
 autogen/gentemplates/gen.go | 22 +++++++++++-----------
 generate.go                 |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/autogen/gentemplates/gen.go b/autogen/gentemplates/gen.go
index cdcd6448a..22d47f452 100644
--- a/autogen/gentemplates/gen.go
+++ b/autogen/gentemplates/gen.go
@@ -884,17 +884,17 @@ type bintree struct {
 }
 
 var _bintree = &bintree{nil, map[string]*bintree{
-	"templates": &bintree{nil, map[string]*bintree{
-		"consul_catalog.tmpl": &bintree{templatesConsul_catalogTmpl, map[string]*bintree{}},
-		"docker.tmpl":         &bintree{templatesDockerTmpl, map[string]*bintree{}},
-		"ecs.tmpl":            &bintree{templatesEcsTmpl, map[string]*bintree{}},
-		"eureka.tmpl":         &bintree{templatesEurekaTmpl, map[string]*bintree{}},
-		"kubernetes.tmpl":     &bintree{templatesKubernetesTmpl, map[string]*bintree{}},
-		"kv.tmpl":             &bintree{templatesKvTmpl, map[string]*bintree{}},
-		"marathon.tmpl":       &bintree{templatesMarathonTmpl, map[string]*bintree{}},
-		"mesos.tmpl":          &bintree{templatesMesosTmpl, map[string]*bintree{}},
-		"notFound.tmpl":       &bintree{templatesNotfoundTmpl, map[string]*bintree{}},
-		"rancher.tmpl":        &bintree{templatesRancherTmpl, map[string]*bintree{}},
+	"templates": {nil, map[string]*bintree{
+		"consul_catalog.tmpl": {templatesConsul_catalogTmpl, map[string]*bintree{}},
+		"docker.tmpl":         {templatesDockerTmpl, map[string]*bintree{}},
+		"ecs.tmpl":            {templatesEcsTmpl, map[string]*bintree{}},
+		"eureka.tmpl":         {templatesEurekaTmpl, map[string]*bintree{}},
+		"kubernetes.tmpl":     {templatesKubernetesTmpl, map[string]*bintree{}},
+		"kv.tmpl":             {templatesKvTmpl, map[string]*bintree{}},
+		"marathon.tmpl":       {templatesMarathonTmpl, map[string]*bintree{}},
+		"mesos.tmpl":          {templatesMesosTmpl, map[string]*bintree{}},
+		"notFound.tmpl":       {templatesNotfoundTmpl, map[string]*bintree{}},
+		"rancher.tmpl":        {templatesRancherTmpl, map[string]*bintree{}},
 	}},
 }}
 
diff --git a/generate.go b/generate.go
index 8de57bf3b..5d3c0e2c4 100644
--- a/generate.go
+++ b/generate.go
@@ -2,7 +2,7 @@
 //go:generate rm -vf autogen/genstatic/gen.go
 //go:generate mkdir -p static
 //go:generate go-bindata -pkg gentemplates -nometadata -nocompress -o autogen/gentemplates/gen.go ./templates/...
-//go:generate gofmt -w autogen/gentemplates/gen.go
+//go:generate gofmt -s -w autogen/gentemplates/gen.go
 //go:generate go-bindata -pkg genstatic -nocompress -o autogen/genstatic/gen.go ./static/...
 
 package main