Merge pull request #429 from 99designs/refactor-gofmt

apply go fmt ./...
99designs · Nov 13, 2018 · 02a1935 · 02a1935
2 parents 3f598bd + 6a77af1
commit 02a1935
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/.circleci/test.sh b/.circleci/test.sh
@@ -2,11 +2,14 @@
 
 set -eu
 
+echo "### go code formatting"
+go fmt ./...
+
 echo "### go generating"
 go generate ./...
 
 if [[ $(git --no-pager diff) ]] ; then
-    echo "you need to run go generate"
+    echo "you need to run `go fmt` or `go generate`"
     git --no-pager diff
     exit 1
 fi

diff --git a/codegen/codegen.go b/codegen/codegen.go
@@ -153,7 +153,7 @@ func (cfg *Config) normalize() error {
 
 	var sources []*ast.Source
 	for _, filename := range cfg.SchemaFilename {
-		sources = append(sources, &ast.Source{Name: filename, Input:  cfg.SchemaStr[filename]})
+		sources = append(sources, &ast.Source{Name: filename, Input: cfg.SchemaStr[filename]})
 	}
 
 	var err *gqlerror.Error

diff --git a/codegen/codegen_test.go b/codegen/codegen_test.go
@@ -22,10 +22,10 @@ func TestGenerateServer(t *testing.T) {
 	serverFilename := "gen/" + name + "/server/server.go"
 	cfg := Config{
 		SchemaFilename: SchemaFilenames{"schema.graphql"},
-		SchemaStr: map[string]string{"schema.graphql": schema},
-		Exec:      PackageConfig{Filename: "gen/" + name + "/exec.go"},
-		Model:     PackageConfig{Filename: "gen/" + name + "/model.go"},
-		Resolver:  PackageConfig{Filename: "gen/" + name + "/resolver.go", Type: "Resolver"},
+		SchemaStr:      map[string]string{"schema.graphql": schema},
+		Exec:           PackageConfig{Filename: "gen/" + name + "/exec.go"},
+		Model:          PackageConfig{Filename: "gen/" + name + "/model.go"},
+		Resolver:       PackageConfig{Filename: "gen/" + name + "/resolver.go", Type: "Resolver"},
 	}
 
 	_ = syscall.Unlink(cfg.Resolver.Filename)

diff --git a/codegen/config_test.go b/codegen/config_test.go
@@ -45,7 +45,7 @@ func TestLoadDefaultConfig(t *testing.T) {
 
 		cfg, err = LoadConfigFromDefaultLocations()
 		require.NoError(t, err)
-		require.Equal(t, SchemaFilenames{"outer"},cfg.SchemaFilename)
+		require.Equal(t, SchemaFilenames{"outer"}, cfg.SchemaFilename)
 	})
 
 	t.Run("will return error if config doesn't exist", func(t *testing.T) {

diff --git a/codegen/input_test.go b/codegen/input_test.go
@@ -36,9 +36,9 @@ func TestTypeInInput(t *testing.T) {
 func generate(name string, schema string, typemap ...TypeMap) error {
 	cfg := Config{
 		SchemaFilename: SchemaFilenames{"schema.graphql"},
-		SchemaStr: map[string]string{"schema.graphql": schema},
-		Exec:      PackageConfig{Filename: "gen/" + name + "/exec.go"},
-		Model:     PackageConfig{Filename: "gen/" + name + "/model.go"},
+		SchemaStr:      map[string]string{"schema.graphql": schema},
+		Exec:           PackageConfig{Filename: "gen/" + name + "/exec.go"},
+		Model:          PackageConfig{Filename: "gen/" + name + "/model.go"},
 	}
 
 	if len(typemap) > 0 {

diff --git a/codegen/util_test.go b/codegen/util_test.go
@@ -101,9 +101,9 @@ func parseScope(t *testing.T, input interface{}, packageName string) (*types.Sco
 
 func TestEqualFieldName(t *testing.T) {
 	tt := []struct {
-		Name string
-		Source string
-		Target string
+		Name     string
+		Source   string
+		Target   string
 		Expected bool
 	}{
 		{Name: "words with same case", Source: "test", Target: "test", Expected: true},
@@ -115,7 +115,7 @@ func TestEqualFieldName(t *testing.T) {
 
 	for _, tc := range tt {
 		t.Run(tc.Name, func(t *testing.T) {
-			result  := equalFieldName(tc.Source, tc.Target)
+			result := equalFieldName(tc.Source, tc.Target)
 			require.Equal(t, tc.Expected, result)
 		})
 	}