From 2de9f838fedf63369f9fdc84d859eeeb209ad82d Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Tue, 2 Jul 2024 15:06:13 -0400 Subject: [PATCH] chore: include io.ReadAll generation updates only --- server/genrest/compliance.go | 16 +++++++------- server/genrest/echo.go | 32 +++++++++++++-------------- server/genrest/iampolicy.go | 32 +++++++++++++-------------- server/genrest/identity.go | 8 +++---- server/genrest/messaging.go | 36 +++++++++++++++---------------- server/genrest/sequenceservice.go | 16 +++++++------- server/genrest/testing.go | 4 ++-- 7 files changed, 72 insertions(+), 72 deletions(-) diff --git a/server/genrest/compliance.go b/server/genrest/compliance.go index 644b9329b..3345da5a5 100644 --- a/server/genrest/compliance.go +++ b/server/genrest/compliance.go @@ -55,8 +55,8 @@ func (backend *RESTBackend) HandleRepeatDataBody(w http.ResponseWriter, r *http. // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -130,8 +130,8 @@ func (backend *RESTBackend) HandleRepeatDataBodyInfo(w http.ResponseWriter, r *h var bodyField genprotopb.ComplianceData var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -537,8 +537,8 @@ func (backend *RESTBackend) HandleRepeatDataBodyPut(w http.ResponseWriter, r *ht // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -611,8 +611,8 @@ func (backend *RESTBackend) HandleRepeatDataBodyPatch(w http.ResponseWriter, r * // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } diff --git a/server/genrest/echo.go b/server/genrest/echo.go index cbf89d155..e35ae461d 100644 --- a/server/genrest/echo.go +++ b/server/genrest/echo.go @@ -55,8 +55,8 @@ func (backend *RESTBackend) HandleEcho(w http.ResponseWriter, r *http.Request) { // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -129,8 +129,8 @@ func (backend *RESTBackend) HandleEchoErrorDetails(w http.ResponseWriter, r *htt // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -203,8 +203,8 @@ func (backend *RESTBackend) HandleExpand(w http.ResponseWriter, r *http.Request) // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -280,8 +280,8 @@ func (backend *RESTBackend) HandlePagedExpand(w http.ResponseWriter, r *http.Req // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -354,8 +354,8 @@ func (backend *RESTBackend) HandlePagedExpandLegacy(w http.ResponseWriter, r *ht // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -428,8 +428,8 @@ func (backend *RESTBackend) HandlePagedExpandLegacyMapped(w http.ResponseWriter, // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -502,8 +502,8 @@ func (backend *RESTBackend) HandleWait(w http.ResponseWriter, r *http.Request) { // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -576,8 +576,8 @@ func (backend *RESTBackend) HandleBlock(w http.ResponseWriter, r *http.Request) // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } diff --git a/server/genrest/iampolicy.go b/server/genrest/iampolicy.go index df8f2f33b..62824e937 100644 --- a/server/genrest/iampolicy.go +++ b/server/genrest/iampolicy.go @@ -55,8 +55,8 @@ func (backend *RESTBackend) HandleSetIamPolicy(w http.ResponseWriter, r *http.Re // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -129,8 +129,8 @@ func (backend *RESTBackend) HandleSetIamPolicy_1(w http.ResponseWriter, r *http. // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -203,8 +203,8 @@ func (backend *RESTBackend) HandleSetIamPolicy_2(w http.ResponseWriter, r *http. // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -277,8 +277,8 @@ func (backend *RESTBackend) HandleSetIamPolicy_3(w http.ResponseWriter, r *http. // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -615,8 +615,8 @@ func (backend *RESTBackend) HandleTestIamPermissions(w http.ResponseWriter, r *h // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -689,8 +689,8 @@ func (backend *RESTBackend) HandleTestIamPermissions_1(w http.ResponseWriter, r // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -763,8 +763,8 @@ func (backend *RESTBackend) HandleTestIamPermissions_2(w http.ResponseWriter, r // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -837,8 +837,8 @@ func (backend *RESTBackend) HandleTestIamPermissions_3(w http.ResponseWriter, r // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } diff --git a/server/genrest/identity.go b/server/genrest/identity.go index c153cfd94..895f0f2da 100644 --- a/server/genrest/identity.go +++ b/server/genrest/identity.go @@ -55,8 +55,8 @@ func (backend *RESTBackend) HandleCreateUser(w http.ResponseWriter, r *http.Requ // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -196,8 +196,8 @@ func (backend *RESTBackend) HandleUpdateUser(w http.ResponseWriter, r *http.Requ var bodyField genprotopb.User var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } diff --git a/server/genrest/messaging.go b/server/genrest/messaging.go index db11c0dd2..a4258fc95 100644 --- a/server/genrest/messaging.go +++ b/server/genrest/messaging.go @@ -55,8 +55,8 @@ func (backend *RESTBackend) HandleCreateRoom(w http.ResponseWriter, r *http.Requ // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -196,8 +196,8 @@ func (backend *RESTBackend) HandleUpdateRoom(w http.ResponseWriter, r *http.Requ var bodyField genprotopb.Room var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -405,8 +405,8 @@ func (backend *RESTBackend) HandleCreateBlurb(w http.ResponseWriter, r *http.Req // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -479,8 +479,8 @@ func (backend *RESTBackend) HandleCreateBlurb_1(w http.ResponseWriter, r *http.R // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -686,8 +686,8 @@ func (backend *RESTBackend) HandleUpdateBlurb(w http.ResponseWriter, r *http.Req var bodyField genprotopb.Blurb var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -769,8 +769,8 @@ func (backend *RESTBackend) HandleUpdateBlurb_1(w http.ResponseWriter, r *http.R var bodyField genprotopb.Blurb var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -1115,8 +1115,8 @@ func (backend *RESTBackend) HandleSearchBlurbs(w http.ResponseWriter, r *http.Re // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -1255,8 +1255,8 @@ func (backend *RESTBackend) HandleStreamBlurbs(w http.ResponseWriter, r *http.Re // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -1325,8 +1325,8 @@ func (backend *RESTBackend) HandleStreamBlurbs_1(w http.ResponseWriter, r *http. // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } diff --git a/server/genrest/sequenceservice.go b/server/genrest/sequenceservice.go index fb93d5a0f..4ff9af216 100644 --- a/server/genrest/sequenceservice.go +++ b/server/genrest/sequenceservice.go @@ -56,8 +56,8 @@ func (backend *RESTBackend) HandleCreateSequence(w http.ResponseWriter, r *http. var bodyField genprotopb.Sequence var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -139,8 +139,8 @@ func (backend *RESTBackend) HandleCreateStreamingSequence(w http.ResponseWriter, var bodyField genprotopb.StreamingSequence var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -353,8 +353,8 @@ func (backend *RESTBackend) HandleAttemptSequence(w http.ResponseWriter, r *http // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } @@ -427,8 +427,8 @@ func (backend *RESTBackend) HandleAttemptStreamingSequence(w http.ResponseWriter // Intentional: Field values in the URL path override those set in the body. var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return } diff --git a/server/genrest/testing.go b/server/genrest/testing.go index 2f59816d2..e240bab52 100644 --- a/server/genrest/testing.go +++ b/server/genrest/testing.go @@ -56,8 +56,8 @@ func (backend *RESTBackend) HandleCreateSession(w http.ResponseWriter, r *http.R var bodyField genprotopb.Session var jsonReader bytes.Buffer bodyReader := io.TeeReader(r.Body, &jsonReader) - rBytes := make([]byte, r.ContentLength) - if _, err := bodyReader.Read(rBytes); err != nil && err != io.EOF { + rBytes, err := io.ReadAll(bodyReader) + if err != nil && err != io.EOF { backend.Error(w, http.StatusBadRequest, "error reading body content: %s", err) return }