weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Implements suggestions from code review

Browse Source 
Signed-off-by: irbekrm <irbekrm@gmail.com>
This commit is contained in:
irbekrm 2021-04-29 17:47:27 +01:00
parent e4554590d8
commit f46aad2b74
7 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/util/warnings.go
View File

@ -19,5 +19,6 @@ package util
// Warning values thrown by validating webhook
// https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/
const (
// DeprecatedACMEEABKeyAlgorithmField is raised when the deprecated keyAlgorithm field for an ACME issuer's external account binding (EAB) is set.
DeprecatedACMEEABKeyAlgorithmField = "ACME issuer spec field 'externalAccount.keyAlgorithm' is deprecated. The value of this field will be ignored."
)

3
pkg/internal/apis/acme/validation/order.go
View File

@ -36,10 +36,9 @@ func ValidateOrderUpdate(_ *admissionv1.AdmissionRequest, oldObj, newObj runtime
}
el := field.ErrorList{}
var warnings validation.WarningList
el = append(el, ValidateOrderSpecUpdate(old.Spec, new.Spec, field.NewPath("spec"))...)
el = append(el, ValidateOrderStatusUpdate(old.Status, new.Status, field.NewPath("status"))...)
return el, warnings
return el, nil
}
func ValidateOrderSpecUpdate(old, new cmacme.OrderSpec, fldPath *field.Path) field.ErrorList {

6
pkg/internal/apis/certmanager/identity/certificaterequests/certificaterequests.go
View File

@ -32,7 +32,6 @@ import (
)
func ValidateCreate(req *admissionv1.AdmissionRequest, obj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
cr := obj.(*cmapi.CertificateRequest)
fldPath := field.NewPath("spec")
@ -50,7 +49,7 @@ func ValidateCreate(req *admissionv1.AdmissionRequest, obj runtime.Object) (fiel
el = append(el, field.Forbidden(fldPath.Child("extra"), "extra identity must be that of the requester"))
}
return el, warnings
return el, nil
}
func extrasMatch(crExtra map[string][]string, reqExtra map[string]authenticationv1.ExtraValue) bool {
@ -73,7 +72,6 @@ func extrasMatch(crExtra map[string][]string, reqExtra map[string]authentication
}
func ValidateUpdate(_ *admissionv1.AdmissionRequest, oldObj, newObj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
oldCR, newCR := oldObj.(*cmapi.CertificateRequest), newObj.(*cmapi.CertificateRequest)
fldPath := field.NewPath("spec")
@ -91,7 +89,7 @@ func ValidateUpdate(_ *admissionv1.AdmissionRequest, oldObj, newObj runtime.Obje
el = append(el, field.Forbidden(fldPath.Child("extra"), "extra identity cannot be changed once set"))
}
return el, warnings
return el, nil
}
func MutateCreate(req *admissionv1.AdmissionRequest, obj runtime.Object) {

6
pkg/internal/apis/certmanager/validation/certificate.go
View File

@ -88,17 +88,15 @@ func ValidateCertificateSpec(crt *internalcmapi.CertificateSpec, fldPath *field.
}
func ValidateCertificate(_ *admissionv1.AdmissionRequest, obj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
crt := obj.(*internalcmapi.Certificate)
allErrs := ValidateCertificateSpec(&crt.Spec, field.NewPath("spec"))
return allErrs, warnings
return allErrs, nil
}
func ValidateUpdateCertificate(_ *admissionv1.AdmissionRequest, oldObj, obj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
crt := obj.(*internalcmapi.Certificate)
allErrs := ValidateCertificateSpec(&crt.Spec, field.NewPath("spec"))
return allErrs, warnings
return allErrs, nil
}
func validateIssuerRef(issuerRef cmmeta.ObjectReference, fldPath *field.Path) field.ErrorList {

6
pkg/internal/apis/certmanager/validation/certificaterequest.go
View File

@ -40,17 +40,15 @@ import (
var defaultInternalKeyUsages = []cmapi.KeyUsage{cmapi.UsageDigitalSignature, cmapi.UsageKeyEncipherment}
func ValidateCertificateRequest(_ *admissionv1.AdmissionRequest, obj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
cr := obj.(*cmapi.CertificateRequest)
allErrs := ValidateCertificateRequestSpec(&cr.Spec, field.NewPath("spec"), true)
allErrs = append(allErrs,
ValidateCertificateRequestApprovalCondition(cr.Status.Conditions, field.NewPath("status", "conditions"))...)
return allErrs, warnings
return allErrs, nil
}
func ValidateUpdateCertificateRequest(_ *admissionv1.AdmissionRequest, oldObj, newObj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
oldCR, newCR := oldObj.(*cmapi.CertificateRequest), newObj.(*cmapi.CertificateRequest)
var el field.ErrorList
@ -69,7 +67,7 @@ func ValidateUpdateCertificateRequest(_ *admissionv1.AdmissionRequest, oldObj, n
el = append(el, field.Forbidden(field.NewPath("spec"), "cannot change spec after creation"))
}
return el, warnings
return el, nil
}
func validateCertificateRequestAnnotations(objA, objB *cmapi.CertificateRequest, fieldPath *field.Path) field.ErrorList {

3
pkg/webhook/handlers/testdata/apis/testgroup/v2/validation.go vendored
View File

@ -26,10 +26,9 @@ import (
func ValidateTestType(_ *admissionv1.AdmissionRequest, obj runtime.Object) (field.ErrorList, validation.WarningList) {
el := field.ErrorList{}
warnings := validation.WarningList{}
tt := obj.(*TestType)
if tt.TestField == DisallowedTestFieldValue {
el = append(el, field.Invalid(field.NewPath("testField"), tt.TestField, "value not allowed"))
}
return el, warnings
return el, nil
}

8
pkg/webhook/handlers/testdata/apis/testgroup/validation/validation.go vendored
View File

@ -27,26 +27,24 @@ import (
)
func ValidateTestType(_ *admissionv1.AdmissionRequest, obj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
testType := obj.(*testgroup.TestType)
el := field.ErrorList{}
if testType.TestField == v1.TestFieldValueNotAllowed {
el = append(el, field.Invalid(field.NewPath("testField"), testType.TestField, "invalid value"))
}
return el, warnings
return el, nil
}
func ValidateTestTypeUpdate(_ *admissionv1.AdmissionRequest, oldObj, newObj runtime.Object) (field.ErrorList, validation.WarningList) {
var warnings validation.WarningList
old, ok := oldObj.(*testgroup.TestType)
new := newObj.(*testgroup.TestType)
// if oldObj is not set, the Update operation is always valid.
if !ok || old == nil {
return nil, warnings
return nil, nil
}
el := field.ErrorList{}
if old.TestFieldImmutable != "" && old.TestFieldImmutable != new.TestFieldImmutable {
el = append(el, field.Forbidden(field.NewPath("testFieldImmutable"), "field is immutable once set"))
}
return el, warnings
return el, nil
}