diff --git a/go.mod b/go.mod index 9bfda2bb85..c305cf7865 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,10 @@ go 1.25 require ( github.com/anaskhan96/soup v1.2.5 - github.com/aws/aws-sdk-go-v2 v1.36.3 - github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 - github.com/docker/cli v28.3.0+incompatible - github.com/docker/docker v28.1.1+incompatible + github.com/aws/aws-sdk-go-v2 v1.39.4 + github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7 + github.com/docker/cli v28.5.2+incompatible + github.com/docker/docker v28.5.2+incompatible github.com/docker/go-connections v0.5.0 github.com/getkin/kin-openapi v0.133.0 github.com/google/go-containerregistry v0.20.5 @@ -31,11 +31,11 @@ require ( github.com/vincent-petithory/dataurl v1.0.0 github.com/xeipuuv/gojsonschema v1.2.0 github.com/xeonx/timeago v1.0.0-rc5 - golang.org/x/crypto v0.38.0 - golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 - golang.org/x/sync v0.14.0 - golang.org/x/sys v0.33.0 - golang.org/x/term v0.32.0 + golang.org/x/crypto v0.45.0 + golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc + golang.org/x/sync v0.18.0 + golang.org/x/sys v0.38.0 + golang.org/x/term v0.37.0 google.golang.org/grpc v1.71.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -49,20 +49,20 @@ require ( github.com/Microsoft/go-winio v0.6.2 // indirect github.com/VividCortex/ewma v1.2.0 // indirect github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect - github.com/aws/smithy-go v1.22.3 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 // indirect + github.com/aws/smithy-go v1.23.1 // indirect github.com/bitfield/gotestdox v0.2.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/containerd/console v1.0.4 // indirect github.com/containerd/containerd/api v1.8.0 // indirect - github.com/containerd/containerd/v2 v2.0.5 // indirect + github.com/containerd/containerd/v2 v2.0.7 // indirect github.com/containerd/continuity v0.4.5 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect @@ -153,11 +153,12 @@ require ( go.opentelemetry.io/otel/sdk v1.35.0 // indirect go.opentelemetry.io/otel/trace v1.35.0 // indirect go.opentelemetry.io/proto/otlp v1.5.0 // indirect - golang.org/x/mod v0.24.0 // indirect - golang.org/x/net v0.40.0 // indirect - golang.org/x/text v0.25.0 // indirect - golang.org/x/time v0.11.0 // indirect - golang.org/x/tools v0.33.0 // indirect + golang.org/x/mod v0.29.0 // indirect + golang.org/x/net v0.47.0 // indirect + golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect + golang.org/x/text v0.31.0 // indirect + golang.org/x/time v0.12.0 // indirect + golang.org/x/tools v0.38.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect google.golang.org/protobuf v1.36.6 // indirect diff --git a/go.sum b/go.sum index 231b97cc98..531249b685 100644 --- a/go.sum +++ b/go.sum @@ -18,28 +18,28 @@ github.com/anaskhan96/soup v1.2.5 h1:V/FHiusdTrPrdF4iA1YkVxsOpdNcgvqT1hG+YtcZ5hM github.com/anaskhan96/soup v1.2.5/go.mod h1:6YnEp9A2yywlYdM4EgDz9NEHclocMepEtku7wg6Cq3s= github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 h1:aM1rlcoLz8y5B2r4tTLMiVTrMtpfY0O8EScKJxaSaEc= github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA= -github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= -github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 h1:4nm2G6A4pV9rdlWzGMPv4BNtQp22v1hg3yrtkYpeLl8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 h1:BRXS0U76Z8wfF+bnkilA2QwpIch6URlm++yPUt9QPmQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3/go.mod h1:bNXKFFyaiVvWuR6O16h/I1724+aXe/tAkA9/QS01t5k= -github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k= -github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= +github.com/aws/aws-sdk-go-v2 v1.39.4 h1:qTsQKcdQPHnfGYBBs+Btl8QwxJeoWcOcPcixK90mRhg= +github.com/aws/aws-sdk-go-v2 v1.39.4/go.mod h1:yWSxrnioGUZ4WVv9TgMrNUeLV3PFESn/v+6T/Su8gnM= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2/go.mod h1:IusfVNTmiSN3t4rhxWFaBAqn+mcNdwKtPcV16eYdgko= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 h1:7AANQZkF3ihM8fbdftpjhken0TP9sBzFbV/Ze/Y4HXA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11/go.mod h1:NTF4QCGkm6fzVwncpkFQqoquQyOolcyXfbpC98urj+c= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 h1:ShdtWUZT37LCAA4Mw2kJAJtzaszfSHFb5n25sdcv4YE= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11/go.mod h1:7bUb2sSr2MZ3M/N+VyETLTQtInemHXb/Fl3s8CLzm0Y= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 h1:bKgSxk1TW//00PGQqYmrq83c+2myGidEclp+t9pPqVI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11/go.mod h1:vrPYCQ6rFHL8jzQA8ppu3gWX18zxjLIDGTeqDxkBmSI= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 h1:xtuxji5CS0JknaXoACOunXOYOQzgfTvGAc9s2QdCJA4= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2/go.mod h1:zxwi0DIR0rcRcgdbl7E2MSOvxDyyXGBlScvBkARFaLQ= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 h1:DGFpGybmutVsCuF6vSuLZ25Vh55E3VmsnJmFfjeBx4M= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2/go.mod h1:hm/wU1HDvXCFEDzOLorQnZZ/CVvPXvWEmHMSmqgQRuA= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 h1:GpMf3z2KJa4RnJ0ew3Hac+hRFYLZ9DDjfgXjuW+pB54= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11/go.mod h1:6MZP3ZI4QQsgUCFTwMZA2V0sEriNQ8k2hmoHF3qjimQ= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 h1:weapBOuuFIBEQ9OX/NVW3tFQCvSutyjZYk/ga5jDLPo= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11/go.mod h1:3C1gN4FmIVLwYSh8etngUS+f1viY6nLCDVtZmrFbDy0= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7 h1:Wer3W0GuaedWT7dv/PiWNZGSQFSTcBY2rZpbiUp5xcA= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.7/go.mod h1:UHKgcRSx8PVtvsc1Poxb/Co3PD3wL7P+f49P0+cWtuY= +github.com/aws/smithy-go v1.23.1 h1:sLvcH6dfAFwGkHLZ7dGiYF7aK6mg4CgKA/iDKjLDt9M= +github.com/aws/smithy-go v1.23.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0= github.com/bitfield/gotestdox v0.2.2 h1:x6RcPAbBbErKLnapz1QeAlf3ospg8efBsedU93CDsnE= github.com/bitfield/gotestdox v0.2.2/go.mod h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= @@ -52,8 +52,8 @@ github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0= github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc= -github.com/containerd/containerd/v2 v2.0.5 h1:2vg/TjUXnaohAxiHnthQg8K06L9I4gdYEMcOLiMc8BQ= -github.com/containerd/containerd/v2 v2.0.5/go.mod h1:Qqo0UN43i2fX1FLkrSTCg6zcHNfjN7gEnx3NPRZI+N0= +github.com/containerd/containerd/v2 v2.0.7 h1:55JsNhqP/L7VZOijyfq6Qn0O8Oeff0UizfRuP+2pc90= +github.com/containerd/containerd/v2 v2.0.7/go.mod h1:su8B0Z1NFQMEIztOIbHwy7xtznbCms/kFlfsxIcQrZ8= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -89,12 +89,12 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk= github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE= -github.com/docker/cli v28.3.0+incompatible h1:s+ttruVLhB5ayeuf2BciwDVxYdKi+RoUlxmwNHV3Vfo= -github.com/docker/cli v28.3.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.5.2+incompatible h1:XmG99IHcBmIAoC1PPg9eLBZPlTrNUAijsHLm8PjhBlg= +github.com/docker/cli v28.5.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= 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/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= -github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM= +github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -340,26 +340,26 @@ go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= 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/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= -golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM= -golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= +golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc h1:TS73t7x3KarrNd5qAipmspBDS1rkMcgVG/fS1aRb4Rc= +golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc/go.mod h1:A+z0yzpGtvnG90cToK5n2tu8UJVP2XUATh+r+sfOOOc= 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.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= +golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= 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-20200114155413-6afb5195e5aa/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.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= 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.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= 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-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -371,22 +371,24 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= -golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU= +golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE= +golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= +golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= 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.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= -golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= -golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= +golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= +golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= 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.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= -golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= +golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= +golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= 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= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 97297fdd04..58ea0bf9cf 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -13,15 +13,17 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/containerd/errdefs v1.0.0 // indirect + github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/platforms v1.0.0-rc.1 // indirect github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect github.com/cpuguy83/dockercfg v0.3.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/distribution/reference v0.6.0 // indirect - github.com/docker/cli v28.3.0+incompatible // indirect + github.com/docker/cli v28.5.2+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v28.1.1+incompatible // indirect + github.com/docker/docker v28.5.2+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.3 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect @@ -30,7 +32,6 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/google/go-containerregistry v0.20.5 // indirect github.com/google/uuid v1.6.0 // indirect github.com/klauspost/compress v1.18.0 // indirect @@ -68,9 +69,9 @@ require ( go.opentelemetry.io/otel/metric v1.35.0 // indirect go.opentelemetry.io/otel/trace v1.35.0 // indirect golang.org/x/crypto v0.45.0 // indirect - golang.org/x/sync v0.14.0 // indirect + golang.org/x/sync v0.18.0 // indirect golang.org/x/sys v0.38.0 // indirect - golang.org/x/tools v0.33.0 // indirect + golang.org/x/tools v0.38.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 6d0ab63d5e..f4e229bfa4 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -8,6 +8,10 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= 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/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= +github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= +github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= +github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E= @@ -24,12 +28,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/cli v28.3.0+incompatible h1:s+ttruVLhB5ayeuf2BciwDVxYdKi+RoUlxmwNHV3Vfo= -github.com/docker/cli v28.3.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.5.2+incompatible h1:XmG99IHcBmIAoC1PPg9eLBZPlTrNUAijsHLm8PjhBlg= +github.com/docker/cli v28.5.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= 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/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= -github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM= +github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -47,8 +51,6 @@ 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/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -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.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= @@ -58,8 +60,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA= github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M= -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/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -129,8 +129,6 @@ github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnn github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA= github.com/xeonx/timeago v1.0.0-rc5 h1:pwcQGpaH3eLfPtXeyPA4DmHWjoQt0Ea7/++FwpxqLxg= github.com/xeonx/timeago v1.0.0-rc5/go.mod h1:qDLrYEFynLO7y5Ho7w3GwgtYgpy5UfhcXIIQvMKVDkA= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= @@ -153,28 +151,13 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= -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/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= -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/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.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= -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.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -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/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -185,22 +168,13 @@ golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= -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.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= -golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= -golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= -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.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= -golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= -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/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= +golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= +golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= +golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= 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-20250218202821-56aae31c358a h1:nwKuGPlUAt+aR+pcrkfFRrTU1BVrSmYyYMxYbUIVHr0= google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a/go.mod h1:3kWAYMk1I75K4vykHtKt2ycnOgpA6974V7bREqbsenU= google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 h1:DMTIbak9GhdaSxEjvVzAeNZvyc03I61duqNbnm3SU0M= diff --git a/pkg/docker/credentials.go b/pkg/docker/credentials.go index 7cffe462bc..dc8481da82 100644 --- a/pkg/docker/credentials.go +++ b/pkg/docker/credentials.go @@ -94,7 +94,6 @@ func tryLoadAuthForHost(ctx context.Context, conf *configfile.ConfigFile, host s Username: auth.Username, Password: auth.Password, Auth: auth.Auth, - Email: auth.Email, ServerAddress: host, IdentityToken: auth.IdentityToken, RegistryToken: auth.RegistryToken, diff --git a/pkg/docker/credentials_test.go b/pkg/docker/credentials_test.go index 53a9ce5651..efab0e64b4 100644 --- a/pkg/docker/credentials_test.go +++ b/pkg/docker/credentials_test.go @@ -140,7 +140,6 @@ func TestTryLoadAuthForHost(t *testing.T) { Username: "testuser", Password: "testpass", Auth: "dGVzdHVzZXI6dGVzdHBhc3M=", - Email: "test@example.com", }, }, } @@ -151,7 +150,6 @@ func TestTryLoadAuthForHost(t *testing.T) { assert.Equal(t, "testuser", auth.Username) assert.Equal(t, "testpass", auth.Password) assert.Equal(t, "dGVzdHVzZXI6dGVzdHBhc3M=", auth.Auth) - assert.Equal(t, "test@example.com", auth.Email) assert.Equal(t, "registry.example.com", auth.ServerAddress) }) diff --git a/pkg/docker/docker.go b/pkg/docker/docker.go index 319fa4f9e0..d2ea3995a7 100644 --- a/pkg/docker/docker.go +++ b/pkg/docker/docker.go @@ -10,6 +10,7 @@ import ( "strconv" "strings" + "github.com/containerd/errdefs" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image" @@ -109,7 +110,7 @@ func (c *apiClient) Pull(ctx context.Context, imageRef string, force bool) (*ima Platform: "linux/amd64", }) if err != nil { - if client.IsErrNotFound(err) { + if errdefs.IsNotFound(err) { return nil, &command.NotFoundError{Ref: imageRef, Object: "image"} } return nil, fmt.Errorf("failed to pull image %q: %w", imageRef, err) @@ -135,7 +136,7 @@ func (c *apiClient) ContainerStop(ctx context.Context, containerID string) error Timeout: ptr.To(3), }) if err != nil { - if client.IsErrNotFound(err) { + if errdefs.IsNotFound(err) { return &command.NotFoundError{Ref: containerID, Object: "container"} } return fmt.Errorf("failed to stop container %q: %w", containerID, err) @@ -148,7 +149,7 @@ func (c *apiClient) ContainerInspect(ctx context.Context, containerID string) (* resp, err := c.client.ContainerInspect(ctx, containerID) if err != nil { - if client.IsErrNotFound(err) { + if errdefs.IsNotFound(err) { return nil, &command.NotFoundError{Ref: containerID, Object: "container"} } return nil, fmt.Errorf("failed to inspect container %q: %w", containerID, err) @@ -171,7 +172,7 @@ func (c *apiClient) ContainerLogs(ctx context.Context, containerID string, w io. Follow: true, }) if err != nil { - if client.IsErrNotFound(err) { + if errdefs.IsNotFound(err) { return &command.NotFoundError{Ref: containerID, Object: "container"} } return fmt.Errorf("failed to get container logs for %q: %w", containerID, err) @@ -270,7 +271,7 @@ func (c *apiClient) Inspect(ctx context.Context, ref string) (*image.InspectResp inspect, err := c.client.ImageInspect(ctx, ref) if err != nil { - if client.IsErrNotFound(err) { + if errdefs.IsNotFound(err) { return nil, &command.NotFoundError{Ref: ref, Object: "image"} } return nil, fmt.Errorf("error inspecting image: %w", err) diff --git a/pkg/docker/dockertest/mock_command.go b/pkg/docker/dockertest/mock_command.go index a9ae927d72..e08f68a5d2 100644 --- a/pkg/docker/dockertest/mock_command.go +++ b/pkg/docker/dockertest/mock_command.go @@ -8,6 +8,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image" + dockerspec "github.com/moby/docker-image-spec/specs-go/v1" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/replicate/cog/pkg/docker/command" ) @@ -60,17 +62,19 @@ func (c *MockCommand) CreateAptTarFile(ctx context.Context, tmpDir string, aptTa func (c *MockCommand) Inspect(ctx context.Context, ref string) (*image.InspectResponse, error) { resp := &image.InspectResponse{ - Config: &container.Config{ - Labels: map[string]string{ - command.CogConfigLabelKey: MockCogConfig, - command.CogOpenAPISchemaLabelKey: MockOpenAPISchema, - command.CogVersionLabelKey: "0.11.3", - }, - Env: []string{ - command.R8TorchVersionEnvVarName + "=2.5.0", - command.R8CudaVersionEnvVarName + "=2.4", - command.R8CudnnVersionEnvVarName + "=1.0", - command.R8PythonVersionEnvVarName + "=3.12", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + command.CogConfigLabelKey: MockCogConfig, + command.CogOpenAPISchemaLabelKey: MockOpenAPISchema, + command.CogVersionLabelKey: "0.11.3", + }, + Env: []string{ + command.R8TorchVersionEnvVarName + "=2.5.0", + command.R8CudaVersionEnvVarName + "=2.4", + command.R8CudnnVersionEnvVarName + "=1.0", + command.R8PythonVersionEnvVarName + "=3.12", + }, }, }, } diff --git a/pkg/docker/run_test.go b/pkg/docker/run_test.go index 94b803849a..ca829fee6d 100644 --- a/pkg/docker/run_test.go +++ b/pkg/docker/run_test.go @@ -1,3 +1,4 @@ +//nolint:staticcheck // container.NetworkSettingsBase deprecated but Ports field moving to NetworkSettings in docker v29 package docker import ( diff --git a/pkg/model/ref_types_test.go b/pkg/model/ref_types_test.go index b91198fa00..31271fefc6 100644 --- a/pkg/model/ref_types_test.go +++ b/pkg/model/ref_types_test.go @@ -5,8 +5,9 @@ import ( "errors" "testing" - "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image" + dockerspec "github.com/moby/docker-image-spec/specs-go/v1" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/require" "github.com/replicate/cog/pkg/config" @@ -124,10 +125,12 @@ func TestTagRef_Resolve_Success(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -190,10 +193,12 @@ func TestLocalRef_Resolve_Success(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:local123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.9.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.9.0", + }, }, }, }, nil @@ -298,10 +303,12 @@ func TestBuildRef_Resolve_Success(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:built123", - Config: &container.Config{ - Labels: map[string]string{ - LabelVersion: "0.11.0", - LabelConfig: `{"build":{"gpu":true}}`, + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelVersion: "0.11.0", + LabelConfig: `{"build":{"gpu":true}}`, + }, }, }, }, nil @@ -392,10 +399,14 @@ func TestResolver_Resolve_DispatchesCorrectly(t *testing.T) { localCalled = true return &image.InspectResponse{ ID: "sha256:test", - Config: &container.Config{Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", - }}, + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, + }, + }, }, nil }, } diff --git a/pkg/model/resolver_test.go b/pkg/model/resolver_test.go index 6a93503f4a..9c1ead5c82 100644 --- a/pkg/model/resolver_test.go +++ b/pkg/model/resolver_test.go @@ -10,6 +10,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image" v1 "github.com/google/go-containerregistry/pkg/v1" + dockerspec "github.com/moby/docker-image-spec/specs-go/v1" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/require" "github.com/replicate/cog/pkg/config" @@ -176,10 +178,12 @@ func TestResolver_Inspect_LocalOnly_Found(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -310,10 +314,12 @@ func TestResolver_Inspect_PreferLocal_FoundLocally(t *testing.T) { localCalled = true return &image.InspectResponse{ ID: "sha256:local123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.9.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.9.0", + }, }, }, }, nil @@ -441,10 +447,12 @@ func TestResolver_Inspect_PreferRemote_Fallback(t *testing.T) { localCalled = true return &image.InspectResponse{ ID: "sha256:local123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -528,10 +536,12 @@ func TestResolver_Inspect_ParsesConfigFromLabels(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"gpu":true,"python_version":"3.12"},"predict":"predict.py:Predictor"}`, - LabelVersion: "0.11.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"gpu":true,"python_version":"3.12"},"predict":"predict.py:Predictor"}`, + LabelVersion: "0.11.0", + }, }, }, }, nil @@ -557,9 +567,11 @@ func TestResolver_Inspect_InvalidConfigJSON(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{invalid json`, + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{invalid json`, + }, }, }, }, nil @@ -582,10 +594,12 @@ func TestResolver_Inspect_NoConfigLabel_ReturnsErrNotCogModel(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - // No LabelConfig - just version label - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + // No LabelConfig - just version label + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -608,10 +622,12 @@ func TestResolver_Inspect_NotCogModel(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - // No Cog labels at all - just some random image - "maintainer": "someone@example.com", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + // No Cog labels at all - just some random image + "maintainer": "someone@example.com", + }, }, }, }, nil @@ -636,10 +652,12 @@ func TestResolver_InspectByID_Found(t *testing.T) { require.Equal(t, "9056219a5fb2", ref) return &image.InspectResponse{ ID: "sha256:9056219a5fb2abc123def456", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -667,10 +685,12 @@ func TestResolver_InspectByID_FullSHA(t *testing.T) { require.Equal(t, fullID, ref) return &image.InspectResponse{ ID: fullID, - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -691,10 +711,12 @@ func TestResolver_InspectByID_NotCogModel(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - // No Cog labels - "maintainer": "someone", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + // No Cog labels + "maintainer": "someone", + }, }, }, }, nil @@ -735,10 +757,12 @@ func TestResolver_Pull_AlreadyLocal(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"gpu":false}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"gpu":false}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -775,10 +799,12 @@ func TestResolver_Pull_NotLocal_PullsAndReturns(t *testing.T) { // After pull: found return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"gpu":true}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"gpu":true}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -787,10 +813,12 @@ func TestResolver_Pull_NotLocal_PullsAndReturns(t *testing.T) { pullCalled = true return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"gpu":true}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"gpu":true}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -821,10 +849,12 @@ func TestResolver_Pull_NotCogModel(t *testing.T) { // After pull: found but not a Cog model return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - // Not a Cog model - "some.label": "value", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + // Not a Cog model + "some.label": "value", + }, }, }, }, nil @@ -832,9 +862,11 @@ func TestResolver_Pull_NotCogModel(t *testing.T) { pullFunc: func(ctx context.Context, ref string, force bool) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - "some.label": "value", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + "some.label": "value", + }, }, }, }, nil @@ -923,10 +955,12 @@ func TestResolver_Build_SetsImageFormat(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -955,10 +989,12 @@ func TestResolver_Build_SetsImageFormat(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -1000,10 +1036,12 @@ func TestResolver_Build_SetsImageFormat(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil @@ -1032,10 +1070,12 @@ func TestResolver_Build_SetsImageFormat(t *testing.T) { inspectFunc: func(ctx context.Context, ref string) (*image.InspectResponse, error) { return &image.InspectResponse{ ID: "sha256:abc123", - Config: &container.Config{ - Labels: map[string]string{ - LabelConfig: `{"build":{"python_version":"3.11"}}`, - LabelVersion: "0.10.0", + Config: &dockerspec.DockerOCIImageConfig{ + ImageConfig: ocispec.ImageConfig{ + Labels: map[string]string{ + LabelConfig: `{"build":{"python_version":"3.11"}}`, + LabelVersion: "0.10.0", + }, }, }, }, nil