Skip to content

Commit 93a0c25

Browse files
kruttenkrutten
authored
Merge pull request #5160 from cloudfoundry/2025Q2-gobumps
Update Patch Migration to handle MySQL/MariaDB Update GoLang versions
2 parents d9120e8 + bc69b36 commit 93a0c25

File tree

14 files changed

+238
-879
lines changed

14 files changed

+238
-879
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stratos",
3-
"version": "v4.9.0",
3+
"version": "v4.9.2",
44
"description": "Stratos Console",
55
"main": "index.js",
66
"scripts": {

‎src/jetstream/api/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ require (
1818
github.com/mattn/go-colorable v0.1.14 // indirect
1919
github.com/mattn/go-isatty v0.0.20 // indirect
2020
github.com/mitchellh/mapstructure v1.5.0 // indirect
21-
github.com/onsi/ginkgo v1.16.5 // indirect
2221
github.com/onsi/gomega v1.27.10 // indirect
2322
github.com/valyala/bytebufferpool v1.0.0 // indirect
2423
github.com/valyala/fasttemplate v1.2.2 // indirect

‎src/jetstream/api/go.sum‎

Lines changed: 6 additions & 81 deletions
Large diffs are not rendered by default.

‎src/jetstream/datastore/20240818042100_RetryEndpointCACert.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ func init() {
1212
}
1313

1414
func CheckIfMigrationExists(db *sql.Tx, migration string, args ...interface{}) (bool, error) {
15-
query := "SELECT 1 FROM goose_db_version WHERE version_id = $1 LIMIT 1"
15+
query_psql := "SELECT 1 FROM goose_db_version WHERE version_id = $1 LIMIT 1"
16+
query_mysql := "SELECT 1 FROM goose_db_version WHERE version_id = ? LIMIT 1"
1617
var exists bool
17-
err := db.QueryRow(query, migration).Scan(&exists)
18+
19+
err := db.QueryRow(query_psql, migration).Scan(&exists)
20+
if err != nil && err != sql.ErrNoRows { // Might not be PSQL try MySQL
21+
err = db.QueryRow(query_mysql, migration).Scan(&exists)
22+
}
1823
if err != nil && err != sql.ErrNoRows {
1924
return false, err
2025
}

‎src/jetstream/plugins/analysis/container/go.mod‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module analyzers
22

3-
go 1.23.0
3+
go 1.24.0
44

55
toolchain go1.24.2
66

@@ -10,30 +10,14 @@ require (
1010
)
1111

1212
require (
13-
github.com/davecgh/go-spew v1.1.1 // indirect
14-
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
15-
github.com/google/go-cmp v0.6.0 // indirect
16-
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
1713
github.com/labstack/gommon v0.4.2 // indirect
1814
github.com/mattn/go-colorable v0.1.14 // indirect
1915
github.com/mattn/go-isatty v0.0.20 // indirect
20-
github.com/pmezard/go-difflib v1.0.0 // indirect
21-
github.com/stretchr/objx v0.5.2 // indirect
22-
github.com/stretchr/testify v1.10.0 // indirect
2316
github.com/valyala/bytebufferpool v1.0.0 // indirect
2417
github.com/valyala/fasttemplate v1.2.2 // indirect
25-
github.com/yuin/goldmark v1.4.13 // indirect
2618
golang.org/x/crypto v0.38.0 // indirect
27-
golang.org/x/mod v0.17.0 // indirect
2819
golang.org/x/net v0.40.0 // indirect
29-
golang.org/x/sync v0.14.0 // indirect
3020
golang.org/x/sys v0.33.0 // indirect
31-
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 // indirect
32-
golang.org/x/term v0.32.0 // indirect
3321
golang.org/x/text v0.25.0 // indirect
3422
golang.org/x/time v0.11.0 // indirect
35-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
36-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect
37-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 // indirect
38-
gopkg.in/yaml.v3 v3.0.1 // indirect
3923
)

‎src/jetstream/plugins/analysis/container/go.sum‎

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,39 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
5-
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
6-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
7-
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
8-
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
9-
github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
10-
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
11-
github.com/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM=
12-
github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws=
134
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
145
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
15-
github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
16-
github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
176
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
187
github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
19-
github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
20-
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
21-
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
228
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
239
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
24-
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
25-
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
26-
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
27-
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
2810
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
2911
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
3012
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3113
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
32-
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
33-
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
3414
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
3515
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
3616
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
37-
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
38-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
39-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
40-
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
41-
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
4217
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
43-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
44-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
45-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
46-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
18+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
4719
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
4820
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
4921
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
50-
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
5122
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
5223
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
53-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
54-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
55-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
56-
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
57-
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
5824
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
5925
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
60-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
61-
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
62-
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
63-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
64-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
65-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
66-
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
67-
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
68-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
69-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
7026
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
7127
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
72-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
73-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
74-
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
75-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
76-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
77-
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
78-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
79-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
80-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
81-
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
82-
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
83-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
8428
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
85-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
86-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
87-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
8829
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
89-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
90-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
91-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9230
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
9331
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
94-
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
95-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
96-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
97-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
98-
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
99-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
100-
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
101-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
102-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
103-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
104-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
105-
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
106-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
107-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
10832
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
10933
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
110-
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
111-
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
11234
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
11335
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
114-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
115-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
116-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
117-
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
118-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
119-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
120-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
12136
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
12237
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
123-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
12438
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
12539
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎src/jetstream/plugins/cfapppush/go.mod‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/cloudfoundry/stratos/src/jetstream/plugins/cfapppush
22

3-
go 1.21
3+
go 1.24
44

55
replace (
6-
github.com/cloudfoundry/stratos/src/jetstream/api => ../../api
76
github.com/cloudfoundry/cli-plugin-repo => code.cloudfoundry.org/cli-plugin-repo v0.0.0-20230525012251-b9c89116786e
7+
github.com/cloudfoundry/stratos/src/jetstream/api => ../../api
88
github.com/moby/moby => github.com/moby/moby v20.10.25+incompatible
99
github.com/sabhiram/go-gitignore => github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94
1010
github.com/vito/go-interact => github.com/vito/go-interact v1.0.0
@@ -14,10 +14,14 @@ require (
1414
code.cloudfoundry.org/cli v0.0.0-20230912192837-efd1d03e7292
1515
code.cloudfoundry.org/clock v1.1.0
1616
github.com/cloudfoundry/stratos/src/jetstream/api v0.0.0-00010101000000-000000000000
17-
github.com/gorilla/websocket v1.5.0
18-
github.com/labstack/echo/v4 v4.11.1
17+
github.com/gorilla/websocket v1.5.3
18+
github.com/labstack/echo/v4 v4.13.3
1919
github.com/mholt/archiver/v3 v3.5.1
2020
github.com/sirupsen/logrus v1.9.3
21+
golang.org/x/crypto v0.38.0 // indirect
22+
golang.org/x/net v0.40.0 // indirect
23+
golang.org/x/oauth2 v0.27.0 // indirect
24+
google.golang.org/protobuf v1.33.0 // indirect
2125
gopkg.in/yaml.v2 v2.4.0
2226
)
2327

@@ -43,7 +47,7 @@ require (
4347
github.com/bmatcuk/doublestar v1.3.4 // indirect
4448
github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect
4549
github.com/charlievieth/fs v0.0.3 // indirect
46-
github.com/cloudfoundry-community/go-cfenv v1.17.0 // indirect
50+
github.com/cloudfoundry-community/go-cfenv v1.18.0 // indirect
4751
github.com/cloudfoundry/bosh-cli v6.4.1+incompatible // indirect
4852
github.com/cloudfoundry/bosh-utils v0.0.385 // indirect
4953
github.com/cppforlife/go-patch v0.2.0 // indirect
@@ -60,21 +64,21 @@ require (
6064
github.com/google/go-querystring v1.1.0 // indirect
6165
github.com/google/gofuzz v1.2.0 // indirect
6266
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
63-
github.com/gorilla/securecookie v1.1.1 // indirect
64-
github.com/gorilla/sessions v1.2.1 // indirect
67+
github.com/gorilla/securecookie v1.1.2 // indirect
68+
github.com/gorilla/sessions v1.4.0 // indirect
6569
github.com/govau/cf-common v0.0.7 // indirect
6670
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
6771
github.com/imdario/mergo v0.3.6 // indirect
6872
github.com/jessevdk/go-flags v1.5.0 // indirect
6973
github.com/json-iterator/go v1.1.12 // indirect
7074
github.com/klauspost/compress v1.11.4 // indirect
7175
github.com/klauspost/pgzip v1.2.5 // indirect
72-
github.com/labstack/gommon v0.4.0 // indirect
76+
github.com/labstack/gommon v0.4.2 // indirect
7377
github.com/lunixbochs/vtclean v1.0.0 // indirect
74-
github.com/mattn/go-colorable v0.1.13 // indirect
75-
github.com/mattn/go-isatty v0.0.19 // indirect
78+
github.com/mattn/go-colorable v0.1.14 // indirect
79+
github.com/mattn/go-isatty v0.0.20 // indirect
7680
github.com/mattn/go-runewidth v0.0.15 // indirect
77-
github.com/mitchellh/mapstructure v1.1.2 // indirect
81+
github.com/mitchellh/mapstructure v1.5.0 // indirect
7882
github.com/moby/term v0.5.0 // indirect
7983
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8084
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -92,20 +96,15 @@ require (
9296
github.com/valyala/fasttemplate v1.2.2 // indirect
9397
github.com/vito/go-interact v1.0.0 // indirect
9498
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
95-
golang.org/x/crypto v0.17.0 // indirect
96-
golang.org/x/net v0.17.0 // indirect
97-
golang.org/x/oauth2 v0.12.0 // indirect
98-
golang.org/x/sys v0.15.0 // indirect
99-
golang.org/x/term v0.15.0 // indirect
100-
golang.org/x/text v0.14.0 // indirect
101-
golang.org/x/time v0.3.0 // indirect
102-
golang.org/x/tools v0.13.0 // indirect
103-
google.golang.org/appengine v1.6.7 // indirect
99+
golang.org/x/sys v0.33.0 // indirect
100+
golang.org/x/term v0.32.0 // indirect
101+
golang.org/x/text v0.25.0 // indirect
102+
golang.org/x/time v0.8.0 // indirect
103+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
104104
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
105105
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
106106
google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
107107
google.golang.org/grpc v1.58.3 // indirect
108-
google.golang.org/protobuf v1.31.0 // indirect
109108
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
110109
gopkg.in/inf.v0 v0.9.1 // indirect
111110
k8s.io/apimachinery v0.28.1 // indirect

0 commit comments

Comments
 (0)