Skip to content

Commit b548785

Browse files
hdonnayhdonnay
committed
all: remove codec pooling functions
Change-Id: Ie2b1bb1e5b5660bda84f3c6150f869386a6a6964 Signed-off-by: Hank Donnay <hdonnay@redhat.com>
1 parent e3368d9 commit b548785

9 files changed

Lines changed: 1 addition & 37 deletions

File tree

‎cmd/clairctl/client.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ func (c *Client) IndexReport(ctx context.Context, id claircore.Digest, m *clairc
210210
}
211211
var report claircore.IndexReport
212212
dec := codec.GetDecoder(rd)
213-
defer codec.PutDecoder(dec)
214213
if err := dec.Decode(&report); err != nil {
215214
slog.DebugContext(ctx, "unable to decode json payload",
216215
"reason", err)
@@ -270,7 +269,6 @@ func (c *Client) VulnerabilityReport(ctx context.Context, id claircore.Digest) (
270269
}
271270
var report claircore.VulnerabilityReport
272271
dec := codec.GetDecoder(res.Body)
273-
defer codec.PutDecoder(dec)
274272
if err := dec.Decode(&report); err != nil {
275273
slog.DebugContext(ctx, "unable to decode json payload",
276274
"reason", err)

‎cmd/clairctl/jsonformatter.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@ func (f *jsonFormatter) Format(r *Result) error {
1919
}
2020

2121
func (f *jsonFormatter) Close() error {
22-
codec.PutEncoder(f.enc)
2322
return f.c.Close()
2423
}

‎cmd/clairctl/manifest.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ func manifestAction(c *cli.Context) error {
6464
})
6565
eg.Go(func() error {
6666
enc := codec.GetEncoder(os.Stdout)
67-
defer codec.PutEncoder(enc)
6867
for m := range result {
6968
if err := enc.Encode(m); err != nil {
7069
return err

‎httptransport/client/indexer.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ func (s *HTTP) AffectedManifests(ctx context.Context, v []claircore.Vulnerabilit
5252
switch ct := req.Header.Get("content-type"); ct {
5353
case "", `application/json`:
5454
dec := codec.GetDecoder(resp.Body)
55-
defer codec.PutDecoder(dec)
5655
if err := dec.Decode(&a); err != nil {
5756
return nil, err
5857
}
@@ -98,7 +97,6 @@ func (s *HTTP) Index(ctx context.Context, manifest *claircore.Manifest) (*clairc
9897
switch ct := resp.Header.Get("content-type"); ct {
9998
case "", `application/json`:
10099
dec := codec.GetDecoder(resp.Body)
101-
defer codec.PutDecoder(dec)
102100
if err := dec.Decode(&ir); err != nil {
103101
return nil, err
104102
}
@@ -142,7 +140,6 @@ func (s *HTTP) IndexReport(ctx context.Context, manifest claircore.Digest) (*cla
142140

143141
ir := &claircore.IndexReport{}
144142
dec := codec.GetDecoder(resp.Body)
145-
defer codec.PutDecoder(dec)
146143
if err := dec.Decode(ir); err != nil {
147144
return nil, false, &clairerror.ErrBadIndexReport{E: err}
148145
}
@@ -199,7 +196,6 @@ func (s *HTTP) DeleteManifests(ctx context.Context, d ...claircore.Digest) ([]cl
199196
}
200197
var ret []claircore.Digest
201198
dec := codec.GetDecoder(resp.Body)
202-
defer codec.PutDecoder(dec)
203199
if err := dec.Decode(&ret); err != nil {
204200
return nil, fmt.Errorf("failed to decode response: %w", err)
205201
}

‎httptransport/client/matcher.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func (c *HTTP) Scan(ctx context.Context, ir *claircore.IndexReport) (*claircore.
5151
switch ct := req.Header.Get("content-type"); ct {
5252
case "", `application/json`:
5353
dec := codec.GetDecoder(resp.Body)
54-
defer codec.PutDecoder(dec)
5554
if err := dec.Decode(&vr); err != nil {
5655
return nil, err
5756
}
@@ -203,7 +202,6 @@ func (c *HTTP) updateOperations(ctx context.Context, req *http.Request, cache *u
203202
case http.StatusOK:
204203
m := make(map[string][]driver.UpdateOperation)
205204
dec := codec.GetDecoder(res.Body)
206-
defer codec.PutDecoder(dec)
207205
if err := dec.Decode(&m); err != nil {
208206
return nil, err
209207
}
@@ -254,7 +252,6 @@ func (c *HTTP) UpdateDiff(ctx context.Context, prev, cur uuid.UUID) (*driver.Upd
254252
}
255253
d := driver.UpdateDiff{}
256254
dec := codec.GetDecoder(res.Body)
257-
defer codec.PutDecoder(dec)
258255
if err := dec.Decode(&d); err != nil {
259256
return nil, err
260257
}

‎httptransport/indexer_v1.go‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ func (h *IndexerV1) indexReport(w http.ResponseWriter, r *http.Request) {
9090
}
9191
defer r.Body.Close()
9292
dec := codec.GetDecoder(r.Body)
93-
defer codec.PutDecoder(dec)
9493
switch r.Method {
9594
case http.MethodPost:
9695
state, err := h.srv.State(ctx)
@@ -130,7 +129,6 @@ func (h *IndexerV1) indexReport(w http.ResponseWriter, r *http.Request) {
130129
defer writerError(w, &err)()
131130
w.WriteHeader(http.StatusCreated)
132131
enc := codec.GetEncoder(w)
133-
defer codec.PutEncoder(enc)
134132
err = enc.Encode(report)
135133
case http.MethodDelete:
136134
var ds []claircore.Digest
@@ -146,7 +144,6 @@ func (h *IndexerV1) indexReport(w http.ResponseWriter, r *http.Request) {
146144
defer writerError(w, &err)()
147145
w.WriteHeader(http.StatusOK)
148146
enc := codec.GetEncoder(w)
149-
defer codec.PutEncoder(enc)
150147
err = enc.Encode(ds)
151148
}
152149
}
@@ -200,7 +197,6 @@ func (h *IndexerV1) indexReportOne(w http.ResponseWriter, r *http.Request) {
200197
w.Header().Add("etag", validator)
201198
defer writerError(w, &err)()
202199
enc := codec.GetEncoder(w)
203-
defer codec.PutEncoder(enc)
204200
err = enc.Encode(report)
205201
case http.MethodDelete:
206202
if _, err := h.srv.DeleteManifests(ctx, d); err != nil {
@@ -237,9 +233,8 @@ func (h *IndexerV1) indexState(w http.ResponseWriter, r *http.Request) {
237233
}
238234

239235
defer writerError(w, &err)()
240-
// TODO(hank) Don't use an encoder to write out like 40 bytes of json.
236+
// TODO(hank) Use the API type.
241237
enc := codec.GetEncoder(w)
242-
defer codec.PutEncoder(enc)
243238
err = enc.Encode(struct {
244239
State string `json:"state"`
245240
}{
@@ -265,7 +260,6 @@ func (h *IndexerV1) affectedManifests(w http.ResponseWriter, r *http.Request) {
265260
V []claircore.Vulnerability `json:"vulnerabilities"`
266261
}
267262
dec := codec.GetDecoder(r.Body)
268-
defer codec.PutDecoder(dec)
269263
if err := dec.Decode(&vulnerabilities); err != nil {
270264
apiError(ctx, w, http.StatusBadRequest, "failed to deserialize vulnerabilities: %v", err)
271265
}
@@ -277,7 +271,6 @@ func (h *IndexerV1) affectedManifests(w http.ResponseWriter, r *http.Request) {
277271

278272
defer writerError(w, &err)
279273
enc := codec.GetEncoder(w)
280-
defer codec.PutEncoder(enc)
281274
err = enc.Encode(affected)
282275
}
283276

‎httptransport/matcher_v1.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ func (h *MatcherV1) vulnerabilityReport(w http.ResponseWriter, r *http.Request)
140140

141141
defer writerError(w, &err)()
142142
enc := codec.GetEncoder(w)
143-
defer codec.PutEncoder(enc)
144143
err = enc.Encode(vulnReport)
145144
}
146145

@@ -176,7 +175,6 @@ func (h *MatcherV1) updateDiffHandler(w http.ResponseWriter, r *http.Request) {
176175

177176
defer writerError(w, &err)()
178177
enc := codec.GetEncoder(w)
179-
defer codec.PutEncoder(enc)
180178
err = enc.Encode(&diff)
181179
}
182180

@@ -223,7 +221,6 @@ func (h *MatcherV1) updateOperationHandlerGet(w http.ResponseWriter, r *http.Req
223221

224222
defer writerError(w, &err)()
225223
enc := codec.GetEncoder(w)
226-
defer codec.PutEncoder(enc)
227224
err = enc.Encode(&uos)
228225
}
229226

‎httptransport/notification_v1.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ func (h *NotificationV1) get(w http.ResponseWriter, r *http.Request) {
169169

170170
defer writerError(w, &err)()
171171
enc := codec.GetEncoder(w)
172-
defer codec.PutEncoder(enc)
173172
err = enc.Encode(&response)
174173
}
175174

‎internal/codec/codec.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ func GetEncoder(w io.Writer, v ...Scheme) Encoder {
6767
panic(invalidScheme(s))
6868
}
6969

70-
// PutEncoder returns an encoder to the pool.
71-
//
72-
// Deprecated: This is no longer needed.
73-
//
74-
//go:fix inline
75-
func PutEncoder(_ Encoder) {}
76-
7770
// GetDecoder returns a [Decoder] configured to read from "r".
7871
//
7972
// An optional [Scheme] may be passed to change the encoding scheme.
@@ -92,10 +85,3 @@ func GetDecoder(r io.Reader, v ...Scheme) Decoder {
9285
}
9386
panic(invalidScheme(s))
9487
}
95-
96-
// PutDecoder returns a decoder to the pool.
97-
//
98-
// Deprecated: This is no longer needed.
99-
//
100-
//go:fix inline
101-
func PutDecoder(_ Decoder) {}

0 commit comments

Comments
 (0)