Skip to content

Commit

Permalink
Merge branch 'master' into report-details-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ezsilmar committed Jul 4, 2019
2 parents f954d4f + b7422b5 commit 3145753
Show file tree
Hide file tree
Showing 9 changed files with 2,246 additions and 2,031 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ clean:
# Golint runs the golint linter.
.PHONY: golint
golint:
$(AT) go install github.com/golang/lint/golint
$(AT) go install golang.org/x/lint/golint
golint -set_exit_status $(GO_PKGS)

# Errcheck runs the errcheck linter.
Expand Down
48 changes: 18 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,46 +1,34 @@
module github.com/bojand/ghz

require (
github.com/BurntSushi/toml v0.3.1 // indirect
cloud.google.com/go v0.41.0 // indirect
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
github.com/bojand/hri v1.1.0
github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
github.com/go-playground/locales v0.12.1 // indirect
github.com/go-playground/universal-translator v0.16.0 // indirect
github.com/go-playground/validator v9.25.0+incompatible
github.com/go-sql-driver/mysql v1.4.1 // indirect
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/golang/lint v0.0.0-20181217174547-8f45f776aaf1
github.com/golang/protobuf v1.2.0
github.com/google/go-cmp v0.2.0 // indirect
github.com/jhump/protoreflect v1.1.0
github.com/jinzhu/configor v0.0.0-20180614024415-4edaf76fe188
github.com/jinzhu/gorm v1.9.2
github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
github.com/jinzhu/now v0.0.0-20181116074157-8ec929ed50c3 // indirect
github.com/go-playground/validator v9.29.0+incompatible
github.com/golang/protobuf v1.3.1
github.com/jhump/protoreflect v1.4.4
github.com/jinzhu/configor v1.1.0
github.com/jinzhu/gorm v1.9.10
github.com/kisielk/errcheck v1.2.0
github.com/labstack/echo v3.3.5+incompatible
github.com/labstack/gommon v0.2.8
github.com/kr/pretty v0.1.0 // indirect
github.com/labstack/echo v3.3.10+incompatible
github.com/labstack/gommon v0.2.9
github.com/leodido/go-urn v1.1.0 // indirect
github.com/lib/pq v1.0.0 // indirect
github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
github.com/mattn/go-sqlite3 v1.10.0 // indirect
github.com/pkg/errors v0.8.1
github.com/rakyll/statik v0.1.5
github.com/rakyll/statik v0.1.6
github.com/stretchr/testify v1.3.0
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 // indirect
go.uber.org/atomic v1.3.2 // indirect
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0
golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc // indirect
golang.org/x/net v0.0.0-20190110200230-915654e7eabc
google.golang.org/grpc v1.17.0
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
golang.org/x/net v0.0.0-20190628185345-da137c7871d7
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb // indirect
golang.org/x/tools v0.0.0-20190703212419-2214986f1668 // indirect
google.golang.org/genproto v0.0.0-20190701230453-710ae3a149df // indirect
google.golang.org/grpc v1.22.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/yaml.v2 v2.2.2 // indirect
honnef.co/go/tools v0.0.0-20190128043916-71123fcbb8fe
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc
)
242 changes: 201 additions & 41 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package tools

import (
_ "github.com/golang/lint/golint" // tool
_ "http://golang.org/x/lint/golint" // tool
_ "github.com/kisielk/errcheck" // tool
_ "honnef.co/go/tools/cmd/staticcheck" // tool
)
28 changes: 14 additions & 14 deletions testdata/localhost.crt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
MIIC5TCCAc2gAwIBAgIJANXS+sWVGNj4MA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
BAMMCWxvY2FsaG9zdDAeFw0xOTA1MjMxNzA2MjNaFw0xOTA2MjIxNzA2MjNaMBQx
MIIC5TCCAc2gAwIBAgIJAMkLVlEvAyR6MA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
BAMMCWxvY2FsaG9zdDAeFw0xOTA3MDQxMjAzMDNaFw0xOTA4MDMxMjAzMDNaMBQx
EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBAKVnKbavNRZgEAi3VeKUCbVRh5+YzeVRoG5LWONc9qINTpB+SFp8XmJwnMyA
ChF0mcQTLJkIV/yv9MIcSkco/Ov1Flbhisz20ofjG05no70lbOOxUi9saKtmlraR
gG5SORDPCEKDMkKmjzxV9x4xDCt/z075/6P3GuTnxEHMui9HVlRfnnodNKhGvFGs
MZ5YdGkg5OkTHon01d3C3UA+BZZ3UxfuHPrOkWmvQ1ihbKbjeXH+JDDEWGvfz3l9
GwBPp6iLXjKckVSnPtkUjE5CdYeYDhHyyDtiPtiQX/5A2fSSfO1Y2heW8vBvo0sP
xRNBgTQkflM1L82wU046aAzfAMUCAwEAAaM6MDgwFAYDVR0RBA0wC4IJbG9jYWxo
ggEBAL0whLnZ6elhwIwUbIwtAtZNxH52c7fsl0bCOMdOk/PW8Xtf6UHwtnRiBhxY
/jKt6ZUI31sq6aOsH3ei+Adm3TNqknN1mSh5qLZ8+QAdE5cStKNXcYnw8ss+CmVg
Joo6iutN5qsYmwijmURPedYROPgN0XMHk34UzDqIZGJw3wdoJ9aZc3mxQtpPmgRL
SQpShPWRYdgyGJRwG+LuYQb47FNMKbAjEYfwKUA/xqEoqFRaHJmMgGTvdBDczzdb
XIOK27m24C0TX1ihArtmytazjk6n8oBCE0k4SQlCOsrbtA3MTqd17TaDXITjvZ2e
tgkORDlfAll6swKqMQOcGWbeK7UCAwEAAaM6MDgwFAYDVR0RBA0wC4IJbG9jYWxo
b3N0MAsGA1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0B
AQsFAAOCAQEAl5cgAcwhFX8oXlqnExz5A6MOPPiHhtwnZWl8KKPKQMu5yBG5G0rM
JAU5r2fhavBfFMx9ZXmdgcGMRCteYTUnYlQeDRt3bS/U6BvczjFeOUWJd1988fEx
Bqqm9YoVRcnpNn+6ev706NQStMuuLG+bA9PJ0lC3/9Y+zG0omApG4vyrR9s2wFwM
Q2ROcKIV4SB4TnWrGD1+HLBB4uVppLe+d6QEhEIrp+Z99DbjjHRmSBBFS2oQvmy4
/wjbrxs2XIZB6sm0F48Zd0U2/PDSX8CxbOanwSLhfQSLlugwc8e5ttEKOWhyKMsO
0U5CXjVV3XjcFQClZKHVfpYD7Xwr/PQNog==
AQsFAAOCAQEApFZn++D65FgEKCUmAaMY5gMIw/wsX3+TVpMwTisQvs52IleqadPf
9WD7P04MhJjDrF2B4bwxunwU+JNOnQE/HWDvL2i0TuJp4dWPFsSiirW0QuAlAy0G
2Ir2578r/Kmjebmq5vGc33Rgc+5EKPp2izv3nzLxpn7o9MFfciCSdEv2nBf3KLUP
KcqdU1WVcZWmrem/TD74cfDXNfKoH6uqDsUsu+0+E77uWxO9c0Muf/kJndL2ssRf
kp7q98iFIsCtBy/K5jVKTtgBs4iSQ1UWSQVRU5XBcBps3AwuND3hGfcZmbuDC/mY
Ii+A8Nd/p735eFX5RZYcQN8CkYacxMCgeg==
-----END CERTIFICATE-----
52 changes: 26 additions & 26 deletions testdata/localhost.key
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQClZym2rzUWYBAI
t1XilAm1UYefmM3lUaBuS1jjXPaiDU6QfkhafF5icJzMgAoRdJnEEyyZCFf8r/TC
HEpHKPzr9RZW4YrM9tKH4xtOZ6O9JWzjsVIvbGirZpa2kYBuUjkQzwhCgzJCpo88
VfceMQwrf89O+f+j9xrk58RBzLovR1ZUX556HTSoRrxRrDGeWHRpIOTpEx6J9NXd
wt1APgWWd1MX7hz6zpFpr0NYoWym43lx/iQwxFhr3895fRsAT6eoi14ynJFUpz7Z
FIxOQnWHmA4R8sg7Yj7YkF/+QNn0knztWNoXlvLwb6NLD8UTQYE0JH5TNS/NsFNO
OmgM3wDFAgMBAAECggEAARhnzE/ouBc2w/gC15dHYS4DCemHI4eg2lohYpARCg2w
gYB0ljTQozI/t5L5fhgZlJTT7MeDXacEpexuCX6Z/i4HUdf4hVb1GfVFDwXcrbn7
uJ5J/wpmvwvU36yi/xgITLYyRc58nLhhpnKjSk3k2Lzl8I3zRXCzeuSWBiGG8h0y
F81bRCbebuC9+rwvx3zbEeK0Htp8Cdlz4Sg1rWVWBq7uvVYqyVsztQT9MF6Lt3gt
KiXQPKKJL2V1H/lGyNPj0w9LeMjNsjfQLPCz88fmAT5q4Uz5qh5qbqIhCzzhzwuA
LD0WmHgtUtHFLpolvkbOJQz0q5ELkeo0hje5N7jyWQKBgQDcb/BxKkaQ+rwmNUqM
veVuZfqd5bnvcFbuGQ/yDDMK8bNG/ecDw3JF57qY+/S1pgnVxjvSBM7vdh9SJZGs
BRUl9qYgwKv0KmHWSWfiAmRCDhzduP0rMBpMsT+piiab/Bgzoechd+N9fznc7Wab
f6W22oWfFDUblnhH+24z5sHXWwKBgQDAFk6xux0T5qeS4UwbCot4Ahp6AKHM/GyE
T9qJhNiXiRER122pbHRxIM7Kl9E8TZhhakwfLdy98KdobaMF7KyOHJcQkaFJ+18h
VVmO4JnnTGcPe0G55E2FAA2oq5fa6rpz6ySMDiOnlSLl/62tdJy4vT96qVfjR94g
TxzCCuIiXwKBgGiWG6g1fKGQtPAT3LkF5/MHI28C7cLys+vnrC8VJqqMnpiSIqcg
dflAxsGK2UHN82Cf2wX8DgqDKr0Y4hKRnsUSTyO/BlakPSMkVMtggxzsAToZaNSy
z+ePOTtBNqxPYVQt/rFcZmzGjjeJ02L3nzIwX7FoLwJV09+jJVgupc19AoGAYvDa
lgeYYbDULf7ocaFL14PV2XPL48c9qiVrnpwT6HIMndEGRld73u2UNpxehR4+2Cal
kQXRhvCXel3Gs/2FoCmv0jQBDRdyl7vbxpGAFLiw+TN21mZ3W4N8hZ3lOTjg02aS
S6XYzbAu6qN49Th0pV+te+QQRhy1mJTHblemxScCgYAz9TNA1Jj18zABgzow1UK1
8m8USwGqHxTVNTUwfwHVKbLhBJ1Fcp0EXhHETB0Q6CC4NcQlxxLfAXu41ThKToV8
M+fIpoB+Nud7sGB3sLjNx47nhEOWtzqjBEdx2o8JWTRTDuFRKIA+gb0IKeKPDh2f
F7nTdRa9CcbeDFhPie1MPg==
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9MIS52enpYcCM
FGyMLQLWTcR+dnO37JdGwjjHTpPz1vF7X+lB8LZ0YgYcWP4yremVCN9bKumjrB93
ovgHZt0zapJzdZkoeai2fPkAHROXErSjV3GJ8PLLPgplYCaKOorrTearGJsIo5lE
T3nWETj4DdFzB5N+FMw6iGRicN8HaCfWmXN5sULaT5oES0kKUoT1kWHYMhiUcBvi
7mEG+OxTTCmwIxGH8ClAP8ahKKhUWhyZjIBk73QQ3M83W1yDitu5tuAtE19YoQK7
ZsrWs45Op/KAQhNJOEkJQjrK27QNzE6nde02g1yE472dnrYJDkQ5XwJZerMCqjED
nBlm3iu1AgMBAAECggEAKATmXoXpA/QojbkYSQKQchKbOQEHc2V5jn8xEX/erhrO
lAFyzv8DKVU+46ozgzbkjSEGVjualoOnWGBBxRcOPX0So5fBoR0zAf8nkM2VwkQz
r8Wkf8BXK4ThIBaZsG23yxR8cb7PtKEen6OMKysTeO07W/DDU01E8jC9w1EK7H7P
lVjSDFWTJgA8GZ0129/+MAFhWqBfUE8fWAgfau+ALiItm7zL8b/0BBXfS39W3BmH
ew98i3DfvmFVcKDlBTOExaP8lv14EBOkb20qqmgLSCGhtoiuvRTatoAHI0d6Tu3p
oi1HnppPbAof5v0OJjGSzzf81ZYT6Of7qBS69oG4QQKBgQDlxFw/rjz3KAXKYzpu
nlMPvtu9oKpAvlh+u6NLemU/AvqtwhBFHRZZsEQRL+3rqPWVBQ/oPU6g4sCqhv4I
rtJYojv8EZ5wQII4bdHhdoSLBIhkC4i5O4WCspkZjSzCmi+4Iy8mqW7gRAv5Vz+3
8hW6m5imokZOU2ON5hgS9ypNcQKBgQDSyig8Ush+YEpThOYYPvFK/99LioFczOgI
RjwB3OOKyc1hTY5KEkA2H81COTWF2mHu/+NUkaxTeukM0AKEHm3Cr+gF+aANVQcp
iHp8BoQcpAT3ut7jk8pg7s9vlps1zolHuAVfDIlb4Azb1gDwxVX+/iLpNpZw2rX/
bYFPTOrwhQKBgHDIHuPfOeuzyIvcgy0TKABdle0RtSBMjpG+ttvwu0vfwX6S+HuE
WJkzrWWmWinH6Kv6LSG5HiRYyWurEXzfmz6Ie9syJsxAzeq29UOvckXutqgtBTKv
JczOr9nb8zGej3faRWW720HYBOyiSBOZj9LmV1rL4qjFw+M+I2kDy87xAoGBALy2
cfk3n/nMWR6Wv6z7ROkBVLb7pD8hz6YAwx5j1G7fpnizh2z3E/eg1xGvyCQy1DS1
cJ+430/JnTV0UJxZ5ahD9fTLfCgTdJsRbZ718nb1vODQs1WJbckEZEAh1IkChFLq
BB0JSzwuxTRXTnZAJXJpsXWbAmq80+1+6yLE2R1FAoGATVQc0biN3ZYy+3aLKdYG
TGpLmUvkzNCns1NXecCQ44ZrF0Lrcr5oTfCfnxyRTUrJ7ylPSIAyIbHdg4Xkf6p3
dVKvRj8RaMd1nNPddNsetqFwpG+++uVr4jYWhXfM6Mi7lRXsD+6LAjcCUxO1Zyzl
TVGjwaG4LrJf5oCnfCdhmSc=
-----END PRIVATE KEY-----
2 changes: 1 addition & 1 deletion web/router/statik/statik.go

Large diffs are not rendered by default.

Loading

0 comments on commit 3145753

Please sign in to comment.