diff --git a/go.mod b/go.mod index 0f799d01..2e42215f 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,15 @@ module code.cloudfoundry.org/tps -go 1.26 +go 1.26.0 require ( code.cloudfoundry.org/bbs v0.0.0-20251029140956-4e01df8b0ac1 code.cloudfoundry.org/clock v1.75.0 - code.cloudfoundry.org/debugserver v0.101.0 + code.cloudfoundry.org/debugserver v0.102.0 code.cloudfoundry.org/diego-logging-client v0.112.0 - code.cloudfoundry.org/lager/v3 v3.73.0 + code.cloudfoundry.org/lager/v3 v3.74.0 code.cloudfoundry.org/localip v0.75.0 - code.cloudfoundry.org/locket v0.1.0 + code.cloudfoundry.org/locket v1.2.0 code.cloudfoundry.org/runtimeschema v0.0.0-20240514235758-31be7684c5bf code.cloudfoundry.org/workpool v0.0.0-20250911194158-1489753f182e github.com/cloudfoundry/dropsonde v1.1.0 @@ -21,10 +21,10 @@ require ( require ( code.cloudfoundry.org/cfhttp/v2 v2.0.1-0.20210513172332-4c5ee488a657 // indirect - code.cloudfoundry.org/durationjson v0.76.0 // indirect + code.cloudfoundry.org/durationjson v0.77.0 // indirect code.cloudfoundry.org/go-diodes v0.0.0-20260615142411-472d6bcdb3c6 // indirect code.cloudfoundry.org/go-loggregator/v9 v9.2.1 // indirect - code.cloudfoundry.org/tlsconfig v0.59.0 // indirect + code.cloudfoundry.org/tlsconfig v0.60.0 // indirect filippo.io/edwards25519 v1.2.0 // indirect github.com/Masterminds/semver/v3 v3.5.0 // indirect github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect @@ -42,7 +42,7 @@ require ( github.com/square/certstrap v1.3.0 // indirect github.com/tedsuo/rata v1.0.0 // indirect github.com/vito/go-sse v1.0.0 // indirect - go.step.sm/crypto v0.82.0 // indirect + go.step.sm/crypto v0.83.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.53.0 // indirect golang.org/x/mod v0.37.0 // indirect @@ -51,7 +51,7 @@ require ( golang.org/x/sys v0.46.0 // indirect golang.org/x/text v0.38.0 // indirect golang.org/x/tools v0.46.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260615183401-62b3387ff324 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260618152121-87f3d3e198d3 // indirect google.golang.org/grpc v1.81.1 // indirect google.golang.org/protobuf v1.36.11 // indirect ) diff --git a/go.sum b/go.sum index 28bd6130..07d84449 100644 --- a/go.sum +++ b/go.sum @@ -598,26 +598,26 @@ code.cloudfoundry.org/cfhttp/v2 v2.0.1-0.20210513172332-4c5ee488a657 h1:8rnhkeAe code.cloudfoundry.org/cfhttp/v2 v2.0.1-0.20210513172332-4c5ee488a657/go.mod h1:Fwt0o/haXfwgOHMom4AM96pXCVw9EAiIcSsPb8hWK9s= code.cloudfoundry.org/clock v1.75.0 h1:3j+bs2xW5d/MRbzICzzaXYnlWTSczbFXmczPYRrXrtg= code.cloudfoundry.org/clock v1.75.0/go.mod h1:pM1eBumw5K6fXZCY2QhZz7B6qrPz33qus1OM4cd98X8= -code.cloudfoundry.org/debugserver v0.101.0 h1:d40Cfq42MfOuptuJUw3cgn9gVkk7xniTnPADXqbraXg= -code.cloudfoundry.org/debugserver v0.101.0/go.mod h1:zguK9q69fQPdBY41zg1/BwTdlBVSSWxnxqWOqp3gvKU= +code.cloudfoundry.org/debugserver v0.102.0 h1:4gvjQFQjJ8GZtmJ5VZyzpHA3E1VWA3Fg05yWLtpxcfc= +code.cloudfoundry.org/debugserver v0.102.0/go.mod h1:/7/tR0/w4DCO/yzcXhGq4vQ3l5PjzZtLxx3b+qRnTiw= code.cloudfoundry.org/diego-logging-client v0.112.0 h1:fDhCXXvxrmnGX0nhyLq/RAyg4vwowu6AdMUk4yG4r28= code.cloudfoundry.org/diego-logging-client v0.112.0/go.mod h1:6U9byQeSUB4RPJ7Kl+uueZHI0EEpKw2SvrJg1u/akB8= -code.cloudfoundry.org/durationjson v0.76.0 h1:qDz92nsNbYG4pjE2svcD6bgXUi73JnoymbuzmG9s254= -code.cloudfoundry.org/durationjson v0.76.0/go.mod h1:Rv8egevccRCjacdnoYZ72ycsxYlF0kfb8GoSAKV0RBE= +code.cloudfoundry.org/durationjson v0.77.0 h1:zuc+ErAZLAkgxfokX+UUj+fCv7BsHA8c/C+PkL97dMQ= +code.cloudfoundry.org/durationjson v0.77.0/go.mod h1:caSqCDeaMprtHaZbQVLi4bCErrkpmtyZHb078UP2taw= code.cloudfoundry.org/go-diodes v0.0.0-20260615142411-472d6bcdb3c6 h1:qx0MWo0/qbKFBGgrmxJ8WonNkHBAY7NgLd7JBMryC3o= code.cloudfoundry.org/go-diodes v0.0.0-20260615142411-472d6bcdb3c6/go.mod h1:YkoAN1rki1xahGvAkpa36KvoEbLSXmM6Eh3iZZuRLaE= code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrUA3GFPYDxy56Fk= code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8= -code.cloudfoundry.org/lager/v3 v3.73.0 h1:yNn39cqgoCMAzc/Vh4uMtfP1x+loXt8b7CjyXCrYx14= -code.cloudfoundry.org/lager/v3 v3.73.0/go.mod h1:iQ1VKsduqY7PtaNaso+HbOTsAdBvKM+0AuZZSP7TagM= +code.cloudfoundry.org/lager/v3 v3.74.0 h1:gRJj1CAI4hjfPYmynLKADvVTnlIbAz0W+YGRQqPQuRs= +code.cloudfoundry.org/lager/v3 v3.74.0/go.mod h1:LXtRzpY16oMUJ46zxyRgB/touvG7Ltklt1tWbV4VwzI= code.cloudfoundry.org/localip v0.75.0 h1:GxzG5KnakrBE3NFbbPw2ymzJ8iyVol0aAoS/b5g0bAE= code.cloudfoundry.org/localip v0.75.0/go.mod h1:6V/acPHCL+JR6b7oqSqE7oTJhwjb0Fu+ucQw+OEVfx4= -code.cloudfoundry.org/locket v0.1.0 h1:m/rClHRORvlmbbhGNsAx3Tq+4ZDqrfRrgTRqnCzXI5s= -code.cloudfoundry.org/locket v0.1.0/go.mod h1:WK2FjCWfxxPtlHkeLwzTLvDTB/////GdeiCVbENklvc= +code.cloudfoundry.org/locket v1.2.0 h1:/pn0IWr3Mnz7YUr/HlKkBXcsRZZ4hwfjqoA4IxuWWIw= +code.cloudfoundry.org/locket v1.2.0/go.mod h1:uHOC1u/FKBvYHW0wTzFjI3WT85O2jGxz1I4+2nrjWLk= code.cloudfoundry.org/runtimeschema v0.0.0-20240514235758-31be7684c5bf h1:sTpfHaU+tgDeRO/fRnyr91gvf1FaJk3ZNiJHiHq4nko= code.cloudfoundry.org/runtimeschema v0.0.0-20240514235758-31be7684c5bf/go.mod h1:Cbw66uMLAXkeK8ZpcTUIJ9nhXNxaN742q1xS/ONrWiQ= -code.cloudfoundry.org/tlsconfig v0.59.0 h1:zD2oBLa3ErABQ0RO6ybO9U1mRoJ/G20mFy8KGu63/r0= -code.cloudfoundry.org/tlsconfig v0.59.0/go.mod h1:uqmfc1HZV9ydxOzhsCtMEsKl1mG0BlZxAheyXz3tUcY= +code.cloudfoundry.org/tlsconfig v0.60.0 h1:bB+VlWZ1Y3RTHJBNMnUx0pnkSN0DrzmJI3A0g1YSnVw= +code.cloudfoundry.org/tlsconfig v0.60.0/go.mod h1:twyxlqwOBbnU5uMc+GoS04cNuJvG7uXHC+gNAIkk81s= code.cloudfoundry.org/workpool v0.0.0-20250911194158-1489753f182e h1:NsULHptleEmqtoC8j6A8J636L9APnGn8YC0c7vocLww= code.cloudfoundry.org/workpool v0.0.0-20250911194158-1489753f182e/go.mod h1:O9HdfntfyDvYRH9nh03XdpnGMbjyZVi8nb2Kh+6hDho= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -735,8 +735,8 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78 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/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U= -github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= +github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= @@ -1038,8 +1038,8 @@ go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLh go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.step.sm/crypto v0.82.0 h1:JOT8b/7Jh4My3mxE4U7UkuaN2sUGkZ8fnjznXaTGoRE= -go.step.sm/crypto v0.82.0/go.mod h1:qyLTv666WJ6ImFPUjljux+684Y/GGYUjAZcKCnc6yBs= +go.step.sm/crypto v0.83.0 h1:llCPEiL2f+kUPY+CUJrOCsuSBoJZ2qooFG9EqGast6w= +go.step.sm/crypto v0.83.0/go.mod h1:qyLTv666WJ6ImFPUjljux+684Y/GGYUjAZcKCnc6yBs= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1636,8 +1636,8 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260615183401-62b3387ff324 h1:9HZDLIdYBJXAnaFOr9WHrKVycfpY+75s9HGadC0305A= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260615183401-62b3387ff324/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260618152121-87f3d3e198d3 h1:phvBWCAQMGN1945mp5fjCXP6jEF0+a0+4TjokS4sxNY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260618152121-87f3d3e198d3/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/vendor/code.cloudfoundry.org/locket/cmd/locket/testrunner/runner.go b/vendor/code.cloudfoundry.org/locket/cmd/locket/testrunner/runner.go index ef3e1422..e338de72 100644 --- a/vendor/code.cloudfoundry.org/locket/cmd/locket/testrunner/runner.go +++ b/vendor/code.cloudfoundry.org/locket/cmd/locket/testrunner/runner.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/locket/cmd/locket/certauthority" "code.cloudfoundry.org/locket/cmd/locket/config" "code.cloudfoundry.org/tlsconfig" - . "github.com/onsi/gomega" + "github.com/onsi/gomega" ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2" ) @@ -56,14 +56,14 @@ func NewLocketRunner(locketBinPath string, fs ...func(cfg *config.LocketConfig)) } locketConfig, err := os.CreateTemp("", "locket-config") - Expect(err).NotTo(HaveOccurred()) + gomega.Expect(err).NotTo(gomega.HaveOccurred()) locketConfigFilePath := locketConfig.Name() encoder := json.NewEncoder(locketConfig) err = encoder.Encode(cfg) - Expect(err).NotTo(HaveOccurred()) - Expect(locketConfig.Close()).To(Succeed()) + gomega.Expect(err).NotTo(gomega.HaveOccurred()) + gomega.Expect(locketConfig.Close()).To(gomega.Succeed()) return ginkgomon.New(ginkgomon.Config{ Name: "locket", @@ -72,7 +72,7 @@ func NewLocketRunner(locketBinPath string, fs ...func(cfg *config.LocketConfig)) Command: exec.Command(locketBinPath, "-config="+locketConfigFilePath), Cleanup: func() { err := os.RemoveAll(locketConfigFilePath) - Expect(err).NotTo(HaveOccurred()) + gomega.Expect(err).NotTo(gomega.HaveOccurred()) }, }) } @@ -82,7 +82,7 @@ func LocketClientTLSConfig() *tls.Config { tlsconfig.WithInternalServiceDefaults(), tlsconfig.WithIdentityFromFile(certFile, keyFile), ).Client(tlsconfig.WithAuthorityFromFile(caCertFile)) - Expect(err).NotTo(HaveOccurred()) + gomega.Expect(err).NotTo(gomega.HaveOccurred()) return tlsConfig } diff --git a/vendor/modules.txt b/vendor/modules.txt index 7ceb6dcd..a042aea4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -15,14 +15,14 @@ code.cloudfoundry.org/cfhttp/v2 # code.cloudfoundry.org/clock v1.75.0 ## explicit; go 1.25.0 code.cloudfoundry.org/clock -# code.cloudfoundry.org/debugserver v0.101.0 +# code.cloudfoundry.org/debugserver v0.102.0 ## explicit; go 1.25.0 code.cloudfoundry.org/debugserver # code.cloudfoundry.org/diego-logging-client v0.112.0 ## explicit; go 1.25.8 code.cloudfoundry.org/diego-logging-client code.cloudfoundry.org/diego-logging-client/testhelpers -# code.cloudfoundry.org/durationjson v0.76.0 +# code.cloudfoundry.org/durationjson v0.77.0 ## explicit; go 1.25.0 code.cloudfoundry.org/durationjson # code.cloudfoundry.org/go-diodes v0.0.0-20260615142411-472d6bcdb3c6 @@ -32,7 +32,7 @@ code.cloudfoundry.org/go-diodes ## explicit; go 1.21 code.cloudfoundry.org/go-loggregator/v9 code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2 -# code.cloudfoundry.org/lager/v3 v3.73.0 +# code.cloudfoundry.org/lager/v3 v3.74.0 ## explicit; go 1.25.0 code.cloudfoundry.org/lager/v3 code.cloudfoundry.org/lager/v3/internal/truncate @@ -42,8 +42,8 @@ code.cloudfoundry.org/lager/v3/lagertest # code.cloudfoundry.org/localip v0.75.0 ## explicit; go 1.25.0 code.cloudfoundry.org/localip -# code.cloudfoundry.org/locket v0.1.0 -## explicit; go 1.26 +# code.cloudfoundry.org/locket v1.2.0 +## explicit; go 1.26.0 code.cloudfoundry.org/locket code.cloudfoundry.org/locket/cmd/locket/certauthority code.cloudfoundry.org/locket/cmd/locket/config @@ -53,7 +53,7 @@ code.cloudfoundry.org/locket/models # code.cloudfoundry.org/runtimeschema v0.0.0-20240514235758-31be7684c5bf ## explicit; go 1.20 code.cloudfoundry.org/runtimeschema/cc_messages -# code.cloudfoundry.org/tlsconfig v0.59.0 +# code.cloudfoundry.org/tlsconfig v0.60.0 ## explicit; go 1.25.8 code.cloudfoundry.org/tlsconfig # code.cloudfoundry.org/workpool v0.0.0-20250911194158-1489753f182e @@ -197,7 +197,7 @@ github.com/tedsuo/rata # github.com/vito/go-sse v1.0.0 ## explicit; go 1.12 github.com/vito/go-sse/sse -# go.step.sm/crypto v0.82.0 +# go.step.sm/crypto v0.83.0 ## explicit; go 1.25.8 go.step.sm/crypto/fingerprint go.step.sm/crypto/internal/bcrypt_pbkdf @@ -295,7 +295,7 @@ golang.org/x/tools/internal/stdlib golang.org/x/tools/internal/typeparams golang.org/x/tools/internal/typesinternal golang.org/x/tools/internal/versions -# google.golang.org/genproto/googleapis/rpc v0.0.0-20260615183401-62b3387ff324 +# google.golang.org/genproto/googleapis/rpc v0.0.0-20260618152121-87f3d3e198d3 ## explicit; go 1.25.0 google.golang.org/genproto/googleapis/rpc/status # google.golang.org/grpc v1.81.1