From 4ecccba4a107b47d96124e3e7773bab4775626d1 Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Thu, 22 Apr 2021 17:29:07 +0300 Subject: [PATCH 01/10] no message --- api/go.mod | 9 + api/go.sum | 646 +++++++++++++ api/sqlite_orm_testing/gorm.db | Bin 0 -> 12288 bytes api/sqlite_orm_testing/roee.go | 55 ++ api/src/.dockerignore | 16 + api/src/Dockerfile | 26 + api/src/main.go | 26 + api/src/pkg/configs/fiber_config.go | 21 + api/src/pkg/controllers/book_controller.go | 17 + api/src/pkg/middleware/fiber_middleware.go | 18 + .../pkg/models/autogenerated_book_model.go | 469 +++++++++ api/src/pkg/models/book_model.go | 305 ++++++ api/src/pkg/routes/not_found_route.go | 18 + api/src/pkg/routes/public_routes.go | 18 + api/src/pkg/utils/utils.go | 30 + tap/go.mod | 8 + tap/go.sum | 45 + tap/src/autogenerated_mizuEntry.go | 908 ++++++++++++++++++ tap/src/main.go | 64 ++ tap/src/mizuEntry.go | 23 + tap/src/models.go | 471 +++++++++ tap/src/types.go | 175 ++++ 22 files changed, 3368 insertions(+) create mode 100644 api/go.mod create mode 100644 api/go.sum create mode 100644 api/sqlite_orm_testing/gorm.db create mode 100644 api/sqlite_orm_testing/roee.go create mode 100644 api/src/.dockerignore create mode 100644 api/src/Dockerfile create mode 100644 api/src/main.go create mode 100644 api/src/pkg/configs/fiber_config.go create mode 100644 api/src/pkg/controllers/book_controller.go create mode 100644 api/src/pkg/middleware/fiber_middleware.go create mode 100644 api/src/pkg/models/autogenerated_book_model.go create mode 100644 api/src/pkg/models/book_model.go create mode 100644 api/src/pkg/routes/not_found_route.go create mode 100644 api/src/pkg/routes/public_routes.go create mode 100644 api/src/pkg/utils/utils.go create mode 100644 tap/go.mod create mode 100644 tap/go.sum create mode 100644 tap/src/autogenerated_mizuEntry.go create mode 100644 tap/src/main.go create mode 100644 tap/src/mizuEntry.go create mode 100644 tap/src/models.go create mode 100644 tap/src/types.go diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 000000000..6f0e56e85 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,9 @@ +module mizuserver + +go 1.16 + +require ( + github.com/gofiber/fiber/v2 v2.8.0 + github.com/jinzhu/gorm v1.9.16 + gorm.io/driver/sqlite v1.1.4 +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 000000000..245118261 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,646 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= +github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE= +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc= +github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo= +github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/arsmn/fiber-swagger/v2 v2.6.0/go.mod h1:U+IKcuTAt2o9gH8JyOPa1JXaUHk8KecABWlRW75X1PY= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/create-go-app/fiber-go-template v1.2.1 h1:qWCB5JC/3hd7E3xSVdyUrIilyFNI5mijB1jsIWS1n44= +github.com/create-go-app/fiber-go-template v1.2.1/go.mod h1:3qE/nhAstP/owAFLXQVWnxhk/UQBK2qxHoyd2oj7SDs= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA= +github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY= +github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-playground/validator/v10 v10.5.0 h1:X9rflw/KmpACwT8zdrm1upefpvdy6ur8d1kWyq6sg3E= +github.com/go-playground/validator/v10 v10.5.0/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk= +github.com/go-redis/redis/v8 v8.8.0/go.mod h1:F7resOH5Kdug49Otu24RjHWwgK7u9AmtqWMnCV1iP5Y= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofiber/fiber/v2 v2.6.0/go.mod h1:f8BRRIMjMdRyt2qmJ/0Sea3j3rwwfufPrh9WNBRiVZ0= +github.com/gofiber/fiber/v2 v2.7.1/go.mod h1:f8BRRIMjMdRyt2qmJ/0Sea3j3rwwfufPrh9WNBRiVZ0= +github.com/gofiber/fiber/v2 v2.8.0 h1:BdWvZmg/WY/Vjtjm38aXOp1Lks1BhuyS2b7lSWSPAzk= +github.com/gofiber/fiber/v2 v2.8.0/go.mod h1:Ah3IJikrKNRepl/HuVawppS25X7FWohwfCSRn7kJG28= +github.com/gofiber/jwt/v2 v2.2.0/go.mod h1:v9PUmQZfhbBsYYg5Gp5PAks5Ip8kJtVqXsbl506wkzc= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= +github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.8.1 h1:ySBX7Q87vOMqKU2bbmKbUvtYhauDFclYbNDYIE1/h6s= +github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/lE2g= +github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.6 h1:b1105ZGEMFe7aCvrT1Cca3VoVb4ZFMaFJLJcg/3zD+8= +github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= +github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= +github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= +github.com/jackc/pgtype v1.7.0 h1:6f4kVsW01QftE38ufBYxKciO6gyioXSC0ABIRLcZrGs= +github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI75BE= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= +github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= +github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.11.0 h1:J86tSWd3Y7nKjwT/43xZBvpi04keQWx8gNC2YkdJhZI= +github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CIdYfcc= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= +github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= +github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmoiron/sqlx v1.3.1 h1:aLN7YINNZ7cYOPK3QC83dbM6KT0NMqVMw961TqrejlE= +github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.13 h1:eSvu8Tmq6j2psUJqJrLcWH6K3w5Dwc+qipbaA6eVEN4= +github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= +github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= +github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= +github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E= +github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.18.0/go.mod h1:jjraHZVbKOXftJfsOYoAjaeygpj5hr8ermTRJNroD7A= +github.com/valyala/fasthttp v1.22.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU= +github.com/valyala/fasthttp v1.23.0 h1:0ufwSD9BhWa6f8HWdmdq4FHQ23peRo3Ng/Qs8m5NcFs= +github.com/valyala/fasthttp v1.23.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg= +go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc= +go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoTKFexE/PJ/nSO7IA= +go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226101413-39120d07d75e h1:jIQURUJ9mlLvYwTBtRHm9h58rYhSonLvRvgAnP8Nr7I= +golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/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-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201210223839-7e3030f88018/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210316092937-0b90fd5c4c48 h1:70qalHWW1n9yoI8B8zEQxFJO/D6NUWIX8SNmJO+rvNw= +golang.org/x/sys v0.0.0-20210316092937-0b90fd5c4c48/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM= +gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= +gorm.io/gorm v1.20.7 h1:rMS4CL3pNmYq1V5/X+nHHjh1Dx6dnf27+Cai5zabo+M= +gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/api/sqlite_orm_testing/gorm.db b/api/sqlite_orm_testing/gorm.db new file mode 100644 index 0000000000000000000000000000000000000000..93745bb8569365781b6ade5c5800ead85c4cfa18 GIT binary patch literal 12288 zcmeI#O;5rw7zgl{X;2fzcv-yl2ocEGKob%ZP31-5=u#lF+zy8ywnu7m>SoX@qD6@ zcvYy8Z1rVZt;Tj~y`abcX- zWGsSl#}xx1h1+ptc(0u{?Q+XzmByKU!}xc3oLw{+53_laf9>a~*)fglx=x?k(&-LF zm=X@LWz|;sq-KBYWl2?@GtZZzCxSG;4TQ5e31_Z~q&F04KDnRA^YcZYM&269^_`*M zOp2*YbEl`m&)QutkbT#Ah}5`jR_f(un^o=h;v}im{NJ1=o{8#c5P$##AOHafKmY;| zfB*y_009X6jlhU*kb0f$)4FMxxr~v|m?q1aMI%=bq#-ji` ?", createdAt)) +} + +// CreatedAtGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtGte(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at >= ?", createdAt)) +} + +// CreatedAtLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtLt(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at < ?", createdAt)) +} + +// CreatedAtLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtLte(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at <= ?", createdAt)) +} + +// CreatedAtNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtNe(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at != ?", createdAt)) +} + +// Delete is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) Delete() error { + return qs.db.Delete(MizuEntry{}).Error +} + +// DeleteNum is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeleteNum() (int64, error) { + db := qs.db.Delete(MizuEntry{}) + return db.RowsAffected, db.Error +} + +// DeleteNumUnscoped is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeleteNumUnscoped() (int64, error) { + db := qs.db.Unscoped().Delete(MizuEntry{}) + return db.RowsAffected, db.Error +} + +// DeletedAtEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtEq(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at = ?", deletedAt)) +} + +// DeletedAtGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtGt(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at > ?", deletedAt)) +} + +// DeletedAtGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtGte(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at >= ?", deletedAt)) +} + +// DeletedAtIsNotNull is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtIsNotNull() MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at IS NOT NULL")) +} + +// DeletedAtIsNull is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtIsNull() MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at IS NULL")) +} + +// DeletedAtLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtLt(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at < ?", deletedAt)) +} + +// DeletedAtLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtLte(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at <= ?", deletedAt)) +} + +// DeletedAtNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtNe(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at != ?", deletedAt)) +} + +// GetDB is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) GetDB() *gorm.DB { + return qs.db +} + +// GetUpdater is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) GetUpdater() MizuEntryUpdater { + return NewMizuEntryUpdater(qs.db) +} + +// IDEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDEq(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id = ?", ID)) +} + +// IDGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDGt(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id > ?", ID)) +} + +// IDGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDGte(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id >= ?", ID)) +} + +// IDIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDIn(ID ...uint) MizuEntryQuerySet { + if len(ID) == 0 { + qs.db.AddError(errors.New("must at least pass one ID in IDIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("id IN (?)", ID)) +} + +// IDLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDLt(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id < ?", ID)) +} + +// IDLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDLte(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id <= ?", ID)) +} + +// IDNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDNe(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id != ?", ID)) +} + +// IDNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDNotIn(ID ...uint) MizuEntryQuerySet { + if len(ID) == 0 { + qs.db.AddError(errors.New("must at least pass one ID in IDNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("id NOT IN (?)", ID)) +} + +// Limit is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) Limit(limit int) MizuEntryQuerySet { + return qs.w(qs.db.Limit(limit)) +} + +// Offset is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) Offset(offset int) MizuEntryQuerySet { + return qs.w(qs.db.Offset(offset)) +} + +// One is used to retrieve one result. It returns gorm.ErrRecordNotFound +// if nothing was fetched +func (qs MizuEntryQuerySet) One(ret *MizuEntry) error { + return qs.db.First(ret).Error +} + +// OrderAscByCreatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByCreatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("created_at ASC")) +} + +// OrderAscByDeletedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByDeletedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("deleted_at ASC")) +} + +// OrderAscByID is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByID() MizuEntryQuerySet { + return qs.w(qs.db.Order("id ASC")) +} + +// OrderAscByUpdatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByUpdatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("updated_at ASC")) +} + +// OrderDescByCreatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByCreatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("created_at DESC")) +} + +// OrderDescByDeletedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByDeletedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("deleted_at DESC")) +} + +// OrderDescByID is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByID() MizuEntryQuerySet { + return qs.w(qs.db.Order("id DESC")) +} + +// OrderDescByUpdatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByUpdatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("updated_at DESC")) +} + +// PreloadEntry is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) PreloadEntry() MizuEntryQuerySet { + return qs.w(qs.db.Preload("Entry")) +} + +// UpdatedAtEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtEq(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at = ?", updatedAt)) +} + +// UpdatedAtGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtGt(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at > ?", updatedAt)) +} + +// UpdatedAtGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtGte(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at >= ?", updatedAt)) +} + +// UpdatedAtLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtLt(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at < ?", updatedAt)) +} + +// UpdatedAtLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtLte(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at <= ?", updatedAt)) +} + +// UpdatedAtNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtNe(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at != ?", updatedAt)) +} + +// SetCreatedAt is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetCreatedAt(createdAt time.Time) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.CreatedAt)] = createdAt + return u +} + +// SetDeletedAt is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetDeletedAt(deletedAt *time.Time) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.DeletedAt)] = deletedAt + return u +} + +// SetEntry is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetEntry(entry Entry) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.Entry)] = entry + return u +} + +// SetID is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetID(ID uint) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.ID)] = ID + return u +} + +// SetUpdatedAt is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetUpdatedAt(updatedAt time.Time) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.UpdatedAt)] = updatedAt + return u +} + +// Update is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) Update() error { + return u.db.Updates(u.fields).Error +} + +// UpdateNum is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) UpdateNum() (int64, error) { + db := u.db.Updates(u.fields) + return db.RowsAffected, db.Error +} + +// ===== END of query set MizuEntryQuerySet + +// ===== BEGIN of MizuEntry modifiers + +// MizuEntryDBSchemaField describes database schema field. It requires for method 'Update' +type MizuEntryDBSchemaField string + +// String method returns string representation of field. +// nolint: dupl +func (f MizuEntryDBSchemaField) String() string { + return string(f) +} + +// MizuEntryDBSchema stores db field names of MizuEntry +var MizuEntryDBSchema = struct { + ID MizuEntryDBSchemaField + CreatedAt MizuEntryDBSchemaField + UpdatedAt MizuEntryDBSchemaField + DeletedAt MizuEntryDBSchemaField + Entry MizuEntryDBSchemaField +}{ + + ID: MizuEntryDBSchemaField("id"), + CreatedAt: MizuEntryDBSchemaField("created_at"), + UpdatedAt: MizuEntryDBSchemaField("updated_at"), + DeletedAt: MizuEntryDBSchemaField("deleted_at"), + Entry: MizuEntryDBSchemaField("entry"), +} + +// Update updates MizuEntry fields by primary key +// nolint: dupl +func (o *MizuEntry) Update(db *gorm.DB, fields ...MizuEntryDBSchemaField) error { + dbNameToFieldName := map[string]interface{}{ + "id": o.ID, + "created_at": o.CreatedAt, + "updated_at": o.UpdatedAt, + "deleted_at": o.DeletedAt, + "entry": o.Entry, + } + u := map[string]interface{}{} + for _, f := range fields { + fs := f.String() + u[fs] = dbNameToFieldName[fs] + } + if err := db.Model(o).Updates(u).Error; err != nil { + if err == gorm.ErrRecordNotFound { + return err + } + + return fmt.Errorf("can't update MizuEntry %v fields %v: %s", + o, fields, err) + } + + return nil +} + +// MizuEntryUpdater is an MizuEntry updates manager +type MizuEntryUpdater struct { + fields map[string]interface{} + db *gorm.DB +} + +// NewMizuEntryUpdater creates new MizuEntry updater +// nolint: dupl +func NewMizuEntryUpdater(db *gorm.DB) MizuEntryUpdater { + return MizuEntryUpdater{ + fields: map[string]interface{}{}, + db: db.Model(&MizuEntry{}), + } +} + +// ===== END of MizuEntry modifiers + +// ===== END of all query sets diff --git a/api/src/pkg/models/book_model.go b/api/src/pkg/models/book_model.go new file mode 100644 index 000000000..cddbdd8a5 --- /dev/null +++ b/api/src/pkg/models/book_model.go @@ -0,0 +1,305 @@ +//go:generate goqueryset -in book_model.go +package models + +import ( + "github.com/jinzhu/gorm" + "time" +) + +/* +HTTP Archive (HAR) format +https://w3c.github.io/web-performance/specs/HAR/Overview.html +*/ + +// gen:qs +type MizuEntry struct { + gorm.Model + // The Entry itself + Entry Entry `json:"entry,omitempty"` + //TODO: here we will add fields we need to query for +} + + + +type Entry struct { + Pageref string `json:"pageref,omitempty"` + // Date and time stamp of the request start + // (ISO 8601 YYYY-MM-DDThh:mm:ss.sTZD). + StartedDateTime string `json:"startedDateTime"` + // Total elapsed time of the request in milliseconds. This is the sum of all + // timings available in the timings object (i.e. not including -1 values) . + Time float32 `json:"time"` + // Detailed info about the request. + Request Request `json:"request"` + // Detailed info about the response. + Response Response `json:"response"` + // Info about cache usage. + Cache Cache `json:"cache"` + // Detailed timing info about request/response round trip. + PageTimings PageTimings `json:"pageTimings"` + // optional (new in 1.2) IP address of the server that was connected + // (result of DNS resolution). + ServerIPAddress string `json:"serverIPAddress,omitempty"` + // optional (new in 1.2) Unique ID of the parent TCP/IP connection, can be + // the client port number. Note that a port number doesn't have to be unique + // identifier in cases where the port is shared for more connections. If the + // port isn't available for the application, any other unique connection ID + // can be used instead (e.g. connection index). Leave out this field if the + // application doesn't support this info. + Connection string `json:"connection,omitempty"` + // (new in 1.2) A comment provided by the user or the application. + Comment string `json:"comment,omitempty"` +} + +// Request contains detailed info about performed request. +type Request struct { + // Request method (GET, POST, ...). + Method string `json:"method"` + // Absolute URL of the request (fragments are not included). + URL string `json:"url"` + // Request HTTP Version. + HTTPVersion string `json:"httpVersion"` + // List of cookie objects. + Cookies []Cookie `json:"cookies"` + // List of header objects. + Headers []NVP `json:"headers"` + // List of query parameter objects. + QueryString []NVP `json:"queryString"` + // Posted data. + PostData PostData `json:"postData"` + // Total number of bytes from the start of the HTTP request message until + // (and including) the double CRLF before the body. Set to -1 if the info + // is not available. + HeaderSize int `json:"headerSize"` + // Size of the request body (POST data payload) in bytes. Set to -1 if the + // info is not available. + BodySize int `json:"bodySize"` + // (new in 1.2) A comment provided by the user or the application. + Comment string `json:"comment"` +} + +// Response contains detailed info about the response. +type Response struct { + // Response status. + Status int `json:"status"` + // Response status description. + StatusText string `json:"statusText"` + // Response HTTP Version. + HTTPVersion string `json:"httpVersion"` + // List of cookie objects. + Cookies []Cookie `json:"cookies"` + // List of header objects. + Headers []NVP `json:"headers"` + // Details about the response body. + Content Content `json:"content"` + // Redirection target URL from the Location response header. + RedirectURL string `json:"redirectURL"` + // Total number of bytes from the start of the HTTP response message until + // (and including) the double CRLF before the body. Set to -1 if the info is + // not available. + // The size of received response-headers is computed only from headers that + // are really received from the server. Additional headers appended by the + // browser are not included in this number, but they appear in the list of + // header objects. + HeadersSize int `json:"headersSize"` + // Size of the received response body in bytes. Set to zero in case of + // responses coming from the cache (304). Set to -1 if the info is not + // available. + BodySize int `json:"bodySize"` + // optional (new in 1.2) A comment provided by the user or the application. + Comment string `json:"comment,omitempty"` +} + +// Cookie contains list of all cookies (used in and objects). +type Cookie struct { + // The name of the cookie. + Name string `json:"name"` + // The cookie value. + Value string `json:"value"` + // optional The path pertaining to the cookie. + Path string `json:"path,omitempty"` + // optional The host of the cookie. + Domain string `json:"domain,omitempty"` + // optional Cookie expiration time. + // (ISO 8601 YYYY-MM-DDThh:mm:ss.sTZD, e.g. 2009-07-24T19:20:30.123+02:00). + Expires string `json:"expires,omitempty"` + // optional Set to true if the cookie is HTTP only, false otherwise. + HTTPOnly bool `json:"httpOnly,omitempty"` + // optional (new in 1.2) True if the cookie was transmitted over ssl, false + // otherwise. + Secure bool `json:"secure,omitempty"` + // optional (new in 1.2) A comment provided by the user or the application. + Comment bool `json:"comment,omitempty"` +} + +// NVP is simply a name/value pair with a comment +type NVP struct { + Name string `json:"name"` + Value string `json:"value"` + Comment string `json:"comment,omitempty"` +} + +// PostData describes posted data, if any (embedded in object). +type PostData struct { + // Mime type of posted data. + MimeType string `json:"mimeType"` + // List of posted parameters (in case of URL encoded parameters). + Params []PostParam `json:"params"` + // Plain text posted data + Text string `json:"text"` + // optional (new in 1.2) A comment provided by the user or the + // application. + Comment string `json:"comment,omitempty"` +} + +// PostParam is a list of posted parameters, if any (embedded in object). +type PostParam struct { + // name of a posted parameter. + Name string `json:"name"` + // optional value of a posted parameter or content of a posted file. + Value string `json:"value,omitempty"` + // optional name of a posted file. + FileName string `json:"fileName,omitempty"` + // optional content type of a posted file. + ContentType string `json:"contentType,omitempty"` + // optional (new in 1.2) A comment provided by the user or the application. + Comment string `json:"comment,omitempty"` +} + +// Content describes details about response content (embedded in object). +type Content struct { + // Length of the returned content in bytes. Should be equal to + // response.bodySize if there is no compression and bigger when the content + // has been compressed. + Size int `json:"size"` + // optional Number of bytes saved. Leave out this field if the information + // is not available. + Compression int `json:"compression,omitempty"` + // MIME type of the response text (value of the Content-Type response + // header). The charset attribute of the MIME type is included (if + // available). + MimeType string `json:"mimeType"` + // optional Response body sent from the server or loaded from the browser + // cache. This field is populated with textual content only. The text field + // is either HTTP decoded text or a encoded (e.g. "base64") representation of + // the response body. Leave out this field if the information is not + // available. + Text string `json:"text,omitempty"` + // optional (new in 1.2) Encoding used for response text field e.g + // "base64". Leave out this field if the text field is HTTP decoded + // (decompressed & unchunked), than trans-coded from its original character + // set into UTF-8. + Encoding string `json:"encoding,omitempty"` + // optional (new in 1.2) A comment provided by the user or the application. + Comment string `json:"comment,omitempty"` +} + +// Cache contains info about a request coming from browser cache. +type Cache struct { + // optional State of a cache entry before the request. Leave out this field + // if the information is not available. + BeforeRequest CacheObject `json:"beforeRequest,omitempty"` + // optional State of a cache entry after the request. Leave out this field if + // the information is not available. + AfterRequest CacheObject `json:"afterRequest,omitempty"` + // optional (new in 1.2) A comment provided by the user or the application. + Comment string `json:"comment,omitempty"` +} + +// CacheObject is used by both beforeRequest and afterRequest +type CacheObject struct { + // optional - Expiration time of the cache entry. + Expires string `json:"expires,omitempty"` + // The last time the cache entry was opened. + LastAccess string `json:"lastAccess"` + // Etag + ETag string `json:"eTag"` + // The number of times the cache entry has been opened. + HitCount int `json:"hitCount"` + // optional (new in 1.2) A comment provided by the user or the application. + Comment string `json:"comment,omitempty"` +} + +// PageTimings describes various phases within request-response round trip. +// All times are specified in milliseconds. +type PageTimings struct { + Blocked int `json:"blocked,omitempty"` + // optional - Time spent in a queue waiting for a network connection. Use -1 + // if the timing does not apply to the current request. + DNS int `json:"dns,omitempty"` + // optional - DNS resolution time. The time required to resolve a host name. + // Use -1 if the timing does not apply to the current request. + Connect int `json:"connect,omitempty"` + // optional - Time required to create TCP connection. Use -1 if the timing + // does not apply to the current request. + Send int `json:"send"` + // Time required to send HTTP request to the server. + Wait int `json:"wait"` + // Waiting for a response from the server. + Receive int `json:"receive"` + // Time required to read entire response from the server (or cache). + Ssl int `json:"ssl,omitempty"` + // optional (new in 1.2) - Time required for SSL/TLS negotiation. If this + // field is defined then the time is also included in the connect field (to + // ensure backward compatibility with HAR 1.1). Use -1 if the timing does not + // apply to the current request. + Comment string `json:"comment,omitempty"` + // optional (new in 1.2) - A comment provided by the user or the application. +} + +// TestResult contains results for an individual HTTP request +type TestResult struct { + URL string `json:"url"` + Status int `json:"status"` // 200, 500, etc. + StartTime time.Time `json:"startTime"` + EndTime time.Time `json:"endTime"` + Latency int `json:"latency"` // milliseconds + Method string `json:"method"` + HarFile string `json:"harfile"` +} +//package models +// +//import ( +// "database/sql/driver" +// "encoding/json" +// "errors" +// "time" +// +// "github.com/google/uuid" +//) +// +//// Book struct to describe book object. +//type Book struct { +// ID uuid.UUID `db:"id" json:"id" validate:"required,uuid"` +// CreatedAt time.Time `db:"created_at" json:"created_at"` +// UpdatedAt time.Time `db:"updated_at" json:"updated_at"` +// UserID uuid.UUID `db:"user_id" json:"user_id" validate:"required,uuid"` +// Title string `db:"title" json:"title" validate:"required,lte=255"` +// Author string `db:"author" json:"author" validate:"required,lte=255"` +// BookStatus int `db:"book_status" json:"book_status" validate:"required,len=1"` +// BookAttrs BookAttrs `db:"book_attrs" json:"book_attrs" validate:"required,dive"` +//} +// +//// BookAttrs struct to describe book attributes. +//type BookAttrs struct { +// Picture string `json:"picture"` +// Description string `json:"description"` +// Rating int `json:"rating" validate:"min=1,max=10"` +//} +// +//// Value make the BookAttrs struct implement the driver.Valuer interface. +//// This method simply returns the JSON-encoded representation of the struct. +//func (b BookAttrs) Value() (driver.Value, error) { +// return json.Marshal(b) +//} +// +//// Scan make the BookAttrs struct implement the sql.Scanner interface. +//// This method simply decodes a JSON-encoded value into the struct fields. +//func (b *BookAttrs) Scan(value interface{}) error { +// j, ok := value.([]byte) +// if !ok { +// return errors.New("type assertion to []byte failed") +// } +// +// return json.Unmarshal(j, &b) +//} diff --git a/api/src/pkg/routes/not_found_route.go b/api/src/pkg/routes/not_found_route.go new file mode 100644 index 000000000..2e0af5237 --- /dev/null +++ b/api/src/pkg/routes/not_found_route.go @@ -0,0 +1,18 @@ +package routes + +import "github.com/gofiber/fiber/v2" + +// NotFoundRoute func for describe 404 Error route. +func NotFoundRoute(a *fiber.App) { + // Register new special route. + a.Use( + // Anonimus function. + func(c *fiber.Ctx) error { + // Return HTTP 404 status and JSON response. + return c.Status(fiber.StatusNotFound).JSON(fiber.Map{ + "error": true, + "msg": "sorry, endpoint is not found", + }) + }, + ) +} diff --git a/api/src/pkg/routes/public_routes.go b/api/src/pkg/routes/public_routes.go new file mode 100644 index 000000000..1d558938c --- /dev/null +++ b/api/src/pkg/routes/public_routes.go @@ -0,0 +1,18 @@ +package routes + +import ( + "mizuserver/src/pkg/controllers" + + "github.com/gofiber/fiber/v2" +) + +// PublicRoutes func for describe group of public routes. +func PublicRoutes(a *fiber.App) { + // Create routes group. + route := a.Group("/api") + + // Routes for GET method: + route.Get("/entries", controllers.GetBooks) // get list of all books + route.Get("/entries/:id", controllers.GetBook) // get one book by ID + +} diff --git a/api/src/pkg/utils/utils.go b/api/src/pkg/utils/utils.go new file mode 100644 index 000000000..6e6e38302 --- /dev/null +++ b/api/src/pkg/utils/utils.go @@ -0,0 +1,30 @@ +package utils + +import ( + "fmt" + "github.com/gofiber/fiber/v2" + "log" + "os" + "os/signal" + "syscall" +) + +/// starts the server with a graceful shutdown +func StartServer(app *fiber.App) { + sigs := make(chan os.Signal, 2) + signal.Notify(sigs, + os.Interrupt, // this catch ctrl + c + syscall.SIGTSTP, // this catch ctrl + z + ) + + go func() { + _ = <-sigs + fmt.Println("Shutting down...") + _ = app.Shutdown() + }() + + // Run server. + if err := app.Listen(":8899"); err != nil { + log.Printf("Oops... Server is not running! Reason: %v", err) + } +} diff --git a/tap/go.mod b/tap/go.mod new file mode 100644 index 000000000..57e1d25ed --- /dev/null +++ b/tap/go.mod @@ -0,0 +1,8 @@ +module harsave + +go 1.16 + +require ( + github.com/google/martian v2.1.0+incompatible + github.com/jinzhu/gorm v1.9.16 +) diff --git a/tap/go.sum b/tap/go.sum new file mode 100644 index 000000000..94e118e2a --- /dev/null +++ b/tap/go.sum @@ -0,0 +1,45 @@ +github.com/CyrusBiotechnology/go-har v0.0.0-20160107200632-7e81ccfd566e h1:5/mVjqdyM1KH36dKfdfQ+En+Fqdj16aAlx9salHhzRY= +github.com/CyrusBiotechnology/go-har v0.0.0-20160107200632-7e81ccfd566e/go.mod h1:F06TYwuSm2x+nwDbYZ/K/I10kmiKWZWSMugUQ/YTSdQ= +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= +github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= +github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= +github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= +github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/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-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +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/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM= +gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= +gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.21.8 h1:2CEwZSzogdhsKPlJ9OvBKTdlWIpELXb6HbfLfMNhSYI= +gorm.io/gorm v1.21.8/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= diff --git a/tap/src/autogenerated_mizuEntry.go b/tap/src/autogenerated_mizuEntry.go new file mode 100644 index 000000000..850a6c6bc --- /dev/null +++ b/tap/src/autogenerated_mizuEntry.go @@ -0,0 +1,908 @@ +// Code generated by go-queryset. DO NOT EDIT. +package main + +import ( + "errors" + "fmt" + "strings" + "time" + + "github.com/google/martian/har" + "github.com/jinzhu/gorm" +) + +// ===== BEGIN of all query sets + +// ===== BEGIN of query set MizuEntryQuerySet + +// MizuEntryQuerySet is an queryset type for MizuEntry +type MizuEntryQuerySet struct { + db *gorm.DB +} + +// NewMizuEntryQuerySet constructs new MizuEntryQuerySet +func NewMizuEntryQuerySet(db *gorm.DB) MizuEntryQuerySet { + return MizuEntryQuerySet{ + db: db.Model(&MizuEntry{}), + } +} + +func (qs MizuEntryQuerySet) w(db *gorm.DB) MizuEntryQuerySet { + return NewMizuEntryQuerySet(db) +} + +func (qs MizuEntryQuerySet) Select(fields ...MizuEntryDBSchemaField) MizuEntryQuerySet { + names := []string{} + for _, f := range fields { + names = append(names, f.String()) + } + + return qs.w(qs.db.Select(strings.Join(names, ","))) +} + +// Create is an autogenerated method +// nolint: dupl +func (o *MizuEntry) Create(db *gorm.DB) error { + return db.Create(o).Error +} + +// Delete is an autogenerated method +// nolint: dupl +func (o *MizuEntry) Delete(db *gorm.DB) error { + return db.Delete(o).Error +} + +// All is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) All(ret *[]MizuEntry) error { + return qs.db.Find(ret).Error +} + +// Count is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) Count() (int, error) { + var count int + err := qs.db.Count(&count).Error + return count, err +} + +// CreatedAtEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtEq(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at = ?", createdAt)) +} + +// CreatedAtGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtGt(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at > ?", createdAt)) +} + +// CreatedAtGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtGte(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at >= ?", createdAt)) +} + +// CreatedAtLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtLt(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at < ?", createdAt)) +} + +// CreatedAtLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtLte(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at <= ?", createdAt)) +} + +// CreatedAtNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) CreatedAtNe(createdAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("created_at != ?", createdAt)) +} + +// Delete is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) Delete() error { + return qs.db.Delete(MizuEntry{}).Error +} + +// DeleteNum is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeleteNum() (int64, error) { + db := qs.db.Delete(MizuEntry{}) + return db.RowsAffected, db.Error +} + +// DeleteNumUnscoped is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeleteNumUnscoped() (int64, error) { + db := qs.db.Unscoped().Delete(MizuEntry{}) + return db.RowsAffected, db.Error +} + +// DeletedAtEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtEq(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at = ?", deletedAt)) +} + +// DeletedAtGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtGt(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at > ?", deletedAt)) +} + +// DeletedAtGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtGte(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at >= ?", deletedAt)) +} + +// DeletedAtIsNotNull is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtIsNotNull() MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at IS NOT NULL")) +} + +// DeletedAtIsNull is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtIsNull() MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at IS NULL")) +} + +// DeletedAtLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtLt(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at < ?", deletedAt)) +} + +// DeletedAtLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtLte(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at <= ?", deletedAt)) +} + +// DeletedAtNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) DeletedAtNe(deletedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("deleted_at != ?", deletedAt)) +} + +// GetDB is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) GetDB() *gorm.DB { + return qs.db +} + +// GetUpdater is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) GetUpdater() MizuEntryUpdater { + return NewMizuEntryUpdater(qs.db) +} + +// IDEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDEq(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id = ?", ID)) +} + +// IDGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDGt(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id > ?", ID)) +} + +// IDGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDGte(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id >= ?", ID)) +} + +// IDIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDIn(ID ...uint) MizuEntryQuerySet { + if len(ID) == 0 { + qs.db.AddError(errors.New("must at least pass one ID in IDIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("id IN (?)", ID)) +} + +// IDLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDLt(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id < ?", ID)) +} + +// IDLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDLte(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id <= ?", ID)) +} + +// IDNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDNe(ID uint) MizuEntryQuerySet { + return qs.w(qs.db.Where("id != ?", ID)) +} + +// IDNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) IDNotIn(ID ...uint) MizuEntryQuerySet { + if len(ID) == 0 { + qs.db.AddError(errors.New("must at least pass one ID in IDNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("id NOT IN (?)", ID)) +} + +// Limit is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) Limit(limit int) MizuEntryQuerySet { + return qs.w(qs.db.Limit(limit)) +} + +// MethodEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodEq(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method = ?", method)) +} + +// MethodGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodGt(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method > ?", method)) +} + +// MethodGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodGte(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method >= ?", method)) +} + +// MethodIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodIn(method ...string) MizuEntryQuerySet { + if len(method) == 0 { + qs.db.AddError(errors.New("must at least pass one method in MethodIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("method IN (?)", method)) +} + +// MethodLike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodLike(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method LIKE ?", method)) +} + +// MethodLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodLt(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method < ?", method)) +} + +// MethodLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodLte(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method <= ?", method)) +} + +// MethodNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodNe(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method != ?", method)) +} + +// MethodNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodNotIn(method ...string) MizuEntryQuerySet { + if len(method) == 0 { + qs.db.AddError(errors.New("must at least pass one method in MethodNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("method NOT IN (?)", method)) +} + +// MethodNotlike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) MethodNotlike(method string) MizuEntryQuerySet { + return qs.w(qs.db.Where("method NOT LIKE ?", method)) +} + +// Offset is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) Offset(offset int) MizuEntryQuerySet { + return qs.w(qs.db.Offset(offset)) +} + +// One is used to retrieve one result. It returns gorm.ErrRecordNotFound +// if nothing was fetched +func (qs MizuEntryQuerySet) One(ret *MizuEntry) error { + return qs.db.First(ret).Error +} + +// OrderAscByCreatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByCreatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("created_at ASC")) +} + +// OrderAscByDeletedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByDeletedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("deleted_at ASC")) +} + +// OrderAscByID is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByID() MizuEntryQuerySet { + return qs.w(qs.db.Order("id ASC")) +} + +// OrderAscByMethod is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByMethod() MizuEntryQuerySet { + return qs.w(qs.db.Order("method ASC")) +} + +// OrderAscByService is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByService() MizuEntryQuerySet { + return qs.w(qs.db.Order("service ASC")) +} + +// OrderAscBySource is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscBySource() MizuEntryQuerySet { + return qs.w(qs.db.Order("source ASC")) +} + +// OrderAscByStatus is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByStatus() MizuEntryQuerySet { + return qs.w(qs.db.Order("status ASC")) +} + +// OrderAscByUpdatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByUpdatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("updated_at ASC")) +} + +// OrderAscByUrl is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByUrl() MizuEntryQuerySet { + return qs.w(qs.db.Order("url ASC")) +} + +// OrderDescByCreatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByCreatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("created_at DESC")) +} + +// OrderDescByDeletedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByDeletedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("deleted_at DESC")) +} + +// OrderDescByID is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByID() MizuEntryQuerySet { + return qs.w(qs.db.Order("id DESC")) +} + +// OrderDescByMethod is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByMethod() MizuEntryQuerySet { + return qs.w(qs.db.Order("method DESC")) +} + +// OrderDescByService is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByService() MizuEntryQuerySet { + return qs.w(qs.db.Order("service DESC")) +} + +// OrderDescBySource is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescBySource() MizuEntryQuerySet { + return qs.w(qs.db.Order("source DESC")) +} + +// OrderDescByStatus is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByStatus() MizuEntryQuerySet { + return qs.w(qs.db.Order("status DESC")) +} + +// OrderDescByUpdatedAt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByUpdatedAt() MizuEntryQuerySet { + return qs.w(qs.db.Order("updated_at DESC")) +} + +// OrderDescByUrl is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByUrl() MizuEntryQuerySet { + return qs.w(qs.db.Order("url DESC")) +} + +// PreloadEntry is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) PreloadEntry() MizuEntryQuerySet { + return qs.w(qs.db.Preload("Entry")) +} + +// ServiceEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceEq(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service = ?", service)) +} + +// ServiceGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceGt(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service > ?", service)) +} + +// ServiceGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceGte(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service >= ?", service)) +} + +// ServiceIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceIn(service ...string) MizuEntryQuerySet { + if len(service) == 0 { + qs.db.AddError(errors.New("must at least pass one service in ServiceIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("service IN (?)", service)) +} + +// ServiceLike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceLike(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service LIKE ?", service)) +} + +// ServiceLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceLt(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service < ?", service)) +} + +// ServiceLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceLte(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service <= ?", service)) +} + +// ServiceNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceNe(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service != ?", service)) +} + +// ServiceNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceNotIn(service ...string) MizuEntryQuerySet { + if len(service) == 0 { + qs.db.AddError(errors.New("must at least pass one service in ServiceNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("service NOT IN (?)", service)) +} + +// ServiceNotlike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) ServiceNotlike(service string) MizuEntryQuerySet { + return qs.w(qs.db.Where("service NOT LIKE ?", service)) +} + +// SourceEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceEq(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source = ?", source)) +} + +// SourceGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceGt(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source > ?", source)) +} + +// SourceGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceGte(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source >= ?", source)) +} + +// SourceIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceIn(source ...string) MizuEntryQuerySet { + if len(source) == 0 { + qs.db.AddError(errors.New("must at least pass one source in SourceIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("source IN (?)", source)) +} + +// SourceLike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceLike(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source LIKE ?", source)) +} + +// SourceLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceLt(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source < ?", source)) +} + +// SourceLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceLte(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source <= ?", source)) +} + +// SourceNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceNe(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source != ?", source)) +} + +// SourceNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceNotIn(source ...string) MizuEntryQuerySet { + if len(source) == 0 { + qs.db.AddError(errors.New("must at least pass one source in SourceNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("source NOT IN (?)", source)) +} + +// SourceNotlike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) SourceNotlike(source string) MizuEntryQuerySet { + return qs.w(qs.db.Where("source NOT LIKE ?", source)) +} + +// StatusEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusEq(status int) MizuEntryQuerySet { + return qs.w(qs.db.Where("status = ?", status)) +} + +// StatusGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusGt(status int) MizuEntryQuerySet { + return qs.w(qs.db.Where("status > ?", status)) +} + +// StatusGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusGte(status int) MizuEntryQuerySet { + return qs.w(qs.db.Where("status >= ?", status)) +} + +// StatusIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusIn(status ...int) MizuEntryQuerySet { + if len(status) == 0 { + qs.db.AddError(errors.New("must at least pass one status in StatusIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("status IN (?)", status)) +} + +// StatusLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusLt(status int) MizuEntryQuerySet { + return qs.w(qs.db.Where("status < ?", status)) +} + +// StatusLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusLte(status int) MizuEntryQuerySet { + return qs.w(qs.db.Where("status <= ?", status)) +} + +// StatusNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusNe(status int) MizuEntryQuerySet { + return qs.w(qs.db.Where("status != ?", status)) +} + +// StatusNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) StatusNotIn(status ...int) MizuEntryQuerySet { + if len(status) == 0 { + qs.db.AddError(errors.New("must at least pass one status in StatusNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("status NOT IN (?)", status)) +} + +// UpdatedAtEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtEq(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at = ?", updatedAt)) +} + +// UpdatedAtGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtGt(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at > ?", updatedAt)) +} + +// UpdatedAtGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtGte(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at >= ?", updatedAt)) +} + +// UpdatedAtLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtLt(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at < ?", updatedAt)) +} + +// UpdatedAtLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtLte(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at <= ?", updatedAt)) +} + +// UpdatedAtNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UpdatedAtNe(updatedAt time.Time) MizuEntryQuerySet { + return qs.w(qs.db.Where("updated_at != ?", updatedAt)) +} + +// UrlEq is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlEq(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url = ?", url)) +} + +// UrlGt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlGt(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url > ?", url)) +} + +// UrlGte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlGte(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url >= ?", url)) +} + +// UrlIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlIn(url ...string) MizuEntryQuerySet { + if len(url) == 0 { + qs.db.AddError(errors.New("must at least pass one url in UrlIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("url IN (?)", url)) +} + +// UrlLike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlLike(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url LIKE ?", url)) +} + +// UrlLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlLt(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url < ?", url)) +} + +// UrlLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlLte(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url <= ?", url)) +} + +// UrlNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlNe(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url != ?", url)) +} + +// UrlNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlNotIn(url ...string) MizuEntryQuerySet { + if len(url) == 0 { + qs.db.AddError(errors.New("must at least pass one url in UrlNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("url NOT IN (?)", url)) +} + +// UrlNotlike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) UrlNotlike(url string) MizuEntryQuerySet { + return qs.w(qs.db.Where("url NOT LIKE ?", url)) +} + +// SetCreatedAt is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetCreatedAt(createdAt time.Time) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.CreatedAt)] = createdAt + return u +} + +// SetDeletedAt is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetDeletedAt(deletedAt *time.Time) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.DeletedAt)] = deletedAt + return u +} + +// SetEntry is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetEntry(entry har.Entry) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.Entry)] = entry + return u +} + +// SetID is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetID(ID uint) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.ID)] = ID + return u +} + +// SetMethod is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetMethod(method string) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.Method)] = method + return u +} + +// SetService is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetService(service string) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.Service)] = service + return u +} + +// SetSource is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetSource(source string) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.Source)] = source + return u +} + +// SetStatus is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetStatus(status int) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.Status)] = status + return u +} + +// SetUpdatedAt is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetUpdatedAt(updatedAt time.Time) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.UpdatedAt)] = updatedAt + return u +} + +// SetUrl is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetUrl(url string) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.Url)] = url + return u +} + +// Update is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) Update() error { + return u.db.Updates(u.fields).Error +} + +// UpdateNum is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) UpdateNum() (int64, error) { + db := u.db.Updates(u.fields) + return db.RowsAffected, db.Error +} + +// ===== END of query set MizuEntryQuerySet + +// ===== BEGIN of MizuEntry modifiers + +// MizuEntryDBSchemaField describes database schema field. It requires for method 'Update' +type MizuEntryDBSchemaField string + +// String method returns string representation of field. +// nolint: dupl +func (f MizuEntryDBSchemaField) String() string { + return string(f) +} + +// MizuEntryDBSchema stores db field names of MizuEntry +var MizuEntryDBSchema = struct { + ID MizuEntryDBSchemaField + CreatedAt MizuEntryDBSchemaField + UpdatedAt MizuEntryDBSchemaField + DeletedAt MizuEntryDBSchemaField + Entry MizuEntryDBSchemaField + Url MizuEntryDBSchemaField + Method MizuEntryDBSchemaField + Status MizuEntryDBSchemaField + Source MizuEntryDBSchemaField + Service MizuEntryDBSchemaField +}{ + + ID: MizuEntryDBSchemaField("id"), + CreatedAt: MizuEntryDBSchemaField("created_at"), + UpdatedAt: MizuEntryDBSchemaField("updated_at"), + DeletedAt: MizuEntryDBSchemaField("deleted_at"), + Entry: MizuEntryDBSchemaField("entry"), + Url: MizuEntryDBSchemaField("url"), + Method: MizuEntryDBSchemaField("method"), + Status: MizuEntryDBSchemaField("status"), + Source: MizuEntryDBSchemaField("source"), + Service: MizuEntryDBSchemaField("service"), +} + +// Update updates MizuEntry fields by primary key +// nolint: dupl +func (o *MizuEntry) Update(db *gorm.DB, fields ...MizuEntryDBSchemaField) error { + dbNameToFieldName := map[string]interface{}{ + "id": o.ID, + "created_at": o.CreatedAt, + "updated_at": o.UpdatedAt, + "deleted_at": o.DeletedAt, + "entry": o.Entry, + "url": o.Url, + "method": o.Method, + "status": o.Status, + "source": o.Source, + "service": o.Service, + } + u := map[string]interface{}{} + for _, f := range fields { + fs := f.String() + u[fs] = dbNameToFieldName[fs] + } + if err := db.Model(o).Updates(u).Error; err != nil { + if err == gorm.ErrRecordNotFound { + return err + } + + return fmt.Errorf("can't update MizuEntry %v fields %v: %s", + o, fields, err) + } + + return nil +} + +// MizuEntryUpdater is an MizuEntry updates manager +type MizuEntryUpdater struct { + fields map[string]interface{} + db *gorm.DB +} + +// NewMizuEntryUpdater creates new MizuEntry updater +// nolint: dupl +func NewMizuEntryUpdater(db *gorm.DB) MizuEntryUpdater { + return MizuEntryUpdater{ + fields: map[string]interface{}{}, + db: db.Model(&MizuEntry{}), + } +} + +// ===== END of MizuEntry modifiers + +// ===== END of all query sets diff --git a/tap/src/main.go b/tap/src/main.go new file mode 100644 index 000000000..c4668388f --- /dev/null +++ b/tap/src/main.go @@ -0,0 +1,64 @@ +package main + +import ( + "bufio" + "encoding/json" + "fmt" + "github.com/google/martian/har" + "github.com/jinzhu/gorm" + // "gorm.io/driver/sqlite" + _ "github.com/jinzhu/gorm/dialects/sqlite" + "os" +) + +func check(e error) { + if e != nil { + panic(e) + } +} + +func main() { + FILEPATH := "/Users/roeegadot/Downloads/testing.har" + file, err := os.Open(FILEPATH) + if err != nil { + fmt.Print(err) + os.Exit(1) + } + + reader := bufio.NewReader(file) + dec := json.NewDecoder(reader) + var inputHar har.HAR + if err := dec.Decode(&inputHar); err != nil { + fmt.Print(err) + os.Exit(1) + + } + + for _, entry := range inputHar.Log.Entries { + saveHarToDb(*entry) + } + +} + +func getGormDB() *gorm.DB { + db, _ := gorm.Open("sqlite", "roee.db") + return db +} + +func saveHarToDb(entry har.Entry) { + entryData := entry + mizuEntry := MizuEntry{ + EntryId: NewObjectID(), + Entry: entryData, + Url: entryData.Request.URL, + Method: entryData.Request.Method, + Status: entryData.Response.Status, + Source: "", + Service: "MyService", + } + + if err := mizuEntry.Create(getGormDB()); err != nil { + panic("cannot create") + } +} + diff --git a/tap/src/mizuEntry.go b/tap/src/mizuEntry.go new file mode 100644 index 000000000..ed6189a68 --- /dev/null +++ b/tap/src/mizuEntry.go @@ -0,0 +1,23 @@ +package main + +import ( + "github.com/jinzhu/gorm" + "github.com/google/martian/har" +) + + +//go:generate goqueryset -in mizuEntry.go +// gen:qs +type MizuEntry struct { + gorm.Model + // The Entry itself + Entry har.Entry `json:"entry,omitempty"` + //TODO: here we will add fields we need to query for + + EntryId ObjectID `json:"entryId"` + Url string `json:"url"` + Method string `json:"method"` + Status int `json:"status"` + Source string `json:"source"` + Service string `json:"serviceName"` +} diff --git a/tap/src/models.go b/tap/src/models.go new file mode 100644 index 000000000..bdfb6a12f --- /dev/null +++ b/tap/src/models.go @@ -0,0 +1,471 @@ +//// Code generated by go-queryset. DO NOT EDIT. +package main +// +//import ( +// "errors" +// "fmt" +// "strings" +// "time" +// +// "github.com/jinzhu/gorm" +// "github.com/google/martian/har" +// +//) +// +//// ===== BEGIN of all query sets +// +//// ===== BEGIN of query set MizuEntryQuerySet +// +//// MizuEntryQuerySet is an queryset type for MizuEntry +//type MizuEntryQuerySet struct { +// db *gorm.DB +//} +// +//// NewMizuEntryQuerySet constructs new MizuEntryQuerySet +//func NewMizuEntryQuerySet(db *gorm.DB) MizuEntryQuerySet { +// return MizuEntryQuerySet{ +// db: db.Model(&MizuEntry{}), +// } +//} +// +//func (qs MizuEntryQuerySet) w(db *gorm.DB) MizuEntryQuerySet { +// return NewMizuEntryQuerySet(db) +//} +// +//func (qs MizuEntryQuerySet) Select(fields ...MizuEntryDBSchemaField) MizuEntryQuerySet { +// names := []string{} +// for _, f := range fields { +// names = append(names, f.String()) +// } +// +// return qs.w(qs.db.Select(strings.Join(names, ","))) +//} +// +//// Create is an autogenerated method +//// nolint: dupl +//func (o *MizuEntry) Create(db *gorm.DB) error { +// return db.Create(o).Error +//} +// +//// Delete is an autogenerated method +//// nolint: dupl +//func (o *MizuEntry) Delete(db *gorm.DB) error { +// return db.Delete(o).Error +//} +// +//// All is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) All(ret *[]MizuEntry) error { +// return qs.db.Find(ret).Error +//} +// +//// Count is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) Count() (int, error) { +// var count int +// err := qs.db.Count(&count).Error +// return count, err +//} +// +//// CreatedAtEq is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) CreatedAtEq(createdAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("created_at = ?", createdAt)) +//} +// +//// CreatedAtGt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) CreatedAtGt(createdAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("created_at > ?", createdAt)) +//} +// +//// CreatedAtGte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) CreatedAtGte(createdAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("created_at >= ?", createdAt)) +//} +// +//// CreatedAtLt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) CreatedAtLt(createdAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("created_at < ?", createdAt)) +//} +// +//// CreatedAtLte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) CreatedAtLte(createdAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("created_at <= ?", createdAt)) +//} +// +//// CreatedAtNe is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) CreatedAtNe(createdAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("created_at != ?", createdAt)) +//} +// +//// Delete is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) Delete() error { +// return qs.db.Delete(MizuEntry{}).Error +//} +// +//// DeleteNum is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeleteNum() (int64, error) { +// db := qs.db.Delete(MizuEntry{}) +// return db.RowsAffected, db.Error +//} +// +//// DeleteNumUnscoped is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeleteNumUnscoped() (int64, error) { +// db := qs.db.Unscoped().Delete(MizuEntry{}) +// return db.RowsAffected, db.Error +//} +// +//// DeletedAtEq is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtEq(deletedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at = ?", deletedAt)) +//} +// +//// DeletedAtGt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtGt(deletedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at > ?", deletedAt)) +//} +// +//// DeletedAtGte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtGte(deletedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at >= ?", deletedAt)) +//} +// +//// DeletedAtIsNotNull is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtIsNotNull() MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at IS NOT NULL")) +//} +// +//// DeletedAtIsNull is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtIsNull() MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at IS NULL")) +//} +// +//// DeletedAtLt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtLt(deletedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at < ?", deletedAt)) +//} +// +//// DeletedAtLte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtLte(deletedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at <= ?", deletedAt)) +//} +// +//// DeletedAtNe is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) DeletedAtNe(deletedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("deleted_at != ?", deletedAt)) +//} +// +//// GetDB is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) GetDB() *gorm.DB { +// return qs.db +//} +// +//// GetUpdater is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) GetUpdater() MizuEntryUpdater { +// return NewMizuEntryUpdater(qs.db) +//} +// +//// IDEq is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDEq(ID uint) MizuEntryQuerySet { +// return qs.w(qs.db.Where("id = ?", ID)) +//} +// +//// IDGt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDGt(ID uint) MizuEntryQuerySet { +// return qs.w(qs.db.Where("id > ?", ID)) +//} +// +//// IDGte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDGte(ID uint) MizuEntryQuerySet { +// return qs.w(qs.db.Where("id >= ?", ID)) +//} +// +//// IDIn is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDIn(ID ...uint) MizuEntryQuerySet { +// if len(ID) == 0 { +// qs.db.AddError(errors.New("must at least pass one ID in IDIn")) +// return qs.w(qs.db) +// } +// return qs.w(qs.db.Where("id IN (?)", ID)) +//} +// +//// IDLt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDLt(ID uint) MizuEntryQuerySet { +// return qs.w(qs.db.Where("id < ?", ID)) +//} +// +//// IDLte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDLte(ID uint) MizuEntryQuerySet { +// return qs.w(qs.db.Where("id <= ?", ID)) +//} +// +//// IDNe is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDNe(ID uint) MizuEntryQuerySet { +// return qs.w(qs.db.Where("id != ?", ID)) +//} +// +//// IDNotIn is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) IDNotIn(ID ...uint) MizuEntryQuerySet { +// if len(ID) == 0 { +// qs.db.AddError(errors.New("must at least pass one ID in IDNotIn")) +// return qs.w(qs.db) +// } +// return qs.w(qs.db.Where("id NOT IN (?)", ID)) +//} +// +//// Limit is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) Limit(limit int) MizuEntryQuerySet { +// return qs.w(qs.db.Limit(limit)) +//} +// +//// Offset is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) Offset(offset int) MizuEntryQuerySet { +// return qs.w(qs.db.Offset(offset)) +//} +// +//// One is used to retrieve one result. It returns gorm.ErrRecordNotFound +//// if nothing was fetched +//func (qs MizuEntryQuerySet) One(ret *MizuEntry) error { +// return qs.db.First(ret).Error +//} +// +//// OrderAscByCreatedAt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderAscByCreatedAt() MizuEntryQuerySet { +// return qs.w(qs.db.Order("created_at ASC")) +//} +// +//// OrderAscByDeletedAt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderAscByDeletedAt() MizuEntryQuerySet { +// return qs.w(qs.db.Order("deleted_at ASC")) +//} +// +//// OrderAscByID is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderAscByID() MizuEntryQuerySet { +// return qs.w(qs.db.Order("id ASC")) +//} +// +//// OrderAscByUpdatedAt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderAscByUpdatedAt() MizuEntryQuerySet { +// return qs.w(qs.db.Order("updated_at ASC")) +//} +// +//// OrderDescByCreatedAt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderDescByCreatedAt() MizuEntryQuerySet { +// return qs.w(qs.db.Order("created_at DESC")) +//} +// +//// OrderDescByDeletedAt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderDescByDeletedAt() MizuEntryQuerySet { +// return qs.w(qs.db.Order("deleted_at DESC")) +//} +// +//// OrderDescByID is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderDescByID() MizuEntryQuerySet { +// return qs.w(qs.db.Order("id DESC")) +//} +// +//// OrderDescByUpdatedAt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) OrderDescByUpdatedAt() MizuEntryQuerySet { +// return qs.w(qs.db.Order("updated_at DESC")) +//} +// +//// PreloadEntry is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) PreloadEntry() MizuEntryQuerySet { +// return qs.w(qs.db.Preload("Entry")) +//} +// +//// UpdatedAtEq is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) UpdatedAtEq(updatedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("updated_at = ?", updatedAt)) +//} +// +//// UpdatedAtGt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) UpdatedAtGt(updatedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("updated_at > ?", updatedAt)) +//} +// +//// UpdatedAtGte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) UpdatedAtGte(updatedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("updated_at >= ?", updatedAt)) +//} +// +//// UpdatedAtLt is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) UpdatedAtLt(updatedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("updated_at < ?", updatedAt)) +//} +// +//// UpdatedAtLte is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) UpdatedAtLte(updatedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("updated_at <= ?", updatedAt)) +//} +// +//// UpdatedAtNe is an autogenerated method +//// nolint: dupl +//func (qs MizuEntryQuerySet) UpdatedAtNe(updatedAt time.Time) MizuEntryQuerySet { +// return qs.w(qs.db.Where("updated_at != ?", updatedAt)) +//} +// +//// SetCreatedAt is an autogenerated method +//// nolint: dupl +//func (u MizuEntryUpdater) SetCreatedAt(createdAt time.Time) MizuEntryUpdater { +// u.fields[string(MizuEntryDBSchema.CreatedAt)] = createdAt +// return u +//} +// +//// SetDeletedAt is an autogenerated method +//// nolint: dupl +//func (u MizuEntryUpdater) SetDeletedAt(deletedAt *time.Time) MizuEntryUpdater { +// u.fields[string(MizuEntryDBSchema.DeletedAt)] = deletedAt +// return u +//} +// +//// SetEntry is an autogenerated method +//// nolint: dupl +//func (u MizuEntryUpdater) SetEntry(entry har.Entry) MizuEntryUpdater { +// u.fields[string(MizuEntryDBSchema.Entry)] = entry +// return u +//} +// +//// SetID is an autogenerated method +//// nolint: dupl +//func (u MizuEntryUpdater) SetID(ID uint) MizuEntryUpdater { +// u.fields[string(MizuEntryDBSchema.ID)] = ID +// return u +//} +// +//// SetUpdatedAt is an autogenerated method +//// nolint: dupl +//func (u MizuEntryUpdater) SetUpdatedAt(updatedAt time.Time) MizuEntryUpdater { +// u.fields[string(MizuEntryDBSchema.UpdatedAt)] = updatedAt +// return u +//} +// +//// Update is an autogenerated method +//// nolint: dupl +//func (u MizuEntryUpdater) Update() error { +// return u.db.Updates(u.fields).Error +//} +// +//// UpdateNum is an autogenerated method +//// nolint: dupl +//func (u MizuEntryUpdater) UpdateNum() (int64, error) { +// db := u.db.Updates(u.fields) +// return db.RowsAffected, db.Error +//} +// +//// ===== END of query set MizuEntryQuerySet +// +//// ===== BEGIN of MizuEntry modifiers +// +//// MizuEntryDBSchemaField describes database schema field. It requires for method 'Update' +//type MizuEntryDBSchemaField string +// +//// String method returns string representation of field. +//// nolint: dupl +//func (f MizuEntryDBSchemaField) String() string { +// return string(f) +//} +// +//// MizuEntryDBSchema stores db field names of MizuEntry +//var MizuEntryDBSchema = struct { +// ID MizuEntryDBSchemaField +// CreatedAt MizuEntryDBSchemaField +// UpdatedAt MizuEntryDBSchemaField +// DeletedAt MizuEntryDBSchemaField +// Entry MizuEntryDBSchemaField +//}{ +// +// ID: MizuEntryDBSchemaField("id"), +// CreatedAt: MizuEntryDBSchemaField("created_at"), +// UpdatedAt: MizuEntryDBSchemaField("updated_at"), +// DeletedAt: MizuEntryDBSchemaField("deleted_at"), +// Entry: MizuEntryDBSchemaField("entry"), +//} +// +//// Update updates MizuEntry fields by primary key +//// nolint: dupl +//func (o *MizuEntry) Update(db *gorm.DB, fields ...MizuEntryDBSchemaField) error { +// dbNameToFieldName := map[string]interface{}{ +// "id": o.ID, +// "created_at": o.CreatedAt, +// "updated_at": o.UpdatedAt, +// "deleted_at": o.DeletedAt, +// "entry": o.Entry, +// } +// u := map[string]interface{}{} +// for _, f := range fields { +// fs := f.String() +// u[fs] = dbNameToFieldName[fs] +// } +// if err := db.Model(o).Updates(u).Error; err != nil { +// if err == gorm.ErrRecordNotFound { +// return err +// } +// +// return fmt.Errorf("can't update MizuEntry %v fields %v: %s", +// o, fields, err) +// } +// +// return nil +//} +// +//// MizuEntryUpdater is an MizuEntry updates manager +//type MizuEntryUpdater struct { +// fields map[string]interface{} +// db *gorm.DB +//} +// +//// NewMizuEntryUpdater creates new MizuEntry updater +//// nolint: dupl +//func NewMizuEntryUpdater(db *gorm.DB) MizuEntryUpdater { +// return MizuEntryUpdater{ +// fields: map[string]interface{}{}, +// db: db.Model(&MizuEntry{}), +// } +//} +// +//// ===== END of MizuEntry modifiers +// +//// ===== END of all query sets diff --git a/tap/src/types.go b/tap/src/types.go new file mode 100644 index 000000000..ef9b56e7e --- /dev/null +++ b/tap/src/types.go @@ -0,0 +1,175 @@ +package main + +import ( + "bytes" + "crypto/rand" + "encoding/binary" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "io" + "sync/atomic" + "time" +) + +// ErrInvalidHex indicates that a hex string cannot be converted to an ObjectID. +var ErrInvalidHex = errors.New("the provided hex string is not a valid ObjectID") + +// ObjectID is the BSON ObjectID type. +type ObjectID [12]byte + +// NilObjectID is the zero value for ObjectID. +var NilObjectID ObjectID + +var objectIDCounter = readRandomUint32() +var processUnique = processUniqueBytes() + +// NewObjectID generates a new ObjectID. +func NewObjectID() ObjectID { + return NewObjectIDFromTimestamp(time.Now()) +} + +// NewObjectIDFromTimestamp generates a new ObjectID based on the given time. +func NewObjectIDFromTimestamp(timestamp time.Time) ObjectID { + var b [12]byte + + binary.BigEndian.PutUint32(b[0:4], uint32(timestamp.Unix())) + copy(b[4:9], processUnique[:]) + putUint24(b[9:12], atomic.AddUint32(&objectIDCounter, 1)) + + return b +} + +// Timestamp extracts the time part of the ObjectId. +func (id ObjectID) Timestamp() time.Time { + unixSecs := binary.BigEndian.Uint32(id[0:4]) + return time.Unix(int64(unixSecs), 0).UTC() +} + +// Hex returns the hex encoding of the ObjectID as a string. +func (id ObjectID) Hex() string { + return hex.EncodeToString(id[:]) +} + +func (id ObjectID) String() string { + return fmt.Sprintf("ObjectID(%q)", id.Hex()) +} + +// IsZero returns true if id is the empty ObjectID. +func (id ObjectID) IsZero() bool { + return bytes.Equal(id[:], NilObjectID[:]) +} + +// ObjectIDFromHex creates a new ObjectID from a hex string. It returns an error if the hex string is not a +// valid ObjectID. +func ObjectIDFromHex(s string) (ObjectID, error) { + b, err := hex.DecodeString(s) + if err != nil { + return NilObjectID, err + } + + if len(b) != 12 { + return NilObjectID, ErrInvalidHex + } + + var oid [12]byte + copy(oid[:], b[:]) + + return oid, nil +} + +// IsValidObjectID returns true if the provided hex string represents a valid ObjectID and false if not. +func IsValidObjectID(s string) bool { + _, err := ObjectIDFromHex(s) + return err == nil +} + +// MarshalJSON returns the ObjectID as a string +func (id ObjectID) MarshalJSON() ([]byte, error) { + return json.Marshal(id.Hex()) +} + +// UnmarshalJSON populates the byte slice with the ObjectID. If the byte slice is 24 bytes long, it +// will be populated with the hex representation of the ObjectID. If the byte slice is twelve bytes +// long, it will be populated with the BSON representation of the ObjectID. This method also accepts empty strings and +// decodes them as NilObjectID. For any other inputs, an error will be returned. +func (id *ObjectID) UnmarshalJSON(b []byte) error { + // Ignore "null" to keep parity with the standard library. Decoding a JSON null into a non-pointer ObjectID field + // will leave the field unchanged. For pointer values, encoding/json will set the pointer to nil and will not + // enter the UnmarshalJSON hook. + if string(b) == "null" { + return nil + } + + var err error + switch len(b) { + case 12: + copy(id[:], b) + default: + // Extended JSON + var res interface{} + err := json.Unmarshal(b, &res) + if err != nil { + return err + } + str, ok := res.(string) + if !ok { + m, ok := res.(map[string]interface{}) + if !ok { + return errors.New("not an extended JSON ObjectID") + } + oid, ok := m["$oid"] + if !ok { + return errors.New("not an extended JSON ObjectID") + } + str, ok = oid.(string) + if !ok { + return errors.New("not an extended JSON ObjectID") + } + } + + // An empty string is not a valid ObjectID, but we treat it as a special value that decodes as NilObjectID. + if len(str) == 0 { + copy(id[:], NilObjectID[:]) + return nil + } + + if len(str) != 24 { + return fmt.Errorf("cannot unmarshal into an ObjectID, the length must be 24 but it is %d", len(str)) + } + + _, err = hex.Decode(id[:], []byte(str)) + if err != nil { + return err + } + } + + return err +} + +func processUniqueBytes() [5]byte { + var b [5]byte + _, err := io.ReadFull(rand.Reader, b[:]) + if err != nil { + panic(fmt.Errorf("cannot initialize objectid package with crypto.rand.Reader: %v", err)) + } + + return b +} + +func readRandomUint32() uint32 { + var b [4]byte + _, err := io.ReadFull(rand.Reader, b[:]) + if err != nil { + panic(fmt.Errorf("cannot initialize objectid package with crypto.rand.Reader: %v", err)) + } + + return (uint32(b[0]) << 0) | (uint32(b[1]) << 8) | (uint32(b[2]) << 16) | (uint32(b[3]) << 24) +} + +func putUint24(b []byte, v uint32) { + b[0] = byte(v >> 16) + b[1] = byte(v >> 8) + b[2] = byte(v) +} From 162dc9de7f7ebc00409436704844e38b5cbe146c Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Thu, 22 Apr 2021 20:11:22 +0300 Subject: [PATCH 02/10] no message --- tap/go.mod | 3 +- tap/go.sum | 5 +- tap/src/autogenerated_mizuEntry.go | 193 ++++++++++++++++++++++------- tap/src/main.go | 32 ++--- tap/src/mizuEntry.go | 9 +- 5 files changed, 176 insertions(+), 66 deletions(-) diff --git a/tap/go.mod b/tap/go.mod index 57e1d25ed..926109c0d 100644 --- a/tap/go.mod +++ b/tap/go.mod @@ -4,5 +4,6 @@ go 1.16 require ( github.com/google/martian v2.1.0+incompatible - github.com/jinzhu/gorm v1.9.16 + gorm.io/driver/sqlite v1.1.4 + gorm.io/gorm v1.21.8 ) diff --git a/tap/go.sum b/tap/go.sum index 94e118e2a..6e4cfdd22 100644 --- a/tap/go.sum +++ b/tap/go.sum @@ -1,5 +1,3 @@ -github.com/CyrusBiotechnology/go-har v0.0.0-20160107200632-7e81ccfd566e h1:5/mVjqdyM1KH36dKfdfQ+En+Fqdj16aAlx9salHhzRY= -github.com/CyrusBiotechnology/go-har v0.0.0-20160107200632-7e81ccfd566e/go.mod h1:F06TYwuSm2x+nwDbYZ/K/I10kmiKWZWSMugUQ/YTSdQ= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= @@ -22,10 +20,11 @@ github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= +github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA= +github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM= diff --git a/tap/src/autogenerated_mizuEntry.go b/tap/src/autogenerated_mizuEntry.go index 850a6c6bc..31ef7ed40 100644 --- a/tap/src/autogenerated_mizuEntry.go +++ b/tap/src/autogenerated_mizuEntry.go @@ -7,8 +7,7 @@ import ( "strings" "time" - "github.com/google/martian/har" - "github.com/jinzhu/gorm" + "gorm.io/gorm" ) // ===== BEGIN of all query sets @@ -60,11 +59,11 @@ func (qs MizuEntryQuerySet) All(ret *[]MizuEntry) error { // Count is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) Count() (int, error) { - var count int - err := qs.db.Count(&count).Error - return count, err -} +//func (qs MizuEntryQuerySet) Count() (int, error) { +// var count int +// err := qs.db.Count(&count).Error +// return count, err +//} // CreatedAtEq is an autogenerated method // nolint: dupl @@ -122,52 +121,140 @@ func (qs MizuEntryQuerySet) DeleteNumUnscoped() (int64, error) { return db.RowsAffected, db.Error } -// DeletedAtEq is an autogenerated method +// EntryEq is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtEq(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at = ?", deletedAt)) +func (qs MizuEntryQuerySet) EntryEq(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry = ?", entry)) } -// DeletedAtGt is an autogenerated method +// EntryGt is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtGt(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at > ?", deletedAt)) +func (qs MizuEntryQuerySet) EntryGt(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry > ?", entry)) } -// DeletedAtGte is an autogenerated method +// EntryGte is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtGte(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at >= ?", deletedAt)) +func (qs MizuEntryQuerySet) EntryGte(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry >= ?", entry)) } -// DeletedAtIsNotNull is an autogenerated method +// EntryIdEq is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtIsNotNull() MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at IS NOT NULL")) +func (qs MizuEntryQuerySet) EntryIdEq(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id = ?", entryId)) } -// DeletedAtIsNull is an autogenerated method +// EntryIdGt is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtIsNull() MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at IS NULL")) +func (qs MizuEntryQuerySet) EntryIdGt(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id > ?", entryId)) } -// DeletedAtLt is an autogenerated method +// EntryIdGte is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtLt(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at < ?", deletedAt)) +func (qs MizuEntryQuerySet) EntryIdGte(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id >= ?", entryId)) } -// DeletedAtLte is an autogenerated method +// EntryIdIn is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtLte(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at <= ?", deletedAt)) +func (qs MizuEntryQuerySet) EntryIdIn(entryId ...string) MizuEntryQuerySet { + if len(entryId) == 0 { + qs.db.AddError(errors.New("must at least pass one entryId in EntryIdIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("entry_id IN (?)", entryId)) } -// DeletedAtNe is an autogenerated method +// EntryIdLike is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtNe(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at != ?", deletedAt)) +func (qs MizuEntryQuerySet) EntryIdLike(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id LIKE ?", entryId)) +} + +// EntryIdLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryIdLt(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id < ?", entryId)) +} + +// EntryIdLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryIdLte(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id <= ?", entryId)) +} + +// EntryIdNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryIdNe(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id != ?", entryId)) +} + +// EntryIdNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryIdNotIn(entryId ...string) MizuEntryQuerySet { + if len(entryId) == 0 { + qs.db.AddError(errors.New("must at least pass one entryId in EntryIdNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("entry_id NOT IN (?)", entryId)) +} + +// EntryIdNotlike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryIdNotlike(entryId string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry_id NOT LIKE ?", entryId)) +} + +// EntryIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryIn(entry ...string) MizuEntryQuerySet { + if len(entry) == 0 { + qs.db.AddError(errors.New("must at least pass one entry in EntryIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("entry IN (?)", entry)) +} + +// EntryLike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryLike(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry LIKE ?", entry)) +} + +// EntryLt is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryLt(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry < ?", entry)) +} + +// EntryLte is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryLte(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry <= ?", entry)) +} + +// EntryNe is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryNe(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry != ?", entry)) +} + +// EntryNotIn is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryNotIn(entry ...string) MizuEntryQuerySet { + if len(entry) == 0 { + qs.db.AddError(errors.New("must at least pass one entry in EntryNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("entry NOT IN (?)", entry)) +} + +// EntryNotlike is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) EntryNotlike(entry string) MizuEntryQuerySet { + return qs.w(qs.db.Where("entry NOT LIKE ?", entry)) } // GetDB is an autogenerated method @@ -330,10 +417,16 @@ func (qs MizuEntryQuerySet) OrderAscByCreatedAt() MizuEntryQuerySet { return qs.w(qs.db.Order("created_at ASC")) } -// OrderAscByDeletedAt is an autogenerated method +// OrderAscByEntry is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByDeletedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("deleted_at ASC")) +func (qs MizuEntryQuerySet) OrderAscByEntry() MizuEntryQuerySet { + return qs.w(qs.db.Order("entry ASC")) +} + +// OrderAscByEntryId is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderAscByEntryId() MizuEntryQuerySet { + return qs.w(qs.db.Order("entry_id ASC")) } // OrderAscByID is an autogenerated method @@ -384,10 +477,16 @@ func (qs MizuEntryQuerySet) OrderDescByCreatedAt() MizuEntryQuerySet { return qs.w(qs.db.Order("created_at DESC")) } -// OrderDescByDeletedAt is an autogenerated method +// OrderDescByEntry is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByDeletedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("deleted_at DESC")) +func (qs MizuEntryQuerySet) OrderDescByEntry() MizuEntryQuerySet { + return qs.w(qs.db.Order("entry DESC")) +} + +// OrderDescByEntryId is an autogenerated method +// nolint: dupl +func (qs MizuEntryQuerySet) OrderDescByEntryId() MizuEntryQuerySet { + return qs.w(qs.db.Order("entry_id DESC")) } // OrderDescByID is an autogenerated method @@ -432,10 +531,10 @@ func (qs MizuEntryQuerySet) OrderDescByUrl() MizuEntryQuerySet { return qs.w(qs.db.Order("url DESC")) } -// PreloadEntry is an autogenerated method +// PreloadDeletedAt is an autogenerated method // nolint: dupl -func (qs MizuEntryQuerySet) PreloadEntry() MizuEntryQuerySet { - return qs.w(qs.db.Preload("Entry")) +func (qs MizuEntryQuerySet) PreloadDeletedAt() MizuEntryQuerySet { + return qs.w(qs.db.Preload("DeletedAt")) } // ServiceEq is an autogenerated method @@ -743,18 +842,25 @@ func (u MizuEntryUpdater) SetCreatedAt(createdAt time.Time) MizuEntryUpdater { // SetDeletedAt is an autogenerated method // nolint: dupl -func (u MizuEntryUpdater) SetDeletedAt(deletedAt *time.Time) MizuEntryUpdater { +func (u MizuEntryUpdater) SetDeletedAt(deletedAt gorm.DeletedAt) MizuEntryUpdater { u.fields[string(MizuEntryDBSchema.DeletedAt)] = deletedAt return u } // SetEntry is an autogenerated method // nolint: dupl -func (u MizuEntryUpdater) SetEntry(entry har.Entry) MizuEntryUpdater { +func (u MizuEntryUpdater) SetEntry(entry string) MizuEntryUpdater { u.fields[string(MizuEntryDBSchema.Entry)] = entry return u } +// SetEntryId is an autogenerated method +// nolint: dupl +func (u MizuEntryUpdater) SetEntryId(entryId string) MizuEntryUpdater { + u.fields[string(MizuEntryDBSchema.EntryId)] = entryId + return u +} + // SetID is an autogenerated method // nolint: dupl func (u MizuEntryUpdater) SetID(ID uint) MizuEntryUpdater { @@ -837,6 +943,7 @@ var MizuEntryDBSchema = struct { UpdatedAt MizuEntryDBSchemaField DeletedAt MizuEntryDBSchemaField Entry MizuEntryDBSchemaField + EntryId MizuEntryDBSchemaField Url MizuEntryDBSchemaField Method MizuEntryDBSchemaField Status MizuEntryDBSchemaField @@ -849,6 +956,7 @@ var MizuEntryDBSchema = struct { UpdatedAt: MizuEntryDBSchemaField("updated_at"), DeletedAt: MizuEntryDBSchemaField("deleted_at"), Entry: MizuEntryDBSchemaField("entry"), + EntryId: MizuEntryDBSchemaField("entry_id"), Url: MizuEntryDBSchemaField("url"), Method: MizuEntryDBSchemaField("method"), Status: MizuEntryDBSchemaField("status"), @@ -865,6 +973,7 @@ func (o *MizuEntry) Update(db *gorm.DB, fields ...MizuEntryDBSchemaField) error "updated_at": o.UpdatedAt, "deleted_at": o.DeletedAt, "entry": o.Entry, + "entry_id": o.EntryId, "url": o.Url, "method": o.Method, "status": o.Status, diff --git a/tap/src/main.go b/tap/src/main.go index c4668388f..eaa6bb59d 100644 --- a/tap/src/main.go +++ b/tap/src/main.go @@ -5,17 +5,11 @@ import ( "encoding/json" "fmt" "github.com/google/martian/har" - "github.com/jinzhu/gorm" - // "gorm.io/driver/sqlite" - _ "github.com/jinzhu/gorm/dialects/sqlite" + "gorm.io/driver/sqlite" + "gorm.io/gorm" "os" ) -func check(e error) { - if e != nil { - panic(e) - } -} func main() { FILEPATH := "/Users/roeegadot/Downloads/testing.har" @@ -41,24 +35,32 @@ func main() { } func getGormDB() *gorm.DB { - db, _ := gorm.Open("sqlite", "roee.db") + db, _ := gorm.Open(sqlite.Open("gorm.db"), &gorm.Config{}) + + migErr := db.AutoMigrate(&MizuEntry{}) + if migErr != nil { + panic("Cannot run migration") + } return db } func saveHarToDb(entry har.Entry) { - entryData := entry + a, _ := json.Marshal(entry) mizuEntry := MizuEntry{ - EntryId: NewObjectID(), - Entry: entryData, - Url: entryData.Request.URL, - Method: entryData.Request.Method, - Status: entryData.Response.Status, + EntryId: NewObjectID().Hex(), + // simple way to store it and not convert to bytes + Entry: string(a), + Url: (&entry).Request.URL, + Method: (&entry).Request.Method, + Status: (&entry).Response.Status, Source: "", Service: "MyService", } if err := mizuEntry.Create(getGormDB()); err != nil { + fmt.Print(err) panic("cannot create") } } + diff --git a/tap/src/mizuEntry.go b/tap/src/mizuEntry.go index ed6189a68..ae5b7130b 100644 --- a/tap/src/mizuEntry.go +++ b/tap/src/mizuEntry.go @@ -1,8 +1,7 @@ package main import ( - "github.com/jinzhu/gorm" - "github.com/google/martian/har" + "gorm.io/gorm" ) @@ -10,11 +9,11 @@ import ( // gen:qs type MizuEntry struct { gorm.Model - // The Entry itself - Entry har.Entry `json:"entry,omitempty"` + // The Entry itself (as string) + Entry string `json:"entry,omitempty"` //TODO: here we will add fields we need to query for - EntryId ObjectID `json:"entryId"` + EntryId string `json:"entryId"` Url string `json:"url"` Method string `json:"method"` Status int `json:"status"` From 40d48a6364a2cda3ba7bcc2144f0a61e19d8bfe7 Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Thu, 22 Apr 2021 21:01:08 +0300 Subject: [PATCH 03/10] remove unused things and use external for object id (instead of copy) --- .gitignore | 1 + tap/go.mod | 3 +- tap/go.sum | 124 +++- tap/src/autogenerated_mizuEntry.go | 1017 ---------------------------- tap/src/main.go | 29 +- tap/src/mizuEntry.go | 16 +- tap/src/models.go | 471 ------------- tap/src/types.go | 175 ----- 8 files changed, 120 insertions(+), 1716 deletions(-) delete mode 100644 tap/src/autogenerated_mizuEntry.go delete mode 100644 tap/src/models.go delete mode 100644 tap/src/types.go diff --git a/.gitignore b/.gitignore index d9592b471..f2ceede70 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ # Dependency directories (remove the comment below to include it) # vendor/ .idea/ +*.db diff --git a/tap/go.mod b/tap/go.mod index 926109c0d..7099709c9 100644 --- a/tap/go.mod +++ b/tap/go.mod @@ -1,9 +1,10 @@ -module harsave +module main go 1.16 require ( github.com/google/martian v2.1.0+incompatible + go.mongodb.org/mongo-driver v1.5.1 gorm.io/driver/sqlite v1.1.4 gorm.io/gorm v1.21.8 ) diff --git a/tap/go.sum b/tap/go.sum index 6e4cfdd22..1d503cab5 100644 --- a/tap/go.sum +++ b/tap/go.sum @@ -1,42 +1,120 @@ -github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= -github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= +github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= +github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= +github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= +github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= +github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= +github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= +github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= +github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= +github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= +github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= +github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= +github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= +github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= +github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= +github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= -github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= +github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= +github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA= -github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= +go.mongodb.org/mongo-driver v1.5.1 h1:9nOVLGDfOaZ9R0tBumx/BcuqkbFpyTCU2r/Po7A2azI= +go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM= -golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/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-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM= gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= diff --git a/tap/src/autogenerated_mizuEntry.go b/tap/src/autogenerated_mizuEntry.go deleted file mode 100644 index 31ef7ed40..000000000 --- a/tap/src/autogenerated_mizuEntry.go +++ /dev/null @@ -1,1017 +0,0 @@ -// Code generated by go-queryset. DO NOT EDIT. -package main - -import ( - "errors" - "fmt" - "strings" - "time" - - "gorm.io/gorm" -) - -// ===== BEGIN of all query sets - -// ===== BEGIN of query set MizuEntryQuerySet - -// MizuEntryQuerySet is an queryset type for MizuEntry -type MizuEntryQuerySet struct { - db *gorm.DB -} - -// NewMizuEntryQuerySet constructs new MizuEntryQuerySet -func NewMizuEntryQuerySet(db *gorm.DB) MizuEntryQuerySet { - return MizuEntryQuerySet{ - db: db.Model(&MizuEntry{}), - } -} - -func (qs MizuEntryQuerySet) w(db *gorm.DB) MizuEntryQuerySet { - return NewMizuEntryQuerySet(db) -} - -func (qs MizuEntryQuerySet) Select(fields ...MizuEntryDBSchemaField) MizuEntryQuerySet { - names := []string{} - for _, f := range fields { - names = append(names, f.String()) - } - - return qs.w(qs.db.Select(strings.Join(names, ","))) -} - -// Create is an autogenerated method -// nolint: dupl -func (o *MizuEntry) Create(db *gorm.DB) error { - return db.Create(o).Error -} - -// Delete is an autogenerated method -// nolint: dupl -func (o *MizuEntry) Delete(db *gorm.DB) error { - return db.Delete(o).Error -} - -// All is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) All(ret *[]MizuEntry) error { - return qs.db.Find(ret).Error -} - -// Count is an autogenerated method -// nolint: dupl -//func (qs MizuEntryQuerySet) Count() (int, error) { -// var count int -// err := qs.db.Count(&count).Error -// return count, err -//} - -// CreatedAtEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtEq(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at = ?", createdAt)) -} - -// CreatedAtGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtGt(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at > ?", createdAt)) -} - -// CreatedAtGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtGte(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at >= ?", createdAt)) -} - -// CreatedAtLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtLt(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at < ?", createdAt)) -} - -// CreatedAtLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtLte(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at <= ?", createdAt)) -} - -// CreatedAtNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtNe(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at != ?", createdAt)) -} - -// Delete is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) Delete() error { - return qs.db.Delete(MizuEntry{}).Error -} - -// DeleteNum is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeleteNum() (int64, error) { - db := qs.db.Delete(MizuEntry{}) - return db.RowsAffected, db.Error -} - -// DeleteNumUnscoped is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeleteNumUnscoped() (int64, error) { - db := qs.db.Unscoped().Delete(MizuEntry{}) - return db.RowsAffected, db.Error -} - -// EntryEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryEq(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry = ?", entry)) -} - -// EntryGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryGt(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry > ?", entry)) -} - -// EntryGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryGte(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry >= ?", entry)) -} - -// EntryIdEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdEq(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id = ?", entryId)) -} - -// EntryIdGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdGt(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id > ?", entryId)) -} - -// EntryIdGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdGte(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id >= ?", entryId)) -} - -// EntryIdIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdIn(entryId ...string) MizuEntryQuerySet { - if len(entryId) == 0 { - qs.db.AddError(errors.New("must at least pass one entryId in EntryIdIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("entry_id IN (?)", entryId)) -} - -// EntryIdLike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdLike(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id LIKE ?", entryId)) -} - -// EntryIdLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdLt(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id < ?", entryId)) -} - -// EntryIdLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdLte(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id <= ?", entryId)) -} - -// EntryIdNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdNe(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id != ?", entryId)) -} - -// EntryIdNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdNotIn(entryId ...string) MizuEntryQuerySet { - if len(entryId) == 0 { - qs.db.AddError(errors.New("must at least pass one entryId in EntryIdNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("entry_id NOT IN (?)", entryId)) -} - -// EntryIdNotlike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIdNotlike(entryId string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry_id NOT LIKE ?", entryId)) -} - -// EntryIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryIn(entry ...string) MizuEntryQuerySet { - if len(entry) == 0 { - qs.db.AddError(errors.New("must at least pass one entry in EntryIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("entry IN (?)", entry)) -} - -// EntryLike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryLike(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry LIKE ?", entry)) -} - -// EntryLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryLt(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry < ?", entry)) -} - -// EntryLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryLte(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry <= ?", entry)) -} - -// EntryNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryNe(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry != ?", entry)) -} - -// EntryNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryNotIn(entry ...string) MizuEntryQuerySet { - if len(entry) == 0 { - qs.db.AddError(errors.New("must at least pass one entry in EntryNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("entry NOT IN (?)", entry)) -} - -// EntryNotlike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) EntryNotlike(entry string) MizuEntryQuerySet { - return qs.w(qs.db.Where("entry NOT LIKE ?", entry)) -} - -// GetDB is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) GetDB() *gorm.DB { - return qs.db -} - -// GetUpdater is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) GetUpdater() MizuEntryUpdater { - return NewMizuEntryUpdater(qs.db) -} - -// IDEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDEq(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id = ?", ID)) -} - -// IDGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDGt(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id > ?", ID)) -} - -// IDGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDGte(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id >= ?", ID)) -} - -// IDIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDIn(ID ...uint) MizuEntryQuerySet { - if len(ID) == 0 { - qs.db.AddError(errors.New("must at least pass one ID in IDIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("id IN (?)", ID)) -} - -// IDLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDLt(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id < ?", ID)) -} - -// IDLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDLte(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id <= ?", ID)) -} - -// IDNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDNe(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id != ?", ID)) -} - -// IDNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDNotIn(ID ...uint) MizuEntryQuerySet { - if len(ID) == 0 { - qs.db.AddError(errors.New("must at least pass one ID in IDNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("id NOT IN (?)", ID)) -} - -// Limit is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) Limit(limit int) MizuEntryQuerySet { - return qs.w(qs.db.Limit(limit)) -} - -// MethodEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodEq(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method = ?", method)) -} - -// MethodGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodGt(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method > ?", method)) -} - -// MethodGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodGte(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method >= ?", method)) -} - -// MethodIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodIn(method ...string) MizuEntryQuerySet { - if len(method) == 0 { - qs.db.AddError(errors.New("must at least pass one method in MethodIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("method IN (?)", method)) -} - -// MethodLike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodLike(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method LIKE ?", method)) -} - -// MethodLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodLt(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method < ?", method)) -} - -// MethodLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodLte(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method <= ?", method)) -} - -// MethodNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodNe(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method != ?", method)) -} - -// MethodNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodNotIn(method ...string) MizuEntryQuerySet { - if len(method) == 0 { - qs.db.AddError(errors.New("must at least pass one method in MethodNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("method NOT IN (?)", method)) -} - -// MethodNotlike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) MethodNotlike(method string) MizuEntryQuerySet { - return qs.w(qs.db.Where("method NOT LIKE ?", method)) -} - -// Offset is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) Offset(offset int) MizuEntryQuerySet { - return qs.w(qs.db.Offset(offset)) -} - -// One is used to retrieve one result. It returns gorm.ErrRecordNotFound -// if nothing was fetched -func (qs MizuEntryQuerySet) One(ret *MizuEntry) error { - return qs.db.First(ret).Error -} - -// OrderAscByCreatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByCreatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("created_at ASC")) -} - -// OrderAscByEntry is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByEntry() MizuEntryQuerySet { - return qs.w(qs.db.Order("entry ASC")) -} - -// OrderAscByEntryId is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByEntryId() MizuEntryQuerySet { - return qs.w(qs.db.Order("entry_id ASC")) -} - -// OrderAscByID is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByID() MizuEntryQuerySet { - return qs.w(qs.db.Order("id ASC")) -} - -// OrderAscByMethod is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByMethod() MizuEntryQuerySet { - return qs.w(qs.db.Order("method ASC")) -} - -// OrderAscByService is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByService() MizuEntryQuerySet { - return qs.w(qs.db.Order("service ASC")) -} - -// OrderAscBySource is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscBySource() MizuEntryQuerySet { - return qs.w(qs.db.Order("source ASC")) -} - -// OrderAscByStatus is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByStatus() MizuEntryQuerySet { - return qs.w(qs.db.Order("status ASC")) -} - -// OrderAscByUpdatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByUpdatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("updated_at ASC")) -} - -// OrderAscByUrl is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByUrl() MizuEntryQuerySet { - return qs.w(qs.db.Order("url ASC")) -} - -// OrderDescByCreatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByCreatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("created_at DESC")) -} - -// OrderDescByEntry is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByEntry() MizuEntryQuerySet { - return qs.w(qs.db.Order("entry DESC")) -} - -// OrderDescByEntryId is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByEntryId() MizuEntryQuerySet { - return qs.w(qs.db.Order("entry_id DESC")) -} - -// OrderDescByID is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByID() MizuEntryQuerySet { - return qs.w(qs.db.Order("id DESC")) -} - -// OrderDescByMethod is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByMethod() MizuEntryQuerySet { - return qs.w(qs.db.Order("method DESC")) -} - -// OrderDescByService is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByService() MizuEntryQuerySet { - return qs.w(qs.db.Order("service DESC")) -} - -// OrderDescBySource is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescBySource() MizuEntryQuerySet { - return qs.w(qs.db.Order("source DESC")) -} - -// OrderDescByStatus is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByStatus() MizuEntryQuerySet { - return qs.w(qs.db.Order("status DESC")) -} - -// OrderDescByUpdatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByUpdatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("updated_at DESC")) -} - -// OrderDescByUrl is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByUrl() MizuEntryQuerySet { - return qs.w(qs.db.Order("url DESC")) -} - -// PreloadDeletedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) PreloadDeletedAt() MizuEntryQuerySet { - return qs.w(qs.db.Preload("DeletedAt")) -} - -// ServiceEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceEq(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service = ?", service)) -} - -// ServiceGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceGt(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service > ?", service)) -} - -// ServiceGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceGte(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service >= ?", service)) -} - -// ServiceIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceIn(service ...string) MizuEntryQuerySet { - if len(service) == 0 { - qs.db.AddError(errors.New("must at least pass one service in ServiceIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("service IN (?)", service)) -} - -// ServiceLike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceLike(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service LIKE ?", service)) -} - -// ServiceLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceLt(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service < ?", service)) -} - -// ServiceLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceLte(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service <= ?", service)) -} - -// ServiceNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceNe(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service != ?", service)) -} - -// ServiceNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceNotIn(service ...string) MizuEntryQuerySet { - if len(service) == 0 { - qs.db.AddError(errors.New("must at least pass one service in ServiceNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("service NOT IN (?)", service)) -} - -// ServiceNotlike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) ServiceNotlike(service string) MizuEntryQuerySet { - return qs.w(qs.db.Where("service NOT LIKE ?", service)) -} - -// SourceEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceEq(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source = ?", source)) -} - -// SourceGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceGt(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source > ?", source)) -} - -// SourceGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceGte(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source >= ?", source)) -} - -// SourceIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceIn(source ...string) MizuEntryQuerySet { - if len(source) == 0 { - qs.db.AddError(errors.New("must at least pass one source in SourceIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("source IN (?)", source)) -} - -// SourceLike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceLike(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source LIKE ?", source)) -} - -// SourceLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceLt(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source < ?", source)) -} - -// SourceLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceLte(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source <= ?", source)) -} - -// SourceNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceNe(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source != ?", source)) -} - -// SourceNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceNotIn(source ...string) MizuEntryQuerySet { - if len(source) == 0 { - qs.db.AddError(errors.New("must at least pass one source in SourceNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("source NOT IN (?)", source)) -} - -// SourceNotlike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) SourceNotlike(source string) MizuEntryQuerySet { - return qs.w(qs.db.Where("source NOT LIKE ?", source)) -} - -// StatusEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusEq(status int) MizuEntryQuerySet { - return qs.w(qs.db.Where("status = ?", status)) -} - -// StatusGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusGt(status int) MizuEntryQuerySet { - return qs.w(qs.db.Where("status > ?", status)) -} - -// StatusGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusGte(status int) MizuEntryQuerySet { - return qs.w(qs.db.Where("status >= ?", status)) -} - -// StatusIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusIn(status ...int) MizuEntryQuerySet { - if len(status) == 0 { - qs.db.AddError(errors.New("must at least pass one status in StatusIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("status IN (?)", status)) -} - -// StatusLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusLt(status int) MizuEntryQuerySet { - return qs.w(qs.db.Where("status < ?", status)) -} - -// StatusLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusLte(status int) MizuEntryQuerySet { - return qs.w(qs.db.Where("status <= ?", status)) -} - -// StatusNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusNe(status int) MizuEntryQuerySet { - return qs.w(qs.db.Where("status != ?", status)) -} - -// StatusNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) StatusNotIn(status ...int) MizuEntryQuerySet { - if len(status) == 0 { - qs.db.AddError(errors.New("must at least pass one status in StatusNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("status NOT IN (?)", status)) -} - -// UpdatedAtEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtEq(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at = ?", updatedAt)) -} - -// UpdatedAtGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtGt(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at > ?", updatedAt)) -} - -// UpdatedAtGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtGte(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at >= ?", updatedAt)) -} - -// UpdatedAtLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtLt(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at < ?", updatedAt)) -} - -// UpdatedAtLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtLte(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at <= ?", updatedAt)) -} - -// UpdatedAtNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtNe(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at != ?", updatedAt)) -} - -// UrlEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlEq(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url = ?", url)) -} - -// UrlGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlGt(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url > ?", url)) -} - -// UrlGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlGte(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url >= ?", url)) -} - -// UrlIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlIn(url ...string) MizuEntryQuerySet { - if len(url) == 0 { - qs.db.AddError(errors.New("must at least pass one url in UrlIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("url IN (?)", url)) -} - -// UrlLike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlLike(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url LIKE ?", url)) -} - -// UrlLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlLt(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url < ?", url)) -} - -// UrlLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlLte(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url <= ?", url)) -} - -// UrlNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlNe(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url != ?", url)) -} - -// UrlNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlNotIn(url ...string) MizuEntryQuerySet { - if len(url) == 0 { - qs.db.AddError(errors.New("must at least pass one url in UrlNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("url NOT IN (?)", url)) -} - -// UrlNotlike is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UrlNotlike(url string) MizuEntryQuerySet { - return qs.w(qs.db.Where("url NOT LIKE ?", url)) -} - -// SetCreatedAt is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetCreatedAt(createdAt time.Time) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.CreatedAt)] = createdAt - return u -} - -// SetDeletedAt is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetDeletedAt(deletedAt gorm.DeletedAt) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.DeletedAt)] = deletedAt - return u -} - -// SetEntry is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetEntry(entry string) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.Entry)] = entry - return u -} - -// SetEntryId is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetEntryId(entryId string) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.EntryId)] = entryId - return u -} - -// SetID is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetID(ID uint) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.ID)] = ID - return u -} - -// SetMethod is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetMethod(method string) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.Method)] = method - return u -} - -// SetService is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetService(service string) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.Service)] = service - return u -} - -// SetSource is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetSource(source string) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.Source)] = source - return u -} - -// SetStatus is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetStatus(status int) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.Status)] = status - return u -} - -// SetUpdatedAt is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetUpdatedAt(updatedAt time.Time) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.UpdatedAt)] = updatedAt - return u -} - -// SetUrl is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetUrl(url string) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.Url)] = url - return u -} - -// Update is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) Update() error { - return u.db.Updates(u.fields).Error -} - -// UpdateNum is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) UpdateNum() (int64, error) { - db := u.db.Updates(u.fields) - return db.RowsAffected, db.Error -} - -// ===== END of query set MizuEntryQuerySet - -// ===== BEGIN of MizuEntry modifiers - -// MizuEntryDBSchemaField describes database schema field. It requires for method 'Update' -type MizuEntryDBSchemaField string - -// String method returns string representation of field. -// nolint: dupl -func (f MizuEntryDBSchemaField) String() string { - return string(f) -} - -// MizuEntryDBSchema stores db field names of MizuEntry -var MizuEntryDBSchema = struct { - ID MizuEntryDBSchemaField - CreatedAt MizuEntryDBSchemaField - UpdatedAt MizuEntryDBSchemaField - DeletedAt MizuEntryDBSchemaField - Entry MizuEntryDBSchemaField - EntryId MizuEntryDBSchemaField - Url MizuEntryDBSchemaField - Method MizuEntryDBSchemaField - Status MizuEntryDBSchemaField - Source MizuEntryDBSchemaField - Service MizuEntryDBSchemaField -}{ - - ID: MizuEntryDBSchemaField("id"), - CreatedAt: MizuEntryDBSchemaField("created_at"), - UpdatedAt: MizuEntryDBSchemaField("updated_at"), - DeletedAt: MizuEntryDBSchemaField("deleted_at"), - Entry: MizuEntryDBSchemaField("entry"), - EntryId: MizuEntryDBSchemaField("entry_id"), - Url: MizuEntryDBSchemaField("url"), - Method: MizuEntryDBSchemaField("method"), - Status: MizuEntryDBSchemaField("status"), - Source: MizuEntryDBSchemaField("source"), - Service: MizuEntryDBSchemaField("service"), -} - -// Update updates MizuEntry fields by primary key -// nolint: dupl -func (o *MizuEntry) Update(db *gorm.DB, fields ...MizuEntryDBSchemaField) error { - dbNameToFieldName := map[string]interface{}{ - "id": o.ID, - "created_at": o.CreatedAt, - "updated_at": o.UpdatedAt, - "deleted_at": o.DeletedAt, - "entry": o.Entry, - "entry_id": o.EntryId, - "url": o.Url, - "method": o.Method, - "status": o.Status, - "source": o.Source, - "service": o.Service, - } - u := map[string]interface{}{} - for _, f := range fields { - fs := f.String() - u[fs] = dbNameToFieldName[fs] - } - if err := db.Model(o).Updates(u).Error; err != nil { - if err == gorm.ErrRecordNotFound { - return err - } - - return fmt.Errorf("can't update MizuEntry %v fields %v: %s", - o, fields, err) - } - - return nil -} - -// MizuEntryUpdater is an MizuEntry updates manager -type MizuEntryUpdater struct { - fields map[string]interface{} - db *gorm.DB -} - -// NewMizuEntryUpdater creates new MizuEntry updater -// nolint: dupl -func NewMizuEntryUpdater(db *gorm.DB) MizuEntryUpdater { - return MizuEntryUpdater{ - fields: map[string]interface{}{}, - db: db.Model(&MizuEntry{}), - } -} - -// ===== END of MizuEntry modifiers - -// ===== END of all query sets diff --git a/tap/src/main.go b/tap/src/main.go index eaa6bb59d..6cdbf5911 100644 --- a/tap/src/main.go +++ b/tap/src/main.go @@ -5,12 +5,12 @@ import ( "encoding/json" "fmt" "github.com/google/martian/har" + "go.mongodb.org/mongo-driver/bson/primitive" "gorm.io/driver/sqlite" "gorm.io/gorm" "os" ) - func main() { FILEPATH := "/Users/roeegadot/Downloads/testing.har" file, err := os.Open(FILEPATH) @@ -29,7 +29,7 @@ func main() { } for _, entry := range inputHar.Log.Entries { - saveHarToDb(*entry) + saveHarToDb(*entry, "service", "source") } } @@ -44,23 +44,16 @@ func getGormDB() *gorm.DB { return db } -func saveHarToDb(entry har.Entry) { +func saveHarToDb(entry har.Entry, serviceName string, source string) { a, _ := json.Marshal(entry) mizuEntry := MizuEntry{ - EntryId: NewObjectID().Hex(), - // simple way to store it and not convert to bytes - Entry: string(a), - Url: (&entry).Request.URL, - Method: (&entry).Request.Method, - Status: (&entry).Response.Status, - Source: "", - Service: "MyService", - } - - if err := mizuEntry.Create(getGormDB()); err != nil { - fmt.Print(err) - panic("cannot create") + EntryId: primitive.NewObjectID().Hex(), + Entry: string(a), // simple way to store it and not convert to bytes + Url: entry.Request.URL, + Method: entry.Request.Method, + Status: entry.Response.Status, + Source: source, + Service: serviceName, } + getGormDB().Create(&mizuEntry) } - - diff --git a/tap/src/mizuEntry.go b/tap/src/mizuEntry.go index ae5b7130b..725e603ee 100644 --- a/tap/src/mizuEntry.go +++ b/tap/src/mizuEntry.go @@ -4,19 +4,13 @@ import ( "gorm.io/gorm" ) - -//go:generate goqueryset -in mizuEntry.go -// gen:qs type MizuEntry struct { gorm.Model - // The Entry itself (as string) - Entry string `json:"entry,omitempty"` - //TODO: here we will add fields we need to query for - + Entry string `json:"entry,omitempty"` EntryId string `json:"entryId"` - Url string `json:"url"` - Method string `json:"method"` - Status int `json:"status"` - Source string `json:"source"` + Url string `json:"url"` + Method string `json:"method"` + Status int `json:"status"` + Source string `json:"source"` Service string `json:"serviceName"` } diff --git a/tap/src/models.go b/tap/src/models.go deleted file mode 100644 index bdfb6a12f..000000000 --- a/tap/src/models.go +++ /dev/null @@ -1,471 +0,0 @@ -//// Code generated by go-queryset. DO NOT EDIT. -package main -// -//import ( -// "errors" -// "fmt" -// "strings" -// "time" -// -// "github.com/jinzhu/gorm" -// "github.com/google/martian/har" -// -//) -// -//// ===== BEGIN of all query sets -// -//// ===== BEGIN of query set MizuEntryQuerySet -// -//// MizuEntryQuerySet is an queryset type for MizuEntry -//type MizuEntryQuerySet struct { -// db *gorm.DB -//} -// -//// NewMizuEntryQuerySet constructs new MizuEntryQuerySet -//func NewMizuEntryQuerySet(db *gorm.DB) MizuEntryQuerySet { -// return MizuEntryQuerySet{ -// db: db.Model(&MizuEntry{}), -// } -//} -// -//func (qs MizuEntryQuerySet) w(db *gorm.DB) MizuEntryQuerySet { -// return NewMizuEntryQuerySet(db) -//} -// -//func (qs MizuEntryQuerySet) Select(fields ...MizuEntryDBSchemaField) MizuEntryQuerySet { -// names := []string{} -// for _, f := range fields { -// names = append(names, f.String()) -// } -// -// return qs.w(qs.db.Select(strings.Join(names, ","))) -//} -// -//// Create is an autogenerated method -//// nolint: dupl -//func (o *MizuEntry) Create(db *gorm.DB) error { -// return db.Create(o).Error -//} -// -//// Delete is an autogenerated method -//// nolint: dupl -//func (o *MizuEntry) Delete(db *gorm.DB) error { -// return db.Delete(o).Error -//} -// -//// All is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) All(ret *[]MizuEntry) error { -// return qs.db.Find(ret).Error -//} -// -//// Count is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) Count() (int, error) { -// var count int -// err := qs.db.Count(&count).Error -// return count, err -//} -// -//// CreatedAtEq is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) CreatedAtEq(createdAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("created_at = ?", createdAt)) -//} -// -//// CreatedAtGt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) CreatedAtGt(createdAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("created_at > ?", createdAt)) -//} -// -//// CreatedAtGte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) CreatedAtGte(createdAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("created_at >= ?", createdAt)) -//} -// -//// CreatedAtLt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) CreatedAtLt(createdAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("created_at < ?", createdAt)) -//} -// -//// CreatedAtLte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) CreatedAtLte(createdAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("created_at <= ?", createdAt)) -//} -// -//// CreatedAtNe is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) CreatedAtNe(createdAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("created_at != ?", createdAt)) -//} -// -//// Delete is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) Delete() error { -// return qs.db.Delete(MizuEntry{}).Error -//} -// -//// DeleteNum is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeleteNum() (int64, error) { -// db := qs.db.Delete(MizuEntry{}) -// return db.RowsAffected, db.Error -//} -// -//// DeleteNumUnscoped is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeleteNumUnscoped() (int64, error) { -// db := qs.db.Unscoped().Delete(MizuEntry{}) -// return db.RowsAffected, db.Error -//} -// -//// DeletedAtEq is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtEq(deletedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at = ?", deletedAt)) -//} -// -//// DeletedAtGt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtGt(deletedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at > ?", deletedAt)) -//} -// -//// DeletedAtGte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtGte(deletedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at >= ?", deletedAt)) -//} -// -//// DeletedAtIsNotNull is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtIsNotNull() MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at IS NOT NULL")) -//} -// -//// DeletedAtIsNull is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtIsNull() MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at IS NULL")) -//} -// -//// DeletedAtLt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtLt(deletedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at < ?", deletedAt)) -//} -// -//// DeletedAtLte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtLte(deletedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at <= ?", deletedAt)) -//} -// -//// DeletedAtNe is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) DeletedAtNe(deletedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("deleted_at != ?", deletedAt)) -//} -// -//// GetDB is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) GetDB() *gorm.DB { -// return qs.db -//} -// -//// GetUpdater is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) GetUpdater() MizuEntryUpdater { -// return NewMizuEntryUpdater(qs.db) -//} -// -//// IDEq is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDEq(ID uint) MizuEntryQuerySet { -// return qs.w(qs.db.Where("id = ?", ID)) -//} -// -//// IDGt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDGt(ID uint) MizuEntryQuerySet { -// return qs.w(qs.db.Where("id > ?", ID)) -//} -// -//// IDGte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDGte(ID uint) MizuEntryQuerySet { -// return qs.w(qs.db.Where("id >= ?", ID)) -//} -// -//// IDIn is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDIn(ID ...uint) MizuEntryQuerySet { -// if len(ID) == 0 { -// qs.db.AddError(errors.New("must at least pass one ID in IDIn")) -// return qs.w(qs.db) -// } -// return qs.w(qs.db.Where("id IN (?)", ID)) -//} -// -//// IDLt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDLt(ID uint) MizuEntryQuerySet { -// return qs.w(qs.db.Where("id < ?", ID)) -//} -// -//// IDLte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDLte(ID uint) MizuEntryQuerySet { -// return qs.w(qs.db.Where("id <= ?", ID)) -//} -// -//// IDNe is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDNe(ID uint) MizuEntryQuerySet { -// return qs.w(qs.db.Where("id != ?", ID)) -//} -// -//// IDNotIn is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) IDNotIn(ID ...uint) MizuEntryQuerySet { -// if len(ID) == 0 { -// qs.db.AddError(errors.New("must at least pass one ID in IDNotIn")) -// return qs.w(qs.db) -// } -// return qs.w(qs.db.Where("id NOT IN (?)", ID)) -//} -// -//// Limit is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) Limit(limit int) MizuEntryQuerySet { -// return qs.w(qs.db.Limit(limit)) -//} -// -//// Offset is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) Offset(offset int) MizuEntryQuerySet { -// return qs.w(qs.db.Offset(offset)) -//} -// -//// One is used to retrieve one result. It returns gorm.ErrRecordNotFound -//// if nothing was fetched -//func (qs MizuEntryQuerySet) One(ret *MizuEntry) error { -// return qs.db.First(ret).Error -//} -// -//// OrderAscByCreatedAt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderAscByCreatedAt() MizuEntryQuerySet { -// return qs.w(qs.db.Order("created_at ASC")) -//} -// -//// OrderAscByDeletedAt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderAscByDeletedAt() MizuEntryQuerySet { -// return qs.w(qs.db.Order("deleted_at ASC")) -//} -// -//// OrderAscByID is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderAscByID() MizuEntryQuerySet { -// return qs.w(qs.db.Order("id ASC")) -//} -// -//// OrderAscByUpdatedAt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderAscByUpdatedAt() MizuEntryQuerySet { -// return qs.w(qs.db.Order("updated_at ASC")) -//} -// -//// OrderDescByCreatedAt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderDescByCreatedAt() MizuEntryQuerySet { -// return qs.w(qs.db.Order("created_at DESC")) -//} -// -//// OrderDescByDeletedAt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderDescByDeletedAt() MizuEntryQuerySet { -// return qs.w(qs.db.Order("deleted_at DESC")) -//} -// -//// OrderDescByID is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderDescByID() MizuEntryQuerySet { -// return qs.w(qs.db.Order("id DESC")) -//} -// -//// OrderDescByUpdatedAt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) OrderDescByUpdatedAt() MizuEntryQuerySet { -// return qs.w(qs.db.Order("updated_at DESC")) -//} -// -//// PreloadEntry is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) PreloadEntry() MizuEntryQuerySet { -// return qs.w(qs.db.Preload("Entry")) -//} -// -//// UpdatedAtEq is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) UpdatedAtEq(updatedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("updated_at = ?", updatedAt)) -//} -// -//// UpdatedAtGt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) UpdatedAtGt(updatedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("updated_at > ?", updatedAt)) -//} -// -//// UpdatedAtGte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) UpdatedAtGte(updatedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("updated_at >= ?", updatedAt)) -//} -// -//// UpdatedAtLt is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) UpdatedAtLt(updatedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("updated_at < ?", updatedAt)) -//} -// -//// UpdatedAtLte is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) UpdatedAtLte(updatedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("updated_at <= ?", updatedAt)) -//} -// -//// UpdatedAtNe is an autogenerated method -//// nolint: dupl -//func (qs MizuEntryQuerySet) UpdatedAtNe(updatedAt time.Time) MizuEntryQuerySet { -// return qs.w(qs.db.Where("updated_at != ?", updatedAt)) -//} -// -//// SetCreatedAt is an autogenerated method -//// nolint: dupl -//func (u MizuEntryUpdater) SetCreatedAt(createdAt time.Time) MizuEntryUpdater { -// u.fields[string(MizuEntryDBSchema.CreatedAt)] = createdAt -// return u -//} -// -//// SetDeletedAt is an autogenerated method -//// nolint: dupl -//func (u MizuEntryUpdater) SetDeletedAt(deletedAt *time.Time) MizuEntryUpdater { -// u.fields[string(MizuEntryDBSchema.DeletedAt)] = deletedAt -// return u -//} -// -//// SetEntry is an autogenerated method -//// nolint: dupl -//func (u MizuEntryUpdater) SetEntry(entry har.Entry) MizuEntryUpdater { -// u.fields[string(MizuEntryDBSchema.Entry)] = entry -// return u -//} -// -//// SetID is an autogenerated method -//// nolint: dupl -//func (u MizuEntryUpdater) SetID(ID uint) MizuEntryUpdater { -// u.fields[string(MizuEntryDBSchema.ID)] = ID -// return u -//} -// -//// SetUpdatedAt is an autogenerated method -//// nolint: dupl -//func (u MizuEntryUpdater) SetUpdatedAt(updatedAt time.Time) MizuEntryUpdater { -// u.fields[string(MizuEntryDBSchema.UpdatedAt)] = updatedAt -// return u -//} -// -//// Update is an autogenerated method -//// nolint: dupl -//func (u MizuEntryUpdater) Update() error { -// return u.db.Updates(u.fields).Error -//} -// -//// UpdateNum is an autogenerated method -//// nolint: dupl -//func (u MizuEntryUpdater) UpdateNum() (int64, error) { -// db := u.db.Updates(u.fields) -// return db.RowsAffected, db.Error -//} -// -//// ===== END of query set MizuEntryQuerySet -// -//// ===== BEGIN of MizuEntry modifiers -// -//// MizuEntryDBSchemaField describes database schema field. It requires for method 'Update' -//type MizuEntryDBSchemaField string -// -//// String method returns string representation of field. -//// nolint: dupl -//func (f MizuEntryDBSchemaField) String() string { -// return string(f) -//} -// -//// MizuEntryDBSchema stores db field names of MizuEntry -//var MizuEntryDBSchema = struct { -// ID MizuEntryDBSchemaField -// CreatedAt MizuEntryDBSchemaField -// UpdatedAt MizuEntryDBSchemaField -// DeletedAt MizuEntryDBSchemaField -// Entry MizuEntryDBSchemaField -//}{ -// -// ID: MizuEntryDBSchemaField("id"), -// CreatedAt: MizuEntryDBSchemaField("created_at"), -// UpdatedAt: MizuEntryDBSchemaField("updated_at"), -// DeletedAt: MizuEntryDBSchemaField("deleted_at"), -// Entry: MizuEntryDBSchemaField("entry"), -//} -// -//// Update updates MizuEntry fields by primary key -//// nolint: dupl -//func (o *MizuEntry) Update(db *gorm.DB, fields ...MizuEntryDBSchemaField) error { -// dbNameToFieldName := map[string]interface{}{ -// "id": o.ID, -// "created_at": o.CreatedAt, -// "updated_at": o.UpdatedAt, -// "deleted_at": o.DeletedAt, -// "entry": o.Entry, -// } -// u := map[string]interface{}{} -// for _, f := range fields { -// fs := f.String() -// u[fs] = dbNameToFieldName[fs] -// } -// if err := db.Model(o).Updates(u).Error; err != nil { -// if err == gorm.ErrRecordNotFound { -// return err -// } -// -// return fmt.Errorf("can't update MizuEntry %v fields %v: %s", -// o, fields, err) -// } -// -// return nil -//} -// -//// MizuEntryUpdater is an MizuEntry updates manager -//type MizuEntryUpdater struct { -// fields map[string]interface{} -// db *gorm.DB -//} -// -//// NewMizuEntryUpdater creates new MizuEntry updater -//// nolint: dupl -//func NewMizuEntryUpdater(db *gorm.DB) MizuEntryUpdater { -// return MizuEntryUpdater{ -// fields: map[string]interface{}{}, -// db: db.Model(&MizuEntry{}), -// } -//} -// -//// ===== END of MizuEntry modifiers -// -//// ===== END of all query sets diff --git a/tap/src/types.go b/tap/src/types.go deleted file mode 100644 index ef9b56e7e..000000000 --- a/tap/src/types.go +++ /dev/null @@ -1,175 +0,0 @@ -package main - -import ( - "bytes" - "crypto/rand" - "encoding/binary" - "encoding/hex" - "encoding/json" - "errors" - "fmt" - "io" - "sync/atomic" - "time" -) - -// ErrInvalidHex indicates that a hex string cannot be converted to an ObjectID. -var ErrInvalidHex = errors.New("the provided hex string is not a valid ObjectID") - -// ObjectID is the BSON ObjectID type. -type ObjectID [12]byte - -// NilObjectID is the zero value for ObjectID. -var NilObjectID ObjectID - -var objectIDCounter = readRandomUint32() -var processUnique = processUniqueBytes() - -// NewObjectID generates a new ObjectID. -func NewObjectID() ObjectID { - return NewObjectIDFromTimestamp(time.Now()) -} - -// NewObjectIDFromTimestamp generates a new ObjectID based on the given time. -func NewObjectIDFromTimestamp(timestamp time.Time) ObjectID { - var b [12]byte - - binary.BigEndian.PutUint32(b[0:4], uint32(timestamp.Unix())) - copy(b[4:9], processUnique[:]) - putUint24(b[9:12], atomic.AddUint32(&objectIDCounter, 1)) - - return b -} - -// Timestamp extracts the time part of the ObjectId. -func (id ObjectID) Timestamp() time.Time { - unixSecs := binary.BigEndian.Uint32(id[0:4]) - return time.Unix(int64(unixSecs), 0).UTC() -} - -// Hex returns the hex encoding of the ObjectID as a string. -func (id ObjectID) Hex() string { - return hex.EncodeToString(id[:]) -} - -func (id ObjectID) String() string { - return fmt.Sprintf("ObjectID(%q)", id.Hex()) -} - -// IsZero returns true if id is the empty ObjectID. -func (id ObjectID) IsZero() bool { - return bytes.Equal(id[:], NilObjectID[:]) -} - -// ObjectIDFromHex creates a new ObjectID from a hex string. It returns an error if the hex string is not a -// valid ObjectID. -func ObjectIDFromHex(s string) (ObjectID, error) { - b, err := hex.DecodeString(s) - if err != nil { - return NilObjectID, err - } - - if len(b) != 12 { - return NilObjectID, ErrInvalidHex - } - - var oid [12]byte - copy(oid[:], b[:]) - - return oid, nil -} - -// IsValidObjectID returns true if the provided hex string represents a valid ObjectID and false if not. -func IsValidObjectID(s string) bool { - _, err := ObjectIDFromHex(s) - return err == nil -} - -// MarshalJSON returns the ObjectID as a string -func (id ObjectID) MarshalJSON() ([]byte, error) { - return json.Marshal(id.Hex()) -} - -// UnmarshalJSON populates the byte slice with the ObjectID. If the byte slice is 24 bytes long, it -// will be populated with the hex representation of the ObjectID. If the byte slice is twelve bytes -// long, it will be populated with the BSON representation of the ObjectID. This method also accepts empty strings and -// decodes them as NilObjectID. For any other inputs, an error will be returned. -func (id *ObjectID) UnmarshalJSON(b []byte) error { - // Ignore "null" to keep parity with the standard library. Decoding a JSON null into a non-pointer ObjectID field - // will leave the field unchanged. For pointer values, encoding/json will set the pointer to nil and will not - // enter the UnmarshalJSON hook. - if string(b) == "null" { - return nil - } - - var err error - switch len(b) { - case 12: - copy(id[:], b) - default: - // Extended JSON - var res interface{} - err := json.Unmarshal(b, &res) - if err != nil { - return err - } - str, ok := res.(string) - if !ok { - m, ok := res.(map[string]interface{}) - if !ok { - return errors.New("not an extended JSON ObjectID") - } - oid, ok := m["$oid"] - if !ok { - return errors.New("not an extended JSON ObjectID") - } - str, ok = oid.(string) - if !ok { - return errors.New("not an extended JSON ObjectID") - } - } - - // An empty string is not a valid ObjectID, but we treat it as a special value that decodes as NilObjectID. - if len(str) == 0 { - copy(id[:], NilObjectID[:]) - return nil - } - - if len(str) != 24 { - return fmt.Errorf("cannot unmarshal into an ObjectID, the length must be 24 but it is %d", len(str)) - } - - _, err = hex.Decode(id[:], []byte(str)) - if err != nil { - return err - } - } - - return err -} - -func processUniqueBytes() [5]byte { - var b [5]byte - _, err := io.ReadFull(rand.Reader, b[:]) - if err != nil { - panic(fmt.Errorf("cannot initialize objectid package with crypto.rand.Reader: %v", err)) - } - - return b -} - -func readRandomUint32() uint32 { - var b [4]byte - _, err := io.ReadFull(rand.Reader, b[:]) - if err != nil { - panic(fmt.Errorf("cannot initialize objectid package with crypto.rand.Reader: %v", err)) - } - - return (uint32(b[0]) << 0) | (uint32(b[1]) << 8) | (uint32(b[2]) << 16) | (uint32(b[3]) << 24) -} - -func putUint24(b []byte, v uint32) { - b[0] = byte(v >> 16) - b[1] = byte(v >> 8) - b[2] = byte(v) -} From f5d27fec2e554e828ba38ba8e378985d90f5c891 Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Sun, 25 Apr 2021 09:02:07 +0300 Subject: [PATCH 04/10] no message --- api/go.mod | 4 +- api/go.sum | 656 +++--------------- api/src/pkg/controllers/book_controller.go | 17 - api/src/pkg/controllers/entries_controller.go | 53 ++ .../pkg/models/autogenerated_book_model.go | 469 ------------- api/src/pkg/models/book_model.go | 305 -------- {tap/src => api/src/pkg/models}/mizuEntry.go | 2 +- api/src/pkg/routes/not_found_route.go | 2 +- api/src/pkg/routes/public_routes.go | 6 +- {tap/src => api/src/pkg/utils}/main.go | 23 +- api/src/pkg/utils/randomString.go | 22 + tap/go.mod | 10 - tap/go.sum | 122 ---- 13 files changed, 207 insertions(+), 1484 deletions(-) delete mode 100644 api/src/pkg/controllers/book_controller.go create mode 100644 api/src/pkg/controllers/entries_controller.go delete mode 100644 api/src/pkg/models/autogenerated_book_model.go delete mode 100644 api/src/pkg/models/book_model.go rename {tap/src => api/src/pkg/models}/mizuEntry.go (95%) rename {tap/src => api/src/pkg/utils}/main.go (64%) create mode 100644 api/src/pkg/utils/randomString.go delete mode 100644 tap/go.mod delete mode 100644 tap/go.sum diff --git a/api/go.mod b/api/go.mod index 6f0e56e85..a853423da 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,6 +4,8 @@ go 1.16 require ( github.com/gofiber/fiber/v2 v2.8.0 - github.com/jinzhu/gorm v1.9.16 + go.mongodb.org/mongo-driver v1.5.1 gorm.io/driver/sqlite v1.1.4 + github.com/google/martian v2.1.0+incompatible + gorm.io/gorm v1.21.8 ) diff --git a/api/go.sum b/api/go.sum index 245118261..1cf88698b 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,238 +1,70 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= -github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/arsmn/fiber-swagger/v2 v2.6.0/go.mod h1:U+IKcuTAt2o9gH8JyOPa1JXaUHk8KecABWlRW75X1PY= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= -github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/create-go-app/fiber-go-template v1.2.1 h1:qWCB5JC/3hd7E3xSVdyUrIilyFNI5mijB1jsIWS1n44= -github.com/create-go-app/fiber-go-template v1.2.1/go.mod h1:3qE/nhAstP/owAFLXQVWnxhk/UQBK2qxHoyd2oj7SDs= +github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPIk= +github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA= -github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/go-playground/validator/v10 v10.5.0 h1:X9rflw/KmpACwT8zdrm1upefpvdy6ur8d1kWyq6sg3E= -github.com/go-playground/validator/v10 v10.5.0/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk= -github.com/go-redis/redis/v8 v8.8.0/go.mod h1:F7resOH5Kdug49Otu24RjHWwgK7u9AmtqWMnCV1iP5Y= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gofiber/fiber/v2 v2.6.0/go.mod h1:f8BRRIMjMdRyt2qmJ/0Sea3j3rwwfufPrh9WNBRiVZ0= -github.com/gofiber/fiber/v2 v2.7.1/go.mod h1:f8BRRIMjMdRyt2qmJ/0Sea3j3rwwfufPrh9WNBRiVZ0= +github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd h1:hSkbZ9XSyjyBirMeqSqUrK+9HboWrweVlzRNqoBi2d4= +github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= +github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= +github.com/gobuffalo/depgen v0.1.0 h1:31atYa/UW9V5q8vMJ+W6wd64OaaTHUrCUXER358zLM4= +github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= +github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= +github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/flect v0.1.3 h1:3GQ53z7E3o00C/yy7Ko8VXqQXoJGLkrTQCLTF1EjoXU= +github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= +github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= +github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= +github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= +github.com/gobuffalo/genny v0.1.1 h1:iQ0D6SpNXIxu52WESsD+KoQ7af2e3nCfnSBoSF/hKe0= +github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= +github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211 h1:mSVZ4vj4khv+oThUfS+SQU3UuFIZ5Zo6UNcvK8E8Mz8= +github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= +github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= +github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= +github.com/gobuffalo/gogen v0.1.1 h1:dLg+zb+uOyd/mKeQUYIbwbNmfRsr9hd/WtYWepmayhI= +github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= +github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2 h1:8thhT+kUJMTMy3HlX4+y9Da+BNJck+p109tqqKp7WDs= +github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= +github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/mapi v1.0.2 h1:fq9WcL1BYrm36SzK6+aAnZ8hcp+SrmnDyAxhNx8dvJk= +github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= +github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packd v0.1.0 h1:4sGKOD8yaYJ+dek1FDkwcxCHA40M4kfKgFHx8N2kwbU= +github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= +github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= +github.com/gobuffalo/packr/v2 v2.2.0 h1:Ir9W9XIm9j7bhhkKE9cokvtTl1vBm62A/fene/ZCj6A= +github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= +github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754 h1:tpom+2CJmpzAWj5/VEHync2rJGi+epHNIeRSWjzGA+4= +github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/gofiber/fiber/v2 v2.8.0 h1:BdWvZmg/WY/Vjtjm38aXOp1Lks1BhuyS2b7lSWSPAzk= github.com/gofiber/fiber/v2 v2.8.0/go.mod h1:Ah3IJikrKNRepl/HuVawppS25X7FWohwfCSRn7kJG28= -github.com/gofiber/jwt/v2 v2.2.0/go.mod h1:v9PUmQZfhbBsYYg5Gp5PAks5Ip8kJtVqXsbl506wkzc= -github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= -github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= -github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= -github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= -github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= -github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= -github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= -github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= -github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.8.1 h1:ySBX7Q87vOMqKU2bbmKbUvtYhauDFclYbNDYIE1/h6s= -github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/lE2g= -github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= -github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= -github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= -github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= -github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.0.6 h1:b1105ZGEMFe7aCvrT1Cca3VoVb4ZFMaFJLJcg/3zD+8= -github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= -github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= -github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= -github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= -github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= -github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= -github.com/jackc/pgtype v1.7.0 h1:6f4kVsW01QftE38ufBYxKciO6gyioXSC0ABIRLcZrGs= -github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI75BE= -github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= -github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= -github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= -github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= -github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= -github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= -github.com/jackc/pgx/v4 v4.11.0 h1:J86tSWd3Y7nKjwT/43xZBvpi04keQWx8gNC2YkdJhZI= -github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CIdYfcc= -github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -240,407 +72,145 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmoiron/sqlx v1.3.1 h1:aLN7YINNZ7cYOPK3QC83dbM6KT0NMqVMw961TqrejlE= -github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= +github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= +github.com/karrick/godirwalk v1.10.3 h1:lOpSw2vJP0y5eLBW906QwKsUK/fe/QDyoqM5rnnuPDY= +github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13 h1:eSvu8Tmq6j2psUJqJrLcWH6K3w5Dwc+qipbaA6eVEN4= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2 h1:JgVTCPf0uBVcUSWpyXmGpgOc62nK5HWUBKAGc3Qqa5k= +github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= +github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= +github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= -github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= +github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= -github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY= -github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E= -github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.18.0/go.mod h1:jjraHZVbKOXftJfsOYoAjaeygpj5hr8ermTRJNroD7A= -github.com/valyala/fasthttp v1.22.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU= github.com/valyala/fasthttp v1.23.0 h1:0ufwSD9BhWa6f8HWdmdq4FHQ23peRo3Ng/Qs8m5NcFs= github.com/valyala/fasthttp v1.23.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= -github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg= -go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc= -go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoTKFexE/PJ/nSO7IA= -go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= +go.mongodb.org/mongo-driver v1.5.1 h1:9nOVLGDfOaZ9R0tBumx/BcuqkbFpyTCU2r/Po7A2azI= +go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226101413-39120d07d75e h1:jIQURUJ9mlLvYwTBtRHm9h58rYhSonLvRvgAnP8Nr7I= golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/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-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201210223839-7e3030f88018/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210316092937-0b90fd5c4c48 h1:70qalHWW1n9yoI8B8zEQxFJO/D6NUWIX8SNmJO+rvNw= -golang.org/x/sys v0.0.0-20210316092937-0b90fd5c4c48/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d h1:bt+R27hbE7uVf7PY9S6wpNg9Xo2WRe/XQT0uGq9RQQw= +golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM= gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= gorm.io/gorm v1.20.7 h1:rMS4CL3pNmYq1V5/X+nHHjh1Dx6dnf27+Cai5zabo+M= gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +gorm.io/gorm v1.21.8 h1:2CEwZSzogdhsKPlJ9OvBKTdlWIpELXb6HbfLfMNhSYI= +gorm.io/gorm v1.21.8/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= diff --git a/api/src/pkg/controllers/book_controller.go b/api/src/pkg/controllers/book_controller.go deleted file mode 100644 index d37844aad..000000000 --- a/api/src/pkg/controllers/book_controller.go +++ /dev/null @@ -1,17 +0,0 @@ -package controllers - -import "github.com/gofiber/fiber/v2" - -func GetBooks(c *fiber.Ctx) error { - return c.Status(fiber.StatusOK).JSON(fiber.Map{ - "error": true, - "msg": "GetBooks", - }) -} - -func GetBook(c *fiber.Ctx) error { - return c.Status(fiber.StatusOK).JSON(fiber.Map{ - "error": true, - "msg": "GetSingleBook", - }) -} diff --git a/api/src/pkg/controllers/entries_controller.go b/api/src/pkg/controllers/entries_controller.go new file mode 100644 index 000000000..f15a4b48d --- /dev/null +++ b/api/src/pkg/controllers/entries_controller.go @@ -0,0 +1,53 @@ +package controllers + +import ( + "github.com/gofiber/fiber/v2" + "go.mongodb.org/mongo-driver/bson/primitive" + "math/rand" + "mizuserver/src/pkg/utils" + "time" +) + +type BaseEntryDetails struct { + Id string `json:"id,omitempty"` + Url string `json:"url,omitempty"` + Service string `json:"service,omitempty"` + Path string `json:"path,omitempty"` + StatusCode int `json:"statusCode,omitempty"` + Method string `json:"method,omitempty"` + Timestamp int64 `json:"timestamp,omitempty"` +} + +var ( + entries [100]BaseEntryDetails + +) + +func GenerateData() { + for i := 0; i < 100; i++ { + entries[i] = BaseEntryDetails{ + Id: primitive.NewObjectID().Hex(), + Url: utils.GetRandomString(10), + Service: utils.GetRandomString(10), + Path: utils.GetRandomString(10), + StatusCode: rand.Int(), + Method: utils.GetRandomString(4), + Timestamp: time.Now().Unix(), + } + } +} + + +func GetEntries(c *fiber.Ctx) error { + return c.Status(fiber.StatusOK).JSON(fiber.Map{ + "error": false, + "entries": entries, + }) +} + +func GetEntry(c *fiber.Ctx) error { + return c.Status(fiber.StatusOK).JSON(fiber.Map{ + "error": true, + "msg": "GetSingleBook", + }) +} diff --git a/api/src/pkg/models/autogenerated_book_model.go b/api/src/pkg/models/autogenerated_book_model.go deleted file mode 100644 index cb0b56c1a..000000000 --- a/api/src/pkg/models/autogenerated_book_model.go +++ /dev/null @@ -1,469 +0,0 @@ -// Code generated by go-queryset. DO NOT EDIT. -package models - -import ( - "errors" - "fmt" - "strings" - "time" - - "github.com/jinzhu/gorm" -) - -// ===== BEGIN of all query sets - -// ===== BEGIN of query set MizuEntryQuerySet - -// MizuEntryQuerySet is an queryset type for MizuEntry -type MizuEntryQuerySet struct { - db *gorm.DB -} - -// NewMizuEntryQuerySet constructs new MizuEntryQuerySet -func NewMizuEntryQuerySet(db *gorm.DB) MizuEntryQuerySet { - return MizuEntryQuerySet{ - db: db.Model(&MizuEntry{}), - } -} - -func (qs MizuEntryQuerySet) w(db *gorm.DB) MizuEntryQuerySet { - return NewMizuEntryQuerySet(db) -} - -func (qs MizuEntryQuerySet) Select(fields ...MizuEntryDBSchemaField) MizuEntryQuerySet { - names := []string{} - for _, f := range fields { - names = append(names, f.String()) - } - - return qs.w(qs.db.Select(strings.Join(names, ","))) -} - -// Create is an autogenerated method -// nolint: dupl -func (o *MizuEntry) Create(db *gorm.DB) error { - return db.Create(o).Error -} - -// Delete is an autogenerated method -// nolint: dupl -func (o *MizuEntry) Delete(db *gorm.DB) error { - return db.Delete(o).Error -} - -// All is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) All(ret *[]MizuEntry) error { - return qs.db.Find(ret).Error -} - -// Count is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) Count() (int, error) { - var count int - err := qs.db.Count(&count).Error - return count, err -} - -// CreatedAtEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtEq(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at = ?", createdAt)) -} - -// CreatedAtGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtGt(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at > ?", createdAt)) -} - -// CreatedAtGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtGte(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at >= ?", createdAt)) -} - -// CreatedAtLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtLt(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at < ?", createdAt)) -} - -// CreatedAtLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtLte(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at <= ?", createdAt)) -} - -// CreatedAtNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) CreatedAtNe(createdAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("created_at != ?", createdAt)) -} - -// Delete is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) Delete() error { - return qs.db.Delete(MizuEntry{}).Error -} - -// DeleteNum is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeleteNum() (int64, error) { - db := qs.db.Delete(MizuEntry{}) - return db.RowsAffected, db.Error -} - -// DeleteNumUnscoped is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeleteNumUnscoped() (int64, error) { - db := qs.db.Unscoped().Delete(MizuEntry{}) - return db.RowsAffected, db.Error -} - -// DeletedAtEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtEq(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at = ?", deletedAt)) -} - -// DeletedAtGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtGt(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at > ?", deletedAt)) -} - -// DeletedAtGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtGte(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at >= ?", deletedAt)) -} - -// DeletedAtIsNotNull is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtIsNotNull() MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at IS NOT NULL")) -} - -// DeletedAtIsNull is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtIsNull() MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at IS NULL")) -} - -// DeletedAtLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtLt(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at < ?", deletedAt)) -} - -// DeletedAtLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtLte(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at <= ?", deletedAt)) -} - -// DeletedAtNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) DeletedAtNe(deletedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("deleted_at != ?", deletedAt)) -} - -// GetDB is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) GetDB() *gorm.DB { - return qs.db -} - -// GetUpdater is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) GetUpdater() MizuEntryUpdater { - return NewMizuEntryUpdater(qs.db) -} - -// IDEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDEq(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id = ?", ID)) -} - -// IDGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDGt(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id > ?", ID)) -} - -// IDGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDGte(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id >= ?", ID)) -} - -// IDIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDIn(ID ...uint) MizuEntryQuerySet { - if len(ID) == 0 { - qs.db.AddError(errors.New("must at least pass one ID in IDIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("id IN (?)", ID)) -} - -// IDLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDLt(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id < ?", ID)) -} - -// IDLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDLte(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id <= ?", ID)) -} - -// IDNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDNe(ID uint) MizuEntryQuerySet { - return qs.w(qs.db.Where("id != ?", ID)) -} - -// IDNotIn is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) IDNotIn(ID ...uint) MizuEntryQuerySet { - if len(ID) == 0 { - qs.db.AddError(errors.New("must at least pass one ID in IDNotIn")) - return qs.w(qs.db) - } - return qs.w(qs.db.Where("id NOT IN (?)", ID)) -} - -// Limit is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) Limit(limit int) MizuEntryQuerySet { - return qs.w(qs.db.Limit(limit)) -} - -// Offset is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) Offset(offset int) MizuEntryQuerySet { - return qs.w(qs.db.Offset(offset)) -} - -// One is used to retrieve one result. It returns gorm.ErrRecordNotFound -// if nothing was fetched -func (qs MizuEntryQuerySet) One(ret *MizuEntry) error { - return qs.db.First(ret).Error -} - -// OrderAscByCreatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByCreatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("created_at ASC")) -} - -// OrderAscByDeletedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByDeletedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("deleted_at ASC")) -} - -// OrderAscByID is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByID() MizuEntryQuerySet { - return qs.w(qs.db.Order("id ASC")) -} - -// OrderAscByUpdatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderAscByUpdatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("updated_at ASC")) -} - -// OrderDescByCreatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByCreatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("created_at DESC")) -} - -// OrderDescByDeletedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByDeletedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("deleted_at DESC")) -} - -// OrderDescByID is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByID() MizuEntryQuerySet { - return qs.w(qs.db.Order("id DESC")) -} - -// OrderDescByUpdatedAt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) OrderDescByUpdatedAt() MizuEntryQuerySet { - return qs.w(qs.db.Order("updated_at DESC")) -} - -// PreloadEntry is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) PreloadEntry() MizuEntryQuerySet { - return qs.w(qs.db.Preload("Entry")) -} - -// UpdatedAtEq is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtEq(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at = ?", updatedAt)) -} - -// UpdatedAtGt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtGt(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at > ?", updatedAt)) -} - -// UpdatedAtGte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtGte(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at >= ?", updatedAt)) -} - -// UpdatedAtLt is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtLt(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at < ?", updatedAt)) -} - -// UpdatedAtLte is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtLte(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at <= ?", updatedAt)) -} - -// UpdatedAtNe is an autogenerated method -// nolint: dupl -func (qs MizuEntryQuerySet) UpdatedAtNe(updatedAt time.Time) MizuEntryQuerySet { - return qs.w(qs.db.Where("updated_at != ?", updatedAt)) -} - -// SetCreatedAt is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetCreatedAt(createdAt time.Time) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.CreatedAt)] = createdAt - return u -} - -// SetDeletedAt is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetDeletedAt(deletedAt *time.Time) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.DeletedAt)] = deletedAt - return u -} - -// SetEntry is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetEntry(entry Entry) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.Entry)] = entry - return u -} - -// SetID is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetID(ID uint) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.ID)] = ID - return u -} - -// SetUpdatedAt is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) SetUpdatedAt(updatedAt time.Time) MizuEntryUpdater { - u.fields[string(MizuEntryDBSchema.UpdatedAt)] = updatedAt - return u -} - -// Update is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) Update() error { - return u.db.Updates(u.fields).Error -} - -// UpdateNum is an autogenerated method -// nolint: dupl -func (u MizuEntryUpdater) UpdateNum() (int64, error) { - db := u.db.Updates(u.fields) - return db.RowsAffected, db.Error -} - -// ===== END of query set MizuEntryQuerySet - -// ===== BEGIN of MizuEntry modifiers - -// MizuEntryDBSchemaField describes database schema field. It requires for method 'Update' -type MizuEntryDBSchemaField string - -// String method returns string representation of field. -// nolint: dupl -func (f MizuEntryDBSchemaField) String() string { - return string(f) -} - -// MizuEntryDBSchema stores db field names of MizuEntry -var MizuEntryDBSchema = struct { - ID MizuEntryDBSchemaField - CreatedAt MizuEntryDBSchemaField - UpdatedAt MizuEntryDBSchemaField - DeletedAt MizuEntryDBSchemaField - Entry MizuEntryDBSchemaField -}{ - - ID: MizuEntryDBSchemaField("id"), - CreatedAt: MizuEntryDBSchemaField("created_at"), - UpdatedAt: MizuEntryDBSchemaField("updated_at"), - DeletedAt: MizuEntryDBSchemaField("deleted_at"), - Entry: MizuEntryDBSchemaField("entry"), -} - -// Update updates MizuEntry fields by primary key -// nolint: dupl -func (o *MizuEntry) Update(db *gorm.DB, fields ...MizuEntryDBSchemaField) error { - dbNameToFieldName := map[string]interface{}{ - "id": o.ID, - "created_at": o.CreatedAt, - "updated_at": o.UpdatedAt, - "deleted_at": o.DeletedAt, - "entry": o.Entry, - } - u := map[string]interface{}{} - for _, f := range fields { - fs := f.String() - u[fs] = dbNameToFieldName[fs] - } - if err := db.Model(o).Updates(u).Error; err != nil { - if err == gorm.ErrRecordNotFound { - return err - } - - return fmt.Errorf("can't update MizuEntry %v fields %v: %s", - o, fields, err) - } - - return nil -} - -// MizuEntryUpdater is an MizuEntry updates manager -type MizuEntryUpdater struct { - fields map[string]interface{} - db *gorm.DB -} - -// NewMizuEntryUpdater creates new MizuEntry updater -// nolint: dupl -func NewMizuEntryUpdater(db *gorm.DB) MizuEntryUpdater { - return MizuEntryUpdater{ - fields: map[string]interface{}{}, - db: db.Model(&MizuEntry{}), - } -} - -// ===== END of MizuEntry modifiers - -// ===== END of all query sets diff --git a/api/src/pkg/models/book_model.go b/api/src/pkg/models/book_model.go deleted file mode 100644 index cddbdd8a5..000000000 --- a/api/src/pkg/models/book_model.go +++ /dev/null @@ -1,305 +0,0 @@ -//go:generate goqueryset -in book_model.go -package models - -import ( - "github.com/jinzhu/gorm" - "time" -) - -/* -HTTP Archive (HAR) format -https://w3c.github.io/web-performance/specs/HAR/Overview.html -*/ - -// gen:qs -type MizuEntry struct { - gorm.Model - // The Entry itself - Entry Entry `json:"entry,omitempty"` - //TODO: here we will add fields we need to query for -} - - - -type Entry struct { - Pageref string `json:"pageref,omitempty"` - // Date and time stamp of the request start - // (ISO 8601 YYYY-MM-DDThh:mm:ss.sTZD). - StartedDateTime string `json:"startedDateTime"` - // Total elapsed time of the request in milliseconds. This is the sum of all - // timings available in the timings object (i.e. not including -1 values) . - Time float32 `json:"time"` - // Detailed info about the request. - Request Request `json:"request"` - // Detailed info about the response. - Response Response `json:"response"` - // Info about cache usage. - Cache Cache `json:"cache"` - // Detailed timing info about request/response round trip. - PageTimings PageTimings `json:"pageTimings"` - // optional (new in 1.2) IP address of the server that was connected - // (result of DNS resolution). - ServerIPAddress string `json:"serverIPAddress,omitempty"` - // optional (new in 1.2) Unique ID of the parent TCP/IP connection, can be - // the client port number. Note that a port number doesn't have to be unique - // identifier in cases where the port is shared for more connections. If the - // port isn't available for the application, any other unique connection ID - // can be used instead (e.g. connection index). Leave out this field if the - // application doesn't support this info. - Connection string `json:"connection,omitempty"` - // (new in 1.2) A comment provided by the user or the application. - Comment string `json:"comment,omitempty"` -} - -// Request contains detailed info about performed request. -type Request struct { - // Request method (GET, POST, ...). - Method string `json:"method"` - // Absolute URL of the request (fragments are not included). - URL string `json:"url"` - // Request HTTP Version. - HTTPVersion string `json:"httpVersion"` - // List of cookie objects. - Cookies []Cookie `json:"cookies"` - // List of header objects. - Headers []NVP `json:"headers"` - // List of query parameter objects. - QueryString []NVP `json:"queryString"` - // Posted data. - PostData PostData `json:"postData"` - // Total number of bytes from the start of the HTTP request message until - // (and including) the double CRLF before the body. Set to -1 if the info - // is not available. - HeaderSize int `json:"headerSize"` - // Size of the request body (POST data payload) in bytes. Set to -1 if the - // info is not available. - BodySize int `json:"bodySize"` - // (new in 1.2) A comment provided by the user or the application. - Comment string `json:"comment"` -} - -// Response contains detailed info about the response. -type Response struct { - // Response status. - Status int `json:"status"` - // Response status description. - StatusText string `json:"statusText"` - // Response HTTP Version. - HTTPVersion string `json:"httpVersion"` - // List of cookie objects. - Cookies []Cookie `json:"cookies"` - // List of header objects. - Headers []NVP `json:"headers"` - // Details about the response body. - Content Content `json:"content"` - // Redirection target URL from the Location response header. - RedirectURL string `json:"redirectURL"` - // Total number of bytes from the start of the HTTP response message until - // (and including) the double CRLF before the body. Set to -1 if the info is - // not available. - // The size of received response-headers is computed only from headers that - // are really received from the server. Additional headers appended by the - // browser are not included in this number, but they appear in the list of - // header objects. - HeadersSize int `json:"headersSize"` - // Size of the received response body in bytes. Set to zero in case of - // responses coming from the cache (304). Set to -1 if the info is not - // available. - BodySize int `json:"bodySize"` - // optional (new in 1.2) A comment provided by the user or the application. - Comment string `json:"comment,omitempty"` -} - -// Cookie contains list of all cookies (used in and objects). -type Cookie struct { - // The name of the cookie. - Name string `json:"name"` - // The cookie value. - Value string `json:"value"` - // optional The path pertaining to the cookie. - Path string `json:"path,omitempty"` - // optional The host of the cookie. - Domain string `json:"domain,omitempty"` - // optional Cookie expiration time. - // (ISO 8601 YYYY-MM-DDThh:mm:ss.sTZD, e.g. 2009-07-24T19:20:30.123+02:00). - Expires string `json:"expires,omitempty"` - // optional Set to true if the cookie is HTTP only, false otherwise. - HTTPOnly bool `json:"httpOnly,omitempty"` - // optional (new in 1.2) True if the cookie was transmitted over ssl, false - // otherwise. - Secure bool `json:"secure,omitempty"` - // optional (new in 1.2) A comment provided by the user or the application. - Comment bool `json:"comment,omitempty"` -} - -// NVP is simply a name/value pair with a comment -type NVP struct { - Name string `json:"name"` - Value string `json:"value"` - Comment string `json:"comment,omitempty"` -} - -// PostData describes posted data, if any (embedded in object). -type PostData struct { - // Mime type of posted data. - MimeType string `json:"mimeType"` - // List of posted parameters (in case of URL encoded parameters). - Params []PostParam `json:"params"` - // Plain text posted data - Text string `json:"text"` - // optional (new in 1.2) A comment provided by the user or the - // application. - Comment string `json:"comment,omitempty"` -} - -// PostParam is a list of posted parameters, if any (embedded in object). -type PostParam struct { - // name of a posted parameter. - Name string `json:"name"` - // optional value of a posted parameter or content of a posted file. - Value string `json:"value,omitempty"` - // optional name of a posted file. - FileName string `json:"fileName,omitempty"` - // optional content type of a posted file. - ContentType string `json:"contentType,omitempty"` - // optional (new in 1.2) A comment provided by the user or the application. - Comment string `json:"comment,omitempty"` -} - -// Content describes details about response content (embedded in object). -type Content struct { - // Length of the returned content in bytes. Should be equal to - // response.bodySize if there is no compression and bigger when the content - // has been compressed. - Size int `json:"size"` - // optional Number of bytes saved. Leave out this field if the information - // is not available. - Compression int `json:"compression,omitempty"` - // MIME type of the response text (value of the Content-Type response - // header). The charset attribute of the MIME type is included (if - // available). - MimeType string `json:"mimeType"` - // optional Response body sent from the server or loaded from the browser - // cache. This field is populated with textual content only. The text field - // is either HTTP decoded text or a encoded (e.g. "base64") representation of - // the response body. Leave out this field if the information is not - // available. - Text string `json:"text,omitempty"` - // optional (new in 1.2) Encoding used for response text field e.g - // "base64". Leave out this field if the text field is HTTP decoded - // (decompressed & unchunked), than trans-coded from its original character - // set into UTF-8. - Encoding string `json:"encoding,omitempty"` - // optional (new in 1.2) A comment provided by the user or the application. - Comment string `json:"comment,omitempty"` -} - -// Cache contains info about a request coming from browser cache. -type Cache struct { - // optional State of a cache entry before the request. Leave out this field - // if the information is not available. - BeforeRequest CacheObject `json:"beforeRequest,omitempty"` - // optional State of a cache entry after the request. Leave out this field if - // the information is not available. - AfterRequest CacheObject `json:"afterRequest,omitempty"` - // optional (new in 1.2) A comment provided by the user or the application. - Comment string `json:"comment,omitempty"` -} - -// CacheObject is used by both beforeRequest and afterRequest -type CacheObject struct { - // optional - Expiration time of the cache entry. - Expires string `json:"expires,omitempty"` - // The last time the cache entry was opened. - LastAccess string `json:"lastAccess"` - // Etag - ETag string `json:"eTag"` - // The number of times the cache entry has been opened. - HitCount int `json:"hitCount"` - // optional (new in 1.2) A comment provided by the user or the application. - Comment string `json:"comment,omitempty"` -} - -// PageTimings describes various phases within request-response round trip. -// All times are specified in milliseconds. -type PageTimings struct { - Blocked int `json:"blocked,omitempty"` - // optional - Time spent in a queue waiting for a network connection. Use -1 - // if the timing does not apply to the current request. - DNS int `json:"dns,omitempty"` - // optional - DNS resolution time. The time required to resolve a host name. - // Use -1 if the timing does not apply to the current request. - Connect int `json:"connect,omitempty"` - // optional - Time required to create TCP connection. Use -1 if the timing - // does not apply to the current request. - Send int `json:"send"` - // Time required to send HTTP request to the server. - Wait int `json:"wait"` - // Waiting for a response from the server. - Receive int `json:"receive"` - // Time required to read entire response from the server (or cache). - Ssl int `json:"ssl,omitempty"` - // optional (new in 1.2) - Time required for SSL/TLS negotiation. If this - // field is defined then the time is also included in the connect field (to - // ensure backward compatibility with HAR 1.1). Use -1 if the timing does not - // apply to the current request. - Comment string `json:"comment,omitempty"` - // optional (new in 1.2) - A comment provided by the user or the application. -} - -// TestResult contains results for an individual HTTP request -type TestResult struct { - URL string `json:"url"` - Status int `json:"status"` // 200, 500, etc. - StartTime time.Time `json:"startTime"` - EndTime time.Time `json:"endTime"` - Latency int `json:"latency"` // milliseconds - Method string `json:"method"` - HarFile string `json:"harfile"` -} -//package models -// -//import ( -// "database/sql/driver" -// "encoding/json" -// "errors" -// "time" -// -// "github.com/google/uuid" -//) -// -//// Book struct to describe book object. -//type Book struct { -// ID uuid.UUID `db:"id" json:"id" validate:"required,uuid"` -// CreatedAt time.Time `db:"created_at" json:"created_at"` -// UpdatedAt time.Time `db:"updated_at" json:"updated_at"` -// UserID uuid.UUID `db:"user_id" json:"user_id" validate:"required,uuid"` -// Title string `db:"title" json:"title" validate:"required,lte=255"` -// Author string `db:"author" json:"author" validate:"required,lte=255"` -// BookStatus int `db:"book_status" json:"book_status" validate:"required,len=1"` -// BookAttrs BookAttrs `db:"book_attrs" json:"book_attrs" validate:"required,dive"` -//} -// -//// BookAttrs struct to describe book attributes. -//type BookAttrs struct { -// Picture string `json:"picture"` -// Description string `json:"description"` -// Rating int `json:"rating" validate:"min=1,max=10"` -//} -// -//// Value make the BookAttrs struct implement the driver.Valuer interface. -//// This method simply returns the JSON-encoded representation of the struct. -//func (b BookAttrs) Value() (driver.Value, error) { -// return json.Marshal(b) -//} -// -//// Scan make the BookAttrs struct implement the sql.Scanner interface. -//// This method simply decodes a JSON-encoded value into the struct fields. -//func (b *BookAttrs) Scan(value interface{}) error { -// j, ok := value.([]byte) -// if !ok { -// return errors.New("type assertion to []byte failed") -// } -// -// return json.Unmarshal(j, &b) -//} diff --git a/tap/src/mizuEntry.go b/api/src/pkg/models/mizuEntry.go similarity index 95% rename from tap/src/mizuEntry.go rename to api/src/pkg/models/mizuEntry.go index 725e603ee..37308f3e0 100644 --- a/tap/src/mizuEntry.go +++ b/api/src/pkg/models/mizuEntry.go @@ -1,4 +1,4 @@ -package main +package models import ( "gorm.io/gorm" diff --git a/api/src/pkg/routes/not_found_route.go b/api/src/pkg/routes/not_found_route.go index 2e0af5237..e0fcda923 100644 --- a/api/src/pkg/routes/not_found_route.go +++ b/api/src/pkg/routes/not_found_route.go @@ -6,7 +6,7 @@ import "github.com/gofiber/fiber/v2" func NotFoundRoute(a *fiber.App) { // Register new special route. a.Use( - // Anonimus function. + // Anonymous function. func(c *fiber.Ctx) error { // Return HTTP 404 status and JSON response. return c.Status(fiber.StatusNotFound).JSON(fiber.Map{ diff --git a/api/src/pkg/routes/public_routes.go b/api/src/pkg/routes/public_routes.go index 1d558938c..a3957ad6f 100644 --- a/api/src/pkg/routes/public_routes.go +++ b/api/src/pkg/routes/public_routes.go @@ -8,11 +8,13 @@ import ( // PublicRoutes func for describe group of public routes. func PublicRoutes(a *fiber.App) { + controllers.GenerateData() + // Create routes group. route := a.Group("/api") // Routes for GET method: - route.Get("/entries", controllers.GetBooks) // get list of all books - route.Get("/entries/:id", controllers.GetBook) // get one book by ID + route.Get("/entries", controllers.GetEntries) // get list of all books + route.Get("/entries/:entryId", controllers.GetEntry) // get one book by ID } diff --git a/tap/src/main.go b/api/src/pkg/utils/main.go similarity index 64% rename from tap/src/main.go rename to api/src/pkg/utils/main.go index 6cdbf5911..3f08fb0d0 100644 --- a/tap/src/main.go +++ b/api/src/pkg/utils/main.go @@ -1,4 +1,4 @@ -package main +package utils import ( "bufio" @@ -8,10 +8,11 @@ import ( "go.mongodb.org/mongo-driver/bson/primitive" "gorm.io/driver/sqlite" "gorm.io/gorm" + "mizuserver/src/pkg/models" "os" ) -func main() { +func testHarSavingToDBFromFile() { FILEPATH := "/Users/roeegadot/Downloads/testing.har" file, err := os.Open(FILEPATH) if err != nil { @@ -34,26 +35,22 @@ func main() { } -func getGormDB() *gorm.DB { - db, _ := gorm.Open(sqlite.Open("gorm.db"), &gorm.Config{}) - - migErr := db.AutoMigrate(&MizuEntry{}) - if migErr != nil { - panic("Cannot run migration") - } +func getGormDB(databaseFilePath string) *gorm.DB { + db, _ := gorm.Open(sqlite.Open(databaseFilePath), &gorm.Config{}) + _ = db.AutoMigrate(&models.MizuEntry{}) // this will ensure table is created return db } func saveHarToDb(entry har.Entry, serviceName string, source string) { - a, _ := json.Marshal(entry) - mizuEntry := MizuEntry{ + entryBytes, _ := json.Marshal(entry) + mizuEntry := models.MizuEntry{ EntryId: primitive.NewObjectID().Hex(), - Entry: string(a), // simple way to store it and not convert to bytes + Entry: string(entryBytes), // simple way to store it and not convert to bytes Url: entry.Request.URL, Method: entry.Request.Method, Status: entry.Response.Status, Source: source, Service: serviceName, } - getGormDB().Create(&mizuEntry) + getGormDB("entries.db").Create(&mizuEntry) } diff --git a/api/src/pkg/utils/randomString.go b/api/src/pkg/utils/randomString.go new file mode 100644 index 000000000..9bed7da59 --- /dev/null +++ b/api/src/pkg/utils/randomString.go @@ -0,0 +1,22 @@ +package utils + +import ( + "math/rand" + "time" +) + +const charset = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" + +var seededRand = rand.New(rand.NewSource(time.Now().UnixNano())) + +func StringWithCharset(length int, charset string) string { + b := make([]byte, length) + for i := range b { + b[i] = charset[seededRand.Intn(len(charset))] + } + return string(b) +} + +func GetRandomString(length int) string { + return StringWithCharset(length, charset) +} diff --git a/tap/go.mod b/tap/go.mod deleted file mode 100644 index 7099709c9..000000000 --- a/tap/go.mod +++ /dev/null @@ -1,10 +0,0 @@ -module main - -go 1.16 - -require ( - github.com/google/martian v2.1.0+incompatible - go.mongodb.org/mongo-driver v1.5.1 - gorm.io/driver/sqlite v1.1.4 - gorm.io/gorm v1.21.8 -) diff --git a/tap/go.sum b/tap/go.sum deleted file mode 100644 index 1d503cab5..000000000 --- a/tap/go.sum +++ /dev/null @@ -1,122 +0,0 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -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/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= -github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= -github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= -github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= -github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= -github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= -github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= -github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= -github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= -github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -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/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= -go.mongodb.org/mongo-driver v1.5.1 h1:9nOVLGDfOaZ9R0tBumx/BcuqkbFpyTCU2r/Po7A2azI= -go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/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-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM= -gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= -gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= -gorm.io/gorm v1.21.8 h1:2CEwZSzogdhsKPlJ9OvBKTdlWIpELXb6HbfLfMNhSYI= -gorm.io/gorm v1.21.8/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= From d0119d60469b22b3bfbacd20f922d627e50a6777 Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Sun, 25 Apr 2021 14:23:08 +0300 Subject: [PATCH 05/10] no message --- api/go.mod | 3 +- api/go.sum | 74 +------------------ api/src/main.go | 6 +- api/src/pkg/controllers/entries_controller.go | 58 ++++++--------- api/src/pkg/database/utils.go | 22 ++++++ api/src/pkg/models/mizuEntry.go | 32 ++++++-- api/src/pkg/routes/public_routes.go | 2 +- api/src/pkg/utils/main.go | 56 -------------- api/src/pkg/utils/pathUtils.go | 50 +++++++++++++ api/src/pkg/utils/utils.go | 15 +++- api/testing_from_file.go | 59 +++++++++++++++ 11 files changed, 198 insertions(+), 179 deletions(-) create mode 100644 api/src/pkg/database/utils.go delete mode 100644 api/src/pkg/utils/main.go create mode 100644 api/src/pkg/utils/pathUtils.go create mode 100644 api/testing_from_file.go diff --git a/api/go.mod b/api/go.mod index a853423da..6ceb5579f 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,9 +3,10 @@ module mizuserver go 1.16 require ( + github.com/djherbis/atime v1.0.0 github.com/gofiber/fiber/v2 v2.8.0 + github.com/google/martian v2.1.0+incompatible go.mongodb.org/mongo-driver v1.5.1 gorm.io/driver/sqlite v1.1.4 - github.com/google/martian v2.1.0+incompatible gorm.io/gorm v1.21.8 ) diff --git a/api/go.sum b/api/go.sum index 1cf88698b..b4a4894b1 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,140 +1,90 @@ -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= -github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPIk= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= -github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/djherbis/atime v1.0.0 h1:ySLvBAM0EvOGaX7TI4dAM5lWj+RdJUCKtGSEHN8SGBg= +github.com/djherbis/atime v1.0.0/go.mod h1:5W+KBIuTwVGcqjIfaTwt+KSYX1o6uep8dtevevQP/f8= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd h1:hSkbZ9XSyjyBirMeqSqUrK+9HboWrweVlzRNqoBi2d4= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0 h1:31atYa/UW9V5q8vMJ+W6wd64OaaTHUrCUXER358zLM4= github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3 h1:3GQ53z7E3o00C/yy7Ko8VXqQXoJGLkrTQCLTF1EjoXU= github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1 h1:iQ0D6SpNXIxu52WESsD+KoQ7af2e3nCfnSBoSF/hKe0= github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211 h1:mSVZ4vj4khv+oThUfS+SQU3UuFIZ5Zo6UNcvK8E8Mz8= github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1 h1:dLg+zb+uOyd/mKeQUYIbwbNmfRsr9hd/WtYWepmayhI= github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2 h1:8thhT+kUJMTMy3HlX4+y9Da+BNJck+p109tqqKp7WDs= github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2 h1:fq9WcL1BYrm36SzK6+aAnZ8hcp+SrmnDyAxhNx8dvJk= github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0 h1:4sGKOD8yaYJ+dek1FDkwcxCHA40M4kfKgFHx8N2kwbU= github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0 h1:Ir9W9XIm9j7bhhkKE9cokvtTl1vBm62A/fene/ZCj6A= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754 h1:tpom+2CJmpzAWj5/VEHync2rJGi+epHNIeRSWjzGA+4= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/gofiber/fiber/v2 v2.8.0 h1:BdWvZmg/WY/Vjtjm38aXOp1Lks1BhuyS2b7lSWSPAzk= github.com/gofiber/fiber/v2 v2.8.0/go.mod h1:Ah3IJikrKNRepl/HuVawppS25X7FWohwfCSRn7kJG28= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= -github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3 h1:lOpSw2vJP0y5eLBW906QwKsUK/fe/QDyoqM5rnnuPDY= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13 h1:eSvu8Tmq6j2psUJqJrLcWH6K3w5Dwc+qipbaA6eVEN4= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2 h1:JgVTCPf0uBVcUSWpyXmGpgOc62nK5HWUBKAGc3Qqa5k= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -142,35 +92,24 @@ github.com/valyala/fasthttp v1.23.0 h1:0ufwSD9BhWa6f8HWdmdq4FHQ23peRo3Ng/Qs8m5Nc github.com/valyala/fasthttp v1.23.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= go.mongodb.org/mongo-driver v1.5.1 h1:9nOVLGDfOaZ9R0tBumx/BcuqkbFpyTCU2r/Po7A2azI= go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20210226101413-39120d07d75e h1:jIQURUJ9mlLvYwTBtRHm9h58rYhSonLvRvgAnP8Nr7I= golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -180,37 +119,28 @@ golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d h1:bt+R27hbE7uVf7PY9S6wpNg9Xo2WRe/XQT0uGq9RQQw= golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM= gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= -gorm.io/gorm v1.20.7 h1:rMS4CL3pNmYq1V5/X+nHHjh1Dx6dnf27+Cai5zabo+M= gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.21.8 h1:2CEwZSzogdhsKPlJ9OvBKTdlWIpELXb6HbfLfMNhSYI= gorm.io/gorm v1.21.8/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= diff --git a/api/src/main.go b/api/src/main.go index d6d2ba799..0695ab038 100644 --- a/api/src/main.go +++ b/api/src/main.go @@ -2,12 +2,17 @@ package main import ( "github.com/gofiber/fiber/v2" + // api "mizuserver" "mizuserver/src/pkg/middleware" "mizuserver/src/pkg/routes" "mizuserver/src/pkg/utils" ) func main() { + // TODO: to generate data + // path := "/Users/roeegadot/Downloads/output2" + // api.TestHarSavingFromFolder(path) + app := fiber.New() middleware.FiberMiddleware(app) // Register Fiber's middleware for app. @@ -21,6 +26,5 @@ func main() { routes.NotFoundRoute(app) utils.StartServer(app) - } diff --git a/api/src/pkg/controllers/entries_controller.go b/api/src/pkg/controllers/entries_controller.go index f15a4b48d..78f559e9e 100644 --- a/api/src/pkg/controllers/entries_controller.go +++ b/api/src/pkg/controllers/entries_controller.go @@ -1,53 +1,37 @@ package controllers import ( + "encoding/json" "github.com/gofiber/fiber/v2" - "go.mongodb.org/mongo-driver/bson/primitive" - "math/rand" - "mizuserver/src/pkg/utils" - "time" + "github.com/google/martian/har" + "mizuserver/src/pkg/database" + "mizuserver/src/pkg/models" ) -type BaseEntryDetails struct { - Id string `json:"id,omitempty"` - Url string `json:"url,omitempty"` - Service string `json:"service,omitempty"` - Path string `json:"path,omitempty"` - StatusCode int `json:"statusCode,omitempty"` - Method string `json:"method,omitempty"` - Timestamp int64 `json:"timestamp,omitempty"` -} - -var ( - entries [100]BaseEntryDetails - -) - -func GenerateData() { - for i := 0; i < 100; i++ { - entries[i] = BaseEntryDetails{ - Id: primitive.NewObjectID().Hex(), - Url: utils.GetRandomString(10), - Service: utils.GetRandomString(10), - Path: utils.GetRandomString(10), - StatusCode: rand.Int(), - Method: utils.GetRandomString(4), - Timestamp: time.Now().Unix(), - } - } -} - - func GetEntries(c *fiber.Ctx) error { + var baseEntries []models.BaseEntryDetails + database.EntriesCollection.Find(&baseEntries) + return c.Status(fiber.StatusOK).JSON(fiber.Map{ "error": false, - "entries": entries, + "entries": baseEntries, }) } func GetEntry(c *fiber.Ctx) error { + + var entryData models.EntryData + database.EntriesCollection. + Select("entry"). + Where(map[string]string{"entryId": c.Params("entryId")}). + First(&entryData) + + var fullEntry har.Entry + entryObject := json.Unmarshal([]byte(entryData.Entry), &fullEntry) + + return c.Status(fiber.StatusOK).JSON(fiber.Map{ - "error": true, - "msg": "GetSingleBook", + "error": false, + "msg": entryObject, }) } diff --git a/api/src/pkg/database/utils.go b/api/src/pkg/database/utils.go new file mode 100644 index 000000000..005c14fe7 --- /dev/null +++ b/api/src/pkg/database/utils.go @@ -0,0 +1,22 @@ +package database + +import ( + "gorm.io/driver/sqlite" + "gorm.io/gorm" + "mizuserver/src/pkg/models" +) + +const ( + DBPath = "./entries.db" +) + +var ( + DB = initDataBase(DBPath) + EntriesCollection = DB.Table("mizu_entries") +) + +func initDataBase(databasePath string) *gorm.DB { + temp, _ := gorm.Open(sqlite.Open(databasePath), &gorm.Config{}) + _ = temp.AutoMigrate(&models.MizuEntry{}) // this will ensure table is created + return temp +} \ No newline at end of file diff --git a/api/src/pkg/models/mizuEntry.go b/api/src/pkg/models/mizuEntry.go index 37308f3e0..7df0620b5 100644 --- a/api/src/pkg/models/mizuEntry.go +++ b/api/src/pkg/models/mizuEntry.go @@ -6,11 +6,29 @@ import ( type MizuEntry struct { gorm.Model - Entry string `json:"entry,omitempty"` - EntryId string `json:"entryId"` - Url string `json:"url"` - Method string `json:"method"` - Status int `json:"status"` - Source string `json:"source"` - Service string `json:"serviceName"` + Entry string `json:"entry,omitempty" gorm:"column:entry"` + EntryId string `json:"entryId" gorm:"column:entryId"` + Url string `json:"url" gorm:"column:url"` + Method string `json:"method" gorm:"column:method"` + Status int `json:"status" gorm:"column:status"` + Source string `json:"source" gorm:"column:source"` + ServiceName string `json:"serviceName" gorm:"column:serviceName"` + Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` + Path string `json:"path" gorm:"column:path"` } + +type BaseEntryDetails struct { + Id string `json:"id,omitempty"` + EntryId string `json:"entryId,omitempty"` + Url string `json:"url,omitempty"` + ServiceName string `json:"serviceName,omitempty"` + Path string `json:"path,omitempty"` + StatusCode int `json:"statusCode,omitempty"` + Method string `json:"method,omitempty"` + Timestamp int64 `json:"timestamp,omitempty"` +} + + +type EntryData struct { + Entry string `json:"entry,omitempty"` +} \ No newline at end of file diff --git a/api/src/pkg/routes/public_routes.go b/api/src/pkg/routes/public_routes.go index a3957ad6f..532b96008 100644 --- a/api/src/pkg/routes/public_routes.go +++ b/api/src/pkg/routes/public_routes.go @@ -8,7 +8,7 @@ import ( // PublicRoutes func for describe group of public routes. func PublicRoutes(a *fiber.App) { - controllers.GenerateData() + //controllers.GenerateData() // Create routes group. route := a.Group("/api") diff --git a/api/src/pkg/utils/main.go b/api/src/pkg/utils/main.go deleted file mode 100644 index 3f08fb0d0..000000000 --- a/api/src/pkg/utils/main.go +++ /dev/null @@ -1,56 +0,0 @@ -package utils - -import ( - "bufio" - "encoding/json" - "fmt" - "github.com/google/martian/har" - "go.mongodb.org/mongo-driver/bson/primitive" - "gorm.io/driver/sqlite" - "gorm.io/gorm" - "mizuserver/src/pkg/models" - "os" -) - -func testHarSavingToDBFromFile() { - FILEPATH := "/Users/roeegadot/Downloads/testing.har" - file, err := os.Open(FILEPATH) - if err != nil { - fmt.Print(err) - os.Exit(1) - } - - reader := bufio.NewReader(file) - dec := json.NewDecoder(reader) - var inputHar har.HAR - if err := dec.Decode(&inputHar); err != nil { - fmt.Print(err) - os.Exit(1) - - } - - for _, entry := range inputHar.Log.Entries { - saveHarToDb(*entry, "service", "source") - } - -} - -func getGormDB(databaseFilePath string) *gorm.DB { - db, _ := gorm.Open(sqlite.Open(databaseFilePath), &gorm.Config{}) - _ = db.AutoMigrate(&models.MizuEntry{}) // this will ensure table is created - return db -} - -func saveHarToDb(entry har.Entry, serviceName string, source string) { - entryBytes, _ := json.Marshal(entry) - mizuEntry := models.MizuEntry{ - EntryId: primitive.NewObjectID().Hex(), - Entry: string(entryBytes), // simple way to store it and not convert to bytes - Url: entry.Request.URL, - Method: entry.Request.Method, - Status: entry.Response.Status, - Source: source, - Service: serviceName, - } - getGormDB("entries.db").Create(&mizuEntry) -} diff --git a/api/src/pkg/utils/pathUtils.go b/api/src/pkg/utils/pathUtils.go new file mode 100644 index 000000000..d936ecf81 --- /dev/null +++ b/api/src/pkg/utils/pathUtils.go @@ -0,0 +1,50 @@ +package utils + +import ( + "github.com/djherbis/atime" + "os" +) + +type ByModTime []os.FileInfo + +func (fis ByModTime) Len() int { + return len(fis) +} + +func (fis ByModTime) Swap(i, j int) { + fis[i], fis[j] = fis[j], fis[i] +} + +func (fis ByModTime) Less(i, j int) bool { + return fis[i].ModTime().Before(fis[j].ModTime()) +} + + +type ByName []os.FileInfo + +func (fis ByName) Len() int { + return len(fis) +} + +func (fis ByName) Swap(i, j int) { + fis[i], fis[j] = fis[j], fis[i] +} + +func (fis ByName) Less(i, j int) bool { + return fis[i].Name() < fis[j].Name() +} + + +type ByCreationTime []os.FileInfo + +func (fis ByCreationTime) Len() int { + return len(fis) +} + +func (fis ByCreationTime) Swap(i, j int) { + fis[i], fis[j] = fis[j], fis[i] +} + +func (fis ByCreationTime) Less(i, j int) bool { + return atime.Get(fis[i]).Unix() < atime.Get(fis[j]).Unix() +} \ No newline at end of file diff --git a/api/src/pkg/utils/utils.go b/api/src/pkg/utils/utils.go index 6e6e38302..108fe3b89 100644 --- a/api/src/pkg/utils/utils.go +++ b/api/src/pkg/utils/utils.go @@ -9,16 +9,16 @@ import ( "syscall" ) -/// starts the server with a graceful shutdown +// StartServer starts the server with a graceful shutdown func StartServer(app *fiber.App) { - sigs := make(chan os.Signal, 2) - signal.Notify(sigs, + signals := make(chan os.Signal, 2) + signal.Notify(signals, os.Interrupt, // this catch ctrl + c syscall.SIGTSTP, // this catch ctrl + z ) go func() { - _ = <-sigs + _ = <-signals fmt.Println("Shutting down...") _ = app.Shutdown() }() @@ -28,3 +28,10 @@ func StartServer(app *fiber.App) { log.Printf("Oops... Server is not running! Reason: %v", err) } } + + +func CheckErr(e error) { + if e != nil { + panic(e) + } +} \ No newline at end of file diff --git a/api/testing_from_file.go b/api/testing_from_file.go new file mode 100644 index 000000000..98a2fe40c --- /dev/null +++ b/api/testing_from_file.go @@ -0,0 +1,59 @@ +package api + +import ( + "bufio" + "encoding/json" + "fmt" + "github.com/google/martian/har" + "go.mongodb.org/mongo-driver/bson/primitive" + "mizuserver/src/pkg/database" + "mizuserver/src/pkg/models" + "mizuserver/src/pkg/utils" + "net/url" + "os" + "path" + "sort" +) + +func TestHarSavingFromFolder(inputDir string) { + dir, _ := os.Open(inputDir) + dirFiles, _ := dir.Readdir(-1) + sort.Sort(utils.ByModTime(dirFiles)) + + for _, fileInfo := range dirFiles { + inputFilePath := path.Join(inputDir, fileInfo.Name()) + file, err := os.Open(inputFilePath) + utils.CheckErr(err) + + var inputHar har.HAR + decErr := json.NewDecoder(bufio.NewReader(file)).Decode(&inputHar) + utils.CheckErr(decErr) + + for _, entry := range inputHar.Log.Entries { + SaveHarToDb(*entry, "source") + } + } +} + +func SaveHarToDb(entry har.Entry, source string) { + entryBytes, _ := json.Marshal(entry) + serviceName, urlPath := getServiceNameFromUrl(entry.Request.URL) + mizuEntry := models.MizuEntry{ + EntryId: primitive.NewObjectID().Hex(), + Entry: string(entryBytes), // simple way to store it and not convert to bytes + ServiceName: serviceName, + Url: entry.Request.URL, + Path: urlPath, + Method: entry.Request.Method, + Status: entry.Response.Status, + Source: source, + Timestamp: entry.StartedDateTime.Unix(), + } + database.EntriesCollection.Create(&mizuEntry) +} + +func getServiceNameFromUrl(inputUrl string) (string, string) { + parsed, err := url.Parse(inputUrl) + utils.CheckErr(err) + return fmt.Sprintf("%s://%s", parsed.Scheme, parsed.Host), parsed.Path +} From 3728ee08d6c799521eaa129462a5e892ce0ff9e4 Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Sun, 25 Apr 2021 14:49:47 +0300 Subject: [PATCH 06/10] some refactor --- api/src/main.go | 6 +++--- api/src/pkg/controllers/entries_controller.go | 14 +++++++++----- api/src/pkg/database/utils.go | 6 +++--- api/src/pkg/models/mizuEntry.go | 9 +++++---- api/src/pkg/routes/not_found_route.go | 7 ++----- api/src/pkg/routes/public_routes.go | 16 +++++----------- api/testing_from_file.go | 2 +- 7 files changed, 28 insertions(+), 32 deletions(-) diff --git a/api/src/main.go b/api/src/main.go index 0695ab038..0abd8b11a 100644 --- a/api/src/main.go +++ b/api/src/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/gofiber/fiber/v2" - // api "mizuserver" + api "mizuserver" "mizuserver/src/pkg/middleware" "mizuserver/src/pkg/routes" "mizuserver/src/pkg/utils" @@ -10,8 +10,8 @@ import ( func main() { // TODO: to generate data - // path := "/Users/roeegadot/Downloads/output2" - // api.TestHarSavingFromFolder(path) + path := "/Users/roeegadot/Downloads/output2" + api.TestHarSavingFromFolder(path) app := fiber.New() diff --git a/api/src/pkg/controllers/entries_controller.go b/api/src/pkg/controllers/entries_controller.go index 78f559e9e..2f64ab921 100644 --- a/api/src/pkg/controllers/entries_controller.go +++ b/api/src/pkg/controllers/entries_controller.go @@ -6,11 +6,14 @@ import ( "github.com/google/martian/har" "mizuserver/src/pkg/database" "mizuserver/src/pkg/models" + "mizuserver/src/pkg/utils" ) func GetEntries(c *fiber.Ctx) error { var baseEntries []models.BaseEntryDetails - database.EntriesCollection.Find(&baseEntries) + database.EntriesTable. + Find(&baseEntries). + Limit(100) return c.Status(fiber.StatusOK).JSON(fiber.Map{ "error": false, @@ -21,17 +24,18 @@ func GetEntries(c *fiber.Ctx) error { func GetEntry(c *fiber.Ctx) error { var entryData models.EntryData - database.EntriesCollection. + database.EntriesTable. Select("entry"). Where(map[string]string{"entryId": c.Params("entryId")}). First(&entryData) + // TODO: check why don't we get entry here var fullEntry har.Entry - entryObject := json.Unmarshal([]byte(entryData.Entry), &fullEntry) - + unmarshallErr := json.Unmarshal([]byte(entryData.Entry), &fullEntry) + utils.CheckErr(unmarshallErr) return c.Status(fiber.StatusOK).JSON(fiber.Map{ "error": false, - "msg": entryObject, + "msg": fullEntry, }) } diff --git a/api/src/pkg/database/utils.go b/api/src/pkg/database/utils.go index 005c14fe7..1771fcaac 100644 --- a/api/src/pkg/database/utils.go +++ b/api/src/pkg/database/utils.go @@ -11,12 +11,12 @@ const ( ) var ( - DB = initDataBase(DBPath) - EntriesCollection = DB.Table("mizu_entries") + DB = initDataBase(DBPath) + EntriesTable = DB.Table("mizu_entries") ) func initDataBase(databasePath string) *gorm.DB { temp, _ := gorm.Open(sqlite.Open(databasePath), &gorm.Config{}) _ = temp.AutoMigrate(&models.MizuEntry{}) // this will ensure table is created return temp -} \ No newline at end of file +} diff --git a/api/src/pkg/models/mizuEntry.go b/api/src/pkg/models/mizuEntry.go index 7df0620b5..f6bbe27f4 100644 --- a/api/src/pkg/models/mizuEntry.go +++ b/api/src/pkg/models/mizuEntry.go @@ -6,6 +6,7 @@ import ( type MizuEntry struct { gorm.Model + // TODO: map id to _id? Entry string `json:"entry,omitempty" gorm:"column:entry"` EntryId string `json:"entryId" gorm:"column:entryId"` Url string `json:"url" gorm:"column:url"` @@ -18,12 +19,12 @@ type MizuEntry struct { } type BaseEntryDetails struct { - Id string `json:"id,omitempty"` - EntryId string `json:"entryId,omitempty"` + Id string `json:"id,omitempty"` // TODO: can be removed + EntryId string `json:"entryId,omitempty" gorm:"column:entryId"` Url string `json:"url,omitempty"` - ServiceName string `json:"serviceName,omitempty"` + ServiceName string `json:"serviceName,omitempty" gorm:"column:serviceName"` Path string `json:"path,omitempty"` - StatusCode int `json:"statusCode,omitempty"` + Status int `json:"status,omitempty"` Method string `json:"method,omitempty"` Timestamp int64 `json:"timestamp,omitempty"` } diff --git a/api/src/pkg/routes/not_found_route.go b/api/src/pkg/routes/not_found_route.go index e0fcda923..1aa1e7da7 100644 --- a/api/src/pkg/routes/not_found_route.go +++ b/api/src/pkg/routes/not_found_route.go @@ -3,12 +3,9 @@ package routes import "github.com/gofiber/fiber/v2" // NotFoundRoute func for describe 404 Error route. -func NotFoundRoute(a *fiber.App) { - // Register new special route. - a.Use( - // Anonymous function. +func NotFoundRoute(fiberApp *fiber.App) { + fiberApp.Use( func(c *fiber.Ctx) error { - // Return HTTP 404 status and JSON response. return c.Status(fiber.StatusNotFound).JSON(fiber.Map{ "error": true, "msg": "sorry, endpoint is not found", diff --git a/api/src/pkg/routes/public_routes.go b/api/src/pkg/routes/public_routes.go index 532b96008..04a4d6a1e 100644 --- a/api/src/pkg/routes/public_routes.go +++ b/api/src/pkg/routes/public_routes.go @@ -1,20 +1,14 @@ package routes import ( - "mizuserver/src/pkg/controllers" - "github.com/gofiber/fiber/v2" + "mizuserver/src/pkg/controllers" ) // PublicRoutes func for describe group of public routes. -func PublicRoutes(a *fiber.App) { - //controllers.GenerateData() - - // Create routes group. - route := a.Group("/api") - - // Routes for GET method: - route.Get("/entries", controllers.GetEntries) // get list of all books - route.Get("/entries/:entryId", controllers.GetEntry) // get one book by ID +func PublicRoutes(fiberApp *fiber.App) { + routeGroup := fiberApp.Group("/api") + routeGroup.Get("/entries", controllers.GetEntries) // get entries (base/thin entries) + routeGroup.Get("/entries/:entryId", controllers.GetEntry) // get single (full) entry } diff --git a/api/testing_from_file.go b/api/testing_from_file.go index 98a2fe40c..4c82e6d14 100644 --- a/api/testing_from_file.go +++ b/api/testing_from_file.go @@ -49,7 +49,7 @@ func SaveHarToDb(entry har.Entry, source string) { Source: source, Timestamp: entry.StartedDateTime.Unix(), } - database.EntriesCollection.Create(&mizuEntry) + database.EntriesTable.Create(&mizuEntry) } func getServiceNameFromUrl(inputUrl string) (string, string) { From d715473088c4a482e3f6f3f6140209124c1b171d Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Tue, 27 Apr 2021 09:45:40 +0300 Subject: [PATCH 07/10] no message --- api/src/pkg/controllers/entries_controller.go | 32 ++++++++++++---- api/src/pkg/database/utils.go | 5 ++- api/src/pkg/models/mizuEntry.go | 37 +++++++++---------- api/src/pkg/utils/utils.go | 3 +- api/testing_from_file.go | 20 +++++----- 5 files changed, 58 insertions(+), 39 deletions(-) diff --git a/api/src/pkg/controllers/entries_controller.go b/api/src/pkg/controllers/entries_controller.go index 2f64ab921..194a311a5 100644 --- a/api/src/pkg/controllers/entries_controller.go +++ b/api/src/pkg/controllers/entries_controller.go @@ -7,13 +7,32 @@ import ( "mizuserver/src/pkg/database" "mizuserver/src/pkg/models" "mizuserver/src/pkg/utils" + "strconv" ) func GetEntries(c *fiber.Ctx) error { - var baseEntries []models.BaseEntryDetails - database.EntriesTable. - Find(&baseEntries). - Limit(100) + limit, e := strconv.Atoi(c.Query("limit", "100")) + utils.CheckErr(e) + + var entries []models.MizuEntry + database.GetEntriesTable(). + Omit("entry"). // remove the "big" entry field + Limit(limit). + Find(&entries) + + // Convert to base entries + baseEntries := make([]models.BaseEntryDetails, 0) + for _, entry := range entries { + baseEntries = append(baseEntries, models.BaseEntryDetails{ + Id: entry.EntryId, + Url: entry.Url, + Service: entry.Service, + Path: entry.Path, + Status: entry.Status, + Method: entry.Method, + Timestamp: entry.Timestamp, + }) + } return c.Status(fiber.StatusOK).JSON(fiber.Map{ "error": false, @@ -21,15 +40,14 @@ func GetEntries(c *fiber.Ctx) error { }) } -func GetEntry(c *fiber.Ctx) error { +func GetEntry(c *fiber.Ctx) error { var entryData models.EntryData - database.EntriesTable. + database.GetEntriesTable(). Select("entry"). Where(map[string]string{"entryId": c.Params("entryId")}). First(&entryData) - // TODO: check why don't we get entry here var fullEntry har.Entry unmarshallErr := json.Unmarshal([]byte(entryData.Entry), &fullEntry) utils.CheckErr(unmarshallErr) diff --git a/api/src/pkg/database/utils.go b/api/src/pkg/database/utils.go index 1771fcaac..4a52eedd0 100644 --- a/api/src/pkg/database/utils.go +++ b/api/src/pkg/database/utils.go @@ -12,9 +12,12 @@ const ( var ( DB = initDataBase(DBPath) - EntriesTable = DB.Table("mizu_entries") ) +func GetEntriesTable() *gorm.DB{ + return DB.Table("mizu_entries") +} + func initDataBase(databasePath string) *gorm.DB { temp, _ := gorm.Open(sqlite.Open(databasePath), &gorm.Config{}) _ = temp.AutoMigrate(&models.MizuEntry{}) // this will ensure table is created diff --git a/api/src/pkg/models/mizuEntry.go b/api/src/pkg/models/mizuEntry.go index f6bbe27f4..89745fdf7 100644 --- a/api/src/pkg/models/mizuEntry.go +++ b/api/src/pkg/models/mizuEntry.go @@ -6,30 +6,27 @@ import ( type MizuEntry struct { gorm.Model - // TODO: map id to _id? - Entry string `json:"entry,omitempty" gorm:"column:entry"` - EntryId string `json:"entryId" gorm:"column:entryId"` - Url string `json:"url" gorm:"column:url"` - Method string `json:"method" gorm:"column:method"` - Status int `json:"status" gorm:"column:status"` - Source string `json:"source" gorm:"column:source"` - ServiceName string `json:"serviceName" gorm:"column:serviceName"` - Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` - Path string `json:"path" gorm:"column:path"` + Entry string `json:"entry,omitempty" gorm:"column:entry"` + EntryId string `json:"entryId" gorm:"column:entryId"` + Url string `json:"url" gorm:"column:url"` + Method string `json:"method" gorm:"column:method"` + Status int `json:"status" gorm:"column:status"` + Source string `json:"source" gorm:"column:source"` + Service string `json:"service" gorm:"column:service"` + Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` + Path string `json:"path" gorm:"column:path"` } type BaseEntryDetails struct { - Id string `json:"id,omitempty"` // TODO: can be removed - EntryId string `json:"entryId,omitempty" gorm:"column:entryId"` - Url string `json:"url,omitempty"` - ServiceName string `json:"serviceName,omitempty" gorm:"column:serviceName"` - Path string `json:"path,omitempty"` - Status int `json:"status,omitempty"` - Method string `json:"method,omitempty"` - Timestamp int64 `json:"timestamp,omitempty"` + Id string `json:"id,omitempty"` + Url string `json:"url,omitempty"` + Service string `json:"service,omitempty"` + Path string `json:"path,omitempty"` + Status int `json:"status,omitempty"` + Method string `json:"method,omitempty"` + Timestamp int64 `json:"timestamp,omitempty"` } - type EntryData struct { Entry string `json:"entry,omitempty"` -} \ No newline at end of file +} diff --git a/api/src/pkg/utils/utils.go b/api/src/pkg/utils/utils.go index 108fe3b89..789756bcb 100644 --- a/api/src/pkg/utils/utils.go +++ b/api/src/pkg/utils/utils.go @@ -32,6 +32,7 @@ func StartServer(app *fiber.App) { func CheckErr(e error) { if e != nil { - panic(e) + log.Printf("%v", e) + //panic(e) } } \ No newline at end of file diff --git a/api/testing_from_file.go b/api/testing_from_file.go index 4c82e6d14..fff207e64 100644 --- a/api/testing_from_file.go +++ b/api/testing_from_file.go @@ -39,17 +39,17 @@ func SaveHarToDb(entry har.Entry, source string) { entryBytes, _ := json.Marshal(entry) serviceName, urlPath := getServiceNameFromUrl(entry.Request.URL) mizuEntry := models.MizuEntry{ - EntryId: primitive.NewObjectID().Hex(), - Entry: string(entryBytes), // simple way to store it and not convert to bytes - ServiceName: serviceName, - Url: entry.Request.URL, - Path: urlPath, - Method: entry.Request.Method, - Status: entry.Response.Status, - Source: source, - Timestamp: entry.StartedDateTime.Unix(), + EntryId: primitive.NewObjectID().Hex(), + Entry: string(entryBytes), // simple way to store it and not convert to bytes + Service: serviceName, + Url: entry.Request.URL, + Path: urlPath, + Method: entry.Request.Method, + Status: entry.Response.Status, + Source: source, + Timestamp: entry.StartedDateTime.Unix(), } - database.EntriesTable.Create(&mizuEntry) + database.GetEntriesTable().Create(&mizuEntry) } func getServiceNameFromUrl(inputUrl string) (string, string) { From b886af224284dba9fad4acc8ebf182836b3fd560 Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Tue, 27 Apr 2021 10:25:02 +0300 Subject: [PATCH 08/10] status to statusCode --- api/src/pkg/controllers/entries_controller.go | 15 +++++++-------- api/src/pkg/models/mizuEntry.go | 14 +++++++------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/api/src/pkg/controllers/entries_controller.go b/api/src/pkg/controllers/entries_controller.go index 194a311a5..e156a55fd 100644 --- a/api/src/pkg/controllers/entries_controller.go +++ b/api/src/pkg/controllers/entries_controller.go @@ -24,13 +24,13 @@ func GetEntries(c *fiber.Ctx) error { baseEntries := make([]models.BaseEntryDetails, 0) for _, entry := range entries { baseEntries = append(baseEntries, models.BaseEntryDetails{ - Id: entry.EntryId, - Url: entry.Url, - Service: entry.Service, - Path: entry.Path, - Status: entry.Status, - Method: entry.Method, - Timestamp: entry.Timestamp, + Id: entry.EntryId, + Url: entry.Url, + Service: entry.Service, + Path: entry.Path, + StatusCode: entry.Status, + Method: entry.Method, + Timestamp: entry.Timestamp, }) } @@ -40,7 +40,6 @@ func GetEntries(c *fiber.Ctx) error { }) } - func GetEntry(c *fiber.Ctx) error { var entryData models.EntryData database.GetEntriesTable(). diff --git a/api/src/pkg/models/mizuEntry.go b/api/src/pkg/models/mizuEntry.go index 89745fdf7..b3eb7c854 100644 --- a/api/src/pkg/models/mizuEntry.go +++ b/api/src/pkg/models/mizuEntry.go @@ -18,13 +18,13 @@ type MizuEntry struct { } type BaseEntryDetails struct { - Id string `json:"id,omitempty"` - Url string `json:"url,omitempty"` - Service string `json:"service,omitempty"` - Path string `json:"path,omitempty"` - Status int `json:"status,omitempty"` - Method string `json:"method,omitempty"` - Timestamp int64 `json:"timestamp,omitempty"` + Id string `json:"id,omitempty"` + Url string `json:"url,omitempty"` + Service string `json:"service,omitempty"` + Path string `json:"path,omitempty"` + StatusCode int `json:"statusCode,omitempty"` + Method string `json:"method,omitempty"` + Timestamp int64 `json:"timestamp,omitempty"` } type EntryData struct { From 1666d578f13c47aef3a33ec9d55f332e2eb22993 Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Tue, 27 Apr 2021 10:33:11 +0300 Subject: [PATCH 09/10] return data directly --- api/src/pkg/controllers/entries_controller.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/api/src/pkg/controllers/entries_controller.go b/api/src/pkg/controllers/entries_controller.go index e156a55fd..9cc5f0310 100644 --- a/api/src/pkg/controllers/entries_controller.go +++ b/api/src/pkg/controllers/entries_controller.go @@ -34,10 +34,7 @@ func GetEntries(c *fiber.Ctx) error { }) } - return c.Status(fiber.StatusOK).JSON(fiber.Map{ - "error": false, - "entries": baseEntries, - }) + return c.Status(fiber.StatusOK).JSON(baseEntries) } func GetEntry(c *fiber.Ctx) error { @@ -51,8 +48,5 @@ func GetEntry(c *fiber.Ctx) error { unmarshallErr := json.Unmarshal([]byte(entryData.Entry), &fullEntry) utils.CheckErr(unmarshallErr) - return c.Status(fiber.StatusOK).JSON(fiber.Map{ - "error": false, - "msg": fullEntry, - }) + return c.Status(fiber.StatusOK).JSON(fullEntry) } From 6c698d15c74b14dffc30920e9fe6bc68928b26ea Mon Sep 17 00:00:00 2001 From: Roee Gadot Date: Tue, 27 Apr 2021 16:29:28 +0300 Subject: [PATCH 10/10] no message --- api/src/main.go | 8 +- api/src/pkg/controllers/entries_controller.go | 11 +++ api/src/pkg/database/{utils.go => main.go} | 4 +- api/src/pkg/inserter/main.go | 91 +++++++++++++++++++ api/src/pkg/models/mizuEntry.go | 8 +- api/src/pkg/routes/public_routes.go | 3 + api/testing_from_file.go | 2 +- 7 files changed, 116 insertions(+), 11 deletions(-) rename api/src/pkg/database/{utils.go => main.go} (84%) create mode 100644 api/src/pkg/inserter/main.go diff --git a/api/src/main.go b/api/src/main.go index 0abd8b11a..076641162 100644 --- a/api/src/main.go +++ b/api/src/main.go @@ -2,7 +2,7 @@ package main import ( "github.com/gofiber/fiber/v2" - api "mizuserver" + "mizuserver/src/pkg/inserter" "mizuserver/src/pkg/middleware" "mizuserver/src/pkg/routes" "mizuserver/src/pkg/utils" @@ -10,9 +10,9 @@ import ( func main() { // TODO: to generate data - path := "/Users/roeegadot/Downloads/output2" - api.TestHarSavingFromFolder(path) - + //path := "/Users/roeegadot/Downloads/output2" + //api.TestHarSavingFromFolder(path) + go inserter.StartReadingFiles("/var/up9hars") app := fiber.New() middleware.FiberMiddleware(app) // Register Fiber's middleware for app. diff --git a/api/src/pkg/controllers/entries_controller.go b/api/src/pkg/controllers/entries_controller.go index 9cc5f0310..727717fd3 100644 --- a/api/src/pkg/controllers/entries_controller.go +++ b/api/src/pkg/controllers/entries_controller.go @@ -50,3 +50,14 @@ func GetEntry(c *fiber.Ctx) error { return c.Status(fiber.StatusOK).JSON(fullEntry) } + + +func DeleteAllEntries(c *fiber.Ctx) error { + database.GetEntriesTable(). + Where("1 = 1"). + Delete(&models.MizuEntry{}) + + return c.Status(fiber.StatusOK).JSON(fiber.Map{ + "msg": "Success", + }) +} \ No newline at end of file diff --git a/api/src/pkg/database/utils.go b/api/src/pkg/database/main.go similarity index 84% rename from api/src/pkg/database/utils.go rename to api/src/pkg/database/main.go index 4a52eedd0..39b8bec75 100644 --- a/api/src/pkg/database/utils.go +++ b/api/src/pkg/database/main.go @@ -11,10 +11,10 @@ const ( ) var ( - DB = initDataBase(DBPath) + DB = initDataBase(DBPath) ) -func GetEntriesTable() *gorm.DB{ +func GetEntriesTable() *gorm.DB { return DB.Table("mizu_entries") } diff --git a/api/src/pkg/inserter/main.go b/api/src/pkg/inserter/main.go new file mode 100644 index 000000000..7251b072d --- /dev/null +++ b/api/src/pkg/inserter/main.go @@ -0,0 +1,91 @@ +package inserter + +import ( + "bufio" + "encoding/json" + "fmt" + "github.com/google/martian/har" + "go.mongodb.org/mongo-driver/bson/primitive" + "io" + "io/fs" + "mizuserver/src/pkg/database" + "mizuserver/src/pkg/models" + "mizuserver/src/pkg/utils" + "net/url" + "os" + "path" + "sort" + "time" +) + + +func IsEmpty(name string) (bool) { + f, err := os.Open(name) + if err != nil { + return false + } + defer f.Close() + + _, err = f.Readdirnames(1) // Or f.Readdir(1) + if err == io.EOF { + return true + } + return false // Either not empty or error, suits both cases +} + +func StartReadingFiles(workingDir string) { + err := os.MkdirAll(workingDir, fs.ModeDir) + utils.CheckErr(err) + + for true { + if IsEmpty(workingDir) { + fmt.Printf("Waiting for new files\n") + time.Sleep(5 * time.Second) + continue + } + + dir, _ := os.Open(workingDir) + dirFiles, _ := dir.Readdir(-1) + sort.Sort(utils.ByModTime(dirFiles)) + + fileInfo := dirFiles[0] + inputFilePath := path.Join(workingDir, fileInfo.Name()) + file, err := os.Open(inputFilePath) + utils.CheckErr(err) + + var inputHar har.HAR + decErr := json.NewDecoder(bufio.NewReader(file)).Decode(&inputHar) + utils.CheckErr(decErr) + + for _, entry := range inputHar.Log.Entries { + fmt.Printf("Entry inserted") + SaveHarToDb(*entry, "") + } + rmErr := os.Remove(inputFilePath) + utils.CheckErr(rmErr) + } + +} + +func SaveHarToDb(entry har.Entry, source string) { + entryBytes, _ := json.Marshal(entry) + serviceName, urlPath := getServiceNameFromUrl(entry.Request.URL) + mizuEntry := models.MizuEntry{ + EntryId: primitive.NewObjectID().Hex(), + Entry: string(entryBytes), // simple way to store it and not convert to bytes + Service: serviceName, + Url: entry.Request.URL, + Path: urlPath, + Method: entry.Request.Method, + Status: entry.Response.Status, + Source: source, + Timestamp: entry.StartedDateTime.Unix(), + } + database.GetEntriesTable().Create(&mizuEntry) +} + +func getServiceNameFromUrl(inputUrl string) (string, string) { + parsed, err := url.Parse(inputUrl) + utils.CheckErr(err) + return fmt.Sprintf("%s://%s", parsed.Scheme, parsed.Host), parsed.Path +} diff --git a/api/src/pkg/models/mizuEntry.go b/api/src/pkg/models/mizuEntry.go index b3eb7c854..1c14e6adc 100644 --- a/api/src/pkg/models/mizuEntry.go +++ b/api/src/pkg/models/mizuEntry.go @@ -1,11 +1,11 @@ package models -import ( - "gorm.io/gorm" -) +import "time" type MizuEntry struct { - gorm.Model + ID uint `gorm:"primarykey"` + CreatedAt time.Time + UpdatedAt time.Time Entry string `json:"entry,omitempty" gorm:"column:entry"` EntryId string `json:"entryId" gorm:"column:entryId"` Url string `json:"url" gorm:"column:url"` diff --git a/api/src/pkg/routes/public_routes.go b/api/src/pkg/routes/public_routes.go index 04a4d6a1e..73e07bcca 100644 --- a/api/src/pkg/routes/public_routes.go +++ b/api/src/pkg/routes/public_routes.go @@ -11,4 +11,7 @@ func PublicRoutes(fiberApp *fiber.App) { routeGroup.Get("/entries", controllers.GetEntries) // get entries (base/thin entries) routeGroup.Get("/entries/:entryId", controllers.GetEntry) // get single (full) entry + + routeGroup.Get("/resetDB", controllers.DeleteAllEntries) // get single (full) entry + } diff --git a/api/testing_from_file.go b/api/testing_from_file.go index fff207e64..1b06a86a8 100644 --- a/api/testing_from_file.go +++ b/api/testing_from_file.go @@ -30,7 +30,7 @@ func TestHarSavingFromFolder(inputDir string) { utils.CheckErr(decErr) for _, entry := range inputHar.Log.Entries { - SaveHarToDb(*entry, "source") + SaveHarToDb(*entry, "") } } }