From 8c4d9679cef07965fd3090e9273c246d9fb51819 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Fri, 14 Feb 2025 13:47:32 -0800 Subject: [PATCH 01/21] Go 1.24 --- .tool-versions | 1 + changelog/v1.19.0-beta8/go-1.24.0.yaml | 6 ++++++ cloudbuild-cache.yaml | 2 +- docs/content/guides/dev/setting-up-dev-environment.md | 4 ++-- go.mod | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .tool-versions create mode 100644 changelog/v1.19.0-beta8/go-1.24.0.yaml diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000000..eeb7440e2b4 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +golang 1.24.0 \ No newline at end of file diff --git a/changelog/v1.19.0-beta8/go-1.24.0.yaml b/changelog/v1.19.0-beta8/go-1.24.0.yaml new file mode 100644 index 00000000000..7cedf8e0769 --- /dev/null +++ b/changelog/v1.19.0-beta8/go-1.24.0.yaml @@ -0,0 +1,6 @@ +changelog: +- type: DEPENDENCY_BUMP + description: Bumped the go version to 1.24.0 + dependencyOwner: golang + dependencyRepo: go + dependencyTag: v1.24.0 \ No newline at end of file diff --git a/cloudbuild-cache.yaml b/cloudbuild-cache.yaml index a7eeea41fb8..f3bf9ed85dc 100644 --- a/cloudbuild-cache.yaml +++ b/cloudbuild-cache.yaml @@ -1,6 +1,6 @@ options: env: - - "_GO_VERSION=1.23.3" + - "_GO_VERSION=1.24.0" steps: - name: gcr.io/cloud-builders/gsutil diff --git a/docs/content/guides/dev/setting-up-dev-environment.md b/docs/content/guides/dev/setting-up-dev-environment.md index e367f0e6cbc..9a24beedc6f 100644 --- a/docs/content/guides/dev/setting-up-dev-environment.md +++ b/docs/content/guides/dev/setting-up-dev-environment.md @@ -12,7 +12,7 @@ Developing on Gloo Gateway requires the following to be installed on your system - [`Make`](https://www.gnu.org/software/make/) - [`Git`](https://git-scm.com/) -- [`Go`](https://golang.org/) (`solo-io` projects are built using version `1.23.3`) +- [`Go`](https://golang.org/) (`solo-io` projects are built using version `1.24.0`) - `Protoc` (`solo-io` projects are built using version `3.6.1`) - Standard development tools like `gcc` @@ -28,7 +28,7 @@ xcode-select --install # install version of go in go.mod ############################################ # - macOS: -brew install go@1.23 +brew install go@1.24 # - other operating systems: # follow directions at https://go.dev/doc/install diff --git a/go.mod b/go.mod index e7b77a8383e..234869ddf8d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/solo-io/gloo -go 1.23.3 +go 1.24.0 // Note for developers: upgrading go will also require upgrading go in the following files: // ./cloudbuild-cache.yaml, From 36f6e8fde9742a42a3d65c0b4e6f4a95d01b1390 Mon Sep 17 00:00:00 2001 From: changelog-bot Date: Fri, 14 Feb 2025 23:04:53 +0000 Subject: [PATCH 02/21] Adding changelog file to new location --- changelog/v1.19.0-beta9/go-1.24.0.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/v1.19.0-beta9/go-1.24.0.yaml diff --git a/changelog/v1.19.0-beta9/go-1.24.0.yaml b/changelog/v1.19.0-beta9/go-1.24.0.yaml new file mode 100644 index 00000000000..7cedf8e0769 --- /dev/null +++ b/changelog/v1.19.0-beta9/go-1.24.0.yaml @@ -0,0 +1,6 @@ +changelog: +- type: DEPENDENCY_BUMP + description: Bumped the go version to 1.24.0 + dependencyOwner: golang + dependencyRepo: go + dependencyTag: v1.24.0 \ No newline at end of file From da59f71b5f09038d78eb178e20feb0de4a057acb Mon Sep 17 00:00:00 2001 From: changelog-bot Date: Fri, 14 Feb 2025 23:04:54 +0000 Subject: [PATCH 03/21] Deleting changelog file from old location --- changelog/v1.19.0-beta8/go-1.24.0.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 changelog/v1.19.0-beta8/go-1.24.0.yaml diff --git a/changelog/v1.19.0-beta8/go-1.24.0.yaml b/changelog/v1.19.0-beta8/go-1.24.0.yaml deleted file mode 100644 index 7cedf8e0769..00000000000 --- a/changelog/v1.19.0-beta8/go-1.24.0.yaml +++ /dev/null @@ -1,6 +0,0 @@ -changelog: -- type: DEPENDENCY_BUMP - description: Bumped the go version to 1.24.0 - dependencyOwner: golang - dependencyRepo: go - dependencyTag: v1.24.0 \ No newline at end of file From 0e788d20750649e28467f7de991e52055cf1d511 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Mon, 17 Feb 2025 10:15:23 -0800 Subject: [PATCH 04/21] Fixing some vet errors and upating linter --- .github/workflows/static-analysis.yaml | 2 +- go.mod | 3 +++ go.sum | 19 +++++++++++++++++++ .../directresponse/direct_response_plugin.go | 5 +++-- .../gateway2/translator/sslutils/ssl_utils.go | 2 +- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 71bab418182..e3391384d92 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -49,7 +49,7 @@ jobs: # `make analyze` runs the linter with similar arguments to what we use here. # If this action fails, try running `make analyze` locally. with: - version: v1.57.2 + version: v1.64.5 args: --verbose --modules-download-mode=readonly --allow-parallel-runners skip-cache: true skip-save-cache: true diff --git a/go.mod b/go.mod index 234869ddf8d..936630c1ccd 100644 --- a/go.mod +++ b/go.mod @@ -101,6 +101,7 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.60.1 github.com/quasilyte/go-ruleguard/dsl v0.3.22 + github.com/solo-io/cue v0.4.7 github.com/stoewer/go-strcase v1.3.0 github.com/stretchr/testify v1.9.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 @@ -273,6 +274,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/oklog/run v1.0.0 // indirect @@ -326,6 +328,7 @@ require ( golang.org/x/term v0.27.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index eb1b994cca8..3867827525a 100644 --- a/go.sum +++ b/go.sum @@ -1331,6 +1331,7 @@ cuelang.org/go v0.10.0/go.mod h1:HzlaqqqInHNiqE6slTP6+UtxT9hN6DAzgJgdbNxXvX8= dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= @@ -1530,6 +1531,8 @@ github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50/go.mod h1:5e1+Vvlzido6 github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI= github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/apd/v2 v2.0.1/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg= github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc= github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= @@ -1611,6 +1614,7 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk= github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/emicklei/proto v1.13.2 h1:z/etSFO3uyXeuEsVPzfl56WNgzcvIr42aQazXaQmFZY= github.com/emicklei/proto v1.13.2/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= @@ -2016,6 +2020,7 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -2304,6 +2309,7 @@ github.com/lestrrat-go/jwx v1.2.30/go.mod h1:vMxrwFhunGZ3qddmfmEm2+uced8MSI6QFWG github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= @@ -2419,6 +2425,8 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= +github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto= +github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -2609,6 +2617,7 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc/go.mod h1:KbKfKPy2I6ecOIGA9apfheFv14+P3RSmmQvshofQyMY= github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 h1:sadMIsgmHpEOGbUs6VtHBXRR1OHevnj7hLx9ZcdNGW4= github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c= github.com/pseudomuto/protoc-gen-doc v1.0.0 h1:g4ld0LeJ2OO2FXhm1o7Arrv+W75sdEClxuvVUSN2RAE= @@ -2633,6 +2642,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -2999,6 +3009,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= @@ -3007,6 +3018,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20210126221216-84987778548c/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= @@ -3040,12 +3052,15 @@ golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPI golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 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.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -3477,6 +3492,7 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -3492,6 +3508,7 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200612220849-54c614fe050c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -3543,6 +3560,7 @@ golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= @@ -4027,6 +4045,7 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/projects/gateway2/translator/plugins/directresponse/direct_response_plugin.go b/projects/gateway2/translator/plugins/directresponse/direct_response_plugin.go index 4aebd302c5c..014af84421a 100644 --- a/projects/gateway2/translator/plugins/directresponse/direct_response_plugin.go +++ b/projects/gateway2/translator/plugins/directresponse/direct_response_plugin.go @@ -8,6 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" + "github.com/solo-io/cue/cue/errors" "github.com/solo-io/gloo/projects/gateway2/api/v1alpha1" "github.com/solo-io/gloo/projects/gateway2/query" "github.com/solo-io/gloo/projects/gateway2/reports" @@ -49,7 +50,7 @@ func (p *plugin) ApplyRoutePlugin( Message: errMsg, }) outputRoute.Action = ErrorResponseAction() - return fmt.Errorf(errMsg) + return errors.New(errMsg) } // verify the DR reference is valid and get the DR object from the cluster. @@ -78,7 +79,7 @@ func (p *plugin) ApplyRoutePlugin( Message: errMsg, }) outputRoute.Action = ErrorResponseAction() - return fmt.Errorf(errMsg) + return errors.New(errMsg) } outputRoute.Action = &v1.Route_DirectResponseAction{ diff --git a/projects/gateway2/translator/sslutils/ssl_utils.go b/projects/gateway2/translator/sslutils/ssl_utils.go index d34444392b0..6681ea5ec9f 100644 --- a/projects/gateway2/translator/sslutils/ssl_utils.go +++ b/projects/gateway2/translator/sslutils/ssl_utils.go @@ -31,7 +31,7 @@ const ( var ( InvalidTlsSecretError = func(secret *corev1.Secret, err error) error { errorString := fmt.Sprintf("%v.%v is not a valid TLS secret", secret.Namespace, secret.Name) - return eris.Wrapf(err, errorString) + return eris.Wrap(err, errorString) } NoCertificateFoundError = eris.New("no certificate information found") From e08fd46c127f54b69f0912207174a92e9b87cb5d Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Mon, 17 Feb 2025 10:41:33 -0800 Subject: [PATCH 05/21] Bumping some versions --- ci/cloudbuild/publish-artifacts.yaml | 10 +++++----- ci/cloudbuild/run-tests.yaml | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/cloudbuild/publish-artifacts.yaml b/ci/cloudbuild/publish-artifacts.yaml index 0de36bc7e57..2ca4026e42e 100644 --- a/ci/cloudbuild/publish-artifacts.yaml +++ b/ci/cloudbuild/publish-artifacts.yaml @@ -1,6 +1,6 @@ steps: -- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2' +- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.3' id: 'prepare-workspace' args: - '--repo-name' @@ -51,7 +51,7 @@ steps: - create - --use -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' id: 'build-certgen-arm64-binary' args: - 'certgen-docker' @@ -60,7 +60,7 @@ steps: - 'GOARCH=arm64' # Run make targets to push docker images to quay.io -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' id: 'publish-docker' args: - 'publish-docker' @@ -86,7 +86,7 @@ steps: waitFor: - 'publish-docker' -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' id: 'release-chart' dir: *dir args: @@ -101,7 +101,7 @@ steps: - 'gcr-auth' # Run make targets to build and push docker images to GCR -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' id: 'publish-docker-extended-gcr' dir: *dir args: diff --git a/ci/cloudbuild/run-tests.yaml b/ci/cloudbuild/run-tests.yaml index 1f7fb0a3712..52953274368 100644 --- a/ci/cloudbuild/run-tests.yaml +++ b/ci/cloudbuild/run-tests.yaml @@ -1,6 +1,6 @@ steps: -- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2' +- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.3' id: 'prepare-workspace' args: - '--repo-name' @@ -23,7 +23,7 @@ steps: cd /go/pkg gsutil cat gs://$PROJECT_ID-cache/gloo/gloo-mod.tar.gz | tar -xzf - || echo "untar mod cache failed; continuing because we can download deps as we need them" -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' id: 'prepare-envoy' dir: *dir entrypoint: 'bash' @@ -77,7 +77,7 @@ steps: waitFor: - 'prepare-gcr-zone' -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' id: 'prepare-test-tools' dir: *dir args: @@ -88,7 +88,7 @@ steps: - 'prepare-gcr-zone' - 'prepare-test-credentials' -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.3' id: 'run-tests' dir: *dir entrypoint: 'make' @@ -99,7 +99,7 @@ steps: secretEnv: - 'JWT_PRIVATE_KEY' -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.3' id: 'run-e2e-tests' dir: *dir entrypoint: 'make' @@ -110,7 +110,7 @@ steps: secretEnv: - 'JWT_PRIVATE_KEY' -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.3' id: 'run-hashicorp-e2e-tests' dir: *dir entrypoint: 'make' From ae0fbd88c6853a3cd1c67f3e398371ec228f8392 Mon Sep 17 00:00:00 2001 From: changelog-bot Date: Mon, 17 Feb 2025 22:12:31 +0000 Subject: [PATCH 06/21] Adding changelog file to new location --- changelog/v1.19.0-beta10/go-1.24.0.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/v1.19.0-beta10/go-1.24.0.yaml diff --git a/changelog/v1.19.0-beta10/go-1.24.0.yaml b/changelog/v1.19.0-beta10/go-1.24.0.yaml new file mode 100644 index 00000000000..7cedf8e0769 --- /dev/null +++ b/changelog/v1.19.0-beta10/go-1.24.0.yaml @@ -0,0 +1,6 @@ +changelog: +- type: DEPENDENCY_BUMP + description: Bumped the go version to 1.24.0 + dependencyOwner: golang + dependencyRepo: go + dependencyTag: v1.24.0 \ No newline at end of file From 6a9429ce8a2e4478e8e845045fb51e663ae11aa5 Mon Sep 17 00:00:00 2001 From: changelog-bot Date: Mon, 17 Feb 2025 22:12:32 +0000 Subject: [PATCH 07/21] Deleting changelog file from old location --- changelog/v1.19.0-beta9/go-1.24.0.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 changelog/v1.19.0-beta9/go-1.24.0.yaml diff --git a/changelog/v1.19.0-beta9/go-1.24.0.yaml b/changelog/v1.19.0-beta9/go-1.24.0.yaml deleted file mode 100644 index 7cedf8e0769..00000000000 --- a/changelog/v1.19.0-beta9/go-1.24.0.yaml +++ /dev/null @@ -1,6 +0,0 @@ -changelog: -- type: DEPENDENCY_BUMP - description: Bumped the go version to 1.24.0 - dependencyOwner: golang - dependencyRepo: go - dependencyTag: v1.24.0 \ No newline at end of file From 5f806b88e57d66c0f700142e9cb48be8d053be0f Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Mon, 17 Feb 2025 15:52:38 -0800 Subject: [PATCH 08/21] Updated cloud-builders --- ci/cloudbuild/run-tests.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/cloudbuild/run-tests.yaml b/ci/cloudbuild/run-tests.yaml index 52953274368..6a8eed904b3 100644 --- a/ci/cloudbuild/run-tests.yaml +++ b/ci/cloudbuild/run-tests.yaml @@ -1,6 +1,6 @@ steps: -- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.3' +- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.12.0' id: 'prepare-workspace' args: - '--repo-name' @@ -23,7 +23,7 @@ steps: cd /go/pkg gsutil cat gs://$PROJECT_ID-cache/gloo/gloo-mod.tar.gz | tar -xzf - || echo "untar mod cache failed; continuing because we can download deps as we need them" -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' id: 'prepare-envoy' dir: *dir entrypoint: 'bash' @@ -77,7 +77,7 @@ steps: waitFor: - 'prepare-gcr-zone' -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' id: 'prepare-test-tools' dir: *dir args: @@ -88,7 +88,7 @@ steps: - 'prepare-gcr-zone' - 'prepare-test-credentials' -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.3' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.12.0' id: 'run-tests' dir: *dir entrypoint: 'make' @@ -99,7 +99,7 @@ steps: secretEnv: - 'JWT_PRIVATE_KEY' -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.3' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.12.0' id: 'run-e2e-tests' dir: *dir entrypoint: 'make' @@ -110,7 +110,7 @@ steps: secretEnv: - 'JWT_PRIVATE_KEY' -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.3' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.12.0' id: 'run-hashicorp-e2e-tests' dir: *dir entrypoint: 'make' From 062459defa702eb5bafbfb3557a070d08d76e94d Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Mon, 17 Feb 2025 16:27:33 -0800 Subject: [PATCH 09/21] Publish version --- ci/cloudbuild/publish-artifacts.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/cloudbuild/publish-artifacts.yaml b/ci/cloudbuild/publish-artifacts.yaml index 2ca4026e42e..741259660b8 100644 --- a/ci/cloudbuild/publish-artifacts.yaml +++ b/ci/cloudbuild/publish-artifacts.yaml @@ -1,6 +1,6 @@ steps: -- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.3' +- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.12.0' id: 'prepare-workspace' args: - '--repo-name' @@ -51,7 +51,7 @@ steps: - create - --use -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' id: 'build-certgen-arm64-binary' args: - 'certgen-docker' @@ -60,7 +60,7 @@ steps: - 'GOARCH=arm64' # Run make targets to push docker images to quay.io -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' id: 'publish-docker' args: - 'publish-docker' @@ -86,7 +86,7 @@ steps: waitFor: - 'publish-docker' -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' id: 'release-chart' dir: *dir args: @@ -101,7 +101,7 @@ steps: - 'gcr-auth' # Run make targets to build and push docker images to GCR -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.3' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' id: 'publish-docker-extended-gcr' dir: *dir args: From f464e7c019d27215da3b210d32b4aa7278f0f49c Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Tue, 18 Feb 2025 09:57:48 -0800 Subject: [PATCH 10/21] Moved uniq-line-by in golangci-lint output to issues. Changed in 1.63 --- .golangci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 871f3450d11..abd34deba66 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -62,6 +62,9 @@ issues: # Set to 0 to disable. max-same-issues: 0 + # Make issues output unique by line. + uniq-by-line: true + run: # Number of CPUs to use when running golangci-lint. # Default: the number of logical CPUs in the machine @@ -104,8 +107,5 @@ output: # Print linter name in the end of issue text. print-linter-name: true - # Make issues output unique by line. - uniq-by-line: true - # Sort results by: filepath, line and column. sort-results: true From 310cfb69950cee96363218daeab750fce4fc64ed Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Tue, 18 Feb 2025 12:05:42 -0800 Subject: [PATCH 11/21] Resolving linter issues --- install/test/helm_test.go | 2 +- test/e2e/health_checks_test.go | 2 +- test/kube2e/gateway/gateway_test.go | 2 +- test/kube2e/gateway/robustness_test.go | 4 ++-- test/v1helpers/test_upstream.go | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/install/test/helm_test.go b/install/test/helm_test.go index 7c528f395d7..b5a455ab221 100644 --- a/install/test/helm_test.go +++ b/install/test/helm_test.go @@ -6321,7 +6321,7 @@ metadata: a = getFieldFromUnstructured(u, append(prefixPath, "spec", "parallelism")...) Expect(a).To(Equal(int64(PARALLELISM))) a = getFieldFromUnstructured(u, append(prefixPath, "spec", "manualSelector")...) - Expect(a).To(Equal(MANUAL_SELECTOR)) + Expect(a).To(BeTrue()) return true } return false diff --git a/test/e2e/health_checks_test.go b/test/e2e/health_checks_test.go index 611fbf50dd6..c8fbc7bfecd 100644 --- a/test/e2e/health_checks_test.go +++ b/test/e2e/health_checks_test.go @@ -293,7 +293,7 @@ var _ = Describe("Health Checks", func() { _, err := testClients.UpstreamClient.Write(tu.Upstream, clients.WriteOpts{}) Expect(err).NotTo(HaveOccurred()) - Eventually(func() error { return envoyInstance.DisablePanicMode() }, time.Second*5, time.Second/4).Should(BeNil()) + Eventually(func() error { return envoyInstance.DisablePanicMode() }, time.Second*5, time.Second/4).Should(Succeed()) tu = v1helpers.NewTestGRPCUpstream(ctx, envoyInstance.LocalAddr(), 5) _, err = testClients.UpstreamClient.Write(tu.Upstream, clients.WriteOpts{}) diff --git a/test/kube2e/gateway/gateway_test.go b/test/kube2e/gateway/gateway_test.go index faba896171f..4591e516b27 100644 --- a/test/kube2e/gateway/gateway_test.go +++ b/test/kube2e/gateway/gateway_test.go @@ -1451,7 +1451,7 @@ var _ = Describe("Kube2e: gateway", func() { } return eris.Errorf("expected all test resources to have been deleted but found: "+ "%d pods, %d virtual services, %d proxies", len(coloredPods.Items), len(vsList), len(proxyList)) - }, time.Minute, time.Second).Should(BeNil()) + }, time.Minute, time.Second).Should(Succeed()) }) It("routes to subsets and upstream groups", func() { diff --git a/test/kube2e/gateway/robustness_test.go b/test/kube2e/gateway/robustness_test.go index 4217ce6c7c8..fa4bff67899 100644 --- a/test/kube2e/gateway/robustness_test.go +++ b/test/kube2e/gateway/robustness_test.go @@ -594,7 +594,7 @@ func scaleDeploymentTo(kubeClient kubernetes.Interface, deploymentToScale *appsv return err } return nil - }, 60*time.Second, 2*time.Second).Should(BeNil()) + }, 60*time.Second, 2*time.Second).Should(Succeed()) // Wait for expected running pod number EventuallyWithOffset(1, func() error { @@ -612,5 +612,5 @@ func scaleDeploymentTo(kubeClient kubernetes.Interface, deploymentToScale *appsv return nil } return eris.Errorf("expected %d pods but found %d", replicas, len(pods.Items)) - }, 60*time.Second, 1*time.Second).Should(BeNil()) + }, 60*time.Second, 1*time.Second).Should(Succeed()) } diff --git a/test/v1helpers/test_upstream.go b/test/v1helpers/test_upstream.go index 916b6ad5910..ae2221f0b30 100644 --- a/test/v1helpers/test_upstream.go +++ b/test/v1helpers/test_upstream.go @@ -463,7 +463,7 @@ func TestUpstreamReachableWithOffset(offset int, envoyPort uint32, tu *TestUpstr } Fail("timeout testing upstream reachability") case receivedRequest = <-tu.C: - if receivedRequest.Method == "POST" && + if receivedRequest.Method == http.MethodPost && bytes.Equal(receivedRequest.Body, body) { return } @@ -600,5 +600,5 @@ func ExpectGrpcHealthOK(rootca *string, envoyPort uint32, service string) { return fmt.Errorf("%v is not SERVING", resp.GetStatus()) } return nil - }, "30s", "1s").Should(BeNil()) + }, "30s", "1s").Should(Succeed()) } From 4774ba08d71db0c71a30af8eca14a2675da542c9 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Tue, 18 Feb 2025 12:19:48 -0800 Subject: [PATCH 12/21] Missed a lint error --- test/kube2e/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/kube2e/util.go b/test/kube2e/util.go index 04af5a3aa8e..7919d95d56a 100644 --- a/test/kube2e/util.go +++ b/test/kube2e/util.go @@ -61,7 +61,7 @@ func GlooctlCheckEventuallyHealthy(offset int, namespace string, timeoutInterval return errors.Wrap(err, "glooctl check detected a problem with the installation") } return nil - }, timeoutInterval, "5s").Should(BeNil()) + }, timeoutInterval, "5s").Should(Succeed()) } func EventuallyReachesConsistentState(installNamespace string) { From d4c0c83a7508ccc30aab56f64d9071613bcee92a Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Tue, 18 Feb 2025 13:27:16 -0800 Subject: [PATCH 13/21] Fixing more compliation errors --- pkg/cliutil/input.go | 3 +- .../validating_admission_webhook.go | 2 +- projects/gateway/pkg/validation/validator.go | 8 ++--- .../gateway/pkg/validation/validator_test.go | 9 +++--- projects/gloo/cli/pkg/cmd/check/gloo_stats.go | 5 ++-- .../cli/pkg/cmd/check/proxy_prom_stats.go | 3 +- projects/gloo/cli/pkg/cmd/check/root.go | 29 +++++++++---------- projects/gloo/cli/pkg/cmd/debug/debug.go | 2 +- projects/gloo/cli/pkg/cmd/license/validate.go | 4 +-- projects/gloo/cli/pkg/printers/check.go | 6 ++-- .../plugins/pluginutils/cluster_extensions.go | 2 +- projects/gloo/pkg/utils/ssl.go | 4 +-- test/gomega/matchers/json_contains.go | 2 +- 13 files changed, 40 insertions(+), 39 deletions(-) diff --git a/pkg/cliutil/input.go b/pkg/cliutil/input.go index 2ea670c8e97..7a0df9d2786 100644 --- a/pkg/cliutil/input.go +++ b/pkg/cliutil/input.go @@ -1,6 +1,7 @@ package cliutil import ( + "errors" "fmt" "strconv" "strings" @@ -200,7 +201,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 errors.New(message) } if !staticMode { if err := GetStringInput(message, &source); err != nil { diff --git a/projects/gateway/pkg/services/k8sadmission/validating_admission_webhook.go b/projects/gateway/pkg/services/k8sadmission/validating_admission_webhook.go index 7b19141dc30..a8ae6233e67 100644 --- a/projects/gateway/pkg/services/k8sadmission/validating_admission_webhook.go +++ b/projects/gateway/pkg/services/k8sadmission/validating_admission_webhook.go @@ -65,7 +65,7 @@ var ( unmarshalErrMsg = "could not unmarshal raw object" UnmarshalErr = errors.New(unmarshalErrMsg) WrappedUnmarshalErr = func(err error) error { - return errors.Wrapf(err, unmarshalErrMsg) + return errors.Wrap(err, unmarshalErrMsg) } ListGVK = schema.GroupVersionKind{ Version: "v1", diff --git a/projects/gateway/pkg/validation/validator.go b/projects/gateway/pkg/validation/validator.go index 9300b264eb4..c3604490160 100644 --- a/projects/gateway/pkg/validation/validator.go +++ b/projects/gateway/pkg/validation/validator.go @@ -78,7 +78,7 @@ var ( failedResourceReports = "failed gloo validation resource reports" failedExtensionResourceReports = "failed extension resource reports" WrappedUnmarshalErr = func(err error) error { - return errors.Wrapf(err, unmarshalErrMsg) + return errors.Wrap(err, unmarshalErrMsg) } proxyFailedGlooValidation = func(err error, proxy *gloov1.Proxy) error { @@ -347,7 +347,7 @@ func (v *validator) validateProxiesAndExtensions(ctx context.Context, snapshot * // The returned value indicates whether to stop processing this proxy, but this is the end of the loop err = v.getErrorsFromGlooValidation(glooReports) if err != nil { - err = errors.Wrapf(err, failedResourceReports) + err = errors.Wrap(err, failedResourceReports) errs = multierror.Append(errs, err) } } // End of proxy validation loop @@ -360,7 +360,7 @@ func (v *validator) validateProxiesAndExtensions(ctx context.Context, snapshot * err = v.getErrorsFromResourceReports(extensionReports) if err != nil { - err = errors.Wrapf(err, failedExtensionResourceReports) + err = errors.Wrap(err, failedExtensionResourceReports) errs = multierror.Append(errs, err) } } @@ -396,7 +396,7 @@ func (v *validator) translateGlooEdgeProxies( err := v.getErrorsFromResourceReports(reports) if err != nil { - err = errors.Wrapf(err, couldNotRenderProxy) + err = errors.Wrap(err, couldNotRenderProxy) errs = multierror.Append(errs, err) if !collectAllErrors { diff --git a/projects/gateway/pkg/validation/validator_test.go b/projects/gateway/pkg/validation/validator_test.go index 2a700969273..8bc321a3796 100644 --- a/projects/gateway/pkg/validation/validator_test.go +++ b/projects/gateway/pkg/validation/validator_test.go @@ -11,6 +11,7 @@ import ( "github.com/hashicorp/go-multierror" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + errors "github.com/rotisserie/eris" "github.com/solo-io/gloo/pkg/utils/statsutils" v1 "github.com/solo-io/gloo/projects/gateway/pkg/api/v1" "github.com/solo-io/gloo/projects/gateway/pkg/translator" @@ -1506,7 +1507,7 @@ func generateNone() reporter.ResourceReports { func generateChangeError() reporter.ResourceReports { validateChangeErrCnt++ return generateTranslationReports(reporter.Report{ - Errors: &multierror.Error{Errors: []error{fmt.Errorf(fmt.Sprintf(errStringF, validateChangeErrCnt))}}, + Errors: &multierror.Error{Errors: []error{fmt.Errorf(errStringF, validateChangeErrCnt)}}, }) } @@ -1520,14 +1521,14 @@ func generateChangeWarn() reporter.ResourceReports { func generateChangeWarnSameError() reporter.ResourceReports { validateChangeWarningCnt++ return generateTranslationReports(reporter.Report{ - Errors: &multierror.Error{Errors: []error{fmt.Errorf(errString)}}, Warnings: []string{fmt.Sprintf(warnStringF, validateChangeWarningCnt)}, + Errors: &multierror.Error{Errors: []error{errors.New(errString)}}, Warnings: []string{fmt.Sprintf(warnStringF, validateChangeWarningCnt)}, }) } func generateSameWarnChangeError() reporter.ResourceReports { validateChangeErrCnt++ return generateTranslationReports(reporter.Report{ - Errors: &multierror.Error{Errors: []error{fmt.Errorf(fmt.Sprintf(errStringF, validateChangeErrCnt))}}, Warnings: []string{warnString}, + Errors: &multierror.Error{Errors: []error{fmt.Errorf(errStringF, validateChangeErrCnt)}}, Warnings: []string{warnString}, }) } @@ -1535,7 +1536,7 @@ func generateChangeWarnChangeError() reporter.ResourceReports { validateChangeErrCnt++ validateChangeWarningCnt++ return generateTranslationReports(reporter.Report{ - Errors: &multierror.Error{Errors: []error{fmt.Errorf(fmt.Sprintf("r0err1-%d", validateChangeErrCnt))}}, Warnings: []string{fmt.Sprintf("r0warn1-%d", validateChangeWarningCnt)}, + Errors: &multierror.Error{Errors: []error{fmt.Errorf("r0err1-%d", validateChangeErrCnt)}}, Warnings: []string{fmt.Sprintf("r0warn1-%d", validateChangeWarningCnt)}, }) } diff --git a/projects/gloo/cli/pkg/cmd/check/gloo_stats.go b/projects/gloo/cli/pkg/cmd/check/gloo_stats.go index b8bd0dff572..f5b583a54b9 100644 --- a/projects/gloo/cli/pkg/cmd/check/gloo_stats.go +++ b/projects/gloo/cli/pkg/cmd/check/gloo_stats.go @@ -2,6 +2,7 @@ package check import ( "context" + "errors" "fmt" "strconv" "strings" @@ -107,12 +108,12 @@ func checkXdsMetrics(ctx context.Context, printer printers.P, opts *options.Opti if strings.TrimSpace(stats) == "" { err := fmt.Sprint(errMessage+": could not find any metrics at", glooStatsPath, "endpoint of the "+customGlooDeploymentName+" deployment") fmt.Println(err) - return fmt.Errorf(err) + return errors.New(err) } if !ResourcesSyncedOverXds(printer, stats, customGlooDeploymentName) { fmt.Println(errMessage) - return fmt.Errorf(errMessage) + return errors.New(errMessage) } for _, deployment := range deployments.Items { diff --git a/projects/gloo/cli/pkg/cmd/check/proxy_prom_stats.go b/projects/gloo/cli/pkg/cmd/check/proxy_prom_stats.go index 7626c1b22f1..230bb3ebdb7 100644 --- a/projects/gloo/cli/pkg/cmd/check/proxy_prom_stats.go +++ b/projects/gloo/cli/pkg/cmd/check/proxy_prom_stats.go @@ -2,6 +2,7 @@ package check import ( "context" + "errors" "fmt" "io" "net/http" @@ -95,7 +96,7 @@ func checkProxyConnectedState(stats string, deploymentName string, genericErrMes } if !strings.Contains(stats, "envoy_control_plane_connected_state{} 1") { - err := fmt.Errorf(connectedStateErrMessage) + err := errors.New(connectedStateErrMessage) return err } diff --git a/projects/gloo/cli/pkg/cmd/check/root.go b/projects/gloo/cli/pkg/cmd/check/root.go index b20c8ffe84d..3ac3e85fdb9 100644 --- a/projects/gloo/cli/pkg/cmd/check/root.go +++ b/projects/gloo/cli/pkg/cmd/check/root.go @@ -272,7 +272,7 @@ func getAndCheckDeployments(ctx context.Context, printer printers.P, opts *optio if err != nil { errMessage := "Gloo namespace does not exist" fmt.Println(errMessage) - return nil, fmt.Errorf(errMessage) + return nil, errors.New(errMessage) } deployments, err := client.AppsV1().Deployments(opts.Metadata.GetNamespace()).List(ctx, metav1.ListOptions{}) if err != nil { @@ -281,7 +281,7 @@ func getAndCheckDeployments(ctx context.Context, printer printers.P, opts *optio if len(deployments.Items) == 0 { errMessage := "Gloo is not installed" fmt.Println(errMessage) - return nil, fmt.Errorf(errMessage) + return nil, errors.New(errMessage) } var multiErr *multierror.Error var message string @@ -391,7 +391,7 @@ func checkPods(ctx context.Context, printer printers.P, opts *options.Options) e } if errorToPrint != "" { - multiErr = multierror.Append(multiErr, fmt.Errorf(errorToPrint)) + multiErr = multierror.Append(multiErr, errors.New(errorToPrint)) } } } @@ -474,9 +474,6 @@ func checkUpstreamGroups(ctx context.Context, printer printers.P, _ *options.Opt multiErr = multierror.Append(multiErr, err) continue } - if err != nil { - return err - } for _, upstreamGroup := range upstreamGroups { if upstreamGroup.GetNamespacedStatuses() != nil { namespacedStatuses := upstreamGroup.GetNamespacedStatuses() @@ -709,11 +706,11 @@ func checkVirtualServices(ctx context.Context, printer printers.P, _ *options.Op case core.Status_Rejected: errMessage := fmt.Sprintf("Found rejected virtual service by '%s': %s ", reporter, renderMetadata(virtualService.GetMetadata())) errMessage += fmt.Sprintf("(Reason: %s)", status.GetReason()) - multiErr = multierror.Append(multiErr, fmt.Errorf(errMessage)) + multiErr = multierror.Append(multiErr, errors.New(errMessage)) case core.Status_Warning: errMessage := fmt.Sprintf("Found virtual service with warnings by '%s': %s ", reporter, renderMetadata(virtualService.GetMetadata())) errMessage += fmt.Sprintf("(Reason: %s)", status.GetReason()) - multiErr = multierror.Append(multiErr, fmt.Errorf(errMessage)) + multiErr = multierror.Append(multiErr, errors.New(errMessage)) } } } else { @@ -731,7 +728,7 @@ func checkVirtualServices(ctx context.Context, printer printers.P, _ *options.Op errMessage := "Virtual service references unknown upstream: " errMessage += fmt.Sprintf("(Virtual service: %s", renderMetadata(virtualService.GetMetadata())) errMessage += fmt.Sprintf(" | Upstream: %s)", renderRef(us.GetUpstream())) - multiErr = multierror.Append(multiErr, fmt.Errorf(errMessage)) + multiErr = multierror.Append(multiErr, errors.New(errMessage)) } } } @@ -746,7 +743,7 @@ func checkVirtualServices(ctx context.Context, printer printers.P, _ *options.Op errMessage := "Virtual service references unknown auth config:\n" errMessage += fmt.Sprintf(" Virtual service: %s\n", renderMetadata(virtualService.GetMetadata())) errMessage += fmt.Sprintf(" Auth Config: %s\n", renderRef(ref)) - return fmt.Errorf(errMessage) + return errors.New(errMessage) } return nil } @@ -757,7 +754,7 @@ func checkVirtualServices(ctx context.Context, printer printers.P, _ *options.Op errMessage := "Virtual service references unknown VirtualHostOption:\n" errMessage += fmt.Sprintf(" Virtual service: %s\n", renderMetadata(virtualService.GetMetadata())) errMessage += fmt.Sprintf(" VirtualHostOption: %s\n", renderRef(ref)) - return fmt.Errorf(errMessage) + return errors.New(errMessage) } } return nil @@ -798,7 +795,7 @@ func checkVirtualServices(ctx context.Context, printer printers.P, _ *options.Op errMessage := "Virtual service references unknown rate limit config:\n" errMessage += fmt.Sprintf(" Virtual service: %s\n", renderMetadata(virtualService.GetMetadata())) errMessage += fmt.Sprintf(" Rate Limit Config: %s\n", renderRef(resourceRef)) - return fmt.Errorf(errMessage) + return errors.New(errMessage) } return nil } @@ -849,11 +846,11 @@ func checkGateways(ctx context.Context, printer printers.P, _ *options.Options, case core.Status_Rejected: errMessage := fmt.Sprintf("Found rejected gateway by '%s': %s\n", reporter, renderMetadata(gateway.GetMetadata())) errMessage += fmt.Sprintf("Reason: %s\n", status.GetReason()) - multiErr = multierror.Append(multiErr, fmt.Errorf(errMessage)) + multiErr = multierror.Append(multiErr, errors.New(errMessage)) case core.Status_Warning: errMessage := fmt.Sprintf("Found gateway with warnings by '%s': %s\n", reporter, renderMetadata(gateway.GetMetadata())) errMessage += fmt.Sprintf("Reason: %s\n", status.GetReason()) - multiErr = multierror.Append(multiErr, fmt.Errorf(errMessage)) + multiErr = multierror.Append(multiErr, errors.New(errMessage)) } } } else { @@ -904,11 +901,11 @@ func checkProxies(ctx context.Context, printer printers.P, opts *options.Options case core.Status_Rejected: errMessage := fmt.Sprintf("Found rejected proxy by '%s': %s\n", reporter, renderMetadata(proxy.GetMetadata())) errMessage += fmt.Sprintf("Reason: %s\n", status.GetReason()) - multiErr = multierror.Append(multiErr, fmt.Errorf(errMessage)) + multiErr = multierror.Append(multiErr, errors.New(errMessage)) case core.Status_Warning: errMessage := fmt.Sprintf("Found proxy with warnings by '%s': %s\n", reporter, renderMetadata(proxy.GetMetadata())) errMessage += fmt.Sprintf("Reason: %s\n", status.GetReason()) - multiErr = multierror.Append(multiErr, fmt.Errorf(errMessage)) + multiErr = multierror.Append(multiErr, errors.New(errMessage)) } } } else { diff --git a/projects/gloo/cli/pkg/cmd/debug/debug.go b/projects/gloo/cli/pkg/cmd/debug/debug.go index 10ef7fcba4b..b8992294ba6 100644 --- a/projects/gloo/cli/pkg/cmd/debug/debug.go +++ b/projects/gloo/cli/pkg/cmd/debug/debug.go @@ -163,7 +163,7 @@ func zip(fs afero.Fs, dir string, file string) error { } func displayLogs(w io.Writer, logs strings.Builder) error { - _, err := fmt.Fprintf(w, logs.String()) + _, err := fmt.Fprint(w, logs.String()) return err } diff --git a/projects/gloo/cli/pkg/cmd/license/validate.go b/projects/gloo/cli/pkg/cmd/license/validate.go index def85a57a1d..0db0b406b8e 100644 --- a/projects/gloo/cli/pkg/cmd/license/validate.go +++ b/projects/gloo/cli/pkg/cmd/license/validate.go @@ -67,7 +67,7 @@ func validateLicense(licenseKey string) error { if err != nil { return fmt.Errorf("can't parse license key") } - fmt.Printf(formatLicenseDetail(licenseClaims.CreationDate, licenseClaims.ExpirationDate, licenseClaims.Product, licenseClaims.LicenseType == "trial")) + fmt.Print(formatLicenseDetail(licenseClaims.CreationDate, licenseClaims.ExpirationDate, licenseClaims.Product, licenseClaims.LicenseType == "trial")) return nil } @@ -78,7 +78,7 @@ func validateLegacyLicense(licenseKey string) error { if err != nil { return fmt.Errorf("can't parse license key") } - fmt.Printf(formatLicenseDetail(licenseLegacyClaim.Iat, licenseLegacyClaim.Exp, licenseLegacyClaim.Product, licenseLegacyClaim.LicType == "trial")) + fmt.Print(formatLicenseDetail(licenseLegacyClaim.Iat, licenseLegacyClaim.Exp, licenseLegacyClaim.Product, licenseLegacyClaim.LicType == "trial")) return nil } diff --git a/projects/gloo/cli/pkg/printers/check.go b/projects/gloo/cli/pkg/printers/check.go index 3d49819d167..40eea09f001 100644 --- a/projects/gloo/cli/pkg/printers/check.go +++ b/projects/gloo/cli/pkg/printers/check.go @@ -33,7 +33,7 @@ type P struct { func (p P) AppendCheck(name string) { if p.OutputType.IsTable() { - fmt.Printf(name) + fmt.Print(name) } else if p.OutputType.IsJSON() { cr := CheckStatus{Name: sanitizeName(name)} p.CheckResult.Resources = append(p.CheckResult.Resources, cr) @@ -43,7 +43,7 @@ func (p P) AppendCheck(name string) { func (p P) AppendStatus(name string, status string) { if p.OutputType.IsTable() { - fmt.Printf(status + "\n") + fmt.Print(status + "\n") } else if p.OutputType.IsJSON() { for i := range p.CheckResult.Resources { if p.CheckResult.Resources[i].Name == name { @@ -56,7 +56,7 @@ func (p P) AppendStatus(name string, status string) { func (p P) AppendMessage(message string) { if p.OutputType.IsTable() { - fmt.Printf(message + "\n") + fmt.Print(message + "\n") } else if p.OutputType.IsJSON() { p.CheckResult.Messages = append(p.CheckResult.Messages, strings.ReplaceAll(message, "\n", "")) } diff --git a/projects/gloo/pkg/plugins/pluginutils/cluster_extensions.go b/projects/gloo/pkg/plugins/pluginutils/cluster_extensions.go index b1436f8fe63..bfb66a4aa22 100644 --- a/projects/gloo/pkg/plugins/pluginutils/cluster_extensions.go +++ b/projects/gloo/pkg/plugins/pluginutils/cluster_extensions.go @@ -11,7 +11,7 @@ import ( func SetExtensionProtocolOptions(out *envoy_config_cluster_v3.Cluster, filterName string, protoext proto.Message) error { protoextAny, err := utils.MessageToAny(protoext) if err != nil { - return errors.Wrapf(err, "converting extension "+filterName+" protocol options to struct") + return errors.Wrapf(err, "converting extension %s protocol options to struct", filterName) } if out.GetTypedExtensionProtocolOptions() == nil { out.TypedExtensionProtocolOptions = make(map[string]*anypb.Any) diff --git a/projects/gloo/pkg/utils/ssl.go b/projects/gloo/pkg/utils/ssl.go index b51e305d18a..5f5698825c9 100644 --- a/projects/gloo/pkg/utils/ssl.go +++ b/projects/gloo/pkg/utils/ssl.go @@ -45,10 +45,10 @@ var ( InvalidTlsSecretError = func(ref *core.ResourceRef, err error) error { if ref == nil { - return eris.Wrapf(err, "Invalid TLS secret") + return eris.Wrap(err, "Invalid TLS secret") } else { errorString := fmt.Sprintf("%v is not a valid TLS secret", ref) - return eris.Wrapf(err, errorString) + return eris.Wrap(err, errorString) } } diff --git a/test/gomega/matchers/json_contains.go b/test/gomega/matchers/json_contains.go index 2ce6f3c7bbf..14250d1b0f0 100644 --- a/test/gomega/matchers/json_contains.go +++ b/test/gomega/matchers/json_contains.go @@ -22,7 +22,7 @@ func JSONContains(expectedJSON any) gomega.OmegaMatcher { var expected map[string]any err := json.Unmarshal(expectedBytes, &expected) if err != nil { - return gomega.BeFalseBecause(err.Error()) + return gomega.BeFalseBecause("%s", err.Error()) } matchers = append(matchers, ContainsDeepMapElements(expected)) From 27078965d86adba413a022c592812bc19546ffcf Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Tue, 18 Feb 2025 14:08:17 -0800 Subject: [PATCH 14/21] One more compilation fix --- changelog/v1.19.0-beta10/go-1.24.0.yaml | 12 +++++++----- projects/gloo/pkg/utils/ssl.go | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog/v1.19.0-beta10/go-1.24.0.yaml b/changelog/v1.19.0-beta10/go-1.24.0.yaml index 7cedf8e0769..519374eea7b 100644 --- a/changelog/v1.19.0-beta10/go-1.24.0.yaml +++ b/changelog/v1.19.0-beta10/go-1.24.0.yaml @@ -1,6 +1,8 @@ changelog: -- type: DEPENDENCY_BUMP - description: Bumped the go version to 1.24.0 - dependencyOwner: golang - dependencyRepo: go - dependencyTag: v1.24.0 \ No newline at end of file + - type: DEPENDENCY_BUMP + description: Bumped the go version to 1.24.0 + dependencyOwner: golang + dependencyRepo: go + dependencyTag: v1.24.0 + issueLink: https://github.com/solo-io/solo-projects/issues/7609 + resolvesIssue: false \ No newline at end of file diff --git a/projects/gloo/pkg/utils/ssl.go b/projects/gloo/pkg/utils/ssl.go index 5f5698825c9..b4b58dd99b9 100644 --- a/projects/gloo/pkg/utils/ssl.go +++ b/projects/gloo/pkg/utils/ssl.go @@ -36,7 +36,7 @@ var ( // indicating a missing secret reference. This can be compared against using errors.Is. SslSecretNotFoundError = eris.New("SSL secret not found") sslSecretNotFoundError = func(err error) error { - return eris.Wrapf(err, SslSecretNotFoundError.Error()) + return eris.Wrap(err, SslSecretNotFoundError.Error()) } NotTlsSecretError = func(ref *core.ResourceRef) error { From ee873eaa868e50d7e6e8b8ccd6a183fb3dea25dd Mon Sep 17 00:00:00 2001 From: changelog-bot Date: Tue, 18 Feb 2025 22:50:33 +0000 Subject: [PATCH 15/21] Adding changelog file to new location --- changelog/v1.19.0-beta11/go-1.24.0.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 changelog/v1.19.0-beta11/go-1.24.0.yaml diff --git a/changelog/v1.19.0-beta11/go-1.24.0.yaml b/changelog/v1.19.0-beta11/go-1.24.0.yaml new file mode 100644 index 00000000000..519374eea7b --- /dev/null +++ b/changelog/v1.19.0-beta11/go-1.24.0.yaml @@ -0,0 +1,8 @@ +changelog: + - type: DEPENDENCY_BUMP + description: Bumped the go version to 1.24.0 + dependencyOwner: golang + dependencyRepo: go + dependencyTag: v1.24.0 + issueLink: https://github.com/solo-io/solo-projects/issues/7609 + resolvesIssue: false \ No newline at end of file From 4d19f8ac796c8d1d0c377552d281c8480a5ca997 Mon Sep 17 00:00:00 2001 From: changelog-bot Date: Tue, 18 Feb 2025 22:50:33 +0000 Subject: [PATCH 16/21] Deleting changelog file from old location --- changelog/v1.19.0-beta10/go-1.24.0.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 changelog/v1.19.0-beta10/go-1.24.0.yaml diff --git a/changelog/v1.19.0-beta10/go-1.24.0.yaml b/changelog/v1.19.0-beta10/go-1.24.0.yaml deleted file mode 100644 index 519374eea7b..00000000000 --- a/changelog/v1.19.0-beta10/go-1.24.0.yaml +++ /dev/null @@ -1,8 +0,0 @@ -changelog: - - type: DEPENDENCY_BUMP - description: Bumped the go version to 1.24.0 - dependencyOwner: golang - dependencyRepo: go - dependencyTag: v1.24.0 - issueLink: https://github.com/solo-io/solo-projects/issues/7609 - resolvesIssue: false \ No newline at end of file From 85b3467eef307cd87454bc7eed02b92a19701343 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Tue, 18 Feb 2025 15:10:13 -0800 Subject: [PATCH 17/21] Removing .tool-versions --- .tool-versions | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index eeb7440e2b4..00000000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -golang 1.24.0 \ No newline at end of file From 169214afdce2105a1d9a13a4e7194bea1f6139f4 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Tue, 18 Feb 2025 15:12:04 -0800 Subject: [PATCH 18/21] Fixing uncommited go.mod --- go.mod | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.mod b/go.mod index ac4a46dbaa8..9af96ac7c47 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,6 @@ module github.com/solo-io/gloo -<<<<<<< HEAD go 1.24.0 -======= -go 1.23.6 ->>>>>>> main // Note for developers: upgrading go will also require upgrading go in the following files: // ./cloudbuild-cache.yaml, From 1973d271778b9e5c1b0ad6406fcac3c266cab5f6 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Wed, 19 Feb 2025 12:31:11 -0800 Subject: [PATCH 19/21] Upgraded some packages --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 9af96ac7c47..f4128bf404d 100644 --- a/go.mod +++ b/go.mod @@ -49,10 +49,10 @@ require ( github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0 github.com/sergi/go-diff v1.2.0 github.com/solo-io/go-list-licenses v0.1.4 - github.com/solo-io/go-utils v0.27.4 - github.com/solo-io/k8s-utils v0.9.0 - github.com/solo-io/protoc-gen-ext v0.0.25 - github.com/solo-io/protoc-gen-openapi v0.2.5 + github.com/solo-io/go-utils v0.28.4 + github.com/solo-io/k8s-utils v0.10.0 + github.com/solo-io/protoc-gen-ext v0.1.0 + github.com/solo-io/protoc-gen-openapi v0.3.0 github.com/solo-io/skv2 v0.42.0 // Pinned to the `k8s-1.32-bump` tag of solo-apis on `gloo-main` branch diff --git a/go.sum b/go.sum index 748d37dd793..26fc99fd3c9 100644 --- a/go.sum +++ b/go.sum @@ -2706,14 +2706,14 @@ github.com/solo-io/cue v0.4.7/go.mod h1:P1tN9y6nBPAMoEK5aJxI8kn0VUcjVcRc+8esieRz github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw= github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA= github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c= -github.com/solo-io/go-utils v0.27.4 h1:/VOXUZTsIfnP+aWeWdkiWI4hCyF8nODOr1x+TX+e+dk= -github.com/solo-io/go-utils v0.27.4/go.mod h1:xJncbCIrp5iovb95MReJQFf88q3P23NgB1RyGckzq7k= -github.com/solo-io/k8s-utils v0.9.0 h1:q3/KN8yJ0ps3eGWOjLOwSjdUpwsJHDl0puv0Ur7ZeBk= -github.com/solo-io/k8s-utils v0.9.0/go.mod h1:Yk4DdpjvFnTUl8+SwnoobjEy3/x9E9rdQ4ee5KLCBNI= -github.com/solo-io/protoc-gen-ext v0.0.25 h1:UqNW/A4UqCO5aUFg7LYdV82tK0R2mqu7RFftYtT/Fu8= -github.com/solo-io/protoc-gen-ext v0.0.25/go.mod h1:TZwUhbFtfd1fQQGBN6qWwtea0Fhi3V6DvGQnbqk3jf8= -github.com/solo-io/protoc-gen-openapi v0.2.5 h1:l8YKsVks6JDFRzA9liYZIqauqpYRxHXnmHi4TjTIRf4= -github.com/solo-io/protoc-gen-openapi v0.2.5/go.mod h1:osEjRl1miHqlq4Wl/8SEqHFoyydptPL1EzEdM9c4vfE= +github.com/solo-io/go-utils v0.28.4 h1:IH3p/CttV5kzRgxBgk+beynbdFBQyxNFN2bOsgK1nGs= +github.com/solo-io/go-utils v0.28.4/go.mod h1:/V0ovlR+tGhb4+QNYIffKscuhtUIEoN29mJhWjYLYA4= +github.com/solo-io/k8s-utils v0.10.0 h1:vZkw/5lfIZ6EKd6TV6k87gF/YPY/9YhmQmBJDV4GEVc= +github.com/solo-io/k8s-utils v0.10.0/go.mod h1:hovE8yeAUL9YIFtC4AIscxfkZOP1abrPOuI/nYLziSc= +github.com/solo-io/protoc-gen-ext v0.1.0 h1:WvmXaontRCax9Wq5vAdewv+4tCwTrubC5rbk6coSajQ= +github.com/solo-io/protoc-gen-ext v0.1.0/go.mod h1:pJ8/XXyHs6T3p7dpu9Hmv0B4uhn7HI+OR2YIjT1mKDc= +github.com/solo-io/protoc-gen-openapi v0.3.0 h1:9Cb45r7GtZcWTPQx+VJ6ba4DB6f47/ONsAxz/8tyuOE= +github.com/solo-io/protoc-gen-openapi v0.3.0/go.mod h1:3Zvq9oDldIwsP7UGfsIxeR9CxRovRhFPDvp4gns0C0w= github.com/solo-io/skv2 v0.42.0 h1:MrrBJauarReCJdkVCB2PtWOVULE1IoJNTTWlQrfX4mc= github.com/solo-io/skv2 v0.42.0/go.mod h1:LP0CYAp2tblmttNP4rlHbYUnIUHazh+LU8QLV36yHAo= github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63 h1:5SI9O39qJ1NZydCqfwVUK1kwLU6C2WHBu2xb2qXtZao= From 6bafe9819245c979d89ce77dfcae50fcaf8f35a4 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Thu, 20 Feb 2025 07:36:21 -0800 Subject: [PATCH 20/21] Updating skv2 and solo-kit --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f4128bf404d..adcd6aef410 100644 --- a/go.mod +++ b/go.mod @@ -53,13 +53,13 @@ require ( github.com/solo-io/k8s-utils v0.10.0 github.com/solo-io/protoc-gen-ext v0.1.0 github.com/solo-io/protoc-gen-openapi v0.3.0 - github.com/solo-io/skv2 v0.42.0 + github.com/solo-io/skv2 v0.43.0 // Pinned to the `k8s-1.32-bump` tag of solo-apis on `gloo-main` branch // Ref: https://github.com/solo-io/gloo/pull/9463/files#r1594409655 && https://solo-io-corp.slack.com/archives/C03MFATU265/p1716913420716729?thread_ts=1716476992.938679&cid=C03MFATU265 // as to why it is now based off `gloo-main` and not `gloo-repo-branch` github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63 - github.com/solo-io/solo-kit v0.37.0 + github.com/solo-io/solo-kit v0.38.0 github.com/spf13/afero v1.11.0 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 @@ -302,7 +302,7 @@ require ( github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/solo-io/anyvendor v0.1.0 // indirect + github.com/solo-io/anyvendor v0.2.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/cast v1.7.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect diff --git a/go.sum b/go.sum index 26fc99fd3c9..57f2e247054 100644 --- a/go.sum +++ b/go.sum @@ -2701,6 +2701,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/solo-io/anyvendor v0.1.0 h1:pzqilD2dxOJnosCe01gl7bU91EHrYjBnfB6W3lQmFx4= github.com/solo-io/anyvendor v0.1.0/go.mod h1:pm4oeT20nrF6moqurCc7U4fEC1oi1RzkqoD/Lp/z/4Y= +github.com/solo-io/anyvendor v0.2.0 h1:L8AnSGS/PW7TA24vZpMXrfTlolXi3IyMMFjoDXOH5z4= +github.com/solo-io/anyvendor v0.2.0/go.mod h1:WIJdoBmSQCii7hsiCpjXNWa0AnRzOLbg6PCYkVK4LDE= github.com/solo-io/cue v0.4.7 h1:X65mDmyBrS3ODvDvAgzIt9aTxbwBtdt+ayg4w9XKoaA= github.com/solo-io/cue v0.4.7/go.mod h1:P1tN9y6nBPAMoEK5aJxI8kn0VUcjVcRc+8esieRzQ7M= github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw= @@ -2716,10 +2718,14 @@ github.com/solo-io/protoc-gen-openapi v0.3.0 h1:9Cb45r7GtZcWTPQx+VJ6ba4DB6f47/ON github.com/solo-io/protoc-gen-openapi v0.3.0/go.mod h1:3Zvq9oDldIwsP7UGfsIxeR9CxRovRhFPDvp4gns0C0w= github.com/solo-io/skv2 v0.42.0 h1:MrrBJauarReCJdkVCB2PtWOVULE1IoJNTTWlQrfX4mc= github.com/solo-io/skv2 v0.42.0/go.mod h1:LP0CYAp2tblmttNP4rlHbYUnIUHazh+LU8QLV36yHAo= +github.com/solo-io/skv2 v0.43.0 h1:c7LWTGH3NxaWN8hEwwTS2X78iIdh8IezKZB6/wyfcLE= +github.com/solo-io/skv2 v0.43.0/go.mod h1:jAscToVhZ0mnagAhmePjg8QV/AuA+icUp+uGlELVTMI= github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63 h1:5SI9O39qJ1NZydCqfwVUK1kwLU6C2WHBu2xb2qXtZao= github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63/go.mod h1:n69+QnkG+YEbZtrAsLYjW9BEqfy2vPGrafan2+fUrMA= github.com/solo-io/solo-kit v0.37.0 h1:hQmxb4OkA24MuFAfERtyK1loUxXdgrEaIrwPLp57urs= github.com/solo-io/solo-kit v0.37.0/go.mod h1:Jdj9cmv2gWF+KIDAlmz9XMmb2MnDTtR6dkbw5gWfJOY= +github.com/solo-io/solo-kit v0.38.0 h1:+Z94eImktdqTghXcLU2BGB97F84wl9hE0WIoAS78YXI= +github.com/solo-io/solo-kit v0.38.0/go.mod h1:Xm7Nauvqk1+trE4Na8p7pdw87E3F1oEqiwQwCqWdSaM= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= From 4a1a1de80cd5ee10f5c14a38d06ecc392e97edf0 Mon Sep 17 00:00:00 2001 From: Ryan Old Date: Thu, 20 Feb 2025 07:56:55 -0800 Subject: [PATCH 21/21] Ran generate-all --- go.sum | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.sum b/go.sum index 57f2e247054..c95203bb200 100644 --- a/go.sum +++ b/go.sum @@ -2699,8 +2699,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/solo-io/anyvendor v0.1.0 h1:pzqilD2dxOJnosCe01gl7bU91EHrYjBnfB6W3lQmFx4= -github.com/solo-io/anyvendor v0.1.0/go.mod h1:pm4oeT20nrF6moqurCc7U4fEC1oi1RzkqoD/Lp/z/4Y= github.com/solo-io/anyvendor v0.2.0 h1:L8AnSGS/PW7TA24vZpMXrfTlolXi3IyMMFjoDXOH5z4= github.com/solo-io/anyvendor v0.2.0/go.mod h1:WIJdoBmSQCii7hsiCpjXNWa0AnRzOLbg6PCYkVK4LDE= github.com/solo-io/cue v0.4.7 h1:X65mDmyBrS3ODvDvAgzIt9aTxbwBtdt+ayg4w9XKoaA= @@ -2716,14 +2714,10 @@ github.com/solo-io/protoc-gen-ext v0.1.0 h1:WvmXaontRCax9Wq5vAdewv+4tCwTrubC5rbk github.com/solo-io/protoc-gen-ext v0.1.0/go.mod h1:pJ8/XXyHs6T3p7dpu9Hmv0B4uhn7HI+OR2YIjT1mKDc= github.com/solo-io/protoc-gen-openapi v0.3.0 h1:9Cb45r7GtZcWTPQx+VJ6ba4DB6f47/ONsAxz/8tyuOE= github.com/solo-io/protoc-gen-openapi v0.3.0/go.mod h1:3Zvq9oDldIwsP7UGfsIxeR9CxRovRhFPDvp4gns0C0w= -github.com/solo-io/skv2 v0.42.0 h1:MrrBJauarReCJdkVCB2PtWOVULE1IoJNTTWlQrfX4mc= -github.com/solo-io/skv2 v0.42.0/go.mod h1:LP0CYAp2tblmttNP4rlHbYUnIUHazh+LU8QLV36yHAo= github.com/solo-io/skv2 v0.43.0 h1:c7LWTGH3NxaWN8hEwwTS2X78iIdh8IezKZB6/wyfcLE= github.com/solo-io/skv2 v0.43.0/go.mod h1:jAscToVhZ0mnagAhmePjg8QV/AuA+icUp+uGlELVTMI= github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63 h1:5SI9O39qJ1NZydCqfwVUK1kwLU6C2WHBu2xb2qXtZao= github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63/go.mod h1:n69+QnkG+YEbZtrAsLYjW9BEqfy2vPGrafan2+fUrMA= -github.com/solo-io/solo-kit v0.37.0 h1:hQmxb4OkA24MuFAfERtyK1loUxXdgrEaIrwPLp57urs= -github.com/solo-io/solo-kit v0.37.0/go.mod h1:Jdj9cmv2gWF+KIDAlmz9XMmb2MnDTtR6dkbw5gWfJOY= github.com/solo-io/solo-kit v0.38.0 h1:+Z94eImktdqTghXcLU2BGB97F84wl9hE0WIoAS78YXI= github.com/solo-io/solo-kit v0.38.0/go.mod h1:Xm7Nauvqk1+trE4Na8p7pdw87E3F1oEqiwQwCqWdSaM= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=