Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 968adfa

Browse files
mikedanesemikedanese
committed
cleanup req.Context() and ResponseWrapper
1 parent d55d617 commit 968adfa

File tree

36 files changed

+83
-99
lines changed

36 files changed

+83
-99
lines changed

‎pkg/controller/podautoscaler/legacy_horizontal_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package podautoscaler
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122
"fmt"
2223
"io"
@@ -55,11 +56,11 @@ import (
5556
_ "k8s.io/kubernetes/pkg/apis/core/install"
5657
)
5758

58-
func (w fakeResponseWrapper) DoRaw() ([]byte, error) {
59+
func (w fakeResponseWrapper) DoRaw(context.Context) ([]byte, error) {
5960
return w.raw, nil
6061
}
6162

62-
func (w fakeResponseWrapper) Stream() (io.ReadCloser, error) {
63+
func (w fakeResponseWrapper) Stream(context.Context) (io.ReadCloser, error) {
6364
return nil, nil
6465
}
6566

‎pkg/controller/podautoscaler/metrics/legacy_metrics_client.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package metrics
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122
"fmt"
2223
"strings"
@@ -27,7 +28,7 @@ import (
2728
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
2829

2930
autoscaling "k8s.io/api/autoscaling/v2beta2"
30-
"k8s.io/api/core/v1"
31+
v1 "k8s.io/api/core/v1"
3132
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3233
"k8s.io/apimachinery/pkg/labels"
3334
clientset "k8s.io/client-go/kubernetes"
@@ -68,7 +69,7 @@ func (h *HeapsterMetricsClient) GetResourceMetric(resource v1.ResourceName, name
6869

6970
resultRaw, err := h.services.
7071
ProxyGet(h.heapsterScheme, h.heapsterService, h.heapsterPort, metricPath, params).
71-
DoRaw()
72+
DoRaw(context.TODO())
7273
if err != nil {
7374
return nil, time.Time{}, fmt.Errorf("failed to get pod resource metrics: %v", err)
7475
}
@@ -139,7 +140,7 @@ func (h *HeapsterMetricsClient) GetRawMetric(metricName string, namespace string
139140

140141
resultRaw, err := h.services.
141142
ProxyGet(h.heapsterScheme, h.heapsterService, h.heapsterPort, metricPath, map[string]string{"start": startTime.Format(time.RFC3339)}).
142-
DoRaw()
143+
DoRaw(context.TODO())
143144
if err != nil {
144145
return nil, time.Time{}, fmt.Errorf("failed to get pod metrics: %v", err)
145146
}

‎pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ limitations under the License.
1717
package metrics
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122
"fmt"
2223
"io"
2324
"testing"
2425
"time"
2526

26-
"k8s.io/api/core/v1"
27+
v1 "k8s.io/api/core/v1"
2728
"k8s.io/apimachinery/pkg/api/resource"
2829
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2930
"k8s.io/apimachinery/pkg/labels"
@@ -40,11 +41,11 @@ import (
4041

4142
var fixedTimestamp = time.Date(2015, time.November, 10, 12, 30, 0, 0, time.UTC)
4243

43-
func (w fakeResponseWrapper) DoRaw() ([]byte, error) {
44+
func (w fakeResponseWrapper) DoRaw(context.Context) ([]byte, error) {
4445
return w.raw, nil
4546
}
4647

47-
func (w fakeResponseWrapper) Stream() (io.ReadCloser, error) {
48+
func (w fakeResponseWrapper) Stream(context.Context) (io.ReadCloser, error) {
4849
return nil, nil
4950
}
5051

‎plugin/pkg/admission/imagepolicy/admission.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func (a *Plugin) admitPod(ctx context.Context, pod *api.Pod, attributes admissio
174174
review.Status = entry.(v1alpha1.ImageReviewStatus)
175175
} else {
176176
result := a.webhook.WithExponentialBackoff(ctx, func() rest.Result {
177-
return a.webhook.RestClient.Post().Context(ctx).Body(review).Do(context.TODO())
177+
return a.webhook.RestClient.Post().Body(review).Do(ctx)
178178
})
179179

180180
if err := result.Error(); err != nil {

‎staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/conversion/webhook_converter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func (c *webhookConverter) Convert(in runtime.Object, toGV schema.GroupVersion)
271271

272272
// TODO: Figure out if adding one second timeout make sense here.
273273
ctx := context.TODO()
274-
r := c.restClient.Post().Context(ctx).Body(request).Do(context.TODO())
274+
r := c.restClient.Post().Body(request).Do(ctx)
275275
if err := r.Into(response); err != nil {
276276
// TODO: Return a webhook specific error to be able to convert it to meta.Status
277277
return nil, fmt.Errorf("conversion webhook for %v failed: %v", in.GetObjectKind().GroupVersionKind(), err)

‎staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/dispatcher.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func (a *mutatingDispatcher) callAttrMutatingHook(ctx context.Context, h *admiss
236236
defer cancel()
237237
}
238238

239-
r := client.Post().Context(ctx).Body(request)
239+
r := client.Post().Body(request)
240240

241241
// if the context has a deadline, set it as a parameter to inform the backend
242242
if deadline, hasDeadline := ctx.Deadline(); hasDeadline {
@@ -251,7 +251,7 @@ func (a *mutatingDispatcher) callAttrMutatingHook(ctx context.Context, h *admiss
251251
}
252252
}
253253

254-
if err := r.Do(context.TODO()).Into(response); err != nil {
254+
if err := r.Do(ctx).Into(response); err != nil {
255255
return false, &webhookutil.ErrCallingWebhook{WebhookName: h.Name, Reason: err}
256256
}
257257
trace.Step("Request completed")

‎staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/dispatcher.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func (d *validatingDispatcher) callHook(ctx context.Context, h *v1.ValidatingWeb
196196
defer cancel()
197197
}
198198

199-
r := client.Post().Context(ctx).Body(request)
199+
r := client.Post().Body(request)
200200

201201
// if the context has a deadline, set it as a parameter to inform the backend
202202
if deadline, hasDeadline := ctx.Deadline(); hasDeadline {
@@ -211,7 +211,7 @@ func (d *validatingDispatcher) callHook(ctx context.Context, h *v1.ValidatingWeb
211211
}
212212
}
213213

214-
if err := r.Do(context.TODO()).Into(response); err != nil {
214+
if err := r.Do(ctx).Into(response); err != nil {
215215
return &webhookutil.ErrCallingWebhook{WebhookName: h.Name, Reason: err}
216216
}
217217
trace.Step("Request completed")

‎staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ type tokenReviewV1Client struct {
198198

199199
func (t *tokenReviewV1Client) CreateContext(ctx context.Context, review *authenticationv1.TokenReview) (*authenticationv1.TokenReview, error) {
200200
result := &authenticationv1.TokenReview{}
201-
err := t.w.RestClient.Post().Context(ctx).Body(review).Do(context.TODO()).Into(result)
201+
err := t.w.RestClient.Post().Body(review).Do(ctx).Into(result)
202202
return result, err
203203
}
204204

@@ -209,7 +209,7 @@ type tokenReviewV1beta1Client struct {
209209
func (t *tokenReviewV1beta1Client) CreateContext(ctx context.Context, review *authenticationv1.TokenReview) (*authenticationv1.TokenReview, error) {
210210
v1beta1Review := &authenticationv1beta1.TokenReview{Spec: v1SpecToV1beta1Spec(&review.Spec)}
211211
v1beta1Result := &authenticationv1beta1.TokenReview{}
212-
err := t.w.RestClient.Post().Context(ctx).Body(v1beta1Review).Do(context.TODO()).Into(v1beta1Result)
212+
err := t.w.RestClient.Post().Body(v1beta1Review).Do(ctx).Into(v1beta1Result)
213213
if err != nil {
214214
return nil, err
215215
}

‎staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ type subjectAccessReviewV1Client struct {
289289

290290
func (t *subjectAccessReviewV1Client) CreateContext(ctx context.Context, subjectAccessReview *authorizationv1.SubjectAccessReview) (*authorizationv1.SubjectAccessReview, error) {
291291
result := &authorizationv1.SubjectAccessReview{}
292-
err := t.w.RestClient.Post().Context(ctx).Body(subjectAccessReview).Do(context.TODO()).Into(result)
292+
err := t.w.RestClient.Post().Body(subjectAccessReview).Do(ctx).Into(result)
293293
return result, err
294294
}
295295

@@ -300,7 +300,7 @@ type subjectAccessReviewV1beta1Client struct {
300300
func (t *subjectAccessReviewV1beta1Client) CreateContext(ctx context.Context, subjectAccessReview *authorizationv1.SubjectAccessReview) (*authorizationv1.SubjectAccessReview, error) {
301301
v1beta1Review := &authorizationv1beta1.SubjectAccessReview{Spec: v1SpecToV1beta1Spec(&subjectAccessReview.Spec)}
302302
v1beta1Result := &authorizationv1beta1.SubjectAccessReview{}
303-
err := t.w.RestClient.Post().Context(ctx).Body(v1beta1Review).Do(context.TODO()).Into(v1beta1Result)
303+
err := t.w.RestClient.Post().Body(v1beta1Review).Do(ctx).Into(v1beta1Result)
304304
if err == nil {
305305
subjectAccessReview.Status = v1beta1StatusToV1Status(&v1beta1Result.Status)
306306
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func (c *tokenReviews) Create(tokenReview *authenticationapi.TokenReview) (resul
3434
func (c *tokenReviews) CreateContext(ctx context.Context, tokenReview *authenticationapi.TokenReview) (result *authenticationapi.TokenReview, err error) {
3535
result = &authenticationapi.TokenReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Resource("tokenreviews").
3938
Body(tokenReview).
40-
Do(context.TODO()).
39+
Do(ctx).
4140
Into(result)
4241
return
4342
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func (c *tokenReviews) Create(tokenReview *authenticationapi.TokenReview) (resul
3434
func (c *tokenReviews) CreateContext(ctx context.Context, tokenReview *authenticationapi.TokenReview) (result *authenticationapi.TokenReview, err error) {
3535
result = &authenticationapi.TokenReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Resource("tokenreviews").
3938
Body(tokenReview).
40-
Do(context.TODO()).
39+
Do(ctx).
4140
Into(result)
4241
return
4342
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ func (c *localSubjectAccessReviews) Create(sar *authorizationapi.LocalSubjectAcc
3434
func (c *localSubjectAccessReviews) CreateContext(ctx context.Context, sar *authorizationapi.LocalSubjectAccessReview) (result *authorizationapi.LocalSubjectAccessReview, err error) {
3535
result = &authorizationapi.LocalSubjectAccessReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Namespace(c.ns).
3938
Resource("localsubjectaccessreviews").
4039
Body(sar).
41-
Do(context.TODO()).
40+
Do(ctx).
4241
Into(result)
4342
return
4443
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func (c *selfSubjectAccessReviews) Create(sar *authorizationapi.SelfSubjectAcces
3434
func (c *selfSubjectAccessReviews) CreateContext(ctx context.Context, sar *authorizationapi.SelfSubjectAccessReview) (result *authorizationapi.SelfSubjectAccessReview, err error) {
3535
result = &authorizationapi.SelfSubjectAccessReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Resource("selfsubjectaccessreviews").
3938
Body(sar).
40-
Do(context.TODO()).
39+
Do(ctx).
4140
Into(result)
4241
return
4342
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func (c *selfSubjectRulesReviews) Create(srr *authorizationapi.SelfSubjectRulesR
3434
func (c *selfSubjectRulesReviews) CreateContext(ctx context.Context, srr *authorizationapi.SelfSubjectRulesReview) (result *authorizationapi.SelfSubjectRulesReview, err error) {
3535
result = &authorizationapi.SelfSubjectRulesReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Resource("selfsubjectrulesreviews").
3938
Body(srr).
40-
Do(context.TODO()).
39+
Do(ctx).
4140
Into(result)
4241
return
4342
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ func (c *subjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview)
3535
func (c *subjectAccessReviews) CreateContext(ctx context.Context, sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) {
3636
result = &authorizationapi.SubjectAccessReview{}
3737
err = c.client.Post().
38-
Context(ctx).
3938
Resource("subjectaccessreviews").
4039
Body(sar).
41-
Do(context.TODO()).
40+
Do(ctx).
4241
Into(result)
4342
return
4443
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ func (c *localSubjectAccessReviews) Create(sar *authorizationapi.LocalSubjectAcc
3434
func (c *localSubjectAccessReviews) CreateContext(ctx context.Context, sar *authorizationapi.LocalSubjectAccessReview) (result *authorizationapi.LocalSubjectAccessReview, err error) {
3535
result = &authorizationapi.LocalSubjectAccessReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Namespace(c.ns).
3938
Resource("localsubjectaccessreviews").
4039
Body(sar).
41-
Do(context.TODO()).
40+
Do(ctx).
4241
Into(result)
4342
return
4443
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func (c *selfSubjectAccessReviews) Create(sar *authorizationapi.SelfSubjectAcces
3434
func (c *selfSubjectAccessReviews) CreateContext(ctx context.Context, sar *authorizationapi.SelfSubjectAccessReview) (result *authorizationapi.SelfSubjectAccessReview, err error) {
3535
result = &authorizationapi.SelfSubjectAccessReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Resource("selfsubjectaccessreviews").
3938
Body(sar).
40-
Do(context.TODO()).
39+
Do(ctx).
4140
Into(result)
4241
return
4342
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func (c *selfSubjectRulesReviews) Create(srr *authorizationapi.SelfSubjectRulesR
3434
func (c *selfSubjectRulesReviews) CreateContext(ctx context.Context, srr *authorizationapi.SelfSubjectRulesReview) (result *authorizationapi.SelfSubjectRulesReview, err error) {
3535
result = &authorizationapi.SelfSubjectRulesReview{}
3636
err = c.client.Post().
37-
Context(ctx).
3837
Resource("selfsubjectrulesreviews").
3938
Body(srr).
40-
Do(context.TODO()).
39+
Do(ctx).
4140
Into(result)
4241
return
4342
}

‎staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ func (c *subjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview)
3535
func (c *subjectAccessReviews) CreateContext(ctx context.Context, sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) {
3636
result = &authorizationapi.SubjectAccessReview{}
3737
err = c.client.Post().
38-
Context(ctx).
3938
Resource("subjectaccessreviews").
4039
Body(sar).
41-
Do(context.TODO()).
40+
Do(ctx).
4241
Into(result)
4342
return
4443
}

‎staging/src/k8s.io/client-go/rest/client_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package rest
1818

1919
import (
20+
"context"
2021
"net/http"
2122
"net/http/httptest"
2223
"net/url"
@@ -79,7 +80,7 @@ func TestDoRequestSuccess(t *testing.T) {
7980
if err != nil {
8081
t.Fatalf("unexpected error: %v", err)
8182
}
82-
body, err := c.Get().Prefix("test").Do().Raw()
83+
body, err := c.Get().Prefix("test").Do(context.Background()).Raw()
8384

8485
testParam := TestParam{actualError: err, expectingError: false, expCreated: true,
8586
expStatus: status, testBody: true, testBodyErrorIsNotNil: false}
@@ -107,7 +108,7 @@ func TestDoRequestFailed(t *testing.T) {
107108
if err != nil {
108109
t.Fatalf("unexpected error: %v", err)
109110
}
110-
err = c.Get().Do().Error()
111+
err = c.Get().Do(context.Background()).Error()
111112
if err == nil {
112113
t.Errorf("unexpected non-error")
113114
}
@@ -146,7 +147,7 @@ func TestDoRawRequestFailed(t *testing.T) {
146147
if err != nil {
147148
t.Fatalf("unexpected error: %v", err)
148149
}
149-
body, err := c.Get().Do().Raw()
150+
body, err := c.Get().Do(context.Background()).Raw()
150151

151152
if err == nil || body == nil {
152153
t.Errorf("unexpected non-error: %#v", body)
@@ -170,7 +171,7 @@ func TestDoRequestCreated(t *testing.T) {
170171
t.Fatalf("unexpected error: %v", err)
171172
}
172173
created := false
173-
body, err := c.Get().Prefix("test").Do().WasCreated(&created).Raw()
174+
body, err := c.Get().Prefix("test").Do(context.Background()).WasCreated(&created).Raw()
174175

175176
testParam := TestParam{actualError: err, expectingError: false, expCreated: true,
176177
expStatus: status, testBody: false}
@@ -185,7 +186,7 @@ func TestDoRequestNotCreated(t *testing.T) {
185186
t.Fatalf("unexpected error: %v", err)
186187
}
187188
created := false
188-
body, err := c.Get().Prefix("test").Do().WasCreated(&created).Raw()
189+
body, err := c.Get().Prefix("test").Do(context.Background()).WasCreated(&created).Raw()
189190
testParam := TestParam{actualError: err, expectingError: false, expCreated: false,
190191
expStatus: expectedStatus, testBody: false}
191192
validate(testParam, t, body, fakeHandler)
@@ -200,7 +201,7 @@ func TestDoRequestAcceptedNoContentReturned(t *testing.T) {
200201
t.Fatalf("unexpected error: %v", err)
201202
}
202203
created := false
203-
body, err := c.Get().Prefix("test").Do().WasCreated(&created).Raw()
204+
body, err := c.Get().Prefix("test").Do(context.Background()).WasCreated(&created).Raw()
204205
testParam := TestParam{actualError: err, expectingError: false, expCreated: false,
205206
testBody: false}
206207
validate(testParam, t, body, fakeHandler)
@@ -214,7 +215,7 @@ func TestBadRequest(t *testing.T) {
214215
t.Fatalf("unexpected error: %v", err)
215216
}
216217
created := false
217-
body, err := c.Get().Prefix("test").Do().WasCreated(&created).Raw()
218+
body, err := c.Get().Prefix("test").Do(context.Background()).WasCreated(&created).Raw()
218219
testParam := TestParam{actualError: err, expectingError: true, expCreated: false,
219220
testBody: true}
220221
validate(testParam, t, body, fakeHandler)

0 commit comments

Comments
 (0)