From 148f1673a381bce3e4f960deab35b39cebe4c727 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:26:05 +0000 Subject: [PATCH 1/2] chore(deps): bump github.com/emicklei/go-restful/v3 Bumps [github.com/emicklei/go-restful/v3](https://github.com/emicklei/go-restful) from 3.11.0 to 3.11.1. - [Release notes](https://github.com/emicklei/go-restful/releases) - [Changelog](https://github.com/emicklei/go-restful/blob/v3.11.1/CHANGES.md) - [Commits](https://github.com/emicklei/go-restful/compare/v3.11.0...v3.11.1) --- updated-dependencies: - dependency-name: github.com/emicklei/go-restful/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d3fa946dc096..6d5025753f3f 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cilium/ebpf v0.12.3 github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.4.0 - github.com/emicklei/go-restful/v3 v3.11.0 + github.com/emicklei/go-restful/v3 v3.11.1 github.com/envoyproxy/go-control-plane v0.11.1 github.com/envoyproxy/protoc-gen-validate v1.0.2 github.com/evanphx/json-patch/v5 v5.7.0 diff --git a/go.sum b/go.sum index f9ad8ffc9e2a..2e9e25518072 100644 --- a/go.sum +++ b/go.sum @@ -95,8 +95,8 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.11.1 h1:S+9bSbua1z3FgCnV0KKOSSZ3mDthb5NyEPL5gEpCvyk= +github.com/emicklei/go-restful/v3 v3.11.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM= From 1d03200a75b92e00657081f200a260259f68b91d Mon Sep 17 00:00:00 2001 From: Mike Beaumont Date: Mon, 8 Jan 2024 22:02:03 +0100 Subject: [PATCH 2/2] chore(api-server): remove custom encoder and marshal functions Signed-off-by: Mike Beaumont --- .../customization/api_manager_test.go | 2 +- pkg/api-server/server.go | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/pkg/api-server/customization/api_manager_test.go b/pkg/api-server/customization/api_manager_test.go index a7859bb5a988..fd5cd379eb0b 100644 --- a/pkg/api-server/customization/api_manager_test.go +++ b/pkg/api-server/customization/api_manager_test.go @@ -59,6 +59,6 @@ var _ = Describe("API Manager", func() { Expect(err).ToNot(HaveOccurred()) // when - Expect(string(body)).To(Equal("\"bar\"\n")) + Expect(string(body)).To(Equal("\"bar\"")) }) }) diff --git a/pkg/api-server/server.go b/pkg/api-server/server.go index 16f220e2636e..f5aa3c1dc28d 100644 --- a/pkg/api-server/server.go +++ b/pkg/api-server/server.go @@ -1,13 +1,10 @@ package api_server import ( - "bytes" "context" "crypto/tls" "crypto/x509" - "encoding/json" "fmt" - "io" "net" "net/http" "net/url" @@ -74,24 +71,6 @@ func (a *ApiServer) Config() api_server.ApiServerConfig { return a.config } -func init() { - // turn off escape & character so the link in "next" fields for resources is user friendly - restful.NewEncoder = func(w io.Writer) *json.Encoder { - encoder := json.NewEncoder(w) - encoder.SetEscapeHTML(false) - return encoder - } - restful.MarshalIndent = func(v interface{}, prefix, indent string) ([]byte, error) { - var buf bytes.Buffer - encoder := restful.NewEncoder(&buf) - encoder.SetIndent(prefix, indent) - if err := encoder.Encode(v); err != nil { - return nil, err - } - return buf.Bytes(), nil - } -} - func NewApiServer( resManager manager.ResourceManager, meshContextBuilder xds_context.MeshContextBuilder,