Skip to content

Commit e75bb89

Browse files
zasgarzasgar
committed
[Cleanup] Fix various golang style issues
Summary: Fixes import grouping, order, redundant renames. Fix redundant struct names. Test Plan: existing Reviewers: michelle, vihang Reviewed By: vihang Differential Revision: https://phab.corp.pixielabs.ai/D7853 GitOrigin-RevId: 4072b3d
1 parent e7f71b4 commit e75bb89

85 files changed

Lines changed: 663 additions & 659 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎demos/applications/hipster_shop/productcatalogservice_client/client.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
log "github.com/sirupsen/logrus"
77
"google.golang.org/grpc"
8+
89
pb "pixielabs.ai/pixielabs/demos/applications/hipster_shop/proto"
910
)
1011

‎demos/client_server_apps/go_https/client/https_client.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package main
22

33
import (
4+
"crypto/tls"
45
"fmt"
56
"io/ioutil"
67
"log"
8+
"net/http"
79
"runtime"
810
"time"
911

10-
"crypto/tls"
11-
"net/http"
12-
1312
"github.com/spf13/pflag"
1413
"github.com/spf13/viper"
1514
)

‎demos/load_generation/generate_load.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
log "github.com/sirupsen/logrus"
1515
"github.com/spf13/pflag"
1616
"github.com/spf13/viper"
17+
1718
pb "pixielabs.ai/pixielabs/demos/load_generation/proto"
1819
"pixielabs.ai/pixielabs/src/utils"
1920
)

‎src/carnot/docstring/pkg/docstring_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,17 +312,17 @@ func TestFailures(t *testing.T) {
312312
func TestParseAllDocStrings(t *testing.T) {
313313
internalDoc := &docspb.InternalPXLDocs{}
314314
internalDoc.DocstringNodes = []*docspb.DocstringNode{
315-
&docspb.DocstringNode{
315+
{
316316
Name: "px",
317317
Docstring: "",
318318
Children: []*docspb.DocstringNode{
319319
// Should show up in the module.
320-
&docspb.DocstringNode{
320+
{
321321
Name: "UpsertTracepoint",
322322
Docstring: upsertTracepointDoc,
323323
},
324324
// Should not show up.
325-
&docspb.DocstringNode{
325+
{
326326
Name: "DataFrame",
327327
Docstring: dataFrameDoc,
328328
},

‎src/carnot/goplanner/logical_planner_benchmark_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/gogo/protobuf/proto"
99
log "github.com/sirupsen/logrus"
1010

11-
uuidpb "pixielabs.ai/pixielabs/src/api/public/uuidpb"
11+
"pixielabs.ai/pixielabs/src/api/public/uuidpb"
1212
public_vizierapipb "pixielabs.ai/pixielabs/src/api/public/vizierapipb"
1313
"pixielabs.ai/pixielabs/src/carnot/goplanner"
1414
"pixielabs.ai/pixielabs/src/carnot/planner/distributedpb"

‎src/cloud/api/apienv/artifact_tracker_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/spf13/viper"
66
"google.golang.org/grpc"
77

8-
artifacttrackerpb "pixielabs.ai/pixielabs/src/cloud/artifact_tracker/artifacttrackerpb"
8+
"pixielabs.ai/pixielabs/src/cloud/artifact_tracker/artifacttrackerpb"
99
"pixielabs.ai/pixielabs/src/shared/services"
1010
)
1111

‎src/cloud/api/apienv/env.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"github.com/spf13/viper"
99

1010
"pixielabs.ai/pixielabs/src/cloud/api/idprovider"
11-
artifacttrackerpb "pixielabs.ai/pixielabs/src/cloud/artifact_tracker/artifacttrackerpb"
11+
"pixielabs.ai/pixielabs/src/cloud/artifact_tracker/artifacttrackerpb"
1212
authpb "pixielabs.ai/pixielabs/src/cloud/auth/proto"
1313
profilepb "pixielabs.ai/pixielabs/src/cloud/profile/profilepb"
14-
vzmgrpb "pixielabs.ai/pixielabs/src/cloud/vzmgr/vzmgrpb"
14+
"pixielabs.ai/pixielabs/src/cloud/vzmgr/vzmgrpb"
1515
"pixielabs.ai/pixielabs/src/shared/services/env"
1616
)
1717

‎src/cloud/api/apienv/vzmgr_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/spf13/viper"
66
"google.golang.org/grpc"
77

8-
vzmgrpb "pixielabs.ai/pixielabs/src/cloud/vzmgr/vzmgrpb"
8+
"pixielabs.ai/pixielabs/src/cloud/vzmgr/vzmgrpb"
99
"pixielabs.ai/pixielabs/src/shared/services"
1010
)
1111

‎src/cloud/api/controller/api_key_resolver_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55
"time"
66

7-
types "github.com/gogo/protobuf/types"
7+
"github.com/gogo/protobuf/types"
88
"github.com/golang/mock/gomock"
99
"github.com/graph-gophers/graphql-go/gqltesting"
1010

@@ -98,19 +98,19 @@ func TestAPIKeys(t *testing.T) {
9898
List(gomock.Any(), &cloudapipb.ListAPIKeyRequest{}).
9999
Return(&cloudapipb.ListAPIKeyResponse{
100100
Keys: []*cloudapipb.APIKey{
101-
&cloudapipb.APIKey{
101+
{
102102
ID: utils.ProtoFromUUIDStrOrNil(key1ID),
103103
Key: "abc",
104104
CreatedAt: createTime1Pb,
105105
Desc: "key description 1",
106106
},
107-
&cloudapipb.APIKey{
107+
{
108108
ID: utils.ProtoFromUUIDStrOrNil(key2ID),
109109
Key: "def",
110110
CreatedAt: createTime2Pb,
111111
Desc: "key description 2",
112112
},
113-
&cloudapipb.APIKey{
113+
{
114114
ID: utils.ProtoFromUUIDStrOrNil(key3ID),
115115
Key: "ghi",
116116
CreatedAt: createTime3Pb,

‎src/cloud/api/controller/artifact_resolver_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestCLIArtifact(t *testing.T) {
2525
}).
2626
Return(&cloudapipb.ArtifactSet{
2727
Name: "cli",
28-
Artifact: []*cloudapipb.Artifact{&cloudapipb.Artifact{
28+
Artifact: []*cloudapipb.Artifact{{
2929
VersionStr: "test",
3030
}},
3131
}, nil)
@@ -76,11 +76,11 @@ func TestArtifacts_CLI(t *testing.T) {
7676
}).
7777
Return(&cloudapipb.ArtifactSet{
7878
Name: "cli",
79-
Artifact: []*cloudapipb.Artifact{&cloudapipb.Artifact{
79+
Artifact: []*cloudapipb.Artifact{{
8080
VersionStr: "1.2.3",
8181
Changelog: "a changelog",
8282
Timestamp: &types.Timestamp{Seconds: 10},
83-
}, &cloudapipb.Artifact{
83+
}, {
8484
VersionStr: "1.2.2",
8585
Changelog: "some changes go here",
8686
Timestamp: &types.Timestamp{Seconds: 5},
@@ -137,11 +137,11 @@ func TestArtifacts_Vizier(t *testing.T) {
137137
}).
138138
Return(&cloudapipb.ArtifactSet{
139139
Name: "vizier",
140-
Artifact: []*cloudapipb.Artifact{&cloudapipb.Artifact{
140+
Artifact: []*cloudapipb.Artifact{{
141141
VersionStr: "1.2.3",
142142
Changelog: "a changelog",
143143
Timestamp: &types.Timestamp{Seconds: 10},
144-
}, &cloudapipb.Artifact{
144+
}, {
145145
VersionStr: "1.2.2",
146146
Changelog: "some changes go here",
147147
Timestamp: &types.Timestamp{Seconds: 5},

0 commit comments

Comments
 (0)