Skip to content

Support time.RFC3339Nano format & Use go.mod #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Support time.RFC3339Nano format & Use go.mod #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9eaf07d
Use go.mod
sachaos Feb 21, 2020
e05e6b6
Remove glide
sachaos Feb 21, 2020
86ab912
Update go.mod
sachaos Feb 21, 2020
d5e38d1
Update go.mod
sachaos Feb 21, 2020
bc1fcff
Fix test
sachaos Feb 21, 2020
c476067
Fix Makefile
sachaos Feb 21, 2020
142a583
Accespt Timestamp with Nano second
sachaos Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ build:

init:
go get golang.org/x/tools/cmd/goyacc
go get -u github.com/golang/lint/golint
go get -u golang.org/x/lint

fmt:
go fmt $$(glide novendor)
go fmt ./...

test:
go test $$(glide novendor)
go test ./...

lint:
golint $$(glide novendor)
golint ./...

yacc:
cd gql; goyacc -o parser.go parser.go.y
Expand Down
2 changes: 1 addition & 1 deletion action/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func Query(ctx core.Context, gqlStr, format string, style core.TypeStyle, filena
}

core.Debugf("kind = %v\n", kind)
core.Debugf("query = %q\n", q)
core.Debugf("query = %+v\n", q)

// Exporter
exporter := getExporter(ctx, format, style, kind, writer)
Expand Down
8 changes: 8 additions & 0 deletions core/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,14 @@ func (p *Parser) parseTimestamp(v interface{}, loc *time.Location) (time.Time, b
`:[0-9][0-9]` + // (minute)
`:[0-9][0-9]` + // (second)
`Z|[-+][0-9][0-9]:[0-9][0-9]$`: time.RFC3339, // (time zone)
`^[0-9][0-9][0-9][0-9]` + // (year)
`-[0-9][0-9]` + // (month)
`-[0-9][0-9]` + // (day)
`T[0-9][0-9]` + // (hour)
`:[0-9][0-9]` + // (minute)
`:[0-9][0-9]` + // (second)
`.[0-9]+` + // (milli second)
`Z|[-+][0-9][0-9]:[0-9][0-9]$`: time.RFC3339Nano, // (time zone)
}

for regx, format := range regxs {
Expand Down
2 changes: 1 addition & 1 deletion dsio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func main() {
cli.IntFlag{
Name: "batch-size",
Value: action.MaxBatchSize,
Usage: fmt.Sprintf("number of entities per one multi upsert operation. batch-size should be smaller than %s.", action.MaxBatchSize),
Usage: fmt.Sprintf("number of entities per one multi upsert operation. batch-size should be smaller than %d.", action.MaxBatchSize),
},
FlagServiceAccoutFile,
FlagProjectID,
Expand Down
126 changes: 0 additions & 126 deletions glide.lock
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions glide.yaml
View file
Open in desktop

This file was deleted.

27 changes: 27 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module github.com/nshmura/dsio

go 1.13

require (
cloud.google.com/go v0.16.0
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/color v1.5.0
github.com/golang/protobuf v0.0.0-20170816001514-ab9f9a6dab16
github.com/googleapis/gax-go v0.0.0-20170824001441-2cadd475a3e9
github.com/mattn/go-colorable v0.0.8-0.20170210172801-5411d3eea597
github.com/mattn/go-isatty v0.0.2-0.20170307163044-57fdcb988a5c
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.1.4
github.com/urfave/cli v1.20.0
golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect
golang.org/x/net v0.0.0-20190620200207-3b0461eec859
golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95
golang.org/x/sys v0.0.0-20190412213103-97732733099d
golang.org/x/text v0.3.0
golang.org/x/tools v0.0.0-20200220224806-8a925fa4c0df // indirect
google.golang.org/api v0.0.0-20170821230356-dd6bdadc5852
google.golang.org/appengine v1.0.1-0.20170814190942-d9a072cfa7b9
google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0
google.golang.org/grpc v1.2.1-0.20170824170843-7db1564ba122
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7
)
51 changes: 51 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
cloud.google.com/go v0.16.0 h1:alV/SO2XpH+lrvqjDl94dYez7FfeT8ptayazgWwHPIU=
cloud.google.com/go v0.16.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fatih/color v1.5.0 h1:vBh+kQp8lg9XPr56u1CPrWjFXtdphMoGWVHr9/1c+A0=
github.com/fatih/color v1.5.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/golang/protobuf v0.0.0-20170816001514-ab9f9a6dab16 h1:aJ1UpMAmhmRgprioyAmDMEDe5cVKlbWs3HDUZw9rT4E=
github.com/golang/protobuf v0.0.0-20170816001514-ab9f9a6dab16/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/googleapis/gax-go v0.0.0-20170824001441-2cadd475a3e9 h1:PvaGRWM6M7sQvvlA3CRAl6uIWzlQ+vKY7bPLmhv17F0=
github.com/googleapis/gax-go v0.0.0-20170824001441-2cadd475a3e9/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
github.com/mattn/go-colorable v0.0.8-0.20170210172801-5411d3eea597 h1:Zw9aNQ5CQ3SERpCiZrPh4vdWcBWogoEd5m8AFf2QWVs=
github.com/mattn/go-colorable v0.0.8-0.20170210172801-5411d3eea597/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.2-0.20170307163044-57fdcb988a5c h1:vNDTotKSxm/15mLGhBXjdU6q6Ncrx0HlVEd8ToAsGTw=
github.com/mattn/go-isatty v0.0.2-0.20170307163044-57fdcb988a5c/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.1.4 h1:ToftOQTytwshuOSj6bDSolVUa3GINfJP/fg3OkkOzQQ=
github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367 h1:0IiAsCRByjO2QjX7ZPkw5oU9x+n1YqRL802rjC0c3Aw=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/net v0.0.0-20170824174428-57efc9c3d9f9/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95 h1:RS+wSrhdVci7CsPwJaMN8exaP3UTuQU0qB34R/E/JD0=
golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20170213225739-e24f485414ae/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.0.0-20170824095709-cc24f0397b10/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200220224806-8a925fa4c0df h1:oQFmpjL+rb2xLkgPCpdGSAGDdq1geTZVvIfCMxSB/wQ=
golang.org/x/tools v0.0.0-20200220224806-8a925fa4c0df/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/api v0.0.0-20170821230356-dd6bdadc5852 h1:8m8eq+cjxNeY7X4z1lAx4a/bvw17NXWalnzXTRrDQHE=
google.golang.org/api v0.0.0-20170821230356-dd6bdadc5852/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
google.golang.org/appengine v1.0.1-0.20170814190942-d9a072cfa7b9/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0 h1:ZvI3lsq5AIkr7axxmT3tfwFlJVRFLqe6Fp0W03+MJ38=
google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/grpc v1.2.1-0.20170824170843-7db1564ba122 h1:7/n5kbuJRBhVWpabicPn+BAx/nbOo/9UpDiWSHrLoKc=
google.golang.org/grpc v1.2.1-0.20170824170843-7db1564ba122/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 h1:+t9dhfO+GNOIGJof6kPOAenx7YgrZMTdRPV+EsnPabk=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=