From d29ba96accd1ff12df6d80f7a366cfe6cdf01872 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Fri, 23 Jul 2021 16:57:16 +0200 Subject: [PATCH] Apply gofmt -s -w --- Makefile | 1 + changelog/unreleased/go-fmt.md | 3 +++ cmd/reva/completer.go | 12 ++++++------ cmd/reva/gen/gen.go | 6 +++--- cmd/reva/ocm-share-create.go | 4 ++-- cmd/reva/ocm-share-list.go | 2 +- cmd/reva/public-share-list.go | 2 +- cmd/reva/share-list.go | 2 +- cmd/reva/transfer-create.go | 6 +++--- .../services/storageprovider/storageprovider.go | 2 +- internal/http/interceptors/auth/auth_test.go | 12 ++++++------ internal/http/services/ocmd/config.go | 2 +- internal/http/services/ocmd/invites.go | 2 +- pkg/auth/manager/demo/demo.go | 6 +++--- pkg/ocm/share/manager/json/json.go | 2 +- pkg/registry/config_test.go | 8 ++++---- pkg/share/cache/cbox/cbox.go | 4 ++-- pkg/storage/registry/static/static.go | 4 ++-- pkg/storage/utils/eosfs/eosfs.go | 8 ++++---- pkg/storage/utils/templates/templates_test.go | 16 ++++++++-------- pkg/token/manager/demo/demo_test.go | 2 +- pkg/user/manager/demo/demo.go | 6 +++--- tools/generate-documentation/main.go | 2 +- 23 files changed, 59 insertions(+), 55 deletions(-) create mode 100644 changelog/unreleased/go-fmt.md diff --git a/Makefile b/Makefile index ac75c7485d..4782f7d163 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ imports: off `go env GOPATH`/bin/goimports -w tools pkg internal cmd build: imports test-go-version + gofmt -s -w . go build -ldflags ${BUILD_FLAGS} -o ./cmd/revad/revad ./cmd/revad go build -ldflags ${BUILD_FLAGS} -o ./cmd/reva/reva ./cmd/reva diff --git a/changelog/unreleased/go-fmt.md b/changelog/unreleased/go-fmt.md new file mode 100644 index 0000000000..b856ecb5d1 --- /dev/null +++ b/changelog/unreleased/go-fmt.md @@ -0,0 +1,3 @@ +Enhancement: Run gofmt before building + +https://github.com/cs3org/reva/pull/1919 diff --git a/cmd/reva/completer.go b/cmd/reva/completer.go index 1f70ab97c2..d39dee6a26 100644 --- a/cmd/reva/completer.go +++ b/cmd/reva/completer.go @@ -168,22 +168,22 @@ func (c *Completer) completeOptionArguments(d prompt.Document) ([]prompt.Suggest var match bool switch option { case "-cs": - suggests = []prompt.Suggest{prompt.Suggest{Text: "basic"}, prompt.Suggest{Text: "oidc"}} + suggests = []prompt.Suggest{{Text: "basic"}, {Text: "oidc"}} match = true case "-dd": - suggests = []prompt.Suggest{prompt.Suggest{Text: "local"}, prompt.Suggest{Text: "owncloud"}} + suggests = []prompt.Suggest{{Text: "local"}, {Text: "owncloud"}} match = true case "-type": - suggests = []prompt.Suggest{prompt.Suggest{Text: "user"}, prompt.Suggest{Text: "group"}} + suggests = []prompt.Suggest{{Text: "user"}, {Text: "group"}} match = true case "-rol": - suggests = []prompt.Suggest{prompt.Suggest{Text: "viewer"}, prompt.Suggest{Text: "editor"}} + suggests = []prompt.Suggest{{Text: "viewer"}, {Text: "editor"}} match = true case "-state": - suggests = []prompt.Suggest{prompt.Suggest{Text: "pending"}, prompt.Suggest{Text: "accepted"}, prompt.Suggest{Text: "rejected"}} + suggests = []prompt.Suggest{{Text: "pending"}, {Text: "accepted"}, {Text: "rejected"}} match = true case "-viewmode": - suggests = []prompt.Suggest{prompt.Suggest{Text: "view"}, prompt.Suggest{Text: "read"}, prompt.Suggest{Text: "write"}} + suggests = []prompt.Suggest{{Text: "view"}, {Text: "read"}, {Text: "write"}} match = true case "-c", "-grantee", "-idp", "-by-resource-id", "-xs", "-token": match = true diff --git a/cmd/reva/gen/gen.go b/cmd/reva/gen/gen.go index 660456dc6a..582837150e 100644 --- a/cmd/reva/gen/gen.go +++ b/cmd/reva/gen/gen.go @@ -400,7 +400,7 @@ func WriteUsers(p string, users []*userpb.User) { if users == nil { uservars = []*UserVars{ - &UserVars{ + { Sub: "c6e5995d6c7fa1986b830b78b478e6c2", Iss: "localhost:9998", Username: "einstein", @@ -408,7 +408,7 @@ func WriteUsers(p string, users []*userpb.User) { Mail: "einstein@example.org", Displayname: "Albert Einstein", }, - &UserVars{ + { Sub: "9fb5f8d212cbf3fc55f1bf67d97ed05d", Iss: "localhost:9998", Username: "marie", @@ -416,7 +416,7 @@ func WriteUsers(p string, users []*userpb.User) { Mail: "marie@example.org", Displayname: "Marie Curie", }, - &UserVars{ + { Sub: "a84075b398fe6a0aee1155f8ead13331", Iss: "localhost:9998", Username: "richard", diff --git a/cmd/reva/ocm-share-create.go b/cmd/reva/ocm-share-create.go index 686a1b4861..06ce7c9105 100644 --- a/cmd/reva/ocm-share-create.go +++ b/cmd/reva/ocm-share-create.go @@ -118,11 +118,11 @@ func ocmShareCreateCommand() *command { opaqueObj := &types.Opaque{ Map: map[string]*types.OpaqueEntry{ - "permissions": &types.OpaqueEntry{ + "permissions": { Decoder: "plain", Value: []byte(strconv.Itoa(pint)), }, - "name": &types.OpaqueEntry{ + "name": { Decoder: "plain", Value: []byte(res.Info.Path), }, diff --git a/cmd/reva/ocm-share-list.go b/cmd/reva/ocm-share-list.go index 06b8836c9b..1bff9bcd3b 100644 --- a/cmd/reva/ocm-share-list.go +++ b/cmd/reva/ocm-share-list.go @@ -61,7 +61,7 @@ func ocmShareListCommand() *command { OpaqueId: tokens[1], } shareRequest.Filters = []*ocm.ListOCMSharesRequest_Filter{ - &ocm.ListOCMSharesRequest_Filter{ + { Type: ocm.ListOCMSharesRequest_Filter_TYPE_RESOURCE_ID, Term: &ocm.ListOCMSharesRequest_Filter_ResourceId{ ResourceId: id, diff --git a/cmd/reva/public-share-list.go b/cmd/reva/public-share-list.go index b8dbf322ce..1a0a2f1a74 100644 --- a/cmd/reva/public-share-list.go +++ b/cmd/reva/public-share-list.go @@ -61,7 +61,7 @@ func publicShareListCommand() *command { OpaqueId: tokens[1], } shareRequest.Filters = []*link.ListPublicSharesRequest_Filter{ - &link.ListPublicSharesRequest_Filter{ + { Type: link.ListPublicSharesRequest_Filter_TYPE_RESOURCE_ID, Term: &link.ListPublicSharesRequest_Filter_ResourceId{ ResourceId: id, diff --git a/cmd/reva/share-list.go b/cmd/reva/share-list.go index 73b005d0cd..9ec94a5999 100644 --- a/cmd/reva/share-list.go +++ b/cmd/reva/share-list.go @@ -61,7 +61,7 @@ func shareListCommand() *command { OpaqueId: tokens[1], } shareRequest.Filters = []*collaboration.ListSharesRequest_Filter{ - &collaboration.ListSharesRequest_Filter{ + { Type: collaboration.ListSharesRequest_Filter_TYPE_RESOURCE_ID, Term: &collaboration.ListSharesRequest_Filter_ResourceId{ ResourceId: id, diff --git a/cmd/reva/transfer-create.go b/cmd/reva/transfer-create.go index 0a853a38be..44654f9104 100644 --- a/cmd/reva/transfer-create.go +++ b/cmd/reva/transfer-create.go @@ -112,15 +112,15 @@ func transferCreateCommand() *command { createShareReq := &ocm.CreateOCMShareRequest{ Opaque: &types.Opaque{ Map: map[string]*types.OpaqueEntry{ - "permissions": &types.OpaqueEntry{ + "permissions": { Decoder: "plain", Value: []byte(strconv.Itoa(pint)), }, - "name": &types.OpaqueEntry{ + "name": { Decoder: "plain", Value: []byte(statRes.Info.Path), }, - "protocol": &types.OpaqueEntry{ + "protocol": { Decoder: "plain", Value: []byte("datatx"), }, diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go index 6b34216ff9..9fc954e213 100644 --- a/internal/grpc/services/storageprovider/storageprovider.go +++ b/internal/grpc/services/storageprovider/storageprovider.go @@ -280,7 +280,7 @@ func (s *service) InitiateFileDownload(ctx context.Context, req *provider.Initia log.Info().Str("data-server", u.String()).Str("fn", req.Ref.GetPath()).Msg("file download") res := &provider.InitiateFileDownloadResponse{ Protocols: []*provider.FileDownloadProtocol{ - &provider.FileDownloadProtocol{ + { Protocol: "simple", DownloadEndpoint: u.String(), Expose: s.conf.ExposeDataServer, diff --git a/internal/http/interceptors/auth/auth_test.go b/internal/http/interceptors/auth/auth_test.go index d81dd21589..7eca334e6b 100644 --- a/internal/http/interceptors/auth/auth_test.go +++ b/internal/http/interceptors/auth/auth_test.go @@ -32,7 +32,7 @@ func TestGetCredsForUserAgent(t *testing.T) { tests := []*test{ // no user agent we return all available credentials - &test{ + { userAgent: "", userAgentMap: map[string]string{}, availableCredentials: []string{"basic"}, @@ -40,7 +40,7 @@ func TestGetCredsForUserAgent(t *testing.T) { }, // map set but user agent not in map - &test{ + { userAgent: "curl", userAgentMap: map[string]string{"mirall": "basic"}, availableCredentials: []string{"basic", "bearer"}, @@ -48,7 +48,7 @@ func TestGetCredsForUserAgent(t *testing.T) { }, // no user map we return all available credentials - &test{ + { userAgent: "mirall", userAgentMap: map[string]string{}, availableCredentials: []string{"basic"}, @@ -56,7 +56,7 @@ func TestGetCredsForUserAgent(t *testing.T) { }, // user agent set but no mapping set we return all credentials - &test{ + { userAgent: "mirall", userAgentMap: map[string]string{}, availableCredentials: []string{"basic"}, @@ -64,7 +64,7 @@ func TestGetCredsForUserAgent(t *testing.T) { }, // user mapping set to non available credential, we return all available - &test{ + { userAgent: "mirall", userAgentMap: map[string]string{"mirall": "notfound"}, availableCredentials: []string{"basic", "bearer"}, @@ -72,7 +72,7 @@ func TestGetCredsForUserAgent(t *testing.T) { }, // user mapping set and we return only desired credential - &test{ + { userAgent: "mirall", userAgentMap: map[string]string{"mirall": "bearer"}, availableCredentials: []string{"basic", "bearer"}, diff --git a/internal/http/services/ocmd/config.go b/internal/http/services/ocmd/config.go index b84c0d9b21..c5acbff898 100644 --- a/internal/http/services/ocmd/config.go +++ b/internal/http/services/ocmd/config.go @@ -62,7 +62,7 @@ func (h *configHandler) init(c *Config) { } h.c.Enabled = true h.c.Endpoint = fmt.Sprintf("https://%s/%s", h.c.Host, c.Prefix) - h.c.ResourceTypes = []resourceTypes{resourceTypes{ + h.c.ResourceTypes = []resourceTypes{{ Name: "file", ShareTypes: []string{"user"}, Protocols: resourceTypesProtocols{ diff --git a/internal/http/services/ocmd/invites.go b/internal/http/services/ocmd/invites.go index 60928f010e..083195193d 100644 --- a/internal/http/services/ocmd/invites.go +++ b/internal/http/services/ocmd/invites.go @@ -205,7 +205,7 @@ func (h *invitesHandler) acceptInvite(w http.ResponseWriter, r *http.Request) { providerInfo := ocmprovider.ProviderInfo{ Domain: recipientProvider, Services: []*ocmprovider.Service{ - &ocmprovider.Service{ + { Host: clientIP, }, }, diff --git a/pkg/auth/manager/demo/demo.go b/pkg/auth/manager/demo/demo.go index a4d18f6964..b0636f62ee 100644 --- a/pkg/auth/manager/demo/demo.go +++ b/pkg/auth/manager/demo/demo.go @@ -74,7 +74,7 @@ func (m *manager) Authenticate(ctx context.Context, clientID, clientSecret strin func getCredentials() map[string]Credentials { return map[string]Credentials{ - "einstein": Credentials{ + "einstein": { Secret: "relativity", User: &user.User{ Id: &user.UserId{ @@ -88,7 +88,7 @@ func getCredentials() map[string]Credentials { DisplayName: "Albert Einstein", }, }, - "marie": Credentials{ + "marie": { Secret: "radioactivity", User: &user.User{ Id: &user.UserId{ @@ -102,7 +102,7 @@ func getCredentials() map[string]Credentials { DisplayName: "Marie Curie", }, }, - "richard": Credentials{ + "richard": { Secret: "superfluidity", User: &user.User{ Id: &user.UserId{ diff --git a/pkg/ocm/share/manager/json/json.go b/pkg/ocm/share/manager/json/json.go index 3c2462fbdd..c63af1c349 100644 --- a/pkg/ocm/share/manager/json/json.go +++ b/pkg/ocm/share/manager/json/json.go @@ -225,7 +225,7 @@ func (m *mgr) Share(ctx context.Context, md *provider.ResourceId, g *ocm.ShareGr userID = owner g.Grantee.Opaque = &typespb.Opaque{ Map: map[string]*typespb.OpaqueEntry{ - "token": &typespb.OpaqueEntry{ + "token": { Decoder: "plain", Value: []byte(token), }, diff --git a/pkg/registry/config_test.go b/pkg/registry/config_test.go index 82bc49a49b..d981677da9 100644 --- a/pkg/registry/config_test.go +++ b/pkg/registry/config_test.go @@ -55,7 +55,7 @@ func TestParseConfig(t *testing.T) { }{ {name: "parse config", args: args{map[string]interface{}{ "services": map[string]map[string]interface{}{ - "authprovider": map[string]interface{}{ + "authprovider": { "basic": map[string]interface{}{ "name": "auth-basic", "nodes": []map[string]interface{}{ @@ -78,15 +78,15 @@ func TestParseConfig(t *testing.T) { }, }}, want: &Config{ Services: map[string]map[string]*service{ - "authprovider": map[string]*service{ - "basic": &service{ + "authprovider": { + "basic": { Name: "auth-basic", Nodes: []node{{ Address: "0.0.0.0:1234", Metadata: map[string]string{"version": "v0.1.0"}, }}, }, - "bearer": &service{ + "bearer": { Name: "auth-bearer", Nodes: []node{{ Address: "0.0.0.0:5678", diff --git a/pkg/share/cache/cbox/cbox.go b/pkg/share/cache/cbox/cbox.go index 9404926ecf..44ac88ab91 100644 --- a/pkg/share/cache/cbox/cbox.go +++ b/pkg/share/cache/cbox/cbox.go @@ -114,11 +114,11 @@ func (m *manager) GetResourceInfos() ([]*provider.ResourceInfo, error) { }, Opaque: &types.Opaque{ Map: map[string]*types.OpaqueEntry{ - "uid": &types.OpaqueEntry{ + "uid": { Decoder: "plain", Value: []byte("0"), }, - "gid": &types.OpaqueEntry{ + "gid": { Decoder: "plain", Value: []byte("0"), }, diff --git a/pkg/storage/registry/static/static.go b/pkg/storage/registry/static/static.go index 69ce5e27cc..418e2d5708 100644 --- a/pkg/storage/registry/static/static.go +++ b/pkg/storage/registry/static/static.go @@ -60,10 +60,10 @@ func (c *config) init() { if len(c.Rules) == 0 { c.Rules = map[string]rule{ - "/": rule{ + "/": { Address: sharedconf.GetGatewaySVC(""), }, - "00000000-0000-0000-0000-000000000000": rule{ + "00000000-0000-0000-0000-000000000000": { Address: sharedconf.GetGatewaySVC(""), }, } diff --git a/pkg/storage/utils/eosfs/eosfs.go b/pkg/storage/utils/eosfs/eosfs.go index 6110fd1386..be8996e8c9 100644 --- a/pkg/storage/utils/eosfs/eosfs.go +++ b/pkg/storage/utils/eosfs/eosfs.go @@ -1076,22 +1076,22 @@ func (fs *eosfs) createUserDir(ctx context.Context, u *userpb.User, path string, } attrs := []*eosclient.Attribute{ - &eosclient.Attribute{ + { Type: SystemAttr, Key: "mask", Val: "700", }, - &eosclient.Attribute{ + { Type: SystemAttr, Key: "allow.oc.sync", Val: "1", }, - &eosclient.Attribute{ + { Type: SystemAttr, Key: "mtime.propagation", Val: "1", }, - &eosclient.Attribute{ + { Type: SystemAttr, Key: "forced.atomic", Val: "1", diff --git a/pkg/storage/utils/templates/templates_test.go b/pkg/storage/utils/templates/templates_test.go index 4ae236a497..fb02dc3de3 100644 --- a/pkg/storage/utils/templates/templates_test.go +++ b/pkg/storage/utils/templates/templates_test.go @@ -31,21 +31,21 @@ type testUnit struct { } var tests = []*testUnit{ - &testUnit{ + { expected: "alabasta", user: &userpb.User{ Username: "alabasta", }, template: "{{.Username}}", }, - &testUnit{ + { expected: "a/alabasta", user: &userpb.User{ Username: "alabasta", }, template: "{{substr 0 1 .Username}}/{{.Username}}", }, - &testUnit{ + { expected: "idp@opaque", user: &userpb.User{ Id: &userpb.UserId{ @@ -55,35 +55,35 @@ var tests = []*testUnit{ }, template: "{{.Id.Idp}}@{{.Id.OpaqueId}}", }, - &testUnit{ // test path clean + { // test path clean expected: "/alabasta", user: &userpb.User{ Username: "alabasta", }, template: "///{{.Username}}", }, - &testUnit{ + { expected: "michael", user: &userpb.User{ Username: "MICHAEL", }, template: "{{lower .Username}}", }, - &testUnit{ + { expected: "somewhere.com/michael@somewhere.com", user: &userpb.User{ Username: "michael@somewhere.com", }, template: "{{.Email.Domain}}/{{.Username}}", }, - &testUnit{ + { expected: "somewhere.com/michael", user: &userpb.User{ Username: "michael@somewhere.com", }, template: "{{.Email.Domain}}/{{.Email.Local}}", }, - &testUnit{ + { expected: "_unknown/michael", user: &userpb.User{ Username: "michael", diff --git a/pkg/token/manager/demo/demo_test.go b/pkg/token/manager/demo/demo_test.go index 84680b2989..aa93d1fde0 100644 --- a/pkg/token/manager/demo/demo_test.go +++ b/pkg/token/manager/demo/demo_test.go @@ -43,7 +43,7 @@ func TestEncodeDecode(t *testing.T) { t.Fatal(err) } scope := map[string]*auth.Scope{ - "user": &auth.Scope{ + "user": { Resource: &types.OpaqueEntry{ Decoder: "json", Value: val, diff --git a/pkg/user/manager/demo/demo.go b/pkg/user/manager/demo/demo.go index 17f18db469..c77d1117dc 100644 --- a/pkg/user/manager/demo/demo.go +++ b/pkg/user/manager/demo/demo.go @@ -101,7 +101,7 @@ func (m *manager) GetUserGroups(ctx context.Context, uid *userpb.UserId) ([]stri func getUsers() map[string]*userpb.User { return map[string]*userpb.User{ - "4c510ada-c86b-4815-8820-42cdf82c3d51": &userpb.User{ + "4c510ada-c86b-4815-8820-42cdf82c3d51": { Id: &userpb.UserId{ Idp: "http://localhost:9998", OpaqueId: "4c510ada-c86b-4815-8820-42cdf82c3d51", @@ -114,7 +114,7 @@ func getUsers() map[string]*userpb.User { UidNumber: 123, GidNumber: 987, }, - "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c": &userpb.User{ + "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c": { Id: &userpb.UserId{ Idp: "http://localhost:9998", OpaqueId: "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", @@ -127,7 +127,7 @@ func getUsers() map[string]*userpb.User { UidNumber: 456, GidNumber: 987, }, - "932b4540-8d16-481e-8ef4-588e4b6b151c": &userpb.User{ + "932b4540-8d16-481e-8ef4-588e4b6b151c": { Id: &userpb.UserId{ Idp: "http://localhost:9998", OpaqueId: "932b4540-8d16-481e-8ef4-588e4b6b151c", diff --git a/tools/generate-documentation/main.go b/tools/generate-documentation/main.go index 42e7961dc8..99827c4364 100644 --- a/tools/generate-documentation/main.go +++ b/tools/generate-documentation/main.go @@ -30,7 +30,7 @@ func main() { conf := &resources.CatoConfig{ Driver: "reva", DriverConfig: map[string]map[string]interface{}{ - "reva": map[string]interface{}{ + "reva": { "DocPaths": map[string]string{ "internal/": "docs/content/en/docs/config/", "pkg/": "docs/content/en/docs/config/packages/",