go fmt everything

cfmysql/api_client.go

@@ -4,13 +4,13 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"bytes"
 	"code.cloudfoundry.org/cli/plugin"
 	sdkModels "code.cloudfoundry.org/cli/plugin/models"
 	pluginModels "github.com/andreasf/cf-mysql-plugin/cfmysql/models"
 	"github.com/andreasf/cf-mysql-plugin/cfmysql/resources"
-	"net/url"
 	"io"
-	"bytes"
+	"net/url"
 )
 
 //go:generate counterfeiter . ApiClient

cfmysql/api_client_test.go

@@ -6,15 +6,15 @@ import (
 	"errors"
 	"fmt"
 
+	"bytes"
 	"code.cloudfoundry.org/cli/plugin/models"
 	"code.cloudfoundry.org/cli/plugin/pluginfakes"
 	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql/models"
 	"github.com/andreasf/cf-mysql-plugin/cfmysql/test_resources"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/andreasf/cf-mysql-plugin/cfmysql/models"
 	"io"
-	"bytes"
 )
 
 var _ = Describe("ApiClient", func() {

cfmysql/cf_service.go

@@ -1,9 +1,9 @@
 package cfmysql
 
 import (
-	"fmt"
 	"code.cloudfoundry.org/cli/plugin"
 	sdkModels "code.cloudfoundry.org/cli/plugin/models"
+	"fmt"
 	pluginModels "github.com/andreasf/cf-mysql-plugin/cfmysql/models"
 	"io"
 )
@@ -22,7 +22,7 @@ func NewCfService(apiClient ApiClient, runner SshRunner, waiter PortWaiter, http
 		portWaiter:  waiter,
 		httpClient:  httpClient,
 		randWrapper: randWrapper,
-		logWriter: logWriter,
+		logWriter:   logWriter,
 	}
 }
 

cfmysql/cf_service_test.go

@@ -1,15 +1,15 @@
 package cfmysql_test
 
 import (
-	. "github.com/andreasf/cf-mysql-plugin/cfmysql"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"code.cloudfoundry.org/cli/plugin/pluginfakes"
-	"code.cloudfoundry.org/cli/plugin/models"
 	"code.cloudfoundry.org/cli/cf/errors"
-	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
 	"code.cloudfoundry.org/cli/plugin"
+	"code.cloudfoundry.org/cli/plugin/models"
+	"code.cloudfoundry.org/cli/plugin/pluginfakes"
+	. "github.com/andreasf/cf-mysql-plugin/cfmysql"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
 	"github.com/andreasf/cf-mysql-plugin/cfmysql/models"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 )
 

cfmysql/http_client_factory.go

@@ -1,8 +1,8 @@
 package cfmysql
 
 import (
-	"net/http"
 	"crypto/tls"
+	"net/http"
 )
 
 //go:generate counterfeiter . HttpClientFactory
@@ -14,11 +14,11 @@ func NewHttpClientFactory() HttpClientFactory {
 	return new(httpClientFactory)
 }
 
-type httpClientFactory struct {}
+type httpClientFactory struct{}
 
 func (self *httpClientFactory) NewClient(sslDisabled bool) *http.Client {
 	transport := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: sslDisabled},
 	}
 	return &http.Client{Transport: transport}
-}
+}

cfmysql/http_wrapper.go

@@ -1,11 +1,11 @@
 package cfmysql
 
 import (
+	"code.cloudfoundry.org/cli/cf/net"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
-	"io"
-	"code.cloudfoundry.org/cli/cf/net"
 )
 
 //go:generate counterfeiter . HttpWrapper

cfmysql/http_wrapper_test.go

@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/andreasf/cf-mysql-plugin/cfmysql"
-	"github.com/onsi/gomega/ghttp"
-	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
 	"bytes"
 	"code.cloudfoundry.org/cli/cf/net/netfakes"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
+	"github.com/onsi/gomega/ghttp"
 )
 
 var _ = Describe("HttpWrapper", func() {

cfmysql/models/models.go

@@ -1,27 +1,27 @@
 package models
 
 type ServiceInstance struct {
-	Name string
-	Guid string
+	Name      string
+	Guid      string
 	SpaceGuid string
 }
 
 type ServiceBinding struct {
 	ServiceInstanceGuid string
-	Uri      string
-	DbName   string
-	Hostname string
-	Port	 string
-	Username string
-	Password string
+	Uri                 string
+	DbName              string
+	Hostname            string
+	Port                string
+	Username            string
+	Password            string
 }
 
 type ServiceKey struct {
 	ServiceInstanceGuid string
-	Uri      string
-	DbName   string
-	Hostname string
-	Port	 string
-	Username string
-	Password string
-}
+	Uri                 string
+	DbName              string
+	Hostname            string
+	Port                string
+	Username            string
+	Password            string
+}

cfmysql/mysql_runner.go

@@ -1,11 +1,11 @@
 package cfmysql
 
 import (
-	"os/exec"
-	"strconv"
 	"code.cloudfoundry.org/cli/cf/errors"
 	"fmt"
 	"os"
+	"os/exec"
+	"strconv"
 	"strings"
 )
 
@@ -63,7 +63,7 @@ func (self *mysqlRunner) RunMysqlDump(hostname string, port int, dbName string,
 		}
 
 		tableArgs = append(tableArgs, argument)
-		nonTableArgs = mysqlDumpArgs[i + 1:]
+		nonTableArgs = mysqlDumpArgs[i+1:]
 	}
 
 	args := []string{"-u", username, "-p" + password, "-h", hostname, "-P", strconv.Itoa(port)}
@@ -85,5 +85,5 @@ func (self *mysqlRunner) RunMysqlDump(hostname string, port int, dbName string,
 }
 
 func (self *mysqlRunner) MakeMysqlCommand(hostname string, port int, dbName string, username string, password string) *exec.Cmd {
-	return exec.Command("mysql", "-u", "username", "-p" + password, "-h", "hostname", "-P", strconv.Itoa(port), dbName)
+	return exec.Command("mysql", "-u", "username", "-p"+password, "-h", "hostname", "-P", strconv.Itoa(port), dbName)
 }

cfmysql/mysql_runner_test.go

@@ -3,10 +3,10 @@ package cfmysql_test
 import (
 	. "github.com/andreasf/cf-mysql-plugin/cfmysql"
 
+	"errors"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
-	"errors"
 	"os"
 )
 

cfmysql/net_wrapper.go

@@ -12,7 +12,7 @@ func NewNetWrapper() NetWrapper {
 	return new(netWrapper)
 }
 
-type netWrapper struct {}
+type netWrapper struct{}
 
 func (self *netWrapper) Dial(network, address string) (net.Conn, error) {
 	return net.Dial(network, address)

cfmysql/os_wrapper.go

@@ -11,8 +11,8 @@ func NewOsWrapper() OsWrapper {
 	return new(osWrapper)
 }
 
-type osWrapper struct {}
+type osWrapper struct{}
 
 func (self *osWrapper) LookupEnv(key string) (string, bool) {
 	return os.LookupEnv(key)
-}
+}

cfmysql/plugin.go

@@ -2,9 +2,9 @@ package cfmysql
 
 import (
 	"code.cloudfoundry.org/cli/plugin"
-	"io"
-	"fmt"
 	"code.cloudfoundry.org/cli/plugin/models"
+	"fmt"
+	"io"
 )
 
 type MysqlPlugin struct {

cfmysql/plugin_test.go

@@ -1,16 +1,16 @@
 package cfmysql_test
 
 import (
+	"code.cloudfoundry.org/cli/cf/errors"
+	"code.cloudfoundry.org/cli/plugin"
+	"code.cloudfoundry.org/cli/plugin/models"
+	"code.cloudfoundry.org/cli/plugin/pluginfakes"
+	"fmt"
 	. "github.com/andreasf/cf-mysql-plugin/cfmysql"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"code.cloudfoundry.org/cli/plugin/pluginfakes"
 	"github.com/onsi/gomega/gbytes"
-	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
-	"code.cloudfoundry.org/cli/plugin"
-	"fmt"
-	"code.cloudfoundry.org/cli/plugin/models"
-	"code.cloudfoundry.org/cli/cf/errors"
 )
 
 var _ = Describe("Plugin", func() {

cfmysql/port_finder.go

@@ -11,7 +11,7 @@ func NewPortFinder() PortFinder {
 	return new(portFinder)
 }
 
-type portFinder struct {}
+type portFinder struct{}
 
 func (self *portFinder) GetPort() int {
 	return freeport.GetPort()

cfmysql/port_waiter.go

@@ -1,10 +1,10 @@
 package cfmysql
 
 import (
-	"time"
-	"strconv"
 	"errors"
 	"net"
+	"strconv"
+	"time"
 )
 
 //go:generate counterfeiter . PortWaiter

cfmysql/port_waiter_test.go

@@ -3,12 +3,12 @@ package cfmysql_test
 import (
 	. "github.com/andreasf/cf-mysql-plugin/cfmysql"
 
+	"errors"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
+	"github.com/andreasf/cf-mysql-plugin/cfmysql/netfakes"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
 	"net"
-	"errors"
-	"github.com/andreasf/cf-mysql-plugin/cfmysql/netfakes"
 )
 
 var _ = Describe("PortWaiter", func() {
@@ -18,7 +18,7 @@ var _ = Describe("PortWaiter", func() {
 	const SucceedAfterTries = 5
 	dialCount := 0
 	mockDial := func(network, address string) (net.Conn, error) {
-		if dialCount < SucceedAfterTries- 1 {
+		if dialCount < SucceedAfterTries-1 {
 			dialCount++
 			return nil, errors.New("GURU MEDITATION")
 		}

cfmysql/request_dumper.go

@@ -1,11 +1,11 @@
 package cfmysql
 
 import (
+	"code.cloudfoundry.org/cli/cf/i18n"
 	"code.cloudfoundry.org/cli/cf/net"
+	"code.cloudfoundry.org/cli/cf/trace"
 	"io"
 	"net/http"
-	"code.cloudfoundry.org/cli/cf/i18n"
-	"code.cloudfoundry.org/cli/cf/trace"
 )
 
 type conditionalRequestDumper struct {

cfmysql/request_dumper_test.go

@@ -1,15 +1,15 @@
 package cfmysql_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"code.cloudfoundry.org/cli/cf/terminal"
 	"github.com/andreasf/cf-mysql-plugin/cfmysql"
 	"github.com/andreasf/cf-mysql-plugin/cfmysql/cfmysqlfakes"
-	"net/http"
-	"regexp"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
-	"code.cloudfoundry.org/cli/cf/terminal"
+	"net/http"
 	"net/url"
+	"regexp"
 )
 
 var _ = Describe("RequestDumper", func() {
@@ -24,17 +24,17 @@ var _ = Describe("RequestDumper", func() {
 		Expect(err).To(BeNil())
 
 		request = http.Request{
-			Method: "BARK",
-			URL: url,
-			Proto: "HTTP/1.1",
+			Method:     "BARK",
+			URL:        url,
+			Proto:      "HTTP/1.1",
 			ProtoMajor: 1,
 			ProtoMinor: 1,
 		}
 
 		response = http.Response{
-			Status: "BORK",
+			Status:     "BORK",
 			StatusCode: 200,
-			Proto: "HTTP/1.1",
+			Proto:      "HTTP/1.1",
 			ProtoMajor: 1,
 			ProtoMinor: 1,
 		}
@@ -109,4 +109,4 @@ func removeTimestampAndColors(requestOrResponse []byte) string {
 	withoutTimestamp := string(re.ReplaceAll([]byte(withoutColors), []byte("[timestamp]")))
 
 	return withoutTimestamp
-}
+}