Skip to content

Commit

Permalink
fix: remove commented prints and rename function
Browse files Browse the repository at this point in the history
  • Loading branch information
teselil committed Jul 10, 2023
1 parent 42f0ec6 commit b54167c
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions pkg/services/resourcesFilterService.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func ShouldResourceBeValidated(admissionReviewReq *admission.AdmissionReview, ro
}
}

if isEqualObjectAndOldObject(admissionReviewReq) {
if isObjectAndOldObjectEqual(admissionReviewReq) {
return ShouldValidatedResourceData{
ShouldValidate: false,
}
Expand Down Expand Up @@ -137,8 +137,7 @@ func isNamespaceThatShouldBeSkipped(admissionReviewReq *admission.AdmissionRevie
return slices.Contains(namespacesToSkip, admissionReviewReq.Request.Namespace)
}

func isEqualObjectAndOldObject(admissionReviewReq *admission.AdmissionReview) bool {
// fmt.Println("@@admissionReviewReq", admissionReviewReq)
func isObjectAndOldObjectEqual(admissionReviewReq *admission.AdmissionReview) bool {
if admissionReviewReq.Request.OldObject.Raw == nil {
return false
}
Expand All @@ -150,8 +149,14 @@ func isEqualObjectAndOldObject(admissionReviewReq *admission.AdmissionReview) bo

var objectMap map[string]interface{}
var oldObjectMap map[string]interface{}
_ = json.Unmarshal(clonedObject.Raw, &objectMap)
_ = json.Unmarshal(clonedOldObject.Raw, &oldObjectMap)
err := json.Unmarshal(clonedObject.Raw, &objectMap)
if err != nil {
return false
}
err = json.Unmarshal(clonedOldObject.Raw, &oldObjectMap)
if err != nil {
return false
}

if objectMetadata, ok := objectMap["metadata"]; ok {
delete(objectMetadata.(map[string]interface{}), "managedFields")
Expand All @@ -163,13 +168,7 @@ func isEqualObjectAndOldObject(admissionReviewReq *admission.AdmissionReview) bo
delete(oldObjectMetadata.(map[string]interface{}), "selfLink")
}

// fmt.Println("@@clonedObject", string(clonedObject.Raw))
// fmt.Println("@@clonedOldObject", string(clonedOldObject.Raw))

isEqual := cmp.Equal(objectMap, oldObjectMap)
// diff := cmp.Diff(objectMap, oldObjectMap)
// fmt.Println("@@isEqual", isEqual)
// fmt.Println("@@diff", diff)
return isEqual
}

Expand Down

0 comments on commit b54167c

Please sign in to comment.