Skip to content

Commit f47ea08

Browse files
rajatgoelrajatgoel
authored
Merge pull request #96 from dropbox/fix-lint
Fix golint errors
2 parents 4c47bbc + 06e004b commit f47ea08

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

‎generator/go_rsrc/sdk.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ package dropbox
2222

2323
import (
2424
"bytes"
25+
"context"
2526
"encoding/json"
2627
"errors"
2728
"fmt"
@@ -31,7 +32,6 @@ import (
3132
"net/http"
3233
"strings"
3334

34-
"golang.org/x/net/context"
3535
"golang.org/x/oauth2"
3636
)
3737

‎generator/go_types.stoneg.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def _generate_struct_builder(self, struct):
147147
default = '"{}"'.format(default)
148148
self.emit('s.{0} = {1}'.format(fmt_var(field.name), default))
149149
elif is_union_type(field.data_type):
150-
self.emit('s.%s = &%s{Tagged:dropbox.Tagged{"%s"}}' %
150+
self.emit('s.%s = &%s{Tagged:dropbox.Tagged{Tag: "%s"}}' %
151151
(fmt_var(field.name),
152152
fmt_type(field.data_type, struct.namespace).lstrip('*'),
153153
field.default.tag_name))

‎v6/dropbox/file_properties/types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ type PropertiesSearchArg struct {
490490
func NewPropertiesSearchArg(Queries []*PropertiesSearchQuery) *PropertiesSearchArg {
491491
s := new(PropertiesSearchArg)
492492
s.Queries = Queries
493-
s.TemplateFilter = &TemplateFilter{Tagged: dropbox.Tagged{"filter_none"}}
493+
s.TemplateFilter = &TemplateFilter{Tagged: dropbox.Tagged{Tag: "filter_none"}}
494494
return s
495495
}
496496

@@ -630,7 +630,7 @@ func NewPropertiesSearchQuery(Query string, Mode *PropertiesSearchMode) *Propert
630630
s := new(PropertiesSearchQuery)
631631
s.Query = Query
632632
s.Mode = Mode
633-
s.LogicalOperator = &LogicalOperator{Tagged: dropbox.Tagged{"or_operator"}}
633+
s.LogicalOperator = &LogicalOperator{Tagged: dropbox.Tagged{Tag: "or_operator"}}
634634
return s
635635
}
636636

‎v6/dropbox/file_requests/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ type UpdateFileRequestArgs struct {
417417
func NewUpdateFileRequestArgs(Id string) *UpdateFileRequestArgs {
418418
s := new(UpdateFileRequestArgs)
419419
s.Id = Id
420-
s.Deadline = &UpdateFileRequestDeadline{Tagged: dropbox.Tagged{"no_update"}}
420+
s.Deadline = &UpdateFileRequestDeadline{Tagged: dropbox.Tagged{Tag: "no_update"}}
421421
return s
422422
}
423423

‎v6/dropbox/files/types.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ type CommitInfo struct {
196196
func NewCommitInfo(Path string) *CommitInfo {
197197
s := new(CommitInfo)
198198
s.Path = Path
199-
s.Mode = &WriteMode{Tagged: dropbox.Tagged{"add"}}
199+
s.Mode = &WriteMode{Tagged: dropbox.Tagged{Tag: "add"}}
200200
s.Autorename = false
201201
s.Mute = false
202202
s.StrictConflict = false
@@ -212,7 +212,7 @@ type CommitInfoWithProperties struct {
212212
func NewCommitInfoWithProperties(Path string) *CommitInfoWithProperties {
213213
s := new(CommitInfoWithProperties)
214214
s.Path = Path
215-
s.Mode = &WriteMode{Tagged: dropbox.Tagged{"add"}}
215+
s.Mode = &WriteMode{Tagged: dropbox.Tagged{Tag: "add"}}
216216
s.Autorename = false
217217
s.Mute = false
218218
s.StrictConflict = false
@@ -2126,7 +2126,7 @@ type ListRevisionsArg struct {
21262126
func NewListRevisionsArg(Path string) *ListRevisionsArg {
21272127
s := new(ListRevisionsArg)
21282128
s.Path = Path
2129-
s.Mode = &ListRevisionsMode{Tagged: dropbox.Tagged{"path"}}
2129+
s.Mode = &ListRevisionsMode{Tagged: dropbox.Tagged{Tag: "path"}}
21302130
s.Limit = 10
21312131
return s
21322132
}
@@ -3890,7 +3890,7 @@ func NewSearchArg(Path string, Query string) *SearchArg {
38903890
s.Query = Query
38913891
s.Start = 0
38923892
s.MaxResults = 100
3893-
s.Mode = &SearchMode{Tagged: dropbox.Tagged{"filename"}}
3893+
s.Mode = &SearchMode{Tagged: dropbox.Tagged{Tag: "filename"}}
38943894
return s
38953895
}
38963896

@@ -4075,7 +4075,7 @@ type SearchOptions struct {
40754075
func NewSearchOptions() *SearchOptions {
40764076
s := new(SearchOptions)
40774077
s.MaxResults = 100
4078-
s.FileStatus = &FileStatus{Tagged: dropbox.Tagged{"active"}}
4078+
s.FileStatus = &FileStatus{Tagged: dropbox.Tagged{Tag: "active"}}
40794079
s.FilenameOnly = false
40804080
return s
40814081
}
@@ -4318,9 +4318,9 @@ type ThumbnailArg struct {
43184318
func NewThumbnailArg(Path string) *ThumbnailArg {
43194319
s := new(ThumbnailArg)
43204320
s.Path = Path
4321-
s.Format = &ThumbnailFormat{Tagged: dropbox.Tagged{"jpeg"}}
4322-
s.Size = &ThumbnailSize{Tagged: dropbox.Tagged{"w64h64"}}
4323-
s.Mode = &ThumbnailMode{Tagged: dropbox.Tagged{"strict"}}
4321+
s.Format = &ThumbnailFormat{Tagged: dropbox.Tagged{Tag: "jpeg"}}
4322+
s.Size = &ThumbnailSize{Tagged: dropbox.Tagged{Tag: "w64h64"}}
4323+
s.Mode = &ThumbnailMode{Tagged: dropbox.Tagged{Tag: "strict"}}
43244324
return s
43254325
}
43264326

@@ -4424,9 +4424,9 @@ type ThumbnailV2Arg struct {
44244424
func NewThumbnailV2Arg(Resource *PathOrLink) *ThumbnailV2Arg {
44254425
s := new(ThumbnailV2Arg)
44264426
s.Resource = Resource
4427-
s.Format = &ThumbnailFormat{Tagged: dropbox.Tagged{"jpeg"}}
4428-
s.Size = &ThumbnailSize{Tagged: dropbox.Tagged{"w64h64"}}
4429-
s.Mode = &ThumbnailMode{Tagged: dropbox.Tagged{"strict"}}
4427+
s.Format = &ThumbnailFormat{Tagged: dropbox.Tagged{Tag: "jpeg"}}
4428+
s.Size = &ThumbnailSize{Tagged: dropbox.Tagged{Tag: "w64h64"}}
4429+
s.Mode = &ThumbnailMode{Tagged: dropbox.Tagged{Tag: "strict"}}
44304430
return s
44314431
}
44324432

‎v6/dropbox/paper/types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type AddMember struct {
4848
func NewAddMember(Member *sharing.MemberSelector) *AddMember {
4949
s := new(AddMember)
5050
s.Member = Member
51-
s.PermissionLevel = &PaperDocPermissionLevel{Tagged: dropbox.Tagged{"edit"}}
51+
s.PermissionLevel = &PaperDocPermissionLevel{Tagged: dropbox.Tagged{Tag: "edit"}}
5252
return s
5353
}
5454

@@ -337,9 +337,9 @@ type ListPaperDocsArgs struct {
337337
// NewListPaperDocsArgs returns a new ListPaperDocsArgs instance
338338
func NewListPaperDocsArgs() *ListPaperDocsArgs {
339339
s := new(ListPaperDocsArgs)
340-
s.FilterBy = &ListPaperDocsFilterBy{Tagged: dropbox.Tagged{"docs_accessed"}}
341-
s.SortBy = &ListPaperDocsSortBy{Tagged: dropbox.Tagged{"accessed"}}
342-
s.SortOrder = &ListPaperDocsSortOrder{Tagged: dropbox.Tagged{"ascending"}}
340+
s.FilterBy = &ListPaperDocsFilterBy{Tagged: dropbox.Tagged{Tag: "docs_accessed"}}
341+
s.SortBy = &ListPaperDocsSortBy{Tagged: dropbox.Tagged{Tag: "accessed"}}
342+
s.SortOrder = &ListPaperDocsSortOrder{Tagged: dropbox.Tagged{Tag: "ascending"}}
343343
s.Limit = 1000
344344
return s
345345
}
@@ -537,7 +537,7 @@ func NewListUsersOnPaperDocArgs(DocId string) *ListUsersOnPaperDocArgs {
537537
s := new(ListUsersOnPaperDocArgs)
538538
s.DocId = DocId
539539
s.Limit = 1000
540-
s.FilterBy = &UserOnPaperDocFilter{Tagged: dropbox.Tagged{"shared"}}
540+
s.FilterBy = &UserOnPaperDocFilter{Tagged: dropbox.Tagged{Tag: "shared"}}
541541
return s
542542
}
543543

‎v6/dropbox/sdk_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestRateLimitJSON(t *testing.T) {
6363
w.Header().Set("Content-Type", "application/json; charset=utf-8")
6464
w.Header().Set("Retry-After", "10")
6565
w.WriteHeader(http.StatusTooManyRequests)
66-
w.Write([]byte(eString))
66+
_, _ = w.Write([]byte(eString))
6767
}))
6868
defer ts.Close()
6969

@@ -91,7 +91,7 @@ func TestAuthError(t *testing.T) {
9191
func(w http.ResponseWriter, r *http.Request) {
9292
w.Header().Set("Content-Type", "application/json; charset=utf-8")
9393
w.WriteHeader(http.StatusUnauthorized)
94-
w.Write([]byte(eString))
94+
_, _ = w.Write([]byte(eString))
9595
}))
9696
defer ts.Close()
9797

@@ -121,7 +121,7 @@ func TestAccessError(t *testing.T) {
121121
func(w http.ResponseWriter, r *http.Request) {
122122
w.Header().Set("Content-Type", "application/json; charset=utf-8")
123123
w.WriteHeader(http.StatusForbidden)
124-
w.Write([]byte(eString))
124+
_, _ = w.Write([]byte(eString))
125125
}))
126126
defer ts.Close()
127127

@@ -149,7 +149,7 @@ func TestAppError(t *testing.T) {
149149
func(w http.ResponseWriter, r *http.Request) {
150150
w.Header().Set("Content-Type", "application/json; charset=utf-8")
151151
w.WriteHeader(http.StatusConflict)
152-
w.Write([]byte(eString))
152+
_, _ = w.Write([]byte(eString))
153153
}))
154154
defer ts.Close()
155155

‎v6/dropbox/sharing/types.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func NewAddFileMemberArgs(File string, Members []*MemberSelector) *AddFileMember
100100
s.File = File
101101
s.Members = Members
102102
s.Quiet = false
103-
s.AccessLevel = &AccessLevel{Tagged: dropbox.Tagged{"viewer"}}
103+
s.AccessLevel = &AccessLevel{Tagged: dropbox.Tagged{Tag: "viewer"}}
104104
s.AddMessageAsComment = false
105105
return s
106106
}
@@ -276,7 +276,7 @@ type AddMember struct {
276276
func NewAddMember(Member *MemberSelector) *AddMember {
277277
s := new(AddMember)
278278
s.Member = Member
279-
s.AccessLevel = &AccessLevel{Tagged: dropbox.Tagged{"viewer"}}
279+
s.AccessLevel = &AccessLevel{Tagged: dropbox.Tagged{Tag: "viewer"}}
280280
return s
281281
}
282282

@@ -3264,7 +3264,7 @@ type SetAccessInheritanceArg struct {
32643264
func NewSetAccessInheritanceArg(SharedFolderId string) *SetAccessInheritanceArg {
32653265
s := new(SetAccessInheritanceArg)
32663266
s.SharedFolderId = SharedFolderId
3267-
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{"inherit"}}
3267+
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{Tag: "inherit"}}
32683268
return s
32693269
}
32703270

@@ -3334,7 +3334,7 @@ func NewShareFolderArgBase(Path string) *ShareFolderArgBase {
33343334
s := new(ShareFolderArgBase)
33353335
s.Path = Path
33363336
s.ForceAsync = false
3337-
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{"inherit"}}
3337+
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{Tag: "inherit"}}
33383338
return s
33393339
}
33403340

@@ -3355,7 +3355,7 @@ func NewShareFolderArg(Path string) *ShareFolderArg {
33553355
s := new(ShareFolderArg)
33563356
s.Path = Path
33573357
s.ForceAsync = false
3358-
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{"inherit"}}
3358+
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{Tag: "inherit"}}
33593359
return s
33603360
}
33613361

@@ -3843,7 +3843,7 @@ func NewSharedFolderMetadata(AccessType *AccessLevel, IsInsideTeamFolder bool, I
38433843
s.PreviewUrl = PreviewUrl
38443844
s.SharedFolderId = SharedFolderId
38453845
s.TimeInvited = TimeInvited
3846-
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{"inherit"}}
3846+
s.AccessInheritance = &AccessInheritance{Tagged: dropbox.Tagged{Tag: "inherit"}}
38473847
return s
38483848
}
38493849

‎v6/dropbox/team/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2611,7 +2611,7 @@ func NewMemberAddArg(MemberEmail string) *MemberAddArg {
26112611
s := new(MemberAddArg)
26122612
s.MemberEmail = MemberEmail
26132613
s.SendWelcomeEmail = true
2614-
s.Role = &AdminTier{Tagged: dropbox.Tagged{"member_only"}}
2614+
s.Role = &AdminTier{Tagged: dropbox.Tagged{Tag: "member_only"}}
26152615
return s
26162616
}
26172617

0 commit comments

Comments
 (0)