Skip to content

Commit b8da9fb

Browse files
Update go.mod dependencies
-------- index 035f855..9251109 100644 code.cloudfoundry.org/clock v1.1.0 code.cloudfoundry.org/debugserver v0.0.0-20230612151301-d597b20f28ce code.cloudfoundry.org/eventhub v0.0.0-20230612151808-5a2f17c5e7b7 - code.cloudfoundry.org/go-metric-registry v0.0.0-20230724203802-cd5c3456d34a + code.cloudfoundry.org/go-metric-registry v0.0.0-20230822175600-ce212c66044d code.cloudfoundry.org/lager/v3 v3.0.2 code.cloudfoundry.org/localip v0.0.0-20230612151424-f52ecafaffc4 code.cloudfoundry.org/locket v0.0.0-20230612151453-08e003863044 github.com/cactus/go-statsd-client v3.2.1+incompatible github.com/cloudfoundry-community/go-uaa v0.3.2-0.20230306214931-fabcc6fe629c github.com/cloudfoundry/cf-routing-test-helpers v0.0.0-20230612154734-4f65ecb98d93 - github.com/cloudfoundry/cf-test-helpers/v2 v2.6.0 + github.com/cloudfoundry/cf-test-helpers/v2 v2.7.0 github.com/cloudfoundry/custom-cats-reporters v0.0.2 github.com/cloudfoundry/dropsonde v1.1.0 - github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8 + github.com/cloudfoundry/sonde-go v0.0.0-20230822175501-8bbdd0e1d8ed github.com/codegangsta/cli v1.22.14 github.com/go-sql-driver/mysql v1.7.1 github.com/golang-jwt/jwt/v4 v4.5.0
1 parent b428ec8 commit b8da9fb

File tree

6 files changed

+52
-47
lines changed

6 files changed

+52
-47
lines changed

src/code.cloudfoundry.org/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
code.cloudfoundry.org/clock v1.1.0
1717
code.cloudfoundry.org/debugserver v0.0.0-20230612151301-d597b20f28ce
1818
code.cloudfoundry.org/eventhub v0.0.0-20230612151808-5a2f17c5e7b7
19-
code.cloudfoundry.org/go-metric-registry v0.0.0-20230724203802-cd5c3456d34a
19+
code.cloudfoundry.org/go-metric-registry v0.0.0-20230822175600-ce212c66044d
2020
code.cloudfoundry.org/lager/v3 v3.0.2
2121
code.cloudfoundry.org/localip v0.0.0-20230612151424-f52ecafaffc4
2222
code.cloudfoundry.org/locket v0.0.0-20230612151453-08e003863044
@@ -25,10 +25,10 @@ require (
2525
github.com/cactus/go-statsd-client v3.2.1+incompatible
2626
github.com/cloudfoundry-community/go-uaa v0.3.2-0.20230306214931-fabcc6fe629c
2727
github.com/cloudfoundry/cf-routing-test-helpers v0.0.0-20230612154734-4f65ecb98d93
28-
github.com/cloudfoundry/cf-test-helpers/v2 v2.6.0
28+
github.com/cloudfoundry/cf-test-helpers/v2 v2.7.0
2929
github.com/cloudfoundry/custom-cats-reporters v0.0.2
3030
github.com/cloudfoundry/dropsonde v1.1.0
31-
github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8
31+
github.com/cloudfoundry/sonde-go v0.0.0-20230822175501-8bbdd0e1d8ed
3232
github.com/codegangsta/cli v1.22.14
3333
github.com/go-sql-driver/mysql v1.7.1
3434
github.com/golang-jwt/jwt/v4 v4.5.0
@@ -61,7 +61,7 @@ require (
6161
require (
6262
code.cloudfoundry.org/diego-logging-client v0.0.0-20230612151813-119d7fd9c963 // indirect
6363
code.cloudfoundry.org/durationjson v0.0.0-20230612152544-cdd056aaf83d // indirect
64-
code.cloudfoundry.org/go-diodes v0.0.0-20230731230506-667604960bc5 // indirect
64+
code.cloudfoundry.org/go-diodes v0.0.0-20230822175528-1a49047bcd23 // indirect
6565
code.cloudfoundry.org/go-loggregator/v8 v8.0.5 // indirect
6666
code.cloudfoundry.org/inigo v0.0.0-20210615140442-4bdc4f6e44d5 // indirect
6767
filippo.io/edwards25519 v1.0.0 // indirect
@@ -79,15 +79,15 @@ require (
7979
github.com/gogo/protobuf v1.3.2 // indirect
8080
github.com/golang/protobuf v1.5.3 // indirect
8181
github.com/google/go-cmp v0.5.9 // indirect
82-
github.com/google/pprof v0.0.0-20230816055901-76846d4d6a3b // indirect
82+
github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f // indirect
8383
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
8484
github.com/jackc/pgx v3.6.2+incompatible // indirect
8585
github.com/jinzhu/inflection v1.0.0 // indirect
8686
github.com/josharian/intern v1.0.0 // indirect
8787
github.com/klauspost/compress v1.16.7 // indirect
8888
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8989
github.com/minio/highwayhash v1.0.2 // indirect
90-
github.com/nats-io/jwt/v2 v2.4.1 // indirect
90+
github.com/nats-io/jwt/v2 v2.5.0 // indirect
9191
github.com/nats-io/nkeys v0.4.4 // indirect
9292
github.com/nats-io/nuid v1.0.1 // indirect
9393
github.com/pkg/errors v0.9.1 // indirect
@@ -99,15 +99,15 @@ require (
9999
github.com/uber-go/atomic v1.11.0 // indirect
100100
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
101101
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
102-
go.step.sm/crypto v0.34.0 // indirect
102+
go.step.sm/crypto v0.35.0 // indirect
103103
go.uber.org/atomic v1.8.0 // indirect
104104
go.uber.org/automaxprocs v1.5.3 // indirect
105105
golang.org/x/mod v0.12.0 // indirect
106106
golang.org/x/sys v0.11.0 // indirect
107107
golang.org/x/text v0.12.0 // indirect
108108
golang.org/x/time v0.3.0 // indirect
109109
google.golang.org/appengine v1.6.7 // indirect
110-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
110+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
111111
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
112112
gopkg.in/yaml.v3 v3.0.1 // indirect
113113
)

src/code.cloudfoundry.org/go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -607,12 +607,12 @@ code.cloudfoundry.org/durationjson v0.0.0-20230612152544-cdd056aaf83d/go.mod h1:
607607
code.cloudfoundry.org/eventhub v0.0.0-20230612151808-5a2f17c5e7b7 h1:H5zo9qK0ivIpMRIKdqqQ0VB0pZcqFL/aAYdlg3lP1GU=
608608
code.cloudfoundry.org/eventhub v0.0.0-20230612151808-5a2f17c5e7b7/go.mod h1:PtCyC3ye1KtXJ/ZkC6rVGZFOZTWuZI8dOCUluHnINuU=
609609
code.cloudfoundry.org/go-diodes v0.0.0-20180905200951-72629b5276e3/go.mod h1:Jzi+ccHgo/V/PLQUaQ6hnZcC1c4BS790gx21LRRui4g=
610-
code.cloudfoundry.org/go-diodes v0.0.0-20230731230506-667604960bc5 h1:DqKyrqSCCyUY+cgvV8c64gsTFlTEqXHfhqGq2ZVL1kU=
611-
code.cloudfoundry.org/go-diodes v0.0.0-20230731230506-667604960bc5/go.mod h1:Y4E08vrhLDimIJmHe5a75Da6zzXZBAg9LWgbPJjZ4gU=
610+
code.cloudfoundry.org/go-diodes v0.0.0-20230822175528-1a49047bcd23 h1:FUuCcRfh9A9jUhYKc0tt9IaIW7QTHzU6Xjguq0q3u80=
611+
code.cloudfoundry.org/go-diodes v0.0.0-20230822175528-1a49047bcd23/go.mod h1:Y4E08vrhLDimIJmHe5a75Da6zzXZBAg9LWgbPJjZ4gU=
612612
code.cloudfoundry.org/go-loggregator/v8 v8.0.5 h1:p1rrGxTwUqLjlUVtbjTAvKOSGNmPuBja8LeQOQgRrBc=
613613
code.cloudfoundry.org/go-loggregator/v8 v8.0.5/go.mod h1:mLlJ1ZyG6gVvBEtYypvbztRvFeCtBsTxE9tt+85tS6Y=
614-
code.cloudfoundry.org/go-metric-registry v0.0.0-20230724203802-cd5c3456d34a h1:yuKGH8QeSiUSlrUrhMWaa+UeIUvWMwxcnjNb49vYhdE=
615-
code.cloudfoundry.org/go-metric-registry v0.0.0-20230724203802-cd5c3456d34a/go.mod h1:qae3782qSVPsYIEaUyB69v0mi89pgyZwFlZHWXyj1OI=
614+
code.cloudfoundry.org/go-metric-registry v0.0.0-20230822175600-ce212c66044d h1:FxP2bWfl0maVbSwiEgshpdB0RQxg4t3XOXnistOgdyE=
615+
code.cloudfoundry.org/go-metric-registry v0.0.0-20230822175600-ce212c66044d/go.mod h1:qae3782qSVPsYIEaUyB69v0mi89pgyZwFlZHWXyj1OI=
616616
code.cloudfoundry.org/inigo v0.0.0-20210615140442-4bdc4f6e44d5 h1:XVhLtnvbIlLQh7L0KADVFjd2dfgXVcOpqPLpMtg/IZA=
617617
code.cloudfoundry.org/inigo v0.0.0-20210615140442-4bdc4f6e44d5/go.mod h1:1ZB1JCh2FAp+SqX79ve6dc8YREvbsziULEOncAilX4Q=
618618
code.cloudfoundry.org/lager/v3 v3.0.2 h1:H0dcQY+814G1Ea0e5K/AMaMpcr+Pe5Iv+AALJEwrP9U=
@@ -673,8 +673,8 @@ github.com/cloudfoundry-community/go-uaa v0.3.2-0.20230306214931-fabcc6fe629c h1
673673
github.com/cloudfoundry-community/go-uaa v0.3.2-0.20230306214931-fabcc6fe629c/go.mod h1:G2QAAVe4I+AZf4yF2EGGUFb/X98nTLWrqscILUznX88=
674674
github.com/cloudfoundry/cf-routing-test-helpers v0.0.0-20230612154734-4f65ecb98d93 h1:XXtu3X6Ubm+7eRJ5f6qCARB6wJut6B6MVcSXR4StifQ=
675675
github.com/cloudfoundry/cf-routing-test-helpers v0.0.0-20230612154734-4f65ecb98d93/go.mod h1:XigJMOXHcv+D+rPZ0pqcYEk4o2PZWG5CZ5mRycXzVcY=
676-
github.com/cloudfoundry/cf-test-helpers/v2 v2.6.0 h1:7Qg0kpKz8uDpYO9ekoV6r0/tA2Yxp15TOFottL4puyU=
677-
github.com/cloudfoundry/cf-test-helpers/v2 v2.6.0/go.mod h1:F9lO5YQLrrF7xf5liS/pRTE9uuyZ8TQ8N2ft/mR5hv8=
676+
github.com/cloudfoundry/cf-test-helpers/v2 v2.7.0 h1:QYPAI6JCL62F8ht6Tz9sDWKwTdoWTV5tKKvDDCZwoJ0=
677+
github.com/cloudfoundry/cf-test-helpers/v2 v2.7.0/go.mod h1:F9lO5YQLrrF7xf5liS/pRTE9uuyZ8TQ8N2ft/mR5hv8=
678678
github.com/cloudfoundry/custom-cats-reporters v0.0.2 h1:ySBjBh6I2an5FvbJ2egszOyiOYJkKqeOtpOmnU2RKiI=
679679
github.com/cloudfoundry/custom-cats-reporters v0.0.2/go.mod h1:uxXHu50QB3u67C2PZlaFBlc9yTy9gQ4Nb+nL3J959bU=
680680
github.com/cloudfoundry/dropsonde v1.0.0/go.mod h1:6zwvrWK5TpxBVYi1cdkE5WDsIO8E0n7qAJg3wR9B67c=
@@ -683,8 +683,8 @@ github.com/cloudfoundry/dropsonde v1.1.0/go.mod h1:OrkxsBrAvM8X0Ve9vaSNKLR+/Jeoh
683683
github.com/cloudfoundry/gosteno v0.0.0-20150423193413-0c8581caea35/go.mod h1:3YBPUR85RIrvaUTdA1dL38YSp6s3OHu1xrWLkGt2Mog=
684684
github.com/cloudfoundry/loggregatorlib v0.0.0-20170823162133-36eddf15ef12/go.mod h1:ucj7+svyACshmxV3Zze2NAcEcdbBf9scZYR+QKCX9/w=
685685
github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod h1:GS0pCHd7onIsewbw8Ue9qa9pZPv2V88cUZDttK6KzgI=
686-
github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8 h1:IpMHKJul/Wr6Rae9VXO+1K0TuORVyhKFjpqkY5ClEAM=
687-
github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8/go.mod h1:GiUWdcLKuM+RX4gSQBSHn3ADveMrRadWxuY6AFK5JNk=
686+
github.com/cloudfoundry/sonde-go v0.0.0-20230822175501-8bbdd0e1d8ed h1:ZZcVVGv50Bsibz42wnTLSJd/VlNqG/UDDLsWMatI8cM=
687+
github.com/cloudfoundry/sonde-go v0.0.0-20230822175501-8bbdd0e1d8ed/go.mod h1:GiUWdcLKuM+RX4gSQBSHn3ADveMrRadWxuY6AFK5JNk=
688688
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
689689
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
690690
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -857,8 +857,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe
857857
github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
858858
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
859859
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
860-
github.com/google/pprof v0.0.0-20230816055901-76846d4d6a3b h1:ZUEdbUOOhWGpraX/m58S9paRt9iUGrabIS9kauan88w=
861-
github.com/google/pprof v0.0.0-20230816055901-76846d4d6a3b/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
860+
github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f h1:pDhu5sgp8yJlEF/g6osliIIpF9K4F5jvkULXa4daRDQ=
861+
github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
862862
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
863863
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
864864
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -950,8 +950,8 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcs
950950
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
951951
github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
952952
github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
953-
github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4=
954-
github.com/nats-io/jwt/v2 v2.4.1/go.mod h1:24BeQtRwxRV8ruvC4CojXlx/WQ/VjuwlYiH+vu/+ibI=
953+
github.com/nats-io/jwt/v2 v2.5.0 h1:WQQ40AAlqqfx+f6ku+i0pOVm+ASirD4fUh+oQsiE9Ak=
954+
github.com/nats-io/jwt/v2 v2.5.0/go.mod h1:24BeQtRwxRV8ruvC4CojXlx/WQ/VjuwlYiH+vu/+ibI=
955955
github.com/nats-io/nats-server/v2 v2.9.21 h1:2TBTh0UDE74eNXQmV4HofsmRSCiVN0TH2Wgrp6BD6fk=
956956
github.com/nats-io/nats-server/v2 v2.9.21/go.mod h1:ozqMZc2vTHcNcblOiXMWIXkf8+0lDGAi5wQcG+O1mHU=
957957
github.com/nats-io/nats.go v1.28.0 h1:Th4G6zdsz2d0OqXdfzKLClo6bOfoI/b1kInhRtFIy5c=
@@ -1105,8 +1105,8 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
11051105
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
11061106
go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
11071107
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
1108-
go.step.sm/crypto v0.34.0 h1:ogSsqUu4G/yT0Jtx14q3ilAjKp3nMO4YJdwrFDmBtEY=
1109-
go.step.sm/crypto v0.34.0/go.mod h1:60g76zZ4KJTK0BTHuO2G5W0aBt8scwNLkVHOBg6MBek=
1108+
go.step.sm/crypto v0.35.0 h1:0N6ks5n1sdv4+biJMUTdqHjpTBKKN9zNqqBdOJIyHe4=
1109+
go.step.sm/crypto v0.35.0/go.mod h1:sBsrpVReoxmiLexbWL+vQRxZd6Gq4YBj/IRSUH+DZe4=
11101110
go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4=
11111111
go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
11121112
go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
@@ -1715,8 +1715,8 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl
17151715
google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
17161716
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
17171717
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
1718-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 h1:lv6/DhyiFFGsmzxbsUUTOkN29II+zeWHxvT8Lpdxsv0=
1719-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
1718+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
1719+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
17201720
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
17211721
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
17221722
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

src/code.cloudfoundry.org/vendor/github.com/cloudfoundry/cf-test-helpers/v2/cf/push.go

Lines changed: 13 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/code.cloudfoundry.org/vendor/github.com/nats-io/jwt/v2/account_claims.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/code.cloudfoundry.org/vendor/go.step.sm/crypto/pemutil/pem.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ var PromptPassword PasswordPrompter
4444
// check if a file exists and prompts the user if it should be overwritten.
4545
var WriteFile FileWriter = utils.WriteFile
4646

47+
// PEMBlockHeader is the expected header for any PEM formatted block.
48+
var PEMBlockHeader = []byte("-----BEGIN ")
49+
4750
// context add options to the pem methods.
4851
type context struct {
4952
filename string
@@ -282,7 +285,7 @@ func ReadCertificate(filename string, opts ...Options) (*x509.Certificate, error
282285
}
283286

284287
// PEM format
285-
if bytes.HasPrefix(b, []byte("-----BEGIN ")) {
288+
if bytes.Contains(b, PEMBlockHeader) {
286289
var crt interface{}
287290
crt, err = Read(filename, opts...)
288291
if err != nil {
@@ -311,7 +314,7 @@ func ReadCertificateBundle(filename string) ([]*x509.Certificate, error) {
311314
}
312315

313316
// PEM format
314-
if bytes.HasPrefix(b, []byte("-----BEGIN ")) {
317+
if bytes.Contains(b, PEMBlockHeader) {
315318
var block *pem.Block
316319
var bundle []*x509.Certificate
317320
for len(b) > 0 {
@@ -352,7 +355,7 @@ func ReadCertificateRequest(filename string) (*x509.CertificateRequest, error) {
352355
}
353356

354357
// PEM format
355-
if bytes.HasPrefix(b, []byte("-----BEGIN ")) {
358+
if bytes.Contains(b, PEMBlockHeader) {
356359
csr, err := Parse(b, WithFilename(filename))
357360
if err != nil {
358361
return nil, err

src/code.cloudfoundry.org/vendor/modules.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ code.cloudfoundry.org/durationjson
2525
# code.cloudfoundry.org/eventhub v0.0.0-20230612151808-5a2f17c5e7b7
2626
## explicit; go 1.19
2727
code.cloudfoundry.org/eventhub
28-
# code.cloudfoundry.org/go-diodes v0.0.0-20230731230506-667604960bc5
28+
# code.cloudfoundry.org/go-diodes v0.0.0-20230822175528-1a49047bcd23
2929
## explicit; go 1.18
3030
code.cloudfoundry.org/go-diodes
3131
# code.cloudfoundry.org/go-loggregator/v8 v8.0.5
@@ -34,7 +34,7 @@ code.cloudfoundry.org/go-loggregator/v8
3434
code.cloudfoundry.org/go-loggregator/v8/rfc5424
3535
code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2
3636
code.cloudfoundry.org/go-loggregator/v8/runtimeemitter
37-
# code.cloudfoundry.org/go-metric-registry v0.0.0-20230724203802-cd5c3456d34a
37+
# code.cloudfoundry.org/go-metric-registry v0.0.0-20230822175600-ce212c66044d
3838
## explicit; go 1.19
3939
code.cloudfoundry.org/go-metric-registry
4040
code.cloudfoundry.org/go-metric-registry/testhelpers
@@ -94,7 +94,7 @@ github.com/cloudfoundry-community/go-uaa/passwordcredentials
9494
# github.com/cloudfoundry/cf-routing-test-helpers v0.0.0-20230612154734-4f65ecb98d93
9595
## explicit
9696
github.com/cloudfoundry/cf-routing-test-helpers/schema
97-
# github.com/cloudfoundry/cf-test-helpers/v2 v2.6.0
97+
# github.com/cloudfoundry/cf-test-helpers/v2 v2.7.0
9898
## explicit; go 1.18
9999
github.com/cloudfoundry/cf-test-helpers/v2/cf
100100
github.com/cloudfoundry/cf-test-helpers/v2/commandreporter
@@ -127,7 +127,7 @@ github.com/cloudfoundry/dropsonde/metric_sender/fake
127127
github.com/cloudfoundry/dropsonde/metricbatcher
128128
github.com/cloudfoundry/dropsonde/metrics
129129
github.com/cloudfoundry/dropsonde/runtime_stats
130-
# github.com/cloudfoundry/sonde-go v0.0.0-20230710164515-a0a43d1dbbf8
130+
# github.com/cloudfoundry/sonde-go v0.0.0-20230822175501-8bbdd0e1d8ed
131131
## explicit; go 1.17
132132
github.com/cloudfoundry/sonde-go/events
133133
# github.com/cockroachdb/apd v1.1.0
@@ -182,7 +182,7 @@ github.com/google/go-cmp/cmp/internal/diff
182182
github.com/google/go-cmp/cmp/internal/flags
183183
github.com/google/go-cmp/cmp/internal/function
184184
github.com/google/go-cmp/cmp/internal/value
185-
# github.com/google/pprof v0.0.0-20230816055901-76846d4d6a3b
185+
# github.com/google/pprof v0.0.0-20230821062121-407c9e7a662f
186186
## explicit; go 1.19
187187
github.com/google/pprof/profile
188188
# github.com/honeycombio/libhoney-go v1.20.0
@@ -245,7 +245,7 @@ github.com/matttproud/golang_protobuf_extensions/pbutil
245245
# github.com/minio/highwayhash v1.0.2
246246
## explicit; go 1.15
247247
github.com/minio/highwayhash
248-
# github.com/nats-io/jwt/v2 v2.4.1
248+
# github.com/nats-io/jwt/v2 v2.5.0
249249
## explicit; go 1.18
250250
github.com/nats-io/jwt/v2
251251
# github.com/nats-io/nats-server/v2 v2.9.21
@@ -376,8 +376,8 @@ github.com/vmihailenco/msgpack/v5/msgpcode
376376
github.com/vmihailenco/tagparser/v2
377377
github.com/vmihailenco/tagparser/v2/internal
378378
github.com/vmihailenco/tagparser/v2/internal/parser
379-
# go.step.sm/crypto v0.34.0
380-
## explicit; go 1.18
379+
# go.step.sm/crypto v0.35.0
380+
## explicit; go 1.20
381381
go.step.sm/crypto/fingerprint
382382
go.step.sm/crypto/internal/bcrypt_pbkdf
383383
go.step.sm/crypto/internal/emoji
@@ -516,7 +516,7 @@ google.golang.org/appengine/internal/log
516516
google.golang.org/appengine/internal/remote_api
517517
google.golang.org/appengine/internal/urlfetch
518518
google.golang.org/appengine/urlfetch
519-
# google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878
519+
# google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
520520
## explicit; go 1.19
521521
google.golang.org/genproto/googleapis/rpc/status
522522
# google.golang.org/grpc v1.57.0

0 commit comments

Comments
 (0)