Skip to content

Commit b2a9552

Browse files
committed
chore: warning message should also be carried with APIStatusError
Signed-off-by: STRRL <[email protected]>
1 parent 0d248e2 commit b2a9552

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

pkg/webhook/admission/validator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (h *validatingHandler) Handle(ctx context.Context, req Request) Response {
117117
if err != nil {
118118
var apiStatus apierrors.APIStatus
119119
if errors.As(err, &apiStatus) {
120-
return validationResponseFromStatus(false, apiStatus.Status())
120+
return validationResponseFromStatus(false, apiStatus.Status()).WithWarnings(warnings...)
121121
}
122122
return Denied(err.Error()).WithWarnings(warnings...)
123123
}

pkg/webhook/admission/validator_custom.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (h *validatorForType) Handle(ctx context.Context, req Request) Response {
116116
if err != nil {
117117
var apiStatus apierrors.APIStatus
118118
if errors.As(err, &apiStatus) {
119-
return validationResponseFromStatus(false, apiStatus.Status())
119+
return validationResponseFromStatus(false, apiStatus.Status()).WithWarnings(warnings...)
120120
}
121121
return Denied(err.Error()).WithWarnings(warnings...)
122122
}

pkg/webhook/admission/validator_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ var _ = Describe("validatingHandler", func() {
183183
Expect(response.Allowed).Should(BeFalse())
184184
Expect(response.Result.Code).Should(Equal(expectedError.Status().Code))
185185
Expect(*response.Result).Should(Equal(expectedError.Status()))
186-
Expect(response.AdmissionResponse.Warnings).Should(BeEmpty())
186+
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(warningMessage))
187+
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(anotherWarningMessage))
187188

188189
})
189190

@@ -206,7 +207,8 @@ var _ = Describe("validatingHandler", func() {
206207
Expect(response.Allowed).Should(BeFalse())
207208
Expect(response.Result.Code).Should(Equal(expectedError.Status().Code))
208209
Expect(*response.Result).Should(Equal(expectedError.Status()))
209-
Expect(response.AdmissionResponse.Warnings).Should(BeEmpty())
210+
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(warningMessage))
211+
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(anotherWarningMessage))
210212

211213
})
212214

@@ -225,7 +227,8 @@ var _ = Describe("validatingHandler", func() {
225227
Expect(response.Allowed).Should(BeFalse())
226228
Expect(response.Result.Code).Should(Equal(expectedError.Status().Code))
227229
Expect(*response.Result).Should(Equal(expectedError.Status()))
228-
Expect(response.AdmissionResponse.Warnings).Should(BeEmpty())
230+
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(warningMessage))
231+
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(anotherWarningMessage))
229232

230233
})
231234

0 commit comments

Comments
 (0)