Merge pull request #661 from uber/standardize_goimports_formatting

Standardize formatting to use goimports instead of gofmt

Makefile

@@ -81,7 +81,7 @@ cyclo-check:
 lint: check-licence eclint-check
 	@rm -f lint.log
 	@echo "Checking formatting..."
-	@gofmt -d -s $(PKG_FILES) 2>&1 | $(FILTER_LINT) | tee -a lint.log
+	@$(GOIMPORTS)/goimports -d $(PKG_FILES) 2>&1 | $(FILTER_LINT) | tee -a lint.log
 	@echo "Installing test dependencies for vet..."
 	@go test -i $(PKGS)
 	@echo "Checking printf statements..."
@@ -115,7 +115,7 @@ generate:
 	@$(GOBINDATA)/go-bindata -pkg config -nocompress -modtime 1 -prefix config -o config/production.gen.go $(ENV_CONFIG)
 	@./node_modules/.bin/uber-licence --file "production.gen.go" --dir "config" > /dev/null
 	@$(GOBINDATA)/go-bindata -pkg templates -nocompress -modtime 1 -prefix codegen/templates -o codegen/template_bundle/template_files.go codegen/templates/...
-	@gofmt -w -e -s "codegen/template_bundle/template_files.go"
+	@$(GOIMPORTS)/goimports -w -e "codegen/template_bundle/template_files.go"
 	@PATH=$(GOGOSLICK):$(YARPCGO):$(GOIMPORTS):$(GOMOCK):$(PATH) bash ./scripts/generate.sh
 
 .PHONY: check-generate

codegen/module.go

@@ -1307,22 +1307,13 @@ func PrintGenLine(
 
 // FormatGoFile reformat the go file imports
 func FormatGoFile(filePath string) error {
-	gofmtCmd := exec.Command("gofmt", "-s", "-w", "-e", filePath)
-	gofmtCmd.Stdout = os.Stdout
-	gofmtCmd.Stderr = os.Stderr
-
-	if err := gofmtCmd.Run(); err != nil {
-		return errors.Wrapf(err, "failed to gofmt file: %q", filePath)
-	}
-
 	goimportsCmd := exec.Command("goimports", "-w", "-e", filePath)
 	goimportsCmd.Stdout = os.Stdout
 	goimportsCmd.Stderr = os.Stderr
 
 	if err := goimportsCmd.Run(); err != nil {
 		return errors.Wrapf(err, "failed to goimports file: %q", filePath)
 	}
-
 	return nil
 }
 

codegen/runner/pre-steps.sh

@@ -135,8 +135,6 @@ for config_file in ${config_files}; do
 	done
 done
 
-gofmt -w -s "$BUILD_DIR/gen-code/"
-
 end=$(date +%s)
 runtime=$((end-start))
 echo "Generated structs : +$runtime"
@@ -200,6 +198,8 @@ $(find "${target_dirs[@]}" -name "*.go" | \
 )
 "$EASY_JSON_BINARY" -all -- "${thriftrw_gofiles[@]}"
 
+goimports -w "$BUILD_DIR/gen-code/"
+
 end=$(date +%s)
 runtime=$((end-start))
 echo "Generated structs : +$runtime"

codegen/runner/runner.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/uber/zanzibar/codegen"
-	"github.com/uber/zanzibar/runtime"
+	zanzibar "github.com/uber/zanzibar/runtime"
 )
 
 type stackTracer interface {

codegen/template.go

@@ -29,7 +29,7 @@ import (
 	tmpl "text/template"
 
 	"github.com/pkg/errors"
-	"github.com/uber/zanzibar/codegen/template_bundle"
+	templates "github.com/uber/zanzibar/codegen/template_bundle"
 )
 
 // AssetProvider provides access to template assets

examples/example-gateway/app.go

@@ -26,7 +26,8 @@ import (
 	"go.uber.org/zap"
 
 	"context"
-	"github.com/uber/zanzibar/runtime"
+
+	zanzibar "github.com/uber/zanzibar/runtime"
 )
 
 // AppOptions defines the custom application func

examples/example-gateway/app/demo/endpoints/abc/abc.go

@@ -2,7 +2,8 @@ package abc
 
 import (
 	"context"
-	"github.com/uber/zanzibar/runtime"
+
+	zanzibar "github.com/uber/zanzibar/runtime"
 
 	module "github.com/uber/zanzibar/examples/example-gateway/build/app/demo/endpoints/abc/module"
 	workflow "github.com/uber/zanzibar/examples/example-gateway/build/app/demo/endpoints/abc/workflow"