diff --git a/go.mod b/go.mod index 0245810f..0f1567c7 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/pivotal-cf/kiln go 1.23 +toolchain go1.23.2 + require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/avvmoto/buf-readerat v0.0.0-20171115124131-a17c8cb89270 @@ -20,11 +22,11 @@ require ( github.com/google/go-github/v50 v50.2.0 github.com/julienschmidt/httprouter v1.3.0 github.com/masterminds/sprig v2.22.0+incompatible - github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0 + github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 github.com/migueleliasweb/go-github-mock v0.0.16 github.com/moby/buildkit v0.12.5 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.27.10 + github.com/onsi/gomega v1.34.2 github.com/opencontainers/image-spec v1.1.0 github.com/pivotal-cf-experimental/gomegamatchers v0.0.0-20180326192815-e36bfcc98c3a github.com/pivotal-cf/go-pivnet/v7 v7.0.2 @@ -32,10 +34,10 @@ require ( github.com/pivotal-cf/om v0.0.0-20230707145702-e2ef8fd451b1 github.com/snabb/httpreaderat v1.0.1 github.com/stretchr/testify v1.8.4 - golang.org/x/crypto v0.21.0 + golang.org/x/crypto v0.28.0 golang.org/x/oauth2 v0.16.0 - golang.org/x/sync v0.6.0 - golang.org/x/term v0.18.0 + golang.org/x/sync v0.8.0 + golang.org/x/term v0.25.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -68,7 +70,7 @@ require ( github.com/fatih/color v1.15.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect - github.com/go-logr/logr v1.4.1 // indirect + 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.3.0 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect @@ -118,17 +120,17 @@ require ( go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/sdk v1.21.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect - golang.org/x/mod v0.15.0 // indirect - golang.org/x/net v0.21.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.18.0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect + golang.org/x/tools v0.26.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240221002015-b0ce06bbee7c // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect google.golang.org/grpc v1.62.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index 12c618f8..754515bc 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBj github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= 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/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/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/go-ole/go-ole v0.0.0-20180625085808-7a0fa49edf48/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= @@ -246,7 +246,8 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -321,8 +322,8 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230811205829-9131a7e9cc17 h1:0h35ESZ02+hN/MFZb7XZOXg+Rl9+Rk8fBIf5YLws9gA= -github.com/google/pprof v0.0.0-20230811205829-9131a7e9cc17/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/readahead v0.0.0-20161222183148-eaceba169032/go.mod h1:qYysrqQXuV4tzsizt4oOQ6mrBZQ0xnQXP3ylXX8Jk5Y= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= @@ -431,8 +432,8 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0 h1:rBhB9Rls+yb8kA4x5a/cWxOufWfXt24E+kq4YlbGj3g= -github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0/go.mod h1:fJ0UAZc1fx3xZhU4eSHQDJ1ApFmTVhp5VTpV9tm2ogg= +github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0 h1:9WsegDYiSKtZXru+NcOB4z7iqb00n4atjmQlyy5TRXI= +github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0/go.mod h1:TeVdzh+5QB5IpWDJAU/uviXA6kOg9yXzLrrjeLKJXqY= github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU= github.com/migueleliasweb/go-github-mock v0.0.16 h1:iEx6iqYASRJVoEO5eMOYpQZFTc00cZ6ysynOArUKM3A= github.com/migueleliasweb/go-github-mock v0.0.16/go.mod h1:CjrgPd8s5sf5g3XSESAQqxufae+PZbgM/F317C3uD7g= @@ -468,8 +469,8 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= -github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= +github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo= +github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/gomega v1.4.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -479,8 +480,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= -github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= 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.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= @@ -626,8 +627,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -662,8 +663,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180712202826-d0887baf81f4/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -710,8 +711,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -734,8 +735,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/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/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180709060233-1b2967e3c290/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -797,8 +798,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= @@ -806,8 +807,8 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -820,8 +821,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -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/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -880,8 +881,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= -golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= 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= @@ -984,8 +985,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/builder/fakes/zipper.go b/internal/builder/fakes/zipper.go index 49e02b43..45245e71 100644 --- a/internal/builder/fakes/zipper.go +++ b/internal/builder/fakes/zipper.go @@ -3,7 +3,7 @@ package fakes import ( "io" - "io/fs" + "os" "sync" "time" ) @@ -21,12 +21,12 @@ type Zipper struct { addReturnsOnCall map[int]struct { result1 error } - AddWithModeStub func(string, io.Reader, fs.FileMode) error + AddWithModeStub func(string, io.Reader, os.FileMode) error addWithModeMutex sync.RWMutex addWithModeArgsForCall []struct { arg1 string arg2 io.Reader - arg3 fs.FileMode + arg3 os.FileMode } addWithModeReturns struct { result1 error @@ -131,13 +131,13 @@ func (fake *Zipper) AddReturnsOnCall(i int, result1 error) { }{result1} } -func (fake *Zipper) AddWithMode(arg1 string, arg2 io.Reader, arg3 fs.FileMode) error { +func (fake *Zipper) AddWithMode(arg1 string, arg2 io.Reader, arg3 os.FileMode) error { fake.addWithModeMutex.Lock() ret, specificReturn := fake.addWithModeReturnsOnCall[len(fake.addWithModeArgsForCall)] fake.addWithModeArgsForCall = append(fake.addWithModeArgsForCall, struct { arg1 string arg2 io.Reader - arg3 fs.FileMode + arg3 os.FileMode }{arg1, arg2, arg3}) stub := fake.AddWithModeStub fakeReturns := fake.addWithModeReturns @@ -158,13 +158,13 @@ func (fake *Zipper) AddWithModeCallCount() int { return len(fake.addWithModeArgsForCall) } -func (fake *Zipper) AddWithModeCalls(stub func(string, io.Reader, fs.FileMode) error) { +func (fake *Zipper) AddWithModeCalls(stub func(string, io.Reader, os.FileMode) error) { fake.addWithModeMutex.Lock() defer fake.addWithModeMutex.Unlock() fake.AddWithModeStub = stub } -func (fake *Zipper) AddWithModeArgsForCall(i int) (string, io.Reader, fs.FileMode) { +func (fake *Zipper) AddWithModeArgsForCall(i int) (string, io.Reader, os.FileMode) { fake.addWithModeMutex.RLock() defer fake.addWithModeMutex.RUnlock() argsForCall := fake.addWithModeArgsForCall[i] diff --git a/internal/commands/fakes/filesystem.go b/internal/commands/fakes/filesystem.go index 8064ef3a..6ef3d3b7 100644 --- a/internal/commands/fakes/filesystem.go +++ b/internal/commands/fakes/filesystem.go @@ -2,7 +2,7 @@ package fakes import ( - "io/fs" + "os" "sync" billy "github.com/go-git/go-billy/v5" @@ -34,11 +34,11 @@ type FileSystem struct { joinReturnsOnCall map[int]struct { result1 string } - MkdirAllStub func(string, fs.FileMode) error + MkdirAllStub func(string, os.FileMode) error mkdirAllMutex sync.RWMutex mkdirAllArgsForCall []struct { arg1 string - arg2 fs.FileMode + arg2 os.FileMode } mkdirAllReturns struct { result1 error @@ -59,12 +59,12 @@ type FileSystem struct { result1 billy.File result2 error } - OpenFileStub func(string, int, fs.FileMode) (billy.File, error) + OpenFileStub func(string, int, os.FileMode) (billy.File, error) openFileMutex sync.RWMutex openFileArgsForCall []struct { arg1 string arg2 int - arg3 fs.FileMode + arg3 os.FileMode } openFileReturns struct { result1 billy.File @@ -74,17 +74,17 @@ type FileSystem struct { result1 billy.File result2 error } - ReadDirStub func(string) ([]fs.FileInfo, error) + ReadDirStub func(string) ([]os.FileInfo, error) readDirMutex sync.RWMutex readDirArgsForCall []struct { arg1 string } readDirReturns struct { - result1 []fs.FileInfo + result1 []os.FileInfo result2 error } readDirReturnsOnCall map[int]struct { - result1 []fs.FileInfo + result1 []os.FileInfo result2 error } RemoveStub func(string) error @@ -110,17 +110,17 @@ type FileSystem struct { renameReturnsOnCall map[int]struct { result1 error } - StatStub func(string) (fs.FileInfo, error) + StatStub func(string) (os.FileInfo, error) statMutex sync.RWMutex statArgsForCall []struct { arg1 string } statReturns struct { - result1 fs.FileInfo + result1 os.FileInfo result2 error } statReturnsOnCall map[int]struct { - result1 fs.FileInfo + result1 os.FileInfo result2 error } invocations map[string][][]interface{} @@ -252,12 +252,12 @@ func (fake *FileSystem) JoinReturnsOnCall(i int, result1 string) { }{result1} } -func (fake *FileSystem) MkdirAll(arg1 string, arg2 fs.FileMode) error { +func (fake *FileSystem) MkdirAll(arg1 string, arg2 os.FileMode) error { fake.mkdirAllMutex.Lock() ret, specificReturn := fake.mkdirAllReturnsOnCall[len(fake.mkdirAllArgsForCall)] fake.mkdirAllArgsForCall = append(fake.mkdirAllArgsForCall, struct { arg1 string - arg2 fs.FileMode + arg2 os.FileMode }{arg1, arg2}) stub := fake.MkdirAllStub fakeReturns := fake.mkdirAllReturns @@ -278,13 +278,13 @@ func (fake *FileSystem) MkdirAllCallCount() int { return len(fake.mkdirAllArgsForCall) } -func (fake *FileSystem) MkdirAllCalls(stub func(string, fs.FileMode) error) { +func (fake *FileSystem) MkdirAllCalls(stub func(string, os.FileMode) error) { fake.mkdirAllMutex.Lock() defer fake.mkdirAllMutex.Unlock() fake.MkdirAllStub = stub } -func (fake *FileSystem) MkdirAllArgsForCall(i int) (string, fs.FileMode) { +func (fake *FileSystem) MkdirAllArgsForCall(i int) (string, os.FileMode) { fake.mkdirAllMutex.RLock() defer fake.mkdirAllMutex.RUnlock() argsForCall := fake.mkdirAllArgsForCall[i] @@ -378,13 +378,13 @@ func (fake *FileSystem) OpenReturnsOnCall(i int, result1 billy.File, result2 err }{result1, result2} } -func (fake *FileSystem) OpenFile(arg1 string, arg2 int, arg3 fs.FileMode) (billy.File, error) { +func (fake *FileSystem) OpenFile(arg1 string, arg2 int, arg3 os.FileMode) (billy.File, error) { fake.openFileMutex.Lock() ret, specificReturn := fake.openFileReturnsOnCall[len(fake.openFileArgsForCall)] fake.openFileArgsForCall = append(fake.openFileArgsForCall, struct { arg1 string arg2 int - arg3 fs.FileMode + arg3 os.FileMode }{arg1, arg2, arg3}) stub := fake.OpenFileStub fakeReturns := fake.openFileReturns @@ -405,13 +405,13 @@ func (fake *FileSystem) OpenFileCallCount() int { return len(fake.openFileArgsForCall) } -func (fake *FileSystem) OpenFileCalls(stub func(string, int, fs.FileMode) (billy.File, error)) { +func (fake *FileSystem) OpenFileCalls(stub func(string, int, os.FileMode) (billy.File, error)) { fake.openFileMutex.Lock() defer fake.openFileMutex.Unlock() fake.OpenFileStub = stub } -func (fake *FileSystem) OpenFileArgsForCall(i int) (string, int, fs.FileMode) { +func (fake *FileSystem) OpenFileArgsForCall(i int) (string, int, os.FileMode) { fake.openFileMutex.RLock() defer fake.openFileMutex.RUnlock() argsForCall := fake.openFileArgsForCall[i] @@ -444,7 +444,7 @@ func (fake *FileSystem) OpenFileReturnsOnCall(i int, result1 billy.File, result2 }{result1, result2} } -func (fake *FileSystem) ReadDir(arg1 string) ([]fs.FileInfo, error) { +func (fake *FileSystem) ReadDir(arg1 string) ([]os.FileInfo, error) { fake.readDirMutex.Lock() ret, specificReturn := fake.readDirReturnsOnCall[len(fake.readDirArgsForCall)] fake.readDirArgsForCall = append(fake.readDirArgsForCall, struct { @@ -469,7 +469,7 @@ func (fake *FileSystem) ReadDirCallCount() int { return len(fake.readDirArgsForCall) } -func (fake *FileSystem) ReadDirCalls(stub func(string) ([]fs.FileInfo, error)) { +func (fake *FileSystem) ReadDirCalls(stub func(string) ([]os.FileInfo, error)) { fake.readDirMutex.Lock() defer fake.readDirMutex.Unlock() fake.ReadDirStub = stub @@ -482,28 +482,28 @@ func (fake *FileSystem) ReadDirArgsForCall(i int) string { return argsForCall.arg1 } -func (fake *FileSystem) ReadDirReturns(result1 []fs.FileInfo, result2 error) { +func (fake *FileSystem) ReadDirReturns(result1 []os.FileInfo, result2 error) { fake.readDirMutex.Lock() defer fake.readDirMutex.Unlock() fake.ReadDirStub = nil fake.readDirReturns = struct { - result1 []fs.FileInfo + result1 []os.FileInfo result2 error }{result1, result2} } -func (fake *FileSystem) ReadDirReturnsOnCall(i int, result1 []fs.FileInfo, result2 error) { +func (fake *FileSystem) ReadDirReturnsOnCall(i int, result1 []os.FileInfo, result2 error) { fake.readDirMutex.Lock() defer fake.readDirMutex.Unlock() fake.ReadDirStub = nil if fake.readDirReturnsOnCall == nil { fake.readDirReturnsOnCall = make(map[int]struct { - result1 []fs.FileInfo + result1 []os.FileInfo result2 error }) } fake.readDirReturnsOnCall[i] = struct { - result1 []fs.FileInfo + result1 []os.FileInfo result2 error }{result1, result2} } @@ -631,7 +631,7 @@ func (fake *FileSystem) RenameReturnsOnCall(i int, result1 error) { }{result1} } -func (fake *FileSystem) Stat(arg1 string) (fs.FileInfo, error) { +func (fake *FileSystem) Stat(arg1 string) (os.FileInfo, error) { fake.statMutex.Lock() ret, specificReturn := fake.statReturnsOnCall[len(fake.statArgsForCall)] fake.statArgsForCall = append(fake.statArgsForCall, struct { @@ -656,7 +656,7 @@ func (fake *FileSystem) StatCallCount() int { return len(fake.statArgsForCall) } -func (fake *FileSystem) StatCalls(stub func(string) (fs.FileInfo, error)) { +func (fake *FileSystem) StatCalls(stub func(string) (os.FileInfo, error)) { fake.statMutex.Lock() defer fake.statMutex.Unlock() fake.StatStub = stub @@ -669,28 +669,28 @@ func (fake *FileSystem) StatArgsForCall(i int) string { return argsForCall.arg1 } -func (fake *FileSystem) StatReturns(result1 fs.FileInfo, result2 error) { +func (fake *FileSystem) StatReturns(result1 os.FileInfo, result2 error) { fake.statMutex.Lock() defer fake.statMutex.Unlock() fake.StatStub = nil fake.statReturns = struct { - result1 fs.FileInfo + result1 os.FileInfo result2 error }{result1, result2} } -func (fake *FileSystem) StatReturnsOnCall(i int, result1 fs.FileInfo, result2 error) { +func (fake *FileSystem) StatReturnsOnCall(i int, result1 os.FileInfo, result2 error) { fake.statMutex.Lock() defer fake.statMutex.Unlock() fake.StatStub = nil if fake.statReturnsOnCall == nil { fake.statReturnsOnCall = make(map[int]struct { - result1 fs.FileInfo + result1 os.FileInfo result2 error }) } fake.statReturnsOnCall[i] = struct { - result1 fs.FileInfo + result1 os.FileInfo result2 error }{result1, result2} } diff --git a/internal/commands/fakes/test_tile_function.go b/internal/commands/fakes/test_tile_function.go index 2fe5e67f..99351a0e 100644 --- a/internal/commands/fakes/test_tile_function.go +++ b/internal/commands/fakes/test_tile_function.go @@ -6,6 +6,7 @@ import ( "io" "sync" + "github.com/pivotal-cf/kiln/internal/commands" "github.com/pivotal-cf/kiln/internal/test" ) @@ -37,7 +38,7 @@ func (fake *TestTileFunction) Spy(arg1 context.Context, arg2 io.Writer, arg3 tes }{arg1, arg2, arg3}) stub := fake.Stub returns := fake.returns - fake.recordInvocation("tileTestFunction", []interface{}{arg1, arg2, arg3}) + fake.recordInvocation("TileTestFunction", []interface{}{arg1, arg2, arg3}) fake.mutex.Unlock() if stub != nil { return stub(arg1, arg2, arg3) @@ -112,3 +113,5 @@ func (fake *TestTileFunction) recordInvocation(key string, args []interface{}) { } fake.invocations[key] = append(fake.invocations[key], args) } + +var _ commands.TileTestFunction = new(TestTileFunction).Spy diff --git a/internal/commands/release_notes.go b/internal/commands/release_notes.go index 7cb1f3b4..e73028f1 100644 --- a/internal/commands/release_notes.go +++ b/internal/commands/release_notes.go @@ -114,7 +114,6 @@ func (r ReleaseNotes) Execute(args []string) error { trainstatClient := notes.NewTrainstatClient(r.Options.TrainstatQuery.TrainstatURL) - _ = notes.FetchData // fetchNotesData is github.com/pivotal/kiln/internal/notes.FetchData data, err := r.fetchNotesData(ctx, r.repository, client, r.repoHost, r.repoOwner, r.repoName, r.Options.Kilnfile, diff --git a/internal/commands/test_tile.go b/internal/commands/test_tile.go index 996e1321..74361f31 100644 --- a/internal/commands/test_tile.go +++ b/internal/commands/test_tile.go @@ -12,6 +12,7 @@ import ( "github.com/pivotal-cf/kiln/internal/test" ) +//counterfeiter:generate -o ./fakes/test_tile_function.go --fake-name TestTileFunction . TileTestFunction type TileTestFunction func(ctx context.Context, w io.Writer, configuration test.Configuration) error type TileTest struct { diff --git a/internal/commands/test_tile_test.go b/internal/commands/test_tile_test.go index 69aceab2..871ad6c0 100644 --- a/internal/commands/test_tile_test.go +++ b/internal/commands/test_tile_test.go @@ -26,12 +26,11 @@ func init() { // counterfeiter does not handle publicly exported type function spy generation super well. // So I am telling it to generate the spy off of a private type alias. This works but is a bit confusing. // -//counterfeiter:generate -o ./fakes/test_tile_function.go --fake-name TestTileFunction . tileTestFunction // nolint:unused // //goland:noinspection GoUnusedType -type tileTestFunction = commands.TileTestFunction +// type tileTestFunction = commands.TileTestFunction var _ = Describe("kiln test", func() { var output bytes.Buffer