diff --git a/go.mod b/go.mod index c5590cf..a90c374 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,34 @@ module github.com/ONSdigital/dp-net -go 1.13 +go 1.18 require ( - github.com/ONSdigital/dp-api-clients-go v1.41.1 - github.com/ONSdigital/dp-healthcheck v1.1.0 // indirect - github.com/ONSdigital/log.go v1.1.0 // indirect - github.com/ONSdigital/log.go/v2 v2.0.9 - github.com/aws/aws-sdk-go v1.38.15 + github.com/ONSdigital/dp-api-clients-go v1.43.0 + github.com/ONSdigital/log.go/v2 v2.2.0 + github.com/aws/aws-sdk-go v1.44.76 github.com/gorilla/mux v1.8.0 github.com/justinas/alice v1.2.0 - github.com/mattn/go-isatty v0.0.13 // indirect github.com/pkg/errors v0.9.1 github.com/smartystreets/goconvey v1.7.2 - github.com/stretchr/testify v1.7.0 - golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d - golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect + github.com/stretchr/testify v1.8.0 + golang.org/x/net v0.0.0-20220812174116-3211cb980234 +) + +require ( + github.com/ONSdigital/dp-api-clients-go/v2 v2.159.1 // indirect + github.com/ONSdigital/dp-healthcheck v1.3.0 // indirect + github.com/ONSdigital/dp-net/v2 v2.4.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fatih/color v1.13.0 // indirect + github.com/gopherjs/gopherjs v1.17.2 // indirect + github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jtolds/gls v4.20.0+incompatible // indirect + github.com/kr/text v0.2.0 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/smartystreets/assertions v1.13.0 // indirect + golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 3ea54e0..5924055 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,14 @@ github.com/ONSdigital/dp-api-clients-go v1.28.0/go.mod h1:iyJy6uRL4B6OYOJA0XMr5UHt6+Q8XmN9uwmURO+9Oj4= github.com/ONSdigital/dp-api-clients-go v1.34.3/go.mod h1:kX+YKuoLYLfkeLHMvQKRRydZVxO7ZEYyYiwG2xhV51E= -github.com/ONSdigital/dp-api-clients-go v1.41.1 h1:xkeT6dCTFSAoBpZxgiJUiuqgcfjCX+c52CIiZo1Y2iU= github.com/ONSdigital/dp-api-clients-go v1.41.1/go.mod h1:Ga1+ANjviu21NFJI9wp5NctJIdB4TJLDGbpQFl2V8Wc= +github.com/ONSdigital/dp-api-clients-go v1.43.0 h1:0982P/YxnYXvba1RhEcFmwF3xywC4eXokWQ8YH3Mm24= +github.com/ONSdigital/dp-api-clients-go v1.43.0/go.mod h1:V5MfINik+o3OAF985UXUoMjXIfrZe3JKYa5AhZn5jts= +github.com/ONSdigital/dp-api-clients-go/v2 v2.159.1 h1:DVJHa54437dxFbJDxEzIHhxcnammGqPQqDX53G0w7TY= +github.com/ONSdigital/dp-api-clients-go/v2 v2.159.1/go.mod h1:hT71K0YuLeXjV1o/jKVdp1407kQuTj0x9mIIebaBwfg= github.com/ONSdigital/dp-healthcheck v1.0.5/go.mod h1:2wbVAUHMl9+4tWhUlxYUuA1dnf2+NrwzC+So5f5BMLk= -github.com/ONSdigital/dp-healthcheck v1.1.0 h1:fKOf8MMe8l4EW28ljX0wNZ5oZTgx/slAs7lyEx4eq2c= github.com/ONSdigital/dp-healthcheck v1.1.0/go.mod h1:vZwyjMJiCHjp/sJ2R1ZEqzZT0rJ0+uHVGwxqdP4J5vg= +github.com/ONSdigital/dp-healthcheck v1.3.0 h1:WQLajH8Ne47fHcz3of9dZKCvqeBmjw+Kyx4bHzpzZLk= +github.com/ONSdigital/dp-healthcheck v1.3.0/go.mod h1:XUhXoDIWPCdletDtpDOoXhmDFcc9b/kbedx96jN75aI= github.com/ONSdigital/dp-mocking v0.0.0-20190905163309-fee2702ad1b9 h1:+WXVfTDyWXY1DQRDFSmt1b/ORKk5c7jGiPu7NoeaM/0= github.com/ONSdigital/dp-mocking v0.0.0-20190905163309-fee2702ad1b9/go.mod h1:BcIRgitUju//qgNePRBmNjATarTtynAgc0yV29VpLEk= github.com/ONSdigital/dp-net v1.0.5-0.20200805082802-e518bc287596/go.mod h1:wDVhk2pYosQ1q6PXxuFIRYhYk2XX5+1CeRRnXpSczPY= @@ -12,6 +16,9 @@ github.com/ONSdigital/dp-net v1.0.5-0.20200805145012-9227a11caddb/go.mod h1:MrSZ github.com/ONSdigital/dp-net v1.0.5-0.20200805150805-cac050646ab5/go.mod h1:de3LB9tedE0tObBwa12dUOt5rvTW4qQkF5rXtt4b6CE= github.com/ONSdigital/dp-net v1.0.7/go.mod h1:1QFzx32FwPKD2lgZI6MtcsUXritsBdJihlzIWDrQ/gc= github.com/ONSdigital/dp-net v1.0.12/go.mod h1:2lvIKOlD4T3BjWQwjHhBUO2UNWDk82u/+mHRn0R3C9A= +github.com/ONSdigital/dp-net v1.2.0/go.mod h1:NinlaqcsPbIR+X7j5PXCl3UI5G2zCL041SDF6WIiiO4= +github.com/ONSdigital/dp-net/v2 v2.4.0 h1:GYJM8ZFGfWOAjUUMO8rXavowAT700q3Zi/vYjc2jh8o= +github.com/ONSdigital/dp-net/v2 v2.4.0/go.mod h1:8X7E1wiJxL59qaDFt3ShDfFLfIGs4WMRPx1sZIgAqbU= github.com/ONSdigital/go-ns v0.0.0-20191104121206-f144c4ec2e58/go.mod h1:iWos35il+NjbvDEqwtB736pyHru0MPFE/LqcwkV1wDc= github.com/ONSdigital/log.go v1.0.0/go.mod h1:UnGu9Q14gNC+kz0DOkdnLYGoqugCvnokHBRBxFRpVoQ= github.com/ONSdigital/log.go v1.0.1-0.20200805084515-ee61165ea36a/go.mod h1:dDnQATFXCBOknvj6ZQuKfmDhbOWf3e8mtV+dPEfWJqs= @@ -21,28 +28,34 @@ github.com/ONSdigital/log.go v1.1.0 h1:XFE8U5lPeiXyujgUtbh+pKCotiICeIGFEAauNk9c2 github.com/ONSdigital/log.go v1.1.0/go.mod h1:0hOVuYR3bDUI30VRo48d5KHfJIoe+spuPXqgt6UF78o= github.com/ONSdigital/log.go/v2 v2.0.0/go.mod h1:PR7vXrv9dZKUc7SI/0toxBbStk84snmybBnWpe+xY2o= github.com/ONSdigital/log.go/v2 v2.0.5/go.mod h1:PR7vXrv9dZKUc7SI/0toxBbStk84snmybBnWpe+xY2o= -github.com/ONSdigital/log.go/v2 v2.0.9 h1:dMtuN89vCP21iRuOBAGInn7ZzxIEGajC3o5pjoicnsY= github.com/ONSdigital/log.go/v2 v2.0.9/go.mod h1:VyTDkL82FtiAkaNFaT+bURBhLbP7NsIx4rkVbdpiuEg= -github.com/aws/aws-sdk-go v1.38.15 h1:usaPeqoxFUzy0FfBLZLZHya5Kv2cpURjb1jqCa7+odA= -github.com/aws/aws-sdk-go v1.38.15/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/ONSdigital/log.go/v2 v2.2.0 h1:Rkv6Gbfa3Jzy5AfPWkUDEnpFNhzYyaGQ6f7YUdBKnHs= +github.com/ONSdigital/log.go/v2 v2.2.0/go.mod h1:i0eFlPDlF1fI4k0/SvXhQIkyQxs676EySpYPj3rQy+I= +github.com/aws/aws-sdk-go v1.44.76 h1:5e8yGO/XeNYKckOjpBKUd5wStf0So3CrQIiOMCVLpOI= +github.com/aws/aws-sdk-go v1.44.76/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9/go.mod h1:uPmAp6Sws4L7+Q/OokbWDAK1ibXYhB3PXFP1kol5hPg= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20210202160940-bed99a852dfe h1:rcf1P0fm+1l0EjG16p06mYLj9gW9X36KgdHJ/88hS4g= github.com/gopherjs/gopherjs v0.0.0-20210202160940-bed99a852dfe/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= +github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/hokaccha/go-prettyjson v0.0.0-20190818114111-108c894c2c0e/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI= -github.com/hokaccha/go-prettyjson v0.0.0-20210113012101-fb4e108d2519 h1:nqAlWFEdqI0ClbTDrhDvE/8LeQ4pftrqKUX9w5k0j3s= github.com/hokaccha/go-prettyjson v0.0.0-20210113012101-fb4e108d2519/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI= +github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f h1:7LYC+Yfkj3CTRcShK0KOL/w6iTiKyqqBA9a41Wnggw8= +github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI= 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= @@ -51,14 +64,21 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo= github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA= github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -66,14 +86,17 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE 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/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs= +github.com/smartystreets/assertions v1.13.0/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= @@ -83,8 +106,10 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= +golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= @@ -97,22 +122,28 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210414055047-fe65e336abe0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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/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.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= 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.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/http/client.go b/http/client.go index 1131ba4..34f7984 100644 --- a/http/client.go +++ b/http/client.go @@ -52,6 +52,7 @@ type Clienter interface { PostForm(ctx context.Context, uri string, data url.Values) (*http.Response, error) Do(ctx context.Context, req *http.Request) (*http.Response, error) + RoundTrip(req *http.Request) (*http.Response, error) } // NewClient returns a copy of DefaultClient. diff --git a/http/mock_client.go b/http/mock_client.go index 8b92207..a9e5665 100644 --- a/http/mock_client.go +++ b/http/mock_client.go @@ -12,69 +12,58 @@ import ( "time" ) -var ( - lockClienterMockDo sync.RWMutex - lockClienterMockGet sync.RWMutex - lockClienterMockGetMaxRetries sync.RWMutex - lockClienterMockGetPathsWithNoRetries sync.RWMutex - lockClienterMockHead sync.RWMutex - lockClienterMockPost sync.RWMutex - lockClienterMockPostForm sync.RWMutex - lockClienterMockPut sync.RWMutex - lockClienterMockSetMaxRetries sync.RWMutex - lockClienterMockSetPathsWithNoRetries sync.RWMutex - lockClienterMockSetTimeout sync.RWMutex -) - // Ensure, that ClienterMock does implement Clienter. // If this is not the case, regenerate this file with moq. var _ Clienter = &ClienterMock{} // ClienterMock is a mock implementation of Clienter. // -// func TestSomethingThatUsesClienter(t *testing.T) { +// func TestSomethingThatUsesClienter(t *testing.T) { // -// // make and configure a mocked Clienter -// mockedClienter := &ClienterMock{ -// DoFunc: func(ctx context.Context, req *http.Request) (*http.Response, error) { -// panic("mock out the Do method") -// }, -// GetFunc: func(ctx context.Context, url string) (*http.Response, error) { -// panic("mock out the Get method") -// }, -// GetMaxRetriesFunc: func() int { -// panic("mock out the GetMaxRetries method") -// }, -// GetPathsWithNoRetriesFunc: func() []string { -// panic("mock out the GetPathsWithNoRetries method") -// }, -// HeadFunc: func(ctx context.Context, url string) (*http.Response, error) { -// panic("mock out the Head method") -// }, -// PostFunc: func(ctx context.Context, url string, contentType string, body io.Reader) (*http.Response, error) { -// panic("mock out the Post method") -// }, -// PostFormFunc: func(ctx context.Context, uri string, data url.Values) (*http.Response, error) { -// panic("mock out the PostForm method") -// }, -// PutFunc: func(ctx context.Context, url string, contentType string, body io.Reader) (*http.Response, error) { -// panic("mock out the Put method") -// }, -// SetMaxRetriesFunc: func(in1 int) { -// panic("mock out the SetMaxRetries method") -// }, -// SetPathsWithNoRetriesFunc: func(in1 []string) { -// panic("mock out the SetPathsWithNoRetries method") -// }, -// SetTimeoutFunc: func(timeout time.Duration) { -// panic("mock out the SetTimeout method") -// }, -// } +// // make and configure a mocked Clienter +// mockedClienter := &ClienterMock{ +// DoFunc: func(ctx context.Context, req *http.Request) (*http.Response, error) { +// panic("mock out the Do method") +// }, +// GetFunc: func(ctx context.Context, url string) (*http.Response, error) { +// panic("mock out the Get method") +// }, +// GetMaxRetriesFunc: func() int { +// panic("mock out the GetMaxRetries method") +// }, +// GetPathsWithNoRetriesFunc: func() []string { +// panic("mock out the GetPathsWithNoRetries method") +// }, +// HeadFunc: func(ctx context.Context, url string) (*http.Response, error) { +// panic("mock out the Head method") +// }, +// PostFunc: func(ctx context.Context, url string, contentType string, body io.Reader) (*http.Response, error) { +// panic("mock out the Post method") +// }, +// PostFormFunc: func(ctx context.Context, uri string, data url.Values) (*http.Response, error) { +// panic("mock out the PostForm method") +// }, +// PutFunc: func(ctx context.Context, urlMoqParam string, contentType string, body io.Reader) (*http.Response, error) { +// panic("mock out the Put method") +// }, +// RoundTripFunc: func(req *http.Request) (*http.Response, error) { +// panic("mock out the RoundTrip method") +// }, +// SetMaxRetriesFunc: func(n int) { +// panic("mock out the SetMaxRetries method") +// }, +// SetPathsWithNoRetriesFunc: func(strings []string) { +// panic("mock out the SetPathsWithNoRetries method") +// }, +// SetTimeoutFunc: func(timeout time.Duration) { +// panic("mock out the SetTimeout method") +// }, +// } // -// // use mockedClienter in code that requires Clienter -// // and then make assertions. +// // use mockedClienter in code that requires Clienter +// // and then make assertions. // -// } +// } type ClienterMock struct { // DoFunc mocks the Do method. DoFunc func(ctx context.Context, req *http.Request) (*http.Response, error) @@ -98,13 +87,16 @@ type ClienterMock struct { PostFormFunc func(ctx context.Context, uri string, data url.Values) (*http.Response, error) // PutFunc mocks the Put method. - PutFunc func(ctx context.Context, url string, contentType string, body io.Reader) (*http.Response, error) + PutFunc func(ctx context.Context, urlMoqParam string, contentType string, body io.Reader) (*http.Response, error) + + // RoundTripFunc mocks the RoundTrip method. + RoundTripFunc func(req *http.Request) (*http.Response, error) // SetMaxRetriesFunc mocks the SetMaxRetries method. - SetMaxRetriesFunc func(in1 int) + SetMaxRetriesFunc func(n int) // SetPathsWithNoRetriesFunc mocks the SetPathsWithNoRetries method. - SetPathsWithNoRetriesFunc func(in1 []string) + SetPathsWithNoRetriesFunc func(strings []string) // SetTimeoutFunc mocks the SetTimeout method. SetTimeoutFunc func(timeout time.Duration) @@ -162,22 +154,27 @@ type ClienterMock struct { Put []struct { // Ctx is the ctx argument value. Ctx context.Context - // URL is the url argument value. - URL string + // UrlMoqParam is the urlMoqParam argument value. + UrlMoqParam string // ContentType is the contentType argument value. ContentType string // Body is the body argument value. Body io.Reader } + // RoundTrip holds details about calls to the RoundTrip method. + RoundTrip []struct { + // Req is the req argument value. + Req *http.Request + } // SetMaxRetries holds details about calls to the SetMaxRetries method. SetMaxRetries []struct { - // In1 is the in1 argument value. - In1 int + // N is the n argument value. + N int } // SetPathsWithNoRetries holds details about calls to the SetPathsWithNoRetries method. SetPathsWithNoRetries []struct { - // In1 is the in1 argument value. - In1 []string + // Strings is the strings argument value. + Strings []string } // SetTimeout holds details about calls to the SetTimeout method. SetTimeout []struct { @@ -185,6 +182,18 @@ type ClienterMock struct { Timeout time.Duration } } + lockDo sync.RWMutex + lockGet sync.RWMutex + lockGetMaxRetries sync.RWMutex + lockGetPathsWithNoRetries sync.RWMutex + lockHead sync.RWMutex + lockPost sync.RWMutex + lockPostForm sync.RWMutex + lockPut sync.RWMutex + lockRoundTrip sync.RWMutex + lockSetMaxRetries sync.RWMutex + lockSetPathsWithNoRetries sync.RWMutex + lockSetTimeout sync.RWMutex } // Do calls DoFunc. @@ -199,9 +208,9 @@ func (mock *ClienterMock) Do(ctx context.Context, req *http.Request) (*http.Resp Ctx: ctx, Req: req, } - lockClienterMockDo.Lock() + mock.lockDo.Lock() mock.calls.Do = append(mock.calls.Do, callInfo) - lockClienterMockDo.Unlock() + mock.lockDo.Unlock() return mock.DoFunc(ctx, req) } @@ -216,9 +225,9 @@ func (mock *ClienterMock) DoCalls() []struct { Ctx context.Context Req *http.Request } - lockClienterMockDo.RLock() + mock.lockDo.RLock() calls = mock.calls.Do - lockClienterMockDo.RUnlock() + mock.lockDo.RUnlock() return calls } @@ -234,9 +243,9 @@ func (mock *ClienterMock) Get(ctx context.Context, url string) (*http.Response, Ctx: ctx, URL: url, } - lockClienterMockGet.Lock() + mock.lockGet.Lock() mock.calls.Get = append(mock.calls.Get, callInfo) - lockClienterMockGet.Unlock() + mock.lockGet.Unlock() return mock.GetFunc(ctx, url) } @@ -251,9 +260,9 @@ func (mock *ClienterMock) GetCalls() []struct { Ctx context.Context URL string } - lockClienterMockGet.RLock() + mock.lockGet.RLock() calls = mock.calls.Get - lockClienterMockGet.RUnlock() + mock.lockGet.RUnlock() return calls } @@ -264,9 +273,9 @@ func (mock *ClienterMock) GetMaxRetries() int { } callInfo := struct { }{} - lockClienterMockGetMaxRetries.Lock() + mock.lockGetMaxRetries.Lock() mock.calls.GetMaxRetries = append(mock.calls.GetMaxRetries, callInfo) - lockClienterMockGetMaxRetries.Unlock() + mock.lockGetMaxRetries.Unlock() return mock.GetMaxRetriesFunc() } @@ -277,9 +286,9 @@ func (mock *ClienterMock) GetMaxRetriesCalls() []struct { } { var calls []struct { } - lockClienterMockGetMaxRetries.RLock() + mock.lockGetMaxRetries.RLock() calls = mock.calls.GetMaxRetries - lockClienterMockGetMaxRetries.RUnlock() + mock.lockGetMaxRetries.RUnlock() return calls } @@ -290,9 +299,9 @@ func (mock *ClienterMock) GetPathsWithNoRetries() []string { } callInfo := struct { }{} - lockClienterMockGetPathsWithNoRetries.Lock() + mock.lockGetPathsWithNoRetries.Lock() mock.calls.GetPathsWithNoRetries = append(mock.calls.GetPathsWithNoRetries, callInfo) - lockClienterMockGetPathsWithNoRetries.Unlock() + mock.lockGetPathsWithNoRetries.Unlock() return mock.GetPathsWithNoRetriesFunc() } @@ -303,9 +312,9 @@ func (mock *ClienterMock) GetPathsWithNoRetriesCalls() []struct { } { var calls []struct { } - lockClienterMockGetPathsWithNoRetries.RLock() + mock.lockGetPathsWithNoRetries.RLock() calls = mock.calls.GetPathsWithNoRetries - lockClienterMockGetPathsWithNoRetries.RUnlock() + mock.lockGetPathsWithNoRetries.RUnlock() return calls } @@ -321,9 +330,9 @@ func (mock *ClienterMock) Head(ctx context.Context, url string) (*http.Response, Ctx: ctx, URL: url, } - lockClienterMockHead.Lock() + mock.lockHead.Lock() mock.calls.Head = append(mock.calls.Head, callInfo) - lockClienterMockHead.Unlock() + mock.lockHead.Unlock() return mock.HeadFunc(ctx, url) } @@ -338,9 +347,9 @@ func (mock *ClienterMock) HeadCalls() []struct { Ctx context.Context URL string } - lockClienterMockHead.RLock() + mock.lockHead.RLock() calls = mock.calls.Head - lockClienterMockHead.RUnlock() + mock.lockHead.RUnlock() return calls } @@ -360,9 +369,9 @@ func (mock *ClienterMock) Post(ctx context.Context, url string, contentType stri ContentType: contentType, Body: body, } - lockClienterMockPost.Lock() + mock.lockPost.Lock() mock.calls.Post = append(mock.calls.Post, callInfo) - lockClienterMockPost.Unlock() + mock.lockPost.Unlock() return mock.PostFunc(ctx, url, contentType, body) } @@ -381,9 +390,9 @@ func (mock *ClienterMock) PostCalls() []struct { ContentType string Body io.Reader } - lockClienterMockPost.RLock() + mock.lockPost.RLock() calls = mock.calls.Post - lockClienterMockPost.RUnlock() + mock.lockPost.RUnlock() return calls } @@ -401,9 +410,9 @@ func (mock *ClienterMock) PostForm(ctx context.Context, uri string, data url.Val URI: uri, Data: data, } - lockClienterMockPostForm.Lock() + mock.lockPostForm.Lock() mock.calls.PostForm = append(mock.calls.PostForm, callInfo) - lockClienterMockPostForm.Unlock() + mock.lockPostForm.Unlock() return mock.PostFormFunc(ctx, uri, data) } @@ -420,32 +429,32 @@ func (mock *ClienterMock) PostFormCalls() []struct { URI string Data url.Values } - lockClienterMockPostForm.RLock() + mock.lockPostForm.RLock() calls = mock.calls.PostForm - lockClienterMockPostForm.RUnlock() + mock.lockPostForm.RUnlock() return calls } // Put calls PutFunc. -func (mock *ClienterMock) Put(ctx context.Context, url string, contentType string, body io.Reader) (*http.Response, error) { +func (mock *ClienterMock) Put(ctx context.Context, urlMoqParam string, contentType string, body io.Reader) (*http.Response, error) { if mock.PutFunc == nil { panic("ClienterMock.PutFunc: method is nil but Clienter.Put was just called") } callInfo := struct { Ctx context.Context - URL string + UrlMoqParam string ContentType string Body io.Reader }{ Ctx: ctx, - URL: url, + UrlMoqParam: urlMoqParam, ContentType: contentType, Body: body, } - lockClienterMockPut.Lock() + mock.lockPut.Lock() mock.calls.Put = append(mock.calls.Put, callInfo) - lockClienterMockPut.Unlock() - return mock.PutFunc(ctx, url, contentType, body) + mock.lockPut.Unlock() + return mock.PutFunc(ctx, urlMoqParam, contentType, body) } // PutCalls gets all the calls that were made to Put. @@ -453,81 +462,112 @@ func (mock *ClienterMock) Put(ctx context.Context, url string, contentType strin // len(mockedClienter.PutCalls()) func (mock *ClienterMock) PutCalls() []struct { Ctx context.Context - URL string + UrlMoqParam string ContentType string Body io.Reader } { var calls []struct { Ctx context.Context - URL string + UrlMoqParam string ContentType string Body io.Reader } - lockClienterMockPut.RLock() + mock.lockPut.RLock() calls = mock.calls.Put - lockClienterMockPut.RUnlock() + mock.lockPut.RUnlock() + return calls +} + +// RoundTrip calls RoundTripFunc. +func (mock *ClienterMock) RoundTrip(req *http.Request) (*http.Response, error) { + if mock.RoundTripFunc == nil { + panic("ClienterMock.RoundTripFunc: method is nil but Clienter.RoundTrip was just called") + } + callInfo := struct { + Req *http.Request + }{ + Req: req, + } + mock.lockRoundTrip.Lock() + mock.calls.RoundTrip = append(mock.calls.RoundTrip, callInfo) + mock.lockRoundTrip.Unlock() + return mock.RoundTripFunc(req) +} + +// RoundTripCalls gets all the calls that were made to RoundTrip. +// Check the length with: +// len(mockedClienter.RoundTripCalls()) +func (mock *ClienterMock) RoundTripCalls() []struct { + Req *http.Request +} { + var calls []struct { + Req *http.Request + } + mock.lockRoundTrip.RLock() + calls = mock.calls.RoundTrip + mock.lockRoundTrip.RUnlock() return calls } // SetMaxRetries calls SetMaxRetriesFunc. -func (mock *ClienterMock) SetMaxRetries(in1 int) { +func (mock *ClienterMock) SetMaxRetries(n int) { if mock.SetMaxRetriesFunc == nil { panic("ClienterMock.SetMaxRetriesFunc: method is nil but Clienter.SetMaxRetries was just called") } callInfo := struct { - In1 int + N int }{ - In1: in1, + N: n, } - lockClienterMockSetMaxRetries.Lock() + mock.lockSetMaxRetries.Lock() mock.calls.SetMaxRetries = append(mock.calls.SetMaxRetries, callInfo) - lockClienterMockSetMaxRetries.Unlock() - mock.SetMaxRetriesFunc(in1) + mock.lockSetMaxRetries.Unlock() + mock.SetMaxRetriesFunc(n) } // SetMaxRetriesCalls gets all the calls that were made to SetMaxRetries. // Check the length with: // len(mockedClienter.SetMaxRetriesCalls()) func (mock *ClienterMock) SetMaxRetriesCalls() []struct { - In1 int + N int } { var calls []struct { - In1 int + N int } - lockClienterMockSetMaxRetries.RLock() + mock.lockSetMaxRetries.RLock() calls = mock.calls.SetMaxRetries - lockClienterMockSetMaxRetries.RUnlock() + mock.lockSetMaxRetries.RUnlock() return calls } // SetPathsWithNoRetries calls SetPathsWithNoRetriesFunc. -func (mock *ClienterMock) SetPathsWithNoRetries(in1 []string) { +func (mock *ClienterMock) SetPathsWithNoRetries(strings []string) { if mock.SetPathsWithNoRetriesFunc == nil { panic("ClienterMock.SetPathsWithNoRetriesFunc: method is nil but Clienter.SetPathsWithNoRetries was just called") } callInfo := struct { - In1 []string + Strings []string }{ - In1: in1, + Strings: strings, } - lockClienterMockSetPathsWithNoRetries.Lock() + mock.lockSetPathsWithNoRetries.Lock() mock.calls.SetPathsWithNoRetries = append(mock.calls.SetPathsWithNoRetries, callInfo) - lockClienterMockSetPathsWithNoRetries.Unlock() - mock.SetPathsWithNoRetriesFunc(in1) + mock.lockSetPathsWithNoRetries.Unlock() + mock.SetPathsWithNoRetriesFunc(strings) } // SetPathsWithNoRetriesCalls gets all the calls that were made to SetPathsWithNoRetries. // Check the length with: // len(mockedClienter.SetPathsWithNoRetriesCalls()) func (mock *ClienterMock) SetPathsWithNoRetriesCalls() []struct { - In1 []string + Strings []string } { var calls []struct { - In1 []string + Strings []string } - lockClienterMockSetPathsWithNoRetries.RLock() + mock.lockSetPathsWithNoRetries.RLock() calls = mock.calls.SetPathsWithNoRetries - lockClienterMockSetPathsWithNoRetries.RUnlock() + mock.lockSetPathsWithNoRetries.RUnlock() return calls } @@ -541,9 +581,9 @@ func (mock *ClienterMock) SetTimeout(timeout time.Duration) { }{ Timeout: timeout, } - lockClienterMockSetTimeout.Lock() + mock.lockSetTimeout.Lock() mock.calls.SetTimeout = append(mock.calls.SetTimeout, callInfo) - lockClienterMockSetTimeout.Unlock() + mock.lockSetTimeout.Unlock() mock.SetTimeoutFunc(timeout) } @@ -556,8 +596,8 @@ func (mock *ClienterMock) SetTimeoutCalls() []struct { var calls []struct { Timeout time.Duration } - lockClienterMockSetTimeout.RLock() + mock.lockSetTimeout.RLock() calls = mock.calls.SetTimeout - lockClienterMockSetTimeout.RUnlock() + mock.lockSetTimeout.RUnlock() return calls }