diff --git a/go.mod b/go.mod index 145e7dd..e2ac317 100644 --- a/go.mod +++ b/go.mod @@ -1,27 +1,44 @@ module github.com/aacebedo/dnsdock -go 1.21.5 +go 1.21 require ( github.com/alecthomas/kingpin/v2 v2.4.0 - github.com/docker/engine-api v0.4.0 + github.com/docker/docker v26.1.0+incompatible github.com/gorilla/mux v1.8.1 - github.com/miekg/dns v1.1.58 + github.com/miekg/dns v1.1.59 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 - github.com/vdemeester/docker-events v0.0.0-20160621105736-be74d4929ec1 - golang.org/x/net v0.20.0 ) require ( github.com/Microsoft/go-winio v0.4.14 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect - github.com/distribution/reference v0.5.0 // indirect - github.com/docker/distribution v2.8.3+incompatible // indirect + github.com/cenkalti/backoff/v4 v4.3.0 + github.com/containerd/log v0.1.0 // indirect + github.com/distribution/reference v0.6.0 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect + github.com/moby/term v0.5.0 // indirect + github.com/morikuni/aec v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/tools v0.17.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect + go.opentelemetry.io/otel v1.26.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 // indirect + go.opentelemetry.io/otel/metric v1.26.0 // indirect + go.opentelemetry.io/otel/sdk v1.26.0 // indirect + go.opentelemetry.io/otel/trace v1.26.0 // indirect + golang.org/x/mod v0.16.0 // indirect + golang.org/x/net v0.23.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.19.0 // indirect + gotest.tools/v3 v3.5.1 // indirect ) diff --git a/go.sum b/go.sum index 2307247..027fcf3 100644 --- a/go.sum +++ b/go.sum @@ -1,58 +1,144 @@ +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY= github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= 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/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= -github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= -github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/engine-api v0.4.0 h1:D0Osr6+45yAlQqLyoczv5qJtAu+P0HB0rLCddck03wY= -github.com/docker/engine-api v0.4.0/go.mod h1:xtQCpzf4YysNZCVFfIGIm7qfLvYbxtLkEVVfKhTVOvw= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/docker v26.1.0+incompatible h1:W1G9MPNbskA6VZWL7b3ZljTh0pXI68FpINx0GKaOdaM= +github.com/docker/docker v26.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= -github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= +github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= +github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= 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/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= 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.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/vdemeester/docker-events v0.0.0-20160621105736-be74d4929ec1 h1:kFsyaUAnFox5TJhHD0s3Ul0vPg9tOG1dNfhIWs0gU4s= -github.com/vdemeester/docker-events v0.0.0-20160621105736-be74d4929ec1/go.mod h1:yzWlPVyEah//aR7RqMj4F54qdNtB6NoGiyxKO6RxuuM= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0/go.mod h1:vy+2G/6NvVMpwGX/NyLqcC41fxepnuKHk16E6IZUcJc= +go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= +go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 h1:1u/AyyOqAWzy+SkPxDpahCNZParHV8Vid1RnI2clyDE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0/go.mod h1:z46paqbJ9l7c9fIPCXTqTGwhQZ5XoTIsfeFYWboizjs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 h1:1wp/gyxsuYtuE/JFxsQRtcCDtMrO2qMvlfXALU5wkzI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0/go.mod h1:gbTHmghkGgqxMomVQQMur1Nba4M0MQ8AYThXDUjsJ38= +go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= +go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= +go.opentelemetry.io/otel/sdk v1.26.0 h1:Y7bumHf5tAiDlRYFmGqetNcLaVUZmh4iYfmGxtmz7F8= +go.opentelemetry.io/otel/sdk v1.26.0/go.mod h1:0p8MXpqLeJ0pzcszQQN4F0S5FVjBLgypeGSngLsmirs= +go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA= +go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= +go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +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/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +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/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/internal/core/docker.go b/internal/core/docker.go index 4068e09..eae3766 100644 --- a/internal/core/docker.go +++ b/internal/core/docker.go @@ -9,6 +9,7 @@ package core import ( + "context" "crypto/tls" "errors" "fmt" @@ -16,16 +17,21 @@ import ( "regexp" "strconv" "strings" + "time" "github.com/aacebedo/dnsdock/internal/servers" "github.com/aacebedo/dnsdock/internal/utils" - "github.com/docker/engine-api/client" - "github.com/docker/engine-api/types" - eventtypes "github.com/docker/engine-api/types/events" - "github.com/vdemeester/docker-events" - "golang.org/x/net/context" + "github.com/cenkalti/backoff/v4" + "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/container" + "github.com/docker/docker/api/types/events" + "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/client" ) +// DockerProvider is the name of the provider used for services added by the Docker client +const DockerProvider = "docker" + // DockerManager is the entrypoint to the docker daemon type DockerManager struct { config *utils.Config @@ -36,9 +42,7 @@ type DockerManager struct { // NewDockerManager creates a new DockerManager func NewDockerManager(c *utils.Config, list servers.ServiceListProvider, tlsConfig *tls.Config) (*DockerManager, error) { - defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"} - dclient, err := client.NewClient(c.DockerHost, "v1.44", nil, defaultHeaders) - + dclient, err := client.NewClientWithOpts(client.WithHost(c.DockerHost), client.WithAPIVersionNegotiation()) if err != nil { return nil, err } @@ -50,89 +54,157 @@ func NewDockerManager(c *utils.Config, list servers.ServiceListProvider, tlsConf func (d *DockerManager) Start() (err error) { ctx, cancel := context.WithCancel(context.Background()) d.cancel = cancel - startHandler := func(m eventtypes.Message) { - logger.Debugf("Started container '%s'", m.ID) - service, err := d.getService(m.ID) - if err != nil { - logger.Errorf("%s", err) - } else { - err = d.list.AddService(m.ID, *service) - if err != nil { - logger.Errorf("Error adding service: %s", err) - } + + go func() { + perr := backoff.RetryNotify(func() error { + return d.run(ctx) + }, backoff.WithContext(backoff.NewExponentialBackOff(), ctx), func(err error, d time.Duration) { + logger.Errorf("Error running docker manager, retrying in %v: %s", d, err) + }) + if perr != nil { + logger.Errorf("Unrecoverable error running docker manager: %s", perr) + cancel() } + }() + + return nil +} + +func (d *DockerManager) run(ctx context.Context) error { + messageChan, errorChan := d.client.Events(ctx, types.EventsOptions{ + Filters: filters.NewArgs(filters.Arg("type", "container")), + }) + + containers, err := d.client.ContainerList(ctx, container.ListOptions{}) + if err != nil { + return fmt.Errorf("error getting containers: %w", err) } - stopHandler := func(m eventtypes.Message) { - logger.Debugf("Stopped container '%s'", m.ID) - if !d.config.All { - err = d.list.RemoveService(m.ID) - if err != nil { - logger.Errorf("%s", err) - } - } else { - logger.Debugf("Stopped container '%s' not removed as --all argument is true", m.ID) + services := make(map[string]struct{}) + for _, container := range containers { + service, err := d.getService(container.ID) + if err != nil { + return fmt.Errorf("error getting service: %w", err) + } + err = d.list.AddService(container.ID, *service) + if err != nil { + return fmt.Errorf("error adding service: %w", err) } + services[container.ID] = struct{}{} } - renameHandler := func(m eventtypes.Message) { - oldName, ok := m.Actor.Attributes["oldName"] - name, ok2 := m.Actor.Attributes["oldName"] - if ok && ok2 { - logger.Debugf("Renamed container '%s' into '%s'", oldName, name) - err = d.list.RemoveService(oldName) + for id, srv := range d.list.GetAllServices() { + if _, ok := services[id]; !ok && srv.Provider == DockerProvider { + err := d.list.RemoveService(id) if err != nil { - logger.Errorf("%s", err) - } - service, err := d.getService(m.ID) - if err != nil { - logger.Errorf("%s", err) - } else { - res := d.list.AddService(m.ID, *service) - if res != nil { - logger.Errorf("Error adding service: %s", res) - } + return fmt.Errorf("error removing service: %w", err) } } } - destroyHandler := func(m eventtypes.Message) { - logger.Debugf("Destroy container '%s'", m.ID) - if d.config.All { - err := d.list.RemoveService(m.ID) + for { + select { + case m := <-messageChan: + err := d.handler(m) if err != nil { - logger.Errorf("%s", err) + return err } + case err := <-errorChan: + return err + case <-ctx.Done(): + return nil } } +} - eventHandler := events.NewHandler(events.ByAction) - eventHandler.Handle("start", startHandler) - eventHandler.Handle("stop", stopHandler) - eventHandler.Handle("die", stopHandler) - eventHandler.Handle("kill", stopHandler) - eventHandler.Handle("destroy", destroyHandler) - eventHandler.Handle("rename", renameHandler) - - events.MonitorWithHandler(ctx, d.client, types.EventsOptions{}, eventHandler) +func (d *DockerManager) handler(m events.Message) error { + switch m.Action { + case "create": + return d.createHandler(m) + case "start": + return d.startHandler(m) + case "unpause": + return d.startHandler(m) + case "die": + return d.stopHandler(m) + case "pause": + return d.stopHandler(m) + case "destroy": + return d.destroyHandler(m) + case "rename": + return d.renameHandler(m) + } + return nil +} - containers, err := d.client.ContainerList(context.Background(), types.ContainerListOptions{}) - if err != nil { - return errors.New("Error getting containers: " + err.Error()) +func (d *DockerManager) createHandler(m events.Message) error { + logger.Debugf("Created container '%s'", m.ID) + if d.config.All { + service, err := d.getService(m.ID) + if err != nil { + return fmt.Errorf("error getting service: %w", err) + } + err = d.list.AddService(m.ID, *service) + if err != nil { + return fmt.Errorf("error adding service: %w", err) + } } + return nil +} - for _, container := range containers { - service, err := d.getService(container.ID) +func (d *DockerManager) startHandler(m events.Message) error { + logger.Debugf("Started container '%s'", m.ID) + if !d.config.All { + service, err := d.getService(m.ID) if err != nil { - logger.Errorf("%s", err) - continue + return fmt.Errorf("error getting service: %w", err) } - err = d.list.AddService(container.ID, *service) + err = d.list.AddService(m.ID, *service) if err != nil { - return fmt.Errorf("Error adding service: %s", err) + return fmt.Errorf("error adding service: %w", err) } } + return nil +} +func (d *DockerManager) stopHandler(m events.Message) error { + logger.Debugf("Stopped container '%s'", m.ID) + if !d.config.All { + err := d.list.RemoveService(m.ID) + if err != nil { + return fmt.Errorf("error removing service: %w", err) + } + } else { + logger.Debugf("Stopped container '%s' not removed as --all argument is true", m.ID) + } + return nil +} + +func (d *DockerManager) renameHandler(m events.Message) error { + logger.Debugf("Renamed container '%s'", m.ID) + err := d.list.RemoveService(m.ID) + if err != nil { + return fmt.Errorf("error removing service: %w", err) + } + service, err := d.getService(m.ID) + if err != nil { + return fmt.Errorf("error getting service: %w", err) + } + res := d.list.AddService(m.ID, *service) + if res != nil { + return fmt.Errorf("error removing service: %w", err) + } + return nil +} + +func (d *DockerManager) destroyHandler(m events.Message) error { + logger.Debugf("Destroy container '%s'", m.ID) + if d.config.All { + err := d.list.RemoveService(m.ID) + if err != nil { + return fmt.Errorf("error removing service: %w", err) + } + } return nil } @@ -147,7 +219,7 @@ func (d *DockerManager) getService(id string) (*servers.Service, error) { return nil, err } - service := servers.NewService() + service := servers.NewService(DockerProvider) service.Aliases = make([]string, 0) service.Image = getImageName(desc.Config.Image) diff --git a/internal/core/docker_test.go b/internal/core/docker_test.go index f575878..c7f24bf 100644 --- a/internal/core/docker_test.go +++ b/internal/core/docker_test.go @@ -9,9 +9,10 @@ package core import ( - "github.com/aacebedo/dnsdock/internal/servers" "reflect" "testing" + + "github.com/aacebedo/dnsdock/internal/servers" ) func TestGetImageName(t *testing.T) { @@ -78,7 +79,7 @@ func TestSplitEnv(t *testing.T) { func TestOverrideFromEnv(t *testing.T) { getService := func() *servers.Service { - service := servers.NewService() + service := servers.NewService(DockerProvider) service.Name = "myfoo" service.Image = "mybar" return service diff --git a/internal/servers/dnsserver.go b/internal/servers/dnsserver.go index 4ea681c..a7ba869 100644 --- a/internal/servers/dnsserver.go +++ b/internal/servers/dnsserver.go @@ -11,13 +11,14 @@ package servers import ( "errors" "fmt" - "github.com/aacebedo/dnsdock/internal/utils" - "github.com/miekg/dns" "net" "regexp" "strings" "sync" "time" + + "github.com/aacebedo/dnsdock/internal/utils" + "github.com/miekg/dns" ) // Service represents a container and an attached DNS record @@ -27,19 +28,23 @@ type Service struct { IPs []net.IP TTL int Aliases []string + + // Provider tracks the creator of a service + Provider string `json:"-"` } // NewService creates a new service -func NewService() (s *Service) { - s = &Service{TTL: -1} +func NewService(provider string) (s *Service) { + s = &Service{TTL: -1, Provider: provider} return } func (s Service) String() string { - return fmt.Sprintf(` Name: %s - Aliases: %s - IPs: %s - TTL: %d - `, s.Name, s.Aliases, s.IPs, s.TTL) + return fmt.Sprintf(` Name: %s + Aliases: %s + IPs: %s + TTL: %d + Provider: %s + `, s.Name, s.Aliases, s.IPs, s.TTL, s.Provider) } // ServiceListProvider represents the entrypoint to get containers @@ -504,7 +509,7 @@ func (s *DNSServer) getExpandedID(in string) (out string, err error) { return } - re, err := regexp.Compile("^[0-9a-f]+$"); + re, err := regexp.Compile("^[0-9a-f]+$") if err != nil { return "", err } @@ -554,9 +559,10 @@ func (s *DNSServer) createSOA() []dns.RR { // namely, the query may be longer than "name" and still be a valid prefix // query for "name". // Examples: -// foo.bar.baz.qux is a valid query for bar.baz.qux (longer prefix is okay) -// foo.*.baz.qux is a valid query for bar.baz.qux (wildcards okay) -// *.baz.qux is a valid query for baz.baz.qux (wildcard prefix okay) +// +// foo.bar.baz.qux is a valid query for bar.baz.qux (longer prefix is okay) +// foo.*.baz.qux is a valid query for bar.baz.qux (wildcards okay) +// *.baz.qux is a valid query for baz.baz.qux (wildcard prefix okay) func isPrefixQuery(query, name []string) bool { for i, j := len(query)-1, len(name)-1; i >= 0 && j >= 0; i, j = i-1, j-1 { if query[i] != name[j] && query[i] != "*" { diff --git a/internal/servers/http.go b/internal/servers/http.go index 0bfc360..2b4c834 100644 --- a/internal/servers/http.go +++ b/internal/servers/http.go @@ -10,11 +10,15 @@ package servers import ( "encoding/json" + "net/http" + "github.com/aacebedo/dnsdock/internal/utils" "github.com/gorilla/mux" - "net/http" ) +// HTTPProvider is the name of the provider used for services added by the HTTP server +const HTTPProvider = "http" + // HTTPServer represents the http endpoint type HTTPServer struct { config *utils.Config @@ -89,7 +93,7 @@ func (s *HTTPServer) addService(w http.ResponseWriter, req *http.Request) { return } - service := NewService() + service := NewService(HTTPProvider) if err := json.NewDecoder(req.Body).Decode(&service); err != nil { logger.Errorf("JSON decoding error: %s", err) http.Error(w, err.Error(), http.StatusInternalServerError) @@ -112,10 +116,10 @@ func (s *HTTPServer) addService(w http.ResponseWriter, req *http.Request) { } err := s.list.AddService(id, *service) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } } func (s *HTTPServer) removeService(w http.ResponseWriter, req *http.Request) { @@ -182,10 +186,10 @@ func (s *HTTPServer) updateService(w http.ResponseWriter, req *http.Request) { // todo: this probably needs to be moved. consider stop event in the // middle of sending PATCH. container would not be removed. err = s.list.AddService(id, service) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } } func (s *HTTPServer) setTTL(w http.ResponseWriter, req *http.Request) {