Skip to content

Commit

Permalink
chore(deps): Bumping to 1.19
Browse files Browse the repository at this point in the history
Signed-off-by: Vincent Boutour <[email protected]>
  • Loading branch information
ViBiOh committed Aug 7, 2022
1 parent 10c6de4 commit 7df7747
Show file tree
Hide file tree
Showing 43 changed files with 207 additions and 200 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '^1.18'
go-version: '^1.19'

- name: Build
run: |
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '^1.18'
go-version: '^1.19'
- name: Build
run: |
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "release"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '^1.18'
go-version: '^1.19'
- name: Build
run: make build
- name: CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: '^1.18'
go-version: '^1.19'
- name: Build
run: make init
- name: Assets
Expand Down
2 changes: 1 addition & 1 deletion cmd/fibr/fibr.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func newLoginApp(tracerApp tracer.App, basicConfig basicMemory.Config) provider.
func generateIdentityName() string {
raw := make([]byte, 4)
if _, err := rand.Read(raw); err != nil {
logger.Error("unable to generate identity name: %s", err)
logger.Error("generate identity name: %s", err)
return "error"
}

Expand Down
24 changes: 12 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module github.com/ViBiOh/fibr

go 1.18
go 1.19

require (
github.com/ViBiOh/ChatPotte v0.0.30
github.com/ViBiOh/absto v0.5.17
github.com/ViBiOh/auth/v2 v2.12.19
github.com/ViBiOh/ChatPotte v0.1.0
github.com/ViBiOh/absto v0.6.2
github.com/ViBiOh/auth/v2 v2.13.0
github.com/ViBiOh/exas v0.4.2
github.com/ViBiOh/flags v1.1.0
github.com/ViBiOh/httputils/v4 v4.45.1
github.com/ViBiOh/flags v1.2.0
github.com/ViBiOh/httputils/v4 v4.46.1
github.com/ViBiOh/vith v0.5.0
github.com/golang/mock v1.6.0
github.com/prometheus/client_golang v1.12.2
github.com/prometheus/client_golang v1.13.0
github.com/streadway/amqp v1.0.0
go.opentelemetry.io/otel v1.9.0
go.opentelemetry.io/otel/trace v1.9.0
Expand Down Expand Up @@ -41,18 +41,18 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/rs/xid v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/tdewolff/minify/v2 v2.12.0 // indirect
github.com/tdewolff/parse/v2 v2.6.1 // indirect
github.com/tdewolff/parse/v2 v2.6.2 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.9.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.9.0 // indirect
golang.org/x/net v0.0.0-20220728030405-41545e8bf201 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 // indirect
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
)
50 changes: 26 additions & 24 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/ViBiOh/ChatPotte v0.0.30 h1:/0HHMRHKwSkNJcl4rxoAjMPW7/YJEYgbKi7PJEcVT7Q=
github.com/ViBiOh/ChatPotte v0.0.30/go.mod h1:UFs9QZ6M/BOxFBAmz8PcYqABCPmT4KtctKydMYrBgEc=
github.com/ViBiOh/absto v0.5.17 h1:CmQLSw0pvlLfETHuBMns/5OYKpmsOoORgrzG4/ZpRXA=
github.com/ViBiOh/absto v0.5.17/go.mod h1:jJppFrRSQaQhyYA7KD/LviD7WWMyyfwDO7uz75vvvXU=
github.com/ViBiOh/auth/v2 v2.12.19 h1:XAjTSf8BcoqhJn0rOwK8O1jIpc7k7VG8/Po9QKeYXac=
github.com/ViBiOh/auth/v2 v2.12.19/go.mod h1:Ot7BBPjye2ERGaJRcBsm0/PYVUAV3Gg3AfaRbmsZJho=
github.com/ViBiOh/ChatPotte v0.1.0 h1:HfTr5fMaaB+PNi3fzkJk3abKx6Kbv24v5fSyD/Yubgg=
github.com/ViBiOh/ChatPotte v0.1.0/go.mod h1:za3YZFVRpJ3x1zeXFj1wudQ5DGwnrC9qZ9CNr25TYxA=
github.com/ViBiOh/absto v0.6.2 h1:KRNEufp/jT5Onvn//wR3OiOQnGRQ8TztCztAskJBk1E=
github.com/ViBiOh/absto v0.6.2/go.mod h1:ZoXcCx5C+xU9R6SBP4HPXSjf3WZcaVIfFCciiViZfCs=
github.com/ViBiOh/auth/v2 v2.13.0 h1:AGPU5WFefkZHvLJkWA8bpMb0a2hu9zJNoYOiz7NLKpQ=
github.com/ViBiOh/auth/v2 v2.13.0/go.mod h1:eGqz0ln1SdfuOG8N2XsruKh8NCU7Plx0P5mQPHsNWxQ=
github.com/ViBiOh/exas v0.4.2 h1:W84et5rOaeG0n0kl60QJHoa6RmP4614vD8DTPL3BvyU=
github.com/ViBiOh/exas v0.4.2/go.mod h1:gYLOTipAUoE7mTrUd3Albe2zKFJKkX135+ALSc9QmGM=
github.com/ViBiOh/flags v1.1.0 h1:2iCnAy2GeIjqdhZ8gE0Z1JhXLg73WNbFSxkJWfkPhW0=
github.com/ViBiOh/flags v1.1.0/go.mod h1:W0YgB4Nqou2j/2vevgO3kyrcS2f+ci/+w+jDGzVZilk=
github.com/ViBiOh/httputils/v4 v4.45.1 h1:fzTSWQQN/DiXjKvN2/YoCy4DzAF3rFt876mnCXZ8tsI=
github.com/ViBiOh/httputils/v4 v4.45.1/go.mod h1:l06QLAxcSJxG//jaKKbdVujKQ9mR7nBzgQf+YjX8gfw=
github.com/ViBiOh/flags v1.2.0 h1:DaujjNXzD29KxKyp4eZdn7c9+uBN5DokWgDAe7DcUmc=
github.com/ViBiOh/flags v1.2.0/go.mod h1:UyMB5zeD/aId7Xw3x7577ZNU298JmukzOcV8p/H2W1s=
github.com/ViBiOh/httputils/v4 v4.46.1 h1:TWSfDGZe8biy5LOSDmyvKdoEfMNS/LZ2y3Ksh7lvbGk=
github.com/ViBiOh/httputils/v4 v4.46.1/go.mod h1:WADqXz2lb3av9YkDlF+ZJCSh1EaXCstj8AFn2snDarY=
github.com/ViBiOh/vith v0.5.0 h1:BpmjwWxd4NGmUJF12XpFOngK32539Lw3mvbMOaeOmhE=
github.com/ViBiOh/vith v0.5.0/go.mod h1:Wf40eedOBEcxeLzGzGpuO+2G8qe5Ov1WIIBPXohyKco=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down Expand Up @@ -163,13 +163,13 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
github.com/jackc/pgconn v1.12.1 h1:rsDFzIpRk7xT4B8FufgpCCeyjdNpKyghZeSefViE5W8=
github.com/jackc/pgconn v1.13.0 h1:3L1XMNV2Zvca/8BYhzcRFS70Lr0WlDg16Di6SFGAbys=
github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgproto3/v2 v2.3.0 h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y=
github.com/jackc/pgproto3/v2 v2.3.1 h1:nwj7qwf0S+Q7ISFfBndqeLwSwxs+4DPsbRFjECT1Y4Y=
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
github.com/jackc/pgtype v1.11.0 h1:u4uiGPz/1hryuXzyaBhSk6dnIyyG2683olG2OV+UUgs=
github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y=
github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w=
github.com/jackc/pgx/v4 v4.17.0 h1:Hsx+baY8/zU2WtPLQyZi8WbecgcsWEeyoK1jvg/WgIo=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
Expand Down Expand Up @@ -224,8 +224,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34=
github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU=
github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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=
Expand All @@ -241,8 +241,9 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
Expand All @@ -264,8 +265,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/tdewolff/minify/v2 v2.12.0 h1:ZyvMKeciyR3vzJrK/oHyBcSmpttQ/V+ah7qOqTZclaU=
github.com/tdewolff/minify/v2 v2.12.0/go.mod h1:8mvf+KglD7XurfvvFZDUYvVURy6bA/r0oTvmakXMnyg=
github.com/tdewolff/parse/v2 v2.6.1 h1:RIfy1erADkO90ynJWvty8VIkqqKYRzf2iLp8ObG174I=
github.com/tdewolff/parse/v2 v2.6.1/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
github.com/tdewolff/parse/v2 v2.6.2 h1:RDExtQ7ThRGSucatK0nri3p+HD/tSreYh1IDtDDAS/I=
github.com/tdewolff/parse/v2 v2.6.2/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs=
github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP3MV19m1gvndjUb1sn8yy74LM=
github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
Expand Down Expand Up @@ -361,8 +363,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220728030405-41545e8bf201 h1:bvOltf3SADAfG05iRml8lAB3qjoEX5RCyN4K6G5v3N0=
golang.org/x/net v0.0.0-20220728030405-41545e8bf201/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 h1:N9Vc/rorQUDes6B9CNdIxAn5jODGj2wzfrei2x4wNj4=
golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
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/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -423,8 +425,8 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 h1:9vYwv7OjYaky/tlAeD7C4oC9EsPTlaFl1H2jS++V+ME=
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
Expand Down Expand Up @@ -560,8 +562,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/crud/bcrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func findBcryptBestCost(maxDuration time.Duration) (int, error) {
for i := bcrypt.MinCost + 1; i <= bcrypt.MaxCost; i++ {
hashedPassword, err := bcrypt.GenerateFromPassword(password, i)
if err != nil {
return i, fmt.Errorf("unable to generate password: %s", err)
return i, fmt.Errorf("generate password: %s", err)
}

start := time.Now()
Expand Down
4 changes: 2 additions & 2 deletions pkg/crud/browse.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (a App) browse(ctx context.Context, w http.ResponseWriter, request provider
var err error
exif, err = a.exifApp.GetExifFor(ctx, item)
if err != nil {
logger.WithField("item", item.Pathname).Error("unable to load exif: %s", err)
logger.WithField("item", item.Pathname).Error("load exif: %s", err)
}
})

Expand Down Expand Up @@ -66,7 +66,7 @@ func (a App) getFilesPreviousAndNext(ctx context.Context, item absto.Item, reque
var err error
items, err = a.storageApp.List(ctx, item.Dir())
if err != nil {
logger.WithField("item", item.Pathname).Error("unable to list neighbors files: %s", err)
logger.WithField("item", item.Pathname).Error("list neighbors files: %s", err)
return
}

Expand Down
10 changes: 5 additions & 5 deletions pkg/crud/crud.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func New(config Config, storage absto.Storage, rendererApp renderer.App, shareAp

if amqpClient != nil {
if err := amqpClient.SetupExclusive(app.amqpExclusiveRoutingKey); err != nil {
return app, fmt.Errorf("unable to setup amqp exclusive: %s", err)
return app, fmt.Errorf("setup amqp exclusive: %s", err)
}
}

Expand Down Expand Up @@ -136,12 +136,12 @@ func New(config Config, storage absto.Storage, rendererApp renderer.App, shareAp

bcryptDuration, err := time.ParseDuration(strings.TrimSpace(*config.bcryptDuration))
if err != nil {
return app, fmt.Errorf("unable to parse bcrypt duration: %s", err)
return app, fmt.Errorf("parse bcrypt duration: %s", err)
}

bcryptCost, err := findBcryptBestCost(bcryptDuration)
if err != nil {
logger.Error("unable to find best bcrypt cost: %s", err)
logger.Error("find best bcrypt cost: %s", err)
bcryptCost = bcrypt.DefaultCost
}
logger.Info("Best bcrypt cost is %d", bcryptCost)
Expand All @@ -162,7 +162,7 @@ func (a App) Start(done <-chan struct{}) {
a.start(ctx, done)
return nil
}); err != nil {
logger.Error("unable to get exclusive semaphore: %s", err)
logger.Error("get exclusive semaphore: %s", err)
}
}

Expand Down Expand Up @@ -190,7 +190,7 @@ func (a App) start(ctx context.Context, done <-chan struct{}) {
func (a App) sanitizeName(ctx context.Context, item absto.Item) absto.Item {
name, err := provider.SanitizeName(item.Pathname, false)
if err != nil {
logger.WithField("item", item.Pathname).Error("unable to sanitize name: %s", err)
logger.WithField("item", item.Pathname).Error("sanitize name: %s", err)
return item
}

Expand Down
10 changes: 5 additions & 5 deletions pkg/crud/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (a App) serveFile(w http.ResponseWriter, r *http.Request, item absto.Item)

file, err := a.storageApp.ReadFrom(r.Context(), item.Pathname)
if err != nil {
return fmt.Errorf("unable to get reader for `%s`: %w", item.Pathname, err)
return fmt.Errorf("get reader for `%s`: %w", item.Pathname, err)
}

defer provider.LogClose(file, "crud.serveFile", item.Pathname)
Expand Down Expand Up @@ -151,7 +151,7 @@ func (a App) listFiles(r *http.Request, request provider.Request, item absto.Ite
if request.IsStory() {
thumbnails, err := a.thumbnailApp.ListDirLarge(ctx, item)
if err != nil {
logger.WithField("item", item.Pathname).Error("unable to list large thumbnails: %s", err)
logger.WithField("item", item.Pathname).Error("list large thumbnails: %s", err)
}

storyItems := items[:0]
Expand Down Expand Up @@ -181,7 +181,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
if query.GetBool(r, "search") {
hash = a.exifHash(ctx, items)
} else if exifs, err := a.exifApp.ListDir(ctx, item); err != nil {
logger.WithField("item", item.Pathname).Error("unable to list exifs: %s", err)
logger.WithField("item", item.Pathname).Error("list exifs: %s", err)
} else {
hash = sha.New(exifs)
}
Expand Down Expand Up @@ -221,7 +221,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid

exif, err := a.exifApp.GetExifFor(ctx, item)
if err != nil {
logger.WithField("item", item.Pathname).Error("unable to get exif: %s", err)
logger.WithField("item", item.Pathname).Error("get exif: %s", err)
continue
}

Expand All @@ -242,7 +242,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
feature.Properties["date"] = exif.Date.Format(time.RFC850)

if err := encoder.Encode(feature); err != nil {
logger.WithField("item", item.Pathname).Error("unable to encode feature: %s", err)
logger.WithField("item", item.Pathname).Error("encode feature: %s", err)
}
}

Expand Down
Loading

0 comments on commit 7df7747

Please sign in to comment.