Run gofmt -s on all our code

Summary: Realized that goimports doesn't run the simplify option on gofmt. So I ran it manually and enabled it as part of golangci-lint. Test Plan: Ran gofmt -s Reviewers: zasgar, michelle Reviewed By: michelle Signed-off-by: Vihang Mehta <vihang@pixielabs.ai> Differential Revision: https://phab.corp.pixielabs.ai/D12423 GitOrigin-RevId: b4a35637a14938e2ceed9ddc150603a3df7184c2
wangzhuzhen · Oct 18, 2022 · f3b6359 · f3b6359
1 parent 138c673
commit f3b6359
Show file tree

Hide file tree

Showing 20 changed files with 224 additions and 223 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -19,6 +19,9 @@ linters:
   - asciicheck
   - deadcode
   - errcheck
+  # Although goimports includes gofmt, it doesn't support the simplify option.
+  # So we include gofmt here.
+  - gofmt
   - gosimple
   - ineffassign
   - makezero
@@ -37,8 +40,6 @@ linters:
   # - wastedassign
   - whitespace
   disable:
-  # We run goimports which includes gofmt.
-  - gofmt
   # The following linters are run separately by arcanist at the moment.
   # This is because we have autofix hooks for these linters.
   - goimports

diff --git a/src/cloud/api/controllers/auth_grpc_test.go b/src/cloud/api/controllers/auth_grpc_test.go
@@ -69,7 +69,7 @@ func TestAuthServer_LoginAPIKey(t *testing.T) {
 	_, mockClients, cleanup := testutils.CreateTestAPIEnv(t)
 	defer cleanup()
 	md := map[string][]string{
-		"pixie-api-key": []string{"test-token"},
+		"pixie-api-key": {"test-token"},
 	}
 
 	ctx := metadata.NewIncomingContext(context.Background(), md)

diff --git a/src/cloud/api/controllers/org_resolver_test.go b/src/cloud/api/controllers/org_resolver_test.go
@@ -360,11 +360,11 @@ func TestOrgSettingsResolver_IDEConfigs(t *testing.T) {
 				}).
 				Return(&cloudpb.GetOrgIDEConfigsResponse{
 					Configs: []*cloudpb.IDEConfig{
-						&cloudpb.IDEConfig{
+						{
 							IDEName: "test",
 							Path:    "subl://{{symbol}}",
 						},
-						&cloudpb.IDEConfig{
+						{
 							IDEName: "anothertest",
 							Path:    "test://{{symbol}}",
 						},

diff --git a/src/cloud/api/controllers/org_test.go b/src/cloud/api/controllers/org_test.go
@@ -442,11 +442,11 @@ func TestOrganizationServiceServer_GetOrgIDEConfigs(t *testing.T) {
 		OrgID: utils.ProtoFromUUIDStrOrNil("6ba7b810-9dad-11d1-80b4-00c04fd430c8"),
 	}).Return(&profilepb.GetOrgIDEConfigsResponse{
 		Configs: []*profilepb.IDEConfig{
-			&profilepb.IDEConfig{
+			{
 				IDEName: "test",
 				Path:    "test://{{symbol}}",
 			},
-			&profilepb.IDEConfig{
+			{
 				IDEName: "another-test",
 				Path:    "sublime://{{symbol}}",
 			},
@@ -461,11 +461,11 @@ func TestOrganizationServiceServer_GetOrgIDEConfigs(t *testing.T) {
 
 	require.NoError(t, err)
 	assert.Equal(t, []*cloudpb.IDEConfig{
-		&cloudpb.IDEConfig{
+		{
 			IDEName: "test",
 			Path:    "test://{{symbol}}",
 		},
-		&cloudpb.IDEConfig{
+		{
 			IDEName: "another-test",
 			Path:    "sublime://{{symbol}}",
 		},

diff --git a/src/cloud/api/controllers/plugin_resolver_test.go b/src/cloud/api/controllers/plugin_resolver_test.go
@@ -40,7 +40,7 @@ func TestPluginResolver_Plugins(t *testing.T) {
 		Kind: cloudpb.PK_RETENTION,
 	}).Return(&cloudpb.GetPluginsResponse{
 		Plugins: []*cloudpb.Plugin{
-			&cloudpb.Plugin{
+			{
 				Name:               "Test Plugin",
 				Id:                 "test-plugin",
 				Description:        "Here is a plugin that is used for this test",
@@ -50,7 +50,7 @@ func TestPluginResolver_Plugins(t *testing.T) {
 				RetentionEnabled:   false,
 				EnabledVersion:     "",
 			},
-			&cloudpb.Plugin{
+			{
 				Name:               "Another Plugin",
 				Id:                 "another-plugin",
 				Description:        "Here is a another plugin that is used for this test",
@@ -319,7 +319,7 @@ func TestPluginResolver_RetentionScripts(t *testing.T) {
 
 	mockClients.MockPlugin.EXPECT().GetRetentionScripts(gomock.Any(), &cloudpb.GetRetentionScriptsRequest{}).Return(&cloudpb.GetRetentionScriptsResponse{
 		Scripts: []*cloudpb.RetentionScript{
-			&cloudpb.RetentionScript{
+			{
 				ScriptID:    utils.ProtoFromUUIDStrOrNil("1ba7b810-9dad-11d1-80b4-00c04fd430c8"),
 				ScriptName:  "Test Script",
 				Description: "This is a script",
@@ -332,7 +332,7 @@ func TestPluginResolver_RetentionScripts(t *testing.T) {
 				Enabled:  true,
 				IsPreset: false,
 			},
-			&cloudpb.RetentionScript{
+			{
 				ScriptID:    utils.ProtoFromUUIDStrOrNil("1ba7b810-9dad-11d1-80b4-00c04fd430c1"),
 				ScriptName:  "Another Script",
 				Description: "This is another script",

diff --git a/src/cloud/api/controllers/plugins_grpc_test.go b/src/cloud/api/controllers/plugins_grpc_test.go
@@ -47,15 +47,15 @@ func TestGetPlugins(t *testing.T) {
 			name: "regular user",
 			ctx:  CreateTestContext(),
 			allPlugins: []*pluginpb.Plugin{
-				&pluginpb.Plugin{
+				{
 					Name:             "Test Plugin",
 					ID:               "test-plugin",
 					Description:      "Here is a plugin that is used for this test",
 					Logo:             "",
 					LatestVersion:    "2.0.0",
 					RetentionEnabled: true,
 				},
-				&pluginpb.Plugin{
+				{
 					Name:             "Another Plugin",
 					ID:               "another-plugin",
 					Description:      "Here is a another plugin that is used for this test",
@@ -65,7 +65,7 @@ func TestGetPlugins(t *testing.T) {
 				},
 			},
 			orgRetentionPlugins: []*pluginpb.GetRetentionPluginsForOrgResponse_PluginState{
-				&pluginpb.GetRetentionPluginsForOrgResponse_PluginState{
+				{
 					Plugin: &pluginpb.Plugin{
 						Name:             "Another Plugin",
 						ID:               "another-plugin",
@@ -78,7 +78,7 @@ func TestGetPlugins(t *testing.T) {
 				},
 			},
 			expectedPlugins: []*cloudpb.Plugin{
-				&cloudpb.Plugin{
+				{
 					Name:               "Test Plugin",
 					Id:                 "test-plugin",
 					Description:        "Here is a plugin that is used for this test",
@@ -88,7 +88,7 @@ func TestGetPlugins(t *testing.T) {
 					RetentionEnabled:   false,
 					EnabledVersion:     "",
 				},
-				&cloudpb.Plugin{
+				{
 					Name:               "Another Plugin",
 					Id:                 "another-plugin",
 					Description:        "Here is a another plugin that is used for this test",
@@ -104,15 +104,15 @@ func TestGetPlugins(t *testing.T) {
 			name: "API user",
 			ctx:  CreateAPIUserTestContext(),
 			allPlugins: []*pluginpb.Plugin{
-				&pluginpb.Plugin{
+				{
 					Name:             "Test Plugin",
 					ID:               "test-plugin",
 					Description:      "Here is a plugin that is used for this test",
 					Logo:             "",
 					LatestVersion:    "2.0.0",
 					RetentionEnabled: true,
 				},
-				&pluginpb.Plugin{
+				{
 					Name:             "Another Plugin",
 					ID:               "another-plugin",
 					Description:      "Here is a another plugin that is used for this test",
@@ -122,7 +122,7 @@ func TestGetPlugins(t *testing.T) {
 				},
 			},
 			orgRetentionPlugins: []*pluginpb.GetRetentionPluginsForOrgResponse_PluginState{
-				&pluginpb.GetRetentionPluginsForOrgResponse_PluginState{
+				{
 					Plugin: &pluginpb.Plugin{
 						Name:             "Another Plugin",
 						ID:               "another-plugin",
@@ -135,7 +135,7 @@ func TestGetPlugins(t *testing.T) {
 				},
 			},
 			expectedPlugins: []*cloudpb.Plugin{
-				&cloudpb.Plugin{
+				{
 					Name:               "Test Plugin",
 					Id:                 "test-plugin",
 					Description:        "Here is a plugin that is used for this test",
@@ -145,7 +145,7 @@ func TestGetPlugins(t *testing.T) {
 					RetentionEnabled:   false,
 					EnabledVersion:     "",
 				},
-				&cloudpb.Plugin{
+				{
 					Name:               "Another Plugin",
 					Id:                 "another-plugin",
 					Description:        "Here is a another plugin that is used for this test",
@@ -342,7 +342,7 @@ func TestGetRetentionScripts(t *testing.T) {
 	mockClients.MockDataRetentionPlugin.EXPECT().GetRetentionScripts(gomock.Any(), mockReq).
 		Return(&pluginpb.GetRetentionScriptsResponse{
 			Scripts: []*pluginpb.RetentionScript{
-				&pluginpb.RetentionScript{
+				{
 					ScriptID:    utils.ProtoFromUUIDStrOrNil("1ba7b810-9dad-11d1-80b4-00c04fd430c8"),
 					ScriptName:  "Test Script",
 					Description: "This is a script",
@@ -355,7 +355,7 @@ func TestGetRetentionScripts(t *testing.T) {
 					Enabled:  true,
 					IsPreset: false,
 				},
-				&pluginpb.RetentionScript{
+				{
 					ScriptID:    utils.ProtoFromUUIDStrOrNil("1ba7b810-9dad-11d1-80b4-00c04fd430c1"),
 					ScriptName:  "Another Script",
 					Description: "This is another script",
@@ -379,7 +379,7 @@ func TestGetRetentionScripts(t *testing.T) {
 
 	assert.Equal(t, &cloudpb.GetRetentionScriptsResponse{
 		Scripts: []*cloudpb.RetentionScript{
-			&cloudpb.RetentionScript{
+			{
 				ScriptID:    utils.ProtoFromUUIDStrOrNil("1ba7b810-9dad-11d1-80b4-00c04fd430c8"),
 				ScriptName:  "Test Script",
 				Description: "This is a script",
@@ -392,7 +392,7 @@ func TestGetRetentionScripts(t *testing.T) {
 				Enabled:  true,
 				IsPreset: false,
 			},
-			&cloudpb.RetentionScript{
+			{
 				ScriptID:    utils.ProtoFromUUIDStrOrNil("1ba7b810-9dad-11d1-80b4-00c04fd430c1"),
 				ScriptName:  "Another Script",
 				Description: "This is another script",

diff --git a/src/cloud/cron_script/controllers/server_test.go b/src/cloud/cron_script/controllers/server_test.go
@@ -153,7 +153,7 @@ func TestServer_GetScripts(t *testing.T) {
 
 	assert.Equal(t, &cronscriptpb.GetScriptsResponse{
 		Scripts: []*cronscriptpb.CronScript{
-			&cronscriptpb.CronScript{
+			{
 				ID:     utils.ProtoFromUUIDStrOrNil("123e4567-e89b-12d3-a456-426655440000"),
 				OrgID:  utils.ProtoFromUUIDStrOrNil("223e4567-e89b-12d3-a456-426655440000"),
 				Script: "px.display()",
@@ -165,7 +165,7 @@ func TestServer_GetScripts(t *testing.T) {
 				Enabled:    true,
 				FrequencyS: 5,
 			},
-			&cronscriptpb.CronScript{
+			{
 				ID:     utils.ProtoFromUUIDStrOrNil("123e4567-e89b-12d3-a456-426655440002"),
 				OrgID:  utils.ProtoFromUUIDStrOrNil("223e4567-e89b-12d3-a456-426655440000"),
 				Script: "px()",
@@ -201,11 +201,11 @@ func TestServer_CreateScript(t *testing.T) {
 		VizierIDs: clusterIDs,
 	}).Return(&vzmgrpb.GetVizierInfosResponse{
 		VizierInfos: []*cvmsgspb.VizierInfo{
-			&cvmsgspb.VizierInfo{
+			{
 				VizierID: utils.ProtoFromUUIDStrOrNil(vz1ID),
 				Status:   cvmsgspb.VZ_ST_HEALTHY,
 			},
-			&cvmsgspb.VizierInfo{
+			{
 				VizierID: utils.ProtoFromUUIDStrOrNil(vz2ID),
 				Status:   cvmsgspb.VZ_ST_HEALTHY,
 			},
@@ -431,11 +431,11 @@ func TestServer_UpdateScript(t *testing.T) {
 		VizierIDs: clusterIDs,
 	}).Return(&vzmgrpb.GetVizierInfosResponse{
 		VizierInfos: []*cvmsgspb.VizierInfo{
-			&cvmsgspb.VizierInfo{
+			{
 				VizierID: utils.ProtoFromUUIDStrOrNil("323e4567-e89b-12d3-a456-426655440003"),
 				Status:   cvmsgspb.VZ_ST_HEALTHY,
 			},
-			&cvmsgspb.VizierInfo{
+			{
 				VizierID: utils.ProtoFromUUIDStrOrNil("323e4567-e89b-12d3-a456-426655440002"),
 				Status:   cvmsgspb.VZ_ST_HEALTHY,
 			},
@@ -448,7 +448,7 @@ func TestServer_UpdateScript(t *testing.T) {
 		},
 	}).Return(&vzmgrpb.GetVizierInfosResponse{
 		VizierInfos: []*cvmsgspb.VizierInfo{
-			&cvmsgspb.VizierInfo{
+			{
 				VizierID: utils.ProtoFromUUIDStrOrNil("323e4567-e89b-12d3-a456-426655440000"),
 				Status:   cvmsgspb.VZ_ST_HEALTHY,
 			},
@@ -516,7 +516,7 @@ func TestServer_DeleteScript(t *testing.T) {
 		},
 	}).Return(&vzmgrpb.GetVizierInfosResponse{
 		VizierInfos: []*cvmsgspb.VizierInfo{
-			&cvmsgspb.VizierInfo{
+			{
 				VizierID: vzIDpb,
 				Status:   cvmsgspb.VZ_ST_HEALTHY,
 			},
@@ -595,7 +595,7 @@ func TestServer_HandleChecksumRequest(t *testing.T) {
 	wg.Add(1)
 
 	csMap := map[string]*cvmsgspb.CronScript{
-		"123e4567-e89b-12d3-a456-426655440001": &cvmsgspb.CronScript{
+		"123e4567-e89b-12d3-a456-426655440001": {
 			ID:         utils.ProtoFromUUIDStrOrNil("123e4567-e89b-12d3-a456-426655440001"),
 			Script:     "px.stream()",
 			FrequencyS: 10,
@@ -654,7 +654,7 @@ func TestServer_HandleGetScriptsRequest(t *testing.T) {
 	wg.Add(1)
 
 	csMap := map[string]*cvmsgspb.CronScript{
-		"123e4567-e89b-12d3-a456-426655440001": &cvmsgspb.CronScript{
+		"123e4567-e89b-12d3-a456-426655440001": {
 			ID:         utils.ProtoFromUUIDStrOrNil("123e4567-e89b-12d3-a456-426655440001"),
 			Script:     "px.stream()",
 			FrequencyS: 10,