all: remove codec pooling calls

hdonnay · hdonnay · commit d46e7559b986 · 2025-09-04T10:01:12.000-05:00
Signed-off-by: Hank Donnay &lt;hdonnay@redhat.com&gt;
diff --git a/cmd/clairctl/client.go b/cmd/clairctl/client.go
@@ -211,7 +211,6 @@ func (c *Client) IndexReport(ctx context.Context, id claircore.Digest, m *clairc
 	}
 	var report claircore.IndexReport
 	dec := codec.GetDecoder(rd)
-	defer codec.PutDecoder(dec)
 	if err := dec.Decode(&report); err != nil {
 		zlog.Debug(ctx).
 			Err(err).
@@ -275,7 +274,6 @@ func (c *Client) VulnerabilityReport(ctx context.Context, id claircore.Digest) (
 	}
 	var report claircore.VulnerabilityReport
 	dec := codec.GetDecoder(res.Body)
-	defer codec.PutDecoder(dec)
 	if err := dec.Decode(&report); err != nil {
 		zlog.Debug(ctx).
 			Err(err).
diff --git a/cmd/clairctl/jsonformatter.go b/cmd/clairctl/jsonformatter.go
@@ -19,6 +19,5 @@ func (f *jsonFormatter) Format(r *Result) error {
 }
 
 func (f *jsonFormatter) Close() error {
-	codec.PutEncoder(f.enc)
 	return f.c.Close()
 }
diff --git a/cmd/clairctl/manifest.go b/cmd/clairctl/manifest.go
@@ -68,7 +68,6 @@ func manifestAction(c *cli.Context) error {
 	})
 	eg.Go(func() error {
 		enc := codec.GetEncoder(os.Stdout)
-		defer codec.PutEncoder(enc)
 		for m := range result {
 			if err := enc.Encode(m); err != nil {
 				return err
diff --git a/httptransport/client/indexer.go b/httptransport/client/indexer.go
@@ -52,7 +52,6 @@ func (s *HTTP) AffectedManifests(ctx context.Context, v []claircore.Vulnerabilit
 	switch ct := req.Header.Get("content-type"); ct {
 	case "", `application/json`:
 		dec := codec.GetDecoder(resp.Body)
-		defer codec.PutDecoder(dec)
 		if err := dec.Decode(&a); err != nil {
 			return nil, err
 		}
@@ -98,7 +97,6 @@ func (s *HTTP) Index(ctx context.Context, manifest *claircore.Manifest) (*clairc
 	switch ct := resp.Header.Get("content-type"); ct {
 	case "", `application/json`:
 		dec := codec.GetDecoder(resp.Body)
-		defer codec.PutDecoder(dec)
 		if err := dec.Decode(&ir); err != nil {
 			return nil, err
 		}
@@ -142,7 +140,6 @@ func (s *HTTP) IndexReport(ctx context.Context, manifest claircore.Digest) (*cla
 
 	ir := &claircore.IndexReport{}
 	dec := codec.GetDecoder(resp.Body)
-	defer codec.PutDecoder(dec)
 	if err := dec.Decode(ir); err != nil {
 		return nil, false, &clairerror.ErrBadIndexReport{E: err}
 	}
@@ -199,7 +196,6 @@ func (s *HTTP) DeleteManifests(ctx context.Context, d ...claircore.Digest) ([]cl
 	}
 	var ret []claircore.Digest
 	dec := codec.GetDecoder(resp.Body)
-	defer codec.PutDecoder(dec)
 	if err := dec.Decode(&ret); err != nil {
 		return nil, fmt.Errorf("failed to decode response: %w", err)
 	}
diff --git a/httptransport/client/matcher.go b/httptransport/client/matcher.go
@@ -51,7 +51,6 @@ func (c *HTTP) Scan(ctx context.Context, ir *claircore.IndexReport) (*claircore.
 	switch ct := req.Header.Get("content-type"); ct {
 	case "", `application/json`:
 		dec := codec.GetDecoder(resp.Body)
-		defer codec.PutDecoder(dec)
 		if err := dec.Decode(&vr); err != nil {
 			return nil, err
 		}
@@ -203,7 +202,6 @@ func (c *HTTP) updateOperations(ctx context.Context, req *http.Request, cache *u
 	case http.StatusOK:
 		m := make(map[string][]driver.UpdateOperation)
 		dec := codec.GetDecoder(res.Body)
-		defer codec.PutDecoder(dec)
 		if err := dec.Decode(&m); err != nil {
 			return nil, err
 		}
@@ -254,7 +252,6 @@ func (c *HTTP) UpdateDiff(ctx context.Context, prev, cur uuid.UUID) (*driver.Upd
 	}
 	d := driver.UpdateDiff{}
 	dec := codec.GetDecoder(res.Body)
-	defer codec.PutDecoder(dec)
 	if err := dec.Decode(&d); err != nil {
 		return nil, err
 	}
diff --git a/httptransport/indexer_v1.go b/httptransport/indexer_v1.go
@@ -92,7 +92,6 @@ func (h *IndexerV1) indexReport(w http.ResponseWriter, r *http.Request) {
 	}
 	defer r.Body.Close()
 	dec := codec.GetDecoder(r.Body)
-	defer codec.PutDecoder(dec)
 	switch r.Method {
 	case http.MethodPost:
 		state, err := h.srv.State(ctx)
@@ -132,7 +131,6 @@ func (h *IndexerV1) indexReport(w http.ResponseWriter, r *http.Request) {
 		defer writerError(w, &err)()
 		w.WriteHeader(http.StatusCreated)
 		enc := codec.GetEncoder(w)
-		defer codec.PutEncoder(enc)
 		err = enc.Encode(report)
 	case http.MethodDelete:
 		var ds []claircore.Digest
@@ -149,7 +147,6 @@ func (h *IndexerV1) indexReport(w http.ResponseWriter, r *http.Request) {
 		defer writerError(w, &err)()
 		w.WriteHeader(http.StatusOK)
 		enc := codec.GetEncoder(w)
-		defer codec.PutEncoder(enc)
 		err = enc.Encode(ds)
 	}
 }
@@ -203,7 +200,6 @@ func (h *IndexerV1) indexReportOne(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("etag", validator)
 		defer writerError(w, &err)()
 		enc := codec.GetEncoder(w)
-		defer codec.PutEncoder(enc)
 		err = enc.Encode(report)
 	case http.MethodDelete:
 		if _, err := h.srv.DeleteManifests(ctx, d); err != nil {
@@ -242,7 +238,6 @@ func (h *IndexerV1) indexState(w http.ResponseWriter, r *http.Request) {
 	defer writerError(w, &err)()
 	// TODO(hank) Don't use an encoder to write out like 40 bytes of json.
 	enc := codec.GetEncoder(w)
-	defer codec.PutEncoder(enc)
 	err = enc.Encode(struct {
 		State string `json:"state"`
 	}{
@@ -268,7 +263,6 @@ func (h *IndexerV1) affectedManifests(w http.ResponseWriter, r *http.Request) {
 		V []claircore.Vulnerability `json:"vulnerabilities"`
 	}
 	dec := codec.GetDecoder(r.Body)
-	defer codec.PutDecoder(dec)
 	if err := dec.Decode(&vulnerabilities); err != nil {
 		apiError(ctx, w, http.StatusBadRequest, "failed to deserialize vulnerabilities: %v", err)
 	}
@@ -280,7 +274,6 @@ func (h *IndexerV1) affectedManifests(w http.ResponseWriter, r *http.Request) {
 
 	defer writerError(w, &err)
 	enc := codec.GetEncoder(w)
-	defer codec.PutEncoder(enc)
 	err = enc.Encode(affected)
 }
 
diff --git a/httptransport/matcher_v1.go b/httptransport/matcher_v1.go
@@ -142,7 +142,6 @@ func (h *MatcherV1) vulnerabilityReport(w http.ResponseWriter, r *http.Request)
 
 	defer writerError(w, &err)()
 	enc := codec.GetEncoder(w)
-	defer codec.PutEncoder(enc)
 	err = enc.Encode(vulnReport)
 }
 
@@ -180,7 +179,6 @@ func (h *MatcherV1) updateDiffHandler(w http.ResponseWriter, r *http.Request) {
 
 	defer writerError(w, &err)()
 	enc := codec.GetEncoder(w)
-	defer codec.PutEncoder(enc)
 	err = enc.Encode(&diff)
 }
 
@@ -229,7 +227,6 @@ func (h *MatcherV1) updateOperationHandlerGet(w http.ResponseWriter, r *http.Req
 
 	defer writerError(w, &err)()
 	enc := codec.GetEncoder(w)
-	defer codec.PutEncoder(enc)
 	err = enc.Encode(&uos)
 }
 
diff --git a/httptransport/notification_v1.go b/httptransport/notification_v1.go
@@ -171,7 +171,6 @@ func (h *NotificationV1) get(w http.ResponseWriter, r *http.Request) {
 
 	defer writerError(w, &err)()
 	enc := codec.GetEncoder(w)
-	defer codec.PutEncoder(enc)
 	err = enc.Encode(&response)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,5 @@ func (f jsonFormatter) Format(r Result) error {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func (f *jsonFormatter) Close() error {`
`22`		`- codec.PutEncoder(f.enc)`
`23`	`22`	`return f.c.Close()`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ func (s *HTTP) AffectedManifests(ctx context.Context, v []claircore.Vulnerabilit`
`52`	`52`	`switch ct := req.Header.Get("content-type"); ct {`
`53`	`53`	case "", `application/json`:
`54`	`54`	`dec := codec.GetDecoder(resp.Body)`
`55`		`- defer codec.PutDecoder(dec)`
`56`	`55`	`if err := dec.Decode(&a); err != nil {`
`57`	`56`	`return nil, err`
`58`	`57`	`}`
`@@ -98,7 +97,6 @@ func (s HTTP) Index(ctx context.Context, manifest claircore.Manifest) (*clairc`
`98`	`97`	`switch ct := resp.Header.Get("content-type"); ct {`
`99`	`98`	case "", `application/json`:
`100`	`99`	`dec := codec.GetDecoder(resp.Body)`
`101`		`- defer codec.PutDecoder(dec)`
`102`	`100`	`if err := dec.Decode(&ir); err != nil {`
`103`	`101`	`return nil, err`
`104`	`102`	`}`
`@@ -142,7 +140,6 @@ func (s HTTP) IndexReport(ctx context.Context, manifest claircore.Digest) (cla`
`142`	`140`
`143`	`141`	`ir := &claircore.IndexReport{}`
`144`	`142`	`dec := codec.GetDecoder(resp.Body)`
`145`		`- defer codec.PutDecoder(dec)`
`146`	`143`	`if err := dec.Decode(ir); err != nil {`
`147`	`144`	`return nil, false, &clairerror.ErrBadIndexReport{E: err}`
`148`	`145`	`}`
`@@ -199,7 +196,6 @@ func (s *HTTP) DeleteManifests(ctx context.Context, d ...claircore.Digest) ([]cl`
`199`	`196`	`}`
`200`	`197`	`var ret []claircore.Digest`
`201`	`198`	`dec := codec.GetDecoder(resp.Body)`
`202`		`- defer codec.PutDecoder(dec)`
`203`	`199`	`if err := dec.Decode(&ret); err != nil {`
`204`	`200`	`return nil, fmt.Errorf("failed to decode response: %w", err)`
`205`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ func (c HTTP) Scan(ctx context.Context, ir claircore.IndexReport) (*claircore.`
`51`	`51`	`switch ct := req.Header.Get("content-type"); ct {`
`52`	`52`	case "", `application/json`:
`53`	`53`	`dec := codec.GetDecoder(resp.Body)`
`54`		`- defer codec.PutDecoder(dec)`
`55`	`54`	`if err := dec.Decode(&vr); err != nil {`
`56`	`55`	`return nil, err`
`57`	`56`	`}`
`@@ -203,7 +202,6 @@ func (c HTTP) updateOperations(ctx context.Context, req http.Request, cache *u`
`203`	`202`	`case http.StatusOK:`
`204`	`203`	`m := make(map[string][]driver.UpdateOperation)`
`205`	`204`	`dec := codec.GetDecoder(res.Body)`
`206`		`- defer codec.PutDecoder(dec)`
`207`	`205`	`if err := dec.Decode(&m); err != nil {`
`208`	`206`	`return nil, err`
`209`	`207`	`}`
`@@ -254,7 +252,6 @@ func (c HTTP) UpdateDiff(ctx context.Context, prev, cur uuid.UUID) (driver.Upd`
`254`	`252`	`}`
`255`	`253`	`d := driver.UpdateDiff{}`
`256`	`254`	`dec := codec.GetDecoder(res.Body)`
`257`		`- defer codec.PutDecoder(dec)`
`258`	`255`	`if err := dec.Decode(&d); err != nil {`
`259`	`256`	`return nil, err`
`260`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,6 @@ func (h MatcherV1) vulnerabilityReport(w http.ResponseWriter, r http.Request)`
`142`	`142`
`143`	`143`	`defer writerError(w, &err)()`
`144`	`144`	`enc := codec.GetEncoder(w)`
`145`		`- defer codec.PutEncoder(enc)`
`146`	`145`	`err = enc.Encode(vulnReport)`
`147`	`146`	`}`
`148`	`147`
`@@ -180,7 +179,6 @@ func (h MatcherV1) updateDiffHandler(w http.ResponseWriter, r http.Request) {`
`180`	`179`
`181`	`180`	`defer writerError(w, &err)()`
`182`	`181`	`enc := codec.GetEncoder(w)`
`183`		`- defer codec.PutEncoder(enc)`
`184`	`182`	`err = enc.Encode(&diff)`
`185`	`183`	`}`
`186`	`184`
`@@ -229,7 +227,6 @@ func (h MatcherV1) updateOperationHandlerGet(w http.ResponseWriter, r http.Req`
`229`	`227`
`230`	`228`	`defer writerError(w, &err)()`
`231`	`229`	`enc := codec.GetEncoder(w)`
`232`		`- defer codec.PutEncoder(enc)`
`233`	`230`	`err = enc.Encode(&uos)`
`234`	`231`	`}`
`235`	`232`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,6 @@ func (h NotificationV1) get(w http.ResponseWriter, r http.Request) {`
`171`	`171`
`172`	`172`	`defer writerError(w, &err)()`
`173`	`173`	`enc := codec.GetEncoder(w)`
`174`		`- defer codec.PutEncoder(enc)`
`175`	`174`	`err = enc.Encode(&response)`
`176`	`175`	`}`
`177`	`176`