Merge pull request #20651 from lesam/add-goimports-2

chore: add goimports
influxdata · Jan 29, 2021 · d5aa736 · d5aa736
2 parents 06020b2 + 781fa0e
commit d5aa736
Show file tree

Hide file tree

Showing 34 changed files with 194 additions and 178 deletions.
diff --git a/Makefile b/Makefile
@@ -128,7 +128,7 @@ ui_client:
 #
 
 fmt: $(SOURCES_NO_VENDOR)
-	gofmt -w -s $^
+	./etc/fmt.sh
 
 checkfmt:
 	./etc/checkfmt.sh

diff --git a/chronograf/dist/dist.go b/chronograf/dist/dist.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/elazarl/go-bindata-assetfs"
+	assetfs "github.com/elazarl/go-bindata-assetfs"
 )
 
 // DebugAssets serves assets via a specified directory

diff --git a/chronograf/enterprise/meta_test.go b/chronograf/enterprise/meta_test.go
@@ -164,7 +164,7 @@ func TestMetaClient_Users(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -195,7 +195,7 @@ func TestMetaClient_Users(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -297,7 +297,7 @@ func TestMetaClient_User(t *testing.T) {
 			want: &User{
 				Name: "admin",
 				Permissions: map[string][]string{
-					"": []string{
+					"": {
 						"ViewAdmin", "ViewChronograf",
 					},
 				},
@@ -723,7 +723,7 @@ func TestMetaClient_Roles(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -755,7 +755,7 @@ func TestMetaClient_Roles(t *testing.T) {
 					{
 						Name: "admin",
 						Permissions: map[string][]string{
-							"": []string{
+							"": {
 								"ViewAdmin", "ViewChronograf",
 							},
 						},
@@ -818,7 +818,7 @@ func TestMetaClient_Role(t *testing.T) {
 			want: &Role{
 				Name: "admin",
 				Permissions: map[string][]string{
-					"": []string{
+					"": {
 						"ViewAdmin", "ViewChronograf",
 					},
 				},
@@ -897,12 +897,12 @@ func TestMetaClient_UserRoles(t *testing.T) {
 				name: nil,
 			},
 			want: map[string]Roles{
-				"marty": Roles{
+				"marty": {
 					Roles: []Role{
 						{
 							Name: "timetravelers",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},
@@ -911,33 +911,33 @@ func TestMetaClient_UserRoles(t *testing.T) {
 						{
 							Name: "mcfly",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},
 							Users: []string{"marty", "george"},
 						},
 					},
 				},
-				"docbrown": Roles{
+				"docbrown": {
 					Roles: []Role{
 						{
 							Name: "timetravelers",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},
 							Users: []string{"marty", "docbrown"},
 						},
 					},
 				},
-				"george": Roles{
+				"george": {
 					Roles: []Role{
 						{
 							Name: "mcfly",
 							Permissions: map[string][]string{
-								"": []string{
+								"": {
 									"ViewAdmin", "ViewChronograf",
 								},
 							},