From e57009341b81b74f85cece068e80c606fa803050 Mon Sep 17 00:00:00 2001 From: Ashish Banerjee Date: Thu, 14 Aug 2025 12:18:30 -0400 Subject: [PATCH 1/8] Update oauth2 --- changelog/v0.25.4/update-oauth2.yaml | 8 ++++++++ go.mod | 9 +++++---- go.sum | 16 ++++++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 changelog/v0.25.4/update-oauth2.yaml diff --git a/changelog/v0.25.4/update-oauth2.yaml b/changelog/v0.25.4/update-oauth2.yaml new file mode 100644 index 00000000..4cfa7e74 --- /dev/null +++ b/changelog/v0.25.4/update-oauth2.yaml @@ -0,0 +1,8 @@ +changelog: +- type: DEPENDENCY_BUMP + description: Bumped the go version for go.mod + dependencyOwner: go + dependencyRepo: oauth2 + dependencyTag: v0.27.0 + issueLink: https://github.com/solo-io/gloo/issues/10934 + diff --git a/go.mod b/go.mod index 20c20206..6e331107 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/solo-io/go-utils -go 1.19 +go 1.23.0 + +toolchain go1.23.3 require ( cloud.google.com/go/pubsub v1.30.0 @@ -42,7 +44,7 @@ require ( go.uber.org/zap v1.25.0 goji.io v2.0.2+incompatible golang.org/x/mod v0.10.0 - golang.org/x/oauth2 v0.8.0 + golang.org/x/oauth2 v0.27.0 golang.org/x/sync v0.2.0 golang.org/x/tools v0.9.3 google.golang.org/api v0.114.0 @@ -55,8 +57,7 @@ require ( require ( cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.0 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v0.13.0 // indirect github.com/Microsoft/go-winio v0.5.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect diff --git a/go.sum b/go.sum index c1d2b3a7..07859481 100644 --- a/go.sum +++ b/go.sum @@ -21,16 +21,16 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= -cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= +cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= cloud.google.com/go/kms v1.10.1 h1:7hm1bRqGCA1GBRQUrp831TwJ9TWhP+tvLuP497CQS2g= +cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI= cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= +cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -74,6 +74,7 @@ github.com/avast/retry-go v2.2.0+incompatible h1:m+w7mVLWa/oKqX2xYqiEKQQkeGH8DDE github.com/avast/retry-go v2.2.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -204,6 +205,7 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -275,6 +277,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -525,8 +528,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210113205817-d3ed898aa8a3/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= +golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= +golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -593,6 +596,7 @@ golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From e8d8594cb23de155b5fc6de9823094bcd5ad4b34 Mon Sep 17 00:00:00 2001 From: Ashish Banerjee Date: Thu, 14 Aug 2025 12:46:07 -0400 Subject: [PATCH 2/8] Update x/mod to make tests pass --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 6e331107..70713fd1 100644 --- a/go.mod +++ b/go.mod @@ -43,10 +43,10 @@ require ( go.opencensus.io v0.24.0 go.uber.org/zap v1.25.0 goji.io v2.0.2+incompatible - golang.org/x/mod v0.10.0 + golang.org/x/mod v0.20.0 golang.org/x/oauth2 v0.27.0 - golang.org/x/sync v0.2.0 - golang.org/x/tools v0.9.3 + golang.org/x/sync v0.3.0 + golang.org/x/tools v0.13.0 google.golang.org/api v0.114.0 google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.30.0 diff --git a/go.sum b/go.sum index 07859481..97e3f64c 100644 --- a/go.sum +++ b/go.sum @@ -484,8 +484,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -540,8 +540,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -652,8 +652,8 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From fd163f2a7ea1cc934dd0b28bdb7626ea6751d5f6 Mon Sep 17 00:00:00 2001 From: Ashish Banerjee Date: Thu, 14 Aug 2025 13:11:56 -0400 Subject: [PATCH 3/8] Remove toolchain --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 70713fd1..885785d8 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/solo-io/go-utils go 1.23.0 -toolchain go1.23.3 - require ( cloud.google.com/go/pubsub v1.30.0 cloud.google.com/go/storage v1.28.1 From 9e08991d86d2e69af6251f919ebeb12f4fdc5baa Mon Sep 17 00:00:00 2001 From: Ashish Banerjee Date: Thu, 14 Aug 2025 13:14:13 -0400 Subject: [PATCH 4/8] Update changelog --- changelog/v0.25.4/update-oauth2.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/changelog/v0.25.4/update-oauth2.yaml b/changelog/v0.25.4/update-oauth2.yaml index 4cfa7e74..b6ab6445 100644 --- a/changelog/v0.25.4/update-oauth2.yaml +++ b/changelog/v0.25.4/update-oauth2.yaml @@ -1,8 +1,25 @@ changelog: +- type: DEPENDENCY_BUMP + description: Bumped the go version for go.mod + dependencyOwner: go + dependencyRepo: mod + dependencyTag: v0.20.0 + issueLink: https://github.com/solo-io/gloo/issues/10934 - type: DEPENDENCY_BUMP description: Bumped the go version for go.mod dependencyOwner: go dependencyRepo: oauth2 dependencyTag: v0.27.0 issueLink: https://github.com/solo-io/gloo/issues/10934 - +- type: DEPENDENCY_BUMP + description: Bumped the go version for go.mod + dependencyOwner: go + dependencyRepo: sync + dependencyTag: v0.3.0 + issueLink: https://github.com/solo-io/gloo/issues/10934 +- type: DEPENDENCY_BUMP + description: Bumped the go version for go.mod + dependencyOwner: go + dependencyRepo: tools + dependencyTag: v0.13.0 + issueLink: https://github.com/solo-io/gloo/issues/10934 From 696aa5a2f678fc94a516a4601db9c863971783e9 Mon Sep 17 00:00:00 2001 From: Ashish Banerjee Date: Thu, 14 Aug 2025 13:16:16 -0400 Subject: [PATCH 5/8] Update go to 1.24.6 --- changelog/v0.25.4/update-oauth2.yaml | 6 ++++++ go.mod | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changelog/v0.25.4/update-oauth2.yaml b/changelog/v0.25.4/update-oauth2.yaml index b6ab6445..800c787e 100644 --- a/changelog/v0.25.4/update-oauth2.yaml +++ b/changelog/v0.25.4/update-oauth2.yaml @@ -1,4 +1,10 @@ changelog: +- type: DEPENDENCY_BUMP + description: Bumped the go version for go.mod + dependencyOwner: golang + dependencyRepo: go + dependencyTag: v1.24.6 + issueLink: https://github.com/solo-io/gloo/issues/10934 - type: DEPENDENCY_BUMP description: Bumped the go version for go.mod dependencyOwner: go diff --git a/go.mod b/go.mod index 885785d8..2e577337 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/solo-io/go-utils -go 1.23.0 +go 1.24.6 require ( cloud.google.com/go/pubsub v1.30.0 From a4113e92d0df275130bb8de11003a23bfe94534f Mon Sep 17 00:00:00 2001 From: sheidkamp Date: Thu, 14 Aug 2025 14:16:52 -0400 Subject: [PATCH 6/8] Update input.go --- surveyutils/input.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surveyutils/input.go b/surveyutils/input.go index 79542e2f..950bccaf 100644 --- a/surveyutils/input.go +++ b/surveyutils/input.go @@ -197,7 +197,7 @@ func SelectJoinedData(message string, target *string, list []JoinerData) error { func EnsureCsv(message string, source string, target *[]string, staticMode bool) error { if staticMode && source == "" { - return fmt.Errorf(message) + return fmt.Errorf("%s", message) } if !staticMode { if err := GetStringInput(message, &source); err != nil { From 8050e6147921c3a12e1e30116d7519c27a370e2d Mon Sep 17 00:00:00 2001 From: sheidkamp Date: Thu, 14 Aug 2025 14:20:32 -0400 Subject: [PATCH 7/8] Update make.go --- testutils/make.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testutils/make.go b/testutils/make.go index 10663e5f..9446fbc9 100644 --- a/testutils/make.go +++ b/testutils/make.go @@ -13,7 +13,7 @@ func MustMake(dir, args string) { make.Dir = dir out, err := make.CombinedOutput() if err != nil { - fmt.Printf(string(out)) + fmt.Printf("%s", out) } Expect(err).NotTo(HaveOccurred()) } From cfc5b7c9ce5519199b36b542fa2658a66a7db429 Mon Sep 17 00:00:00 2001 From: sheidkamp Date: Thu, 14 Aug 2025 14:21:44 -0400 Subject: [PATCH 8/8] Update update-oauth2.yaml --- changelog/v0.25.4/update-oauth2.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changelog/v0.25.4/update-oauth2.yaml b/changelog/v0.25.4/update-oauth2.yaml index 800c787e..76cde446 100644 --- a/changelog/v0.25.4/update-oauth2.yaml +++ b/changelog/v0.25.4/update-oauth2.yaml @@ -5,27 +5,32 @@ changelog: dependencyRepo: go dependencyTag: v1.24.6 issueLink: https://github.com/solo-io/gloo/issues/10934 + resolvesIssue: false - type: DEPENDENCY_BUMP description: Bumped the go version for go.mod dependencyOwner: go dependencyRepo: mod dependencyTag: v0.20.0 issueLink: https://github.com/solo-io/gloo/issues/10934 + resolvesIssue: false - type: DEPENDENCY_BUMP description: Bumped the go version for go.mod dependencyOwner: go dependencyRepo: oauth2 dependencyTag: v0.27.0 issueLink: https://github.com/solo-io/gloo/issues/10934 + resolvesIssue: false - type: DEPENDENCY_BUMP description: Bumped the go version for go.mod dependencyOwner: go dependencyRepo: sync dependencyTag: v0.3.0 issueLink: https://github.com/solo-io/gloo/issues/10934 + resolvesIssue: false - type: DEPENDENCY_BUMP description: Bumped the go version for go.mod dependencyOwner: go dependencyRepo: tools dependencyTag: v0.13.0 issueLink: https://github.com/solo-io/gloo/issues/10934 + resolvesIssue: false \ No newline at end of file