From 9eaf07dc5d040176d56262fd629ffee9f035d947 Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Fri, 21 Feb 2020 17:49:47 +0900 Subject: [PATCH 1/7] Use go.mod --- go.mod | 24 ++++++++++++++++++++++++ go.sum | 29 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..d42ef80 --- /dev/null +++ b/go.mod @@ -0,0 +1,24 @@ +module github.com/nshmura/dsio + +go 1.13 + +require ( + cloud.google.com/go v0.16.0 + 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/stretchr/testify v1.1.4 + github.com/urfave/cli v1.20.0 + 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 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..de472cf --- /dev/null +++ b/go.sum @@ -0,0 +1,29 @@ +cloud.google.com/go v0.16.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/fatih/color v1.5.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +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/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +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/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +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/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/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +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/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +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/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/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/grpc v1.2.1-0.20170824170843-7db1564ba122/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= From e05e6b608b4e32c513043118e420df0482f5779d Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Fri, 21 Feb 2020 17:52:39 +0900 Subject: [PATCH 2/7] Remove glide --- glide.lock | 126 ----------------------------------------------------- glide.yaml | 15 ------- 2 files changed, 141 deletions(-) delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/glide.lock b/glide.lock deleted file mode 100644 index bd7075d..0000000 --- a/glide.lock +++ /dev/null @@ -1,126 +0,0 @@ -hash: 14c47ed93938ffd805a951672edcbb816f6ad1df6e5e96e071385b1ebbb371ae -updated: 2017-11-22T14:22:58.189622738+09:00 -imports: -- name: cloud.google.com/go - version: 2d3a6656c17a60b0815b7e06ab0be04eacb6e613 - subpackages: - - compute/metadata - - datastore - - internal - - internal/atomiccache - - internal/fields - - internal/version -- name: github.com/fatih/color - version: 570b54cabe6b8eb0bc2dfce68d964677d63b5260 -- name: github.com/golang/protobuf - version: ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e - subpackages: - - proto - - protoc-gen-go/descriptor - - ptypes - - ptypes/any - - ptypes/duration - - ptypes/struct - - ptypes/timestamp - - ptypes/wrappers -- name: github.com/googleapis/gax-go - version: 2cadd475a3e966ec9b77a21afc530dbacec6d613 -- name: github.com/mattn/go-colorable - version: 5411d3eea5978e6cdc258b30de592b60df6aba96 - repo: https://github.com/mattn/go-colorable -- name: github.com/mattn/go-isatty - version: 57fdcb988a5c543893cc61bce354a6e24ab70022 - repo: https://github.com/mattn/go-isatty -- name: github.com/stretchr/testify - version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 - subpackages: - - assert -- name: github.com/urfave/cli - version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1 -- name: golang.org/x/net - version: 57efc9c3d9f91fb3277f8da1cff370539c4d3dc5 - subpackages: - - context - - context/ctxhttp - - http2 - - http2/hpack - - idna - - internal/timeseries - - lex/httplex - - trace -- name: golang.org/x/oauth2 - version: 9a379c6b3e95a790ffc43293c2a78dee0d7b6e20 - subpackages: - - google - - internal - - jws - - jwt -- name: golang.org/x/sys - version: e24f485414aeafb646f6fca458b0bf869c0880a1 - repo: https://go.googlesource.com/sys - subpackages: - - unix -- name: golang.org/x/text - version: cc24f0397b10b6321b1a1322b6bd592984fdabf2 - subpackages: - - secure/bidirule - - transform - - unicode/bidi - - unicode/norm -- name: google.golang.org/api - version: dd6bdadc5852eae2d133075a3690d6ad744add48 - subpackages: - - internal - - iterator - - option - - transport/grpc -- name: google.golang.org/appengine - version: d9a072cfa7b9736e44311ef77b3e09d804bfa599 - subpackages: - - internal - - internal/app_identity - - internal/base - - internal/datastore - - internal/log - - internal/modules - - internal/remote_api - - internal/socket - - internal/urlfetch - - socket - - urlfetch -- name: google.golang.org/genproto - version: ee236bd376b077c7a89f260c026c4735b195e459 - subpackages: - - googleapis/api/annotations - - googleapis/datastore/v1 - - googleapis/rpc/status - - googleapis/type/latlng -- name: google.golang.org/grpc - version: 7db1564ba1229bc42919bb1f6d9c4186f3aa8678 - subpackages: - - codes - - connectivity - - credentials - - credentials/oauth - - grpclb/messages_only/grpc_lb_v1 - - grpclog - - internal - - keepalive - - metadata - - naming - - peer - - stats - - status - - tap - - transport -- name: gopkg.in/yaml.v2 - version: eb3733d160e74a9c7e442f435eb3bea458e1d19f -testImports: -- name: github.com/davecgh/go-spew - version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 - subpackages: - - spew -- name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d - subpackages: - - difflib diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index e1b87f2..0000000 --- a/glide.yaml +++ /dev/null @@ -1,15 +0,0 @@ -package: github.com/nshmura/dsio -import: -- package: github.com/urfave/cli - version: ^1.20.0 -- package: gopkg.in/yaml.v2 -- package: cloud.google.com/go - version: ^0.12.0 - subpackages: - - datastore -- package: github.com/fatih/color - version: ^1.5.0 -- package: github.com/stretchr/testify - version: ^1.1.4 - subpackages: - - assert From 86ab912e54f9099c906d96b835eafaa34c12751e Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Fri, 21 Feb 2020 17:55:23 +0900 Subject: [PATCH 3/7] Update go.mod --- go.mod | 1 + go.sum | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/go.mod b/go.mod index d42ef80..ec47a65 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/mattn/go-isatty v0.0.2-0.20170307163044-57fdcb988a5c 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 diff --git a/go.sum b/go.sum index de472cf..97f1698 100644 --- a/go.sum +++ b/go.sum @@ -1,29 +1,46 @@ +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/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/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= From d5e38d11ebb24d44e15fc942229dfe0a0baabd6a Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Fri, 21 Feb 2020 18:05:09 +0900 Subject: [PATCH 4/7] Update go.mod --- go.mod | 2 ++ go.sum | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/go.mod b/go.mod index ec47a65..c962ad1 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,13 @@ 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 diff --git a/go.sum b/go.sum index 97f1698..459925b 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ 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= @@ -10,6 +12,9 @@ github.com/mattn/go-colorable v0.0.8-0.20170210172801-5411d3eea597 h1:Zw9aNQ5CQ3 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= From bc1fcffce60d47f06e66e5bbf32392c677962439 Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Fri, 21 Feb 2020 18:05:46 +0900 Subject: [PATCH 5/7] Fix test --- action/query.go | 2 +- dsio.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/action/query.go b/action/query.go index 520982b..4a9e51f 100644 --- a/action/query.go +++ b/action/query.go @@ -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) diff --git a/dsio.go b/dsio.go index cff00a9..f0858c2 100644 --- a/dsio.go +++ b/dsio.go @@ -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, From c476067c85c4b3f0dc4484c3aba662e80fd5f886 Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Fri, 21 Feb 2020 18:05:53 +0900 Subject: [PATCH 6/7] Fix Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bf76969..1bfbf60 100644 --- a/Makefile +++ b/Makefile @@ -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 From 142a5831ff61ed701414134d2222d14e8be077cc Mon Sep 17 00:00:00 2001 From: Takumasa Sakao Date: Fri, 21 Feb 2020 18:06:09 +0900 Subject: [PATCH 7/7] Accespt Timestamp with Nano second --- core/parser.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/parser.go b/core/parser.go index b9e381b..8d83c3a 100644 --- a/core/parser.go +++ b/core/parser.go @@ -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 {