Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚠️ feat: new features about support warning with webhook #2014

Merged
merged 13 commits into from
Apr 19, 2023
+396 −202
Merged

⚠️ feat: new features about support warning with webhook #2014

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2f57272
feat: new features about support warning with webhook
STRRL Sep 29, 2022
f099810
chore: refine implementing declaration, fix import cycle
STRRL Nov 3, 2022
31371cc
chore: refine interface methods declration
STRRL Nov 3, 2022
b37201d
chore: move error as the last value returned by CustomValidatorWarn's…
STRRL Dec 5, 2022
7d1e860
chore: stop using goerrors as alias or std errors
STRRL Dec 5, 2022
9205bab
refactor(defaulting webhook): breaking the original interface instead…
STRRL Feb 9, 2023
6e2a023
chore: rename validator_warn_test.go to validator_test.go
STRRL Feb 9, 2023
844f97a
chore: append comments for modified Validator and CustomValidator
STRRL Feb 10, 2023
6fe2ffd
chore: address the comments
STRRL Feb 21, 2023
1e1dd76
refactor: move and unexport FakeValidator for unit tests in admission…
STRRL Apr 13, 2023
8770b4d
refactor: introduce new type as Warnings
STRRL Apr 13, 2023
0d248e2
chore: move fakeValidator from individual file into Validator_test.go
STRRL Apr 14, 2023
b2a9552
chore: warning message should also be carried with APIStatusError
STRRL Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
chore: warning message should also be carried with APIStatusError 
Signed-off-by: STRRL <[email protected]>
@STRRL
STRRL committed Apr 17, 2023

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
commit b2a955209912f188758a1ae2281f8cea691a6126
2 changes: 1 addition & 1 deletion pkg/webhook/admission/validator.go
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ func (h *validatingHandler) Handle(ctx context.Context, req Request) Response {
if err != nil {
var apiStatus apierrors.APIStatus
if errors.As(err, &apiStatus) {
return validationResponseFromStatus(false, apiStatus.Status())
return validationResponseFromStatus(false, apiStatus.Status()).WithWarnings(warnings...)
}
return Denied(err.Error()).WithWarnings(warnings...)
}
2 changes: 1 addition & 1 deletion pkg/webhook/admission/validator_custom.go
View file
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ func (h *validatorForType) Handle(ctx context.Context, req Request) Response {
if err != nil {
var apiStatus apierrors.APIStatus
if errors.As(err, &apiStatus) {
return validationResponseFromStatus(false, apiStatus.Status())
return validationResponseFromStatus(false, apiStatus.Status()).WithWarnings(warnings...)
}
return Denied(err.Error()).WithWarnings(warnings...)
}
9 changes: 6 additions & 3 deletions pkg/webhook/admission/validator_test.go
View file
Original file line number Diff line number Diff line change
@@ -183,7 +183,8 @@ var _ = Describe("validatingHandler", func() {
Expect(response.Allowed).Should(BeFalse())
Expect(response.Result.Code).Should(Equal(expectedError.Status().Code))
Expect(*response.Result).Should(Equal(expectedError.Status()))
Expect(response.AdmissionResponse.Warnings).Should(BeEmpty())
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(warningMessage))
Expect(response.AdmissionResponse.Warnings).Should(ContainElements(anotherWarningMessage))

})

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

})

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

})