run goimports with -ed

jky-yy · jky-yy · commit fbe142680bd0 · 2020-05-16T20:44:02.000+08:00
diff --git a/http/http_test.go b/http/http_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/jukylin/esim/config"
 	"github.com/jukylin/esim/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_model/go"
+	io_prometheus_client "github.com/prometheus/client_model/go"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/infra/infraer.go b/infra/infraer.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
-	"github.com/jukylin/esim/tool/db2entity/domain-file"
+	domain_file "github.com/jukylin/esim/tool/db2entity/domain-file"
 	"github.com/spf13/viper"
 	"golang.org/x/tools/imports"
 )
diff --git a/mysql/mysql_test.go b/mysql/mysql_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/ory/dockertest/v3"
 	dc "github.com/ory/dockertest/v3/docker"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_model/go"
+	io_prometheus_client "github.com/prometheus/client_model/go"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/redis/redis_test.go b/redis/redis_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ory/dockertest/v3"
 	dc "github.com/ory/dockertest/v3/docker"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_model/go"
+	io_prometheus_client "github.com/prometheus/client_model/go"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tool/cmd/db2entity.go b/tool/cmd/db2entity.go
@@ -1,15 +1,16 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/jukylin/esim/infra"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/jukylin/esim/tool/db2entity"
-	"github.com/jukylin/esim/tool/db2entity/domain-file"
+	domain_file "github.com/jukylin/esim/tool/db2entity/domain-file"
 )
 
 var db2entityCmd = &cobra.Command{
diff --git a/tool/cmd/factory.go b/tool/cmd/factory.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/jukylin/esim/tool/factory"
 	"github.com/spf13/cobra"
diff --git a/tool/cmd/ifacer.go b/tool/cmd/ifacer.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/jukylin/esim/tool/ifacer"
 	"github.com/spf13/cobra"
diff --git a/tool/cmd/new.go b/tool/cmd/new.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/jukylin/esim/tool/new"
 	"github.com/spf13/cobra"
diff --git a/tool/db2entity/db2entity.go b/tool/db2entity/db2entity.go
@@ -5,15 +5,15 @@ import (
 
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 
 	"errors"
 	"os"
 	"path/filepath"
 
 	"github.com/jukylin/esim/infra"
 	"github.com/jukylin/esim/pkg/templates"
-	"github.com/jukylin/esim/tool/db2entity/domain-file"
+	domain_file "github.com/jukylin/esim/tool/db2entity/domain-file"
 	"github.com/serenize/snaker"
 	"github.com/spf13/viper"
 	"golang.org/x/tools/imports"
diff --git a/tool/db2entity/db2entity_test.go b/tool/db2entity/db2entity_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/jukylin/esim/infra"
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
-	"github.com/jukylin/esim/tool/db2entity/domain-file"
+	domain_file "github.com/jukylin/esim/tool/db2entity/domain-file"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/tool/db2entity/domain-file/dao_domain_file.go b/tool/db2entity/domain-file/dao_domain_file.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/spf13/viper"
 )
diff --git a/tool/db2entity/domain-file/entity_domain_file.go b/tool/db2entity/domain-file/entity_domain_file.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/serenize/snaker"
 	"github.com/spf13/viper"
diff --git a/tool/db2entity/domain-file/repo_domain_file.go b/tool/db2entity/domain-file/repo_domain_file.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/spf13/viper"
 )
diff --git a/tool/db2entity/domain-file/repo_domain_file_test.go b/tool/db2entity/domain-file/repo_domain_file_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/jukylin/esim/log"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/tool/factory/factory.go b/tool/factory/factory.go
@@ -12,9 +12,10 @@ import (
 	"strings"
 
 	"fmt"
+
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/martinusso/inflect"
 	"github.com/serenize/snaker"
diff --git a/tool/factory/factory_test.go b/tool/factory/factory_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
diff --git a/tool/factory/struct_field.go b/tool/factory/struct_field.go
@@ -17,7 +17,7 @@ import (
 	"github.com/hashicorp/go-plugin"
 	log2 "github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"golang.org/x/tools/imports"
 )
diff --git a/tool/ifacer/ifacer.go b/tool/ifacer/ifacer.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/jukylin/esim/log"
 	"github.com/jukylin/esim/pkg"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/spf13/viper"
 	"github.com/vektra/mockery/mockery"
diff --git a/tool/ifacer/ifacer_test.go b/tool/ifacer/ifacer_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/jukylin/esim/log"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
diff --git a/tool/new/new.go b/tool/new/new.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/jukylin/esim/log"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/jukylin/esim/pkg/templates"
 	"github.com/spf13/viper"
 	"golang.org/x/tools/imports"
diff --git a/tool/protoc/protoc.go b/tool/protoc/protoc.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/jukylin/esim/log"
-	"github.com/jukylin/esim/pkg/file-dir"
+	file_dir "github.com/jukylin/esim/pkg/file-dir"
 	"github.com/spf13/viper"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/jukylin/esim/config"`
`12`	`12`	`"github.com/jukylin/esim/log"`
`13`	`13`	`"github.com/prometheus/client_golang/prometheus"`
`14`		`- "github.com/prometheus/client_model/go"`
	`14`	`+ io_prometheus_client "github.com/prometheus/client_model/go"`
`15`	`15`	`"github.com/stretchr/testify/assert"`
`16`	`16`	`)`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"github.com/ory/dockertest/v3"`
`14`	`14`	`dc "github.com/ory/dockertest/v3/docker"`
`15`	`15`	`"github.com/prometheus/client_golang/prometheus"`
`16`		`- "github.com/prometheus/client_model/go"`
	`16`	`+ io_prometheus_client "github.com/prometheus/client_model/go"`
`17`	`17`	`"github.com/stretchr/testify/assert"`
`18`	`18`	`)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/ory/dockertest/v3"`
`13`	`13`	`dc "github.com/ory/dockertest/v3/docker"`
`14`	`14`	`"github.com/prometheus/client_golang/prometheus"`
`15`		`- "github.com/prometheus/client_model/go"`
	`15`	`+ io_prometheus_client "github.com/prometheus/client_model/go"`
`16`	`16`	`"github.com/stretchr/testify/assert"`
`17`	`17`	`)`
`18`	`18`