From 098ad9601900592b026c900590b63da146733228 Mon Sep 17 00:00:00 2001 From: CF Logging And Metrics CI Bot Date: Wed, 8 May 2024 07:01:04 +0000 Subject: [PATCH] Bump dependencies --- src/go.mod | 14 +++++------ src/go.sum | 24 +++++++++---------- .../github.com/onsi/ginkgo/v2/CHANGELOG.md | 5 ++++ .../ginkgo/v2/ginkgo/watch/package_hash.go | 9 +++++++ .../onsi/ginkgo/v2/types/version.go | 2 +- src/vendor/modules.txt | 12 +++++----- 6 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/go.mod b/src/go.mod index 9206c07ce..e913cb36f 100644 --- a/src/go.mod +++ b/src/go.mod @@ -2,16 +2,16 @@ module code.cloudfoundry.org/loggregator-agent-release/src go 1.21.0 -toolchain go1.21.9 +toolchain go1.21.10 require ( - code.cloudfoundry.org/go-batching v0.0.0-20240325232529-c21ea48767e2 - code.cloudfoundry.org/go-diodes v0.0.0-20240419195010-376885f5f3d4 + code.cloudfoundry.org/go-batching v0.0.0-20240507185452-b51464486eb5 + code.cloudfoundry.org/go-diodes v0.0.0-20240507202434-96dd3c119b5c code.cloudfoundry.org/go-envstruct v1.7.0 - code.cloudfoundry.org/go-metric-registry v0.0.0-20240325232813-eb1144b007e4 + code.cloudfoundry.org/go-metric-registry v0.0.0-20240507185439-f0b17e194563 code.cloudfoundry.org/tlsconfig v0.0.0-20240506165053-ee50c1ee9388 github.com/cloudfoundry/dropsonde v1.1.0 - github.com/cloudfoundry/sonde-go v0.0.0-20240311165458-423aa0d4dfc8 + github.com/cloudfoundry/sonde-go v0.0.0-20240507181428-8b8ae008ea35 github.com/onsi/gomega v1.33.1 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.53.0 @@ -26,7 +26,7 @@ require ( git.sr.ht/~nelsam/hel/v3 v3.0.4 github.com/go-chi/chi/v5 v5.0.12 github.com/google/go-cmp v0.6.0 - github.com/onsi/ginkgo/v2 v2.17.2 + github.com/onsi/ginkgo/v2 v2.17.3 go.opentelemetry.io/proto/otlp v1.2.0 google.golang.org/protobuf v1.34.1 ) @@ -38,7 +38,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect - github.com/google/pprof v0.0.0-20240430035430-e4905b036c4e // indirect + github.com/google/pprof v0.0.0-20240507183855-6f11f98ebb1c // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/klauspost/compress v1.17.8 // indirect diff --git a/src/go.sum b/src/go.sum index 2a5da2bb9..e4886b06c 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,14 +1,14 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -code.cloudfoundry.org/go-batching v0.0.0-20240325232529-c21ea48767e2 h1:/e1JMWKtA56BAU9mrPnrys7eZwuvsU2oLJRNHmrbqG4= -code.cloudfoundry.org/go-batching v0.0.0-20240325232529-c21ea48767e2/go.mod h1:9NOR98JnBAZ2wMqdt7BkcHjtsIt/RDCrr+sekuFVjTg= -code.cloudfoundry.org/go-diodes v0.0.0-20240419195010-376885f5f3d4 h1:exUBTQS/m2MhcsRJspBU9hClxrAPNihvQz9SDQBwE+4= -code.cloudfoundry.org/go-diodes v0.0.0-20240419195010-376885f5f3d4/go.mod h1:mndfNpz8bKGHkWW+mTJpXW0N8rT4cZuBjo0QFWn2EIA= +code.cloudfoundry.org/go-batching v0.0.0-20240507185452-b51464486eb5 h1:8mINti57LH3ZuJF8jHkh6y43BXP7jNHSHG8rdk7+pCY= +code.cloudfoundry.org/go-batching v0.0.0-20240507185452-b51464486eb5/go.mod h1:QKqC0vneuqiVLFVrHGVzzybwiSxoi24zmzcV3YlK65w= +code.cloudfoundry.org/go-diodes v0.0.0-20240507202434-96dd3c119b5c h1:M8eQSwbo51rsOZChT8mjksucOe4GEjBqmy+9pLWmCP8= +code.cloudfoundry.org/go-diodes v0.0.0-20240507202434-96dd3c119b5c/go.mod h1:eVHabU/rcpC5ocoIAXvnaySkdH6+PgORRVlY5l3SDys= code.cloudfoundry.org/go-envstruct v1.7.0 h1:6e90Z+lTPrI2jMJOoKErskL7a+Qm97GFiithcXeVWdk= code.cloudfoundry.org/go-envstruct v1.7.0/go.mod h1:xm6Eto/WB7Qq1iwEN29jUQXDeUCJ+nruwAnnrpY0s4E= 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/go-metric-registry v0.0.0-20240325232813-eb1144b007e4 h1:Fhvj2Am/ySajwFky5UKix+NNNCO3jqv/0IgrDeovXM8= -code.cloudfoundry.org/go-metric-registry v0.0.0-20240325232813-eb1144b007e4/go.mod h1:kRAQ6GTC/+pAWbgKFK6S7zT6pVlUlMFsnk0HDe3Gehc= +code.cloudfoundry.org/go-metric-registry v0.0.0-20240507185439-f0b17e194563 h1:mkCsrZ0h4ZF9jcVTEtLiSRJ0Mu2AIQANEWVDcXrOSVY= +code.cloudfoundry.org/go-metric-registry v0.0.0-20240507185439-f0b17e194563/go.mod h1:zYhHvL+6LLy/lGiIe/T5Ma6ae0Tv5Qxm6TNWOvsQVrQ= code.cloudfoundry.org/tlsconfig v0.0.0-20240506165053-ee50c1ee9388 h1:TAtvhdrE/hhV3Prqe9VpD+ZuHc+sN/8GkT1fAKtoYmY= code.cloudfoundry.org/tlsconfig v0.0.0-20240506165053-ee50c1ee9388/go.mod h1:nrEZdor0XB7oBXmkKyVtYFk3oGF6eCmryhVBOeGaUso= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= @@ -34,8 +34,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudfoundry/dropsonde v1.1.0 h1:nerhj8K0heOsv/U/Ddou5Esw56YlNeHHJH6MP9QlACQ= github.com/cloudfoundry/dropsonde v1.1.0/go.mod h1:OrkxsBrAvM8X0Ve9vaSNKLR+/Jeohu3+J0M4JEaTmnM= -github.com/cloudfoundry/sonde-go v0.0.0-20240311165458-423aa0d4dfc8 h1:HyE7RpLgcJBA3vxdvlv7KJtVVKdBF2sJ2TjVM5Ea46A= -github.com/cloudfoundry/sonde-go v0.0.0-20240311165458-423aa0d4dfc8/go.mod h1:QFHOWY2pc/fHo/sOwsG6ARMbRrX4c0IeA2hEUzImOng= +github.com/cloudfoundry/sonde-go v0.0.0-20240507181428-8b8ae008ea35 h1:pGaWKjm/KaAdURwEGENnmEfjg0XtOQAGxI64IWwy6rI= +github.com/cloudfoundry/sonde-go v0.0.0-20240507181428-8b8ae008ea35/go.mod h1:coL2Xp6vT69LY78t/FJ6VhWSFmGlhOYeUUHUPnJyQtM= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -71,8 +71,8 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240430035430-e4905b036c4e h1:RsXNnXE59RTt8o3DcA+w7ICdRfR2l+Bb5aE0YMpNTO8= -github.com/google/pprof v0.0.0-20240430035430-e4905b036c4e/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240507183855-6f11f98ebb1c h1:GCixZ7sgey01Kjw8pxBzCD0uVrubxl8SRzRgI0jwP+A= +github.com/google/pprof v0.0.0-20240507183855-6f11f98ebb1c/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -110,8 +110,8 @@ github.com/nelsam/hel/v2 v2.3.2/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= -github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU= +github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= diff --git a/src/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/src/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 0a8949799..13be7ec6a 100644 --- a/src/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/src/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.17.3 + +### Fixes +`ginkgo watch` now ignores hidden files [bde6e00] + ## 2.17.2 ### Fixes diff --git a/src/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go b/src/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go index 17d052bdc..0e6ae1f29 100644 --- a/src/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go +++ b/src/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "regexp" + "strings" "time" ) @@ -79,6 +80,10 @@ func (p *PackageHash) computeHashes() (codeHash string, codeModifiedTime time.Ti continue } + if isHiddenFile(info) { + continue + } + if goTestRegExp.MatchString(info.Name()) { testHash += p.hashForFileInfo(info) if info.ModTime().After(testModifiedTime) { @@ -103,6 +108,10 @@ func (p *PackageHash) computeHashes() (codeHash string, codeModifiedTime time.Ti return } +func isHiddenFile(info os.FileInfo) bool { + return strings.HasPrefix(info.Name(), ".") || strings.HasPrefix(info.Name(), "_") +} + func (p *PackageHash) hashForFileInfo(info os.FileInfo) string { return fmt.Sprintf("%s_%d_%d", info.Name(), info.Size(), info.ModTime().UnixNano()) } diff --git a/src/vendor/github.com/onsi/ginkgo/v2/types/version.go b/src/vendor/github.com/onsi/ginkgo/v2/types/version.go index 5dd0140cd..52cc3abc8 100644 --- a/src/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/src/vendor/github.com/onsi/ginkgo/v2/types/version.go @@ -1,3 +1,3 @@ package types -const VERSION = "2.17.2" +const VERSION = "2.17.3" diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index 4fffd4d66..965906fe6 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -1,7 +1,7 @@ -# code.cloudfoundry.org/go-batching v0.0.0-20240325232529-c21ea48767e2 +# code.cloudfoundry.org/go-batching v0.0.0-20240507185452-b51464486eb5 ## explicit; go 1.21 code.cloudfoundry.org/go-batching -# code.cloudfoundry.org/go-diodes v0.0.0-20240419195010-376885f5f3d4 +# code.cloudfoundry.org/go-diodes v0.0.0-20240507202434-96dd3c119b5c ## explicit; go 1.21 code.cloudfoundry.org/go-diodes # code.cloudfoundry.org/go-envstruct v1.7.0 @@ -13,7 +13,7 @@ code.cloudfoundry.org/go-loggregator/v9 code.cloudfoundry.org/go-loggregator/v9/conversion code.cloudfoundry.org/go-loggregator/v9/rfc5424 code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2 -# code.cloudfoundry.org/go-metric-registry v0.0.0-20240325232813-eb1144b007e4 +# code.cloudfoundry.org/go-metric-registry v0.0.0-20240507185439-f0b17e194563 ## explicit; go 1.21 code.cloudfoundry.org/go-metric-registry code.cloudfoundry.org/go-metric-registry/testhelpers @@ -44,7 +44,7 @@ github.com/cespare/xxhash/v2 # github.com/cloudfoundry/dropsonde v1.1.0 ## explicit; go 1.18 github.com/cloudfoundry/dropsonde/emitter -# github.com/cloudfoundry/sonde-go v0.0.0-20240311165458-423aa0d4dfc8 +# github.com/cloudfoundry/sonde-go v0.0.0-20240507181428-8b8ae008ea35 ## explicit; go 1.17 github.com/cloudfoundry/sonde-go/events # github.com/go-chi/chi/v5 v5.0.12 @@ -65,7 +65,7 @@ github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/flags github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value -# github.com/google/pprof v0.0.0-20240430035430-e4905b036c4e +# github.com/google/pprof v0.0.0-20240507183855-6f11f98ebb1c ## explicit; go 1.19 github.com/google/pprof/profile # github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 @@ -81,7 +81,7 @@ github.com/inconshreveable/mousetrap github.com/klauspost/compress/flate github.com/klauspost/compress/gzip github.com/klauspost/compress/zlib -# github.com/onsi/ginkgo/v2 v2.17.2 +# github.com/onsi/ginkgo/v2 v2.17.3 ## explicit; go 1.20 github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2/config