diff --git a/buildengine/testdata/projects/alpha/go.mod b/buildengine/testdata/projects/alpha/go.mod index 3c3439a0e9..852cde6dfd 100644 --- a/buildengine/testdata/projects/alpha/go.mod +++ b/buildengine/testdata/projects/alpha/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/buildengine/testdata/projects/alpha/go.sum b/buildengine/testdata/projects/alpha/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/buildengine/testdata/projects/alpha/go.sum +++ b/buildengine/testdata/projects/alpha/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/buildengine/testdata/projects/another/go.mod b/buildengine/testdata/projects/another/go.mod index 5987ae2c3b..421aa569f2 100644 --- a/buildengine/testdata/projects/another/go.mod +++ b/buildengine/testdata/projects/another/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/buildengine/testdata/projects/another/go.sum b/buildengine/testdata/projects/another/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/buildengine/testdata/projects/another/go.sum +++ b/buildengine/testdata/projects/another/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/buildengine/testdata/projects/other/go.mod b/buildengine/testdata/projects/other/go.mod index 0dc40c33a7..09d3122763 100644 --- a/buildengine/testdata/projects/other/go.mod +++ b/buildengine/testdata/projects/other/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/buildengine/testdata/projects/other/go.sum b/buildengine/testdata/projects/other/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/buildengine/testdata/projects/other/go.sum +++ b/buildengine/testdata/projects/other/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/examples/go/echo/go.mod b/examples/go/echo/go.mod index bcea550528..2ac4e64903 100644 --- a/examples/go/echo/go.mod +++ b/examples/go/echo/go.mod @@ -12,7 +12,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/examples/go/echo/go.sum b/examples/go/echo/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/examples/go/echo/go.sum +++ b/examples/go/echo/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/go-runtime/compile/testdata/failing/go.mod b/go-runtime/compile/testdata/failing/go.mod index 170e7afd2e..8518a85b9b 100644 --- a/go-runtime/compile/testdata/failing/go.mod +++ b/go-runtime/compile/testdata/failing/go.mod @@ -12,7 +12,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/go-runtime/compile/testdata/failing/go.sum b/go-runtime/compile/testdata/failing/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/go-runtime/compile/testdata/failing/go.sum +++ b/go-runtime/compile/testdata/failing/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/go-runtime/compile/testdata/fsm/go.mod b/go-runtime/compile/testdata/fsm/go.mod index b505979e2f..76f9755194 100644 --- a/go-runtime/compile/testdata/fsm/go.mod +++ b/go-runtime/compile/testdata/fsm/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/go-runtime/compile/testdata/fsm/go.sum b/go-runtime/compile/testdata/fsm/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/go-runtime/compile/testdata/fsm/go.sum +++ b/go-runtime/compile/testdata/fsm/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/go-runtime/compile/testdata/one/go.mod b/go-runtime/compile/testdata/one/go.mod index ec76da0234..9562a5c99a 100644 --- a/go-runtime/compile/testdata/one/go.mod +++ b/go-runtime/compile/testdata/one/go.mod @@ -12,7 +12,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/go-runtime/compile/testdata/one/go.sum b/go-runtime/compile/testdata/one/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/go-runtime/compile/testdata/one/go.sum +++ b/go-runtime/compile/testdata/one/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/go-runtime/compile/testdata/two/go.mod b/go-runtime/compile/testdata/two/go.mod index 46239cae8d..f02d565fb8 100644 --- a/go-runtime/compile/testdata/two/go.mod +++ b/go-runtime/compile/testdata/two/go.mod @@ -12,7 +12,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/go-runtime/compile/testdata/two/go.sum b/go-runtime/compile/testdata/two/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/go-runtime/compile/testdata/two/go.sum +++ b/go-runtime/compile/testdata/two/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/go.mod b/go.mod index 858e63f0b8..e00a039672 100644 --- a/go.mod +++ b/go.mod @@ -15,12 +15,13 @@ require ( github.com/alecthomas/kong v0.9.0 github.com/alecthomas/kong-toml v0.2.0 github.com/alecthomas/participle/v2 v2.1.1 - github.com/alecthomas/types v0.14.0 + github.com/alecthomas/types v0.15.0 github.com/amacneil/dbmate/v2 v2.15.0 github.com/beevik/etree v1.4.0 github.com/bmatcuk/doublestar/v4 v4.6.1 github.com/deckarep/golang-set/v2 v2.6.0 github.com/docker/docker v25.0.5+incompatible + github.com/docker/go-connections v0.5.0 github.com/go-logr/logr v1.4.1 github.com/gofrs/flock v0.8.1 github.com/golang/protobuf v1.5.4 @@ -65,7 +66,6 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/distribution/reference v0.5.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/gogo/protobuf v1.3.2 // indirect diff --git a/go.sum b/go.sum index 2827553d95..15b00189fd 100644 --- a/go.sum +++ b/go.sum @@ -30,8 +30,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/amacneil/dbmate/v2 v2.15.0 h1:s5NVssvrdRMUTQI8YGMsIfdmZCmCPDsdqncj3XsMfjk= diff --git a/integration/testdata/go/cron/go.mod b/integration/testdata/go/cron/go.mod index da611f6802..a6afc95e03 100644 --- a/integration/testdata/go/cron/go.mod +++ b/integration/testdata/go/cron/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/cron/go.sum b/integration/testdata/go/cron/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/integration/testdata/go/cron/go.sum +++ b/integration/testdata/go/cron/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/database/go.mod b/integration/testdata/go/database/go.mod index 93fbba8ceb..a57716b1af 100644 --- a/integration/testdata/go/database/go.mod +++ b/integration/testdata/go/database/go.mod @@ -17,7 +17,7 @@ require ( github.com/alecthomas/kong v0.9.0 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/repr v0.4.0 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/database/go.sum b/integration/testdata/go/database/go.sum index 274b52ab16..502d64e9d3 100644 --- a/integration/testdata/go/database/go.sum +++ b/integration/testdata/go/database/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/echo/go.mod b/integration/testdata/go/echo/go.mod index abdc1e8c21..b66b1a3b4b 100644 --- a/integration/testdata/go/echo/go.mod +++ b/integration/testdata/go/echo/go.mod @@ -12,7 +12,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/echo/go.sum b/integration/testdata/go/echo/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/integration/testdata/go/echo/go.sum +++ b/integration/testdata/go/echo/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/httpingress/go.mod b/integration/testdata/go/httpingress/go.mod index c9c2f2f96d..43739909ad 100644 --- a/integration/testdata/go/httpingress/go.mod +++ b/integration/testdata/go/httpingress/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/httpingress/go.sum b/integration/testdata/go/httpingress/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/integration/testdata/go/httpingress/go.sum +++ b/integration/testdata/go/httpingress/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/leases/go.mod b/integration/testdata/go/leases/go.mod index 37406fd268..529b4e66ef 100644 --- a/integration/testdata/go/leases/go.mod +++ b/integration/testdata/go/leases/go.mod @@ -12,7 +12,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/leases/go.sum b/integration/testdata/go/leases/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/integration/testdata/go/leases/go.sum +++ b/integration/testdata/go/leases/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/notexportedverb/go.mod b/integration/testdata/go/notexportedverb/go.mod index d1716663a4..f5eaf52ad4 100644 --- a/integration/testdata/go/notexportedverb/go.mod +++ b/integration/testdata/go/notexportedverb/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/notexportedverb/go.sum b/integration/testdata/go/notexportedverb/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/integration/testdata/go/notexportedverb/go.sum +++ b/integration/testdata/go/notexportedverb/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/omitempty/go.mod b/integration/testdata/go/omitempty/go.mod index 182a5b7f84..e882860c1e 100644 --- a/integration/testdata/go/omitempty/go.mod +++ b/integration/testdata/go/omitempty/go.mod @@ -10,7 +10,7 @@ require ( connectrpc.com/otelconnect v0.7.0 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/omitempty/go.sum b/integration/testdata/go/omitempty/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/integration/testdata/go/omitempty/go.sum +++ b/integration/testdata/go/omitempty/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/runtimereflection/go.mod b/integration/testdata/go/runtimereflection/go.mod index 9cc608064a..80a7a37541 100644 --- a/integration/testdata/go/runtimereflection/go.mod +++ b/integration/testdata/go/runtimereflection/go.mod @@ -14,7 +14,7 @@ require ( github.com/alecthomas/concurrency v0.0.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/repr v0.4.0 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/runtimereflection/go.sum b/integration/testdata/go/runtimereflection/go.sum index 48ca09fb84..ef44aba8ee 100644 --- a/integration/testdata/go/runtimereflection/go.sum +++ b/integration/testdata/go/runtimereflection/go.sum @@ -12,8 +12,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/verbtypes/go.mod b/integration/testdata/go/verbtypes/go.mod index ea93d1fac1..700e6946c2 100644 --- a/integration/testdata/go/verbtypes/go.mod +++ b/integration/testdata/go/verbtypes/go.mod @@ -19,7 +19,7 @@ require ( github.com/alecthomas/kong v0.9.0 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/repr v0.4.0 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/verbtypes/go.sum b/integration/testdata/go/verbtypes/go.sum index 274b52ab16..502d64e9d3 100644 --- a/integration/testdata/go/verbtypes/go.sum +++ b/integration/testdata/go/verbtypes/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/integration/testdata/go/wrapped/go.mod b/integration/testdata/go/wrapped/go.mod index e207cb9ad4..f8a615a6ca 100644 --- a/integration/testdata/go/wrapped/go.mod +++ b/integration/testdata/go/wrapped/go.mod @@ -17,7 +17,7 @@ require ( github.com/alecthomas/kong v0.9.0 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/repr v0.4.0 // indirect - github.com/alecthomas/types v0.14.0 // indirect + github.com/alecthomas/types v0.15.0 // indirect github.com/alessio/shellescape v1.4.2 // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/integration/testdata/go/wrapped/go.sum b/integration/testdata/go/wrapped/go.sum index 274b52ab16..502d64e9d3 100644 --- a/integration/testdata/go/wrapped/go.sum +++ b/integration/testdata/go/wrapped/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/alecthomas/types v0.14.0 h1:4pCdEWVctLZQP9dE48fCyXWYkcoQtkf1EAxx9xGfCRY= -github.com/alecthomas/types v0.14.0/go.mod h1:fIOGnLeeUJXe1AAVofQmMaEMWLxY9bK4QxTLGIo30PA= +github.com/alecthomas/types v0.15.0 h1:jEU6sKdzA09bvrgM0RbgtorGTEzmbXrZetdZt1muZg8= +github.com/alecthomas/types v0.15.0/go.mod h1:0sfhvzmxpRjEmC6hamErjOEcknTpVZmHKhjplgn6k40= github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/bool64/dev v0.2.34 h1:P9n315P8LdpxusnYQ0X7MP1CZXwBK5ae5RZrd+GdSZE= diff --git a/internal/container/container.go b/internal/container/container.go index 01355c3746..149b5e55a1 100644 --- a/internal/container/container.go +++ b/internal/container/container.go @@ -6,9 +6,9 @@ import ( "io" "os" "strconv" - "sync" "time" + "github.com/alecthomas/types/once" "github.com/alecthomas/types/optional" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" @@ -19,23 +19,12 @@ import ( "github.com/TBD54566975/ftl/internal/log" ) -var ( - dockerClient *client.Client - dockerClientOnce sync.Once - - errDockerClient error -) - -func newClient() (*client.Client, error) { - dockerClientOnce.Do(func() { - dockerClient, errDockerClient = client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) - }) - - return dockerClient, errDockerClient -} +var dockerClient = once.Once(func(ctx context.Context) (*client.Client, error) { + return client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation()) +}) func DoesExist(ctx context.Context, name string) (bool, error) { - cli, err := newClient() + cli, err := dockerClient.Get(ctx) if err != nil { return false, err } @@ -53,7 +42,7 @@ func DoesExist(ctx context.Context, name string) (bool, error) { // Run starts a new detached container with the given image, name, port map, and (optional) volume mount. func Run(ctx context.Context, image, name string, hostPort, containerPort int, volume optional.Option[string]) error { - cli, err := newClient() + cli, err := dockerClient.Get(ctx) if err != nil { return err } @@ -94,7 +83,7 @@ func Run(ctx context.Context, image, name string, hostPort, containerPort int, v // RunDB runs a new detached postgres container with the given name and exposed port. func RunDB(ctx context.Context, name string, port int) error { - cli, err := newClient() + cli, err := dockerClient.Get(ctx) if err != nil { return err } @@ -141,7 +130,7 @@ func RunDB(ctx context.Context, name string, port int) error { // Start starts an existing container with the given name. func Start(ctx context.Context, name string) error { - cli, err := newClient() + cli, err := dockerClient.Get(ctx) if err != nil { return err } @@ -159,7 +148,7 @@ func Exec(ctx context.Context, name string, command ...string) error { logger := log.FromContext(ctx) logger.Debugf("Running command %q in container %q", command, name) - cli, err := newClient() + cli, err := dockerClient.Get(ctx) if err != nil { return err } @@ -202,7 +191,7 @@ func Exec(ctx context.Context, name string, command ...string) error { // GetContainerPort returns the host TCP port of the given container's exposed port. func GetContainerPort(ctx context.Context, name string, port int) (int, error) { - cli, err := newClient() + cli, err := dockerClient.Get(ctx) if err != nil { return 0, err } @@ -230,7 +219,7 @@ func PollContainerHealth(ctx context.Context, containerName string, timeout time logger := log.FromContext(ctx) logger.Debugf("Waiting for %s to be healthy", containerName) - cli, err := newClient() + cli, err := dockerClient.Get(ctx) if err != nil { return err }