Skip to content

Commit

Permalink
fix: change diff logic to equal logic + fix lint err
Browse files Browse the repository at this point in the history
  • Loading branch information
Yishay Mendelsohn authored and Yishay Mendelsohn committed Jul 3, 2023
1 parent 9bf61d7 commit 2c5cd06
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions pkg/services/resourcesFilterService.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func ShouldResourceBeValidated(admissionReviewReq *admission.AdmissionReview, ro
return true
}

if !isDiffBetweenObjectAndOldObject(admissionReviewReq) {
if isEqualObjectAndOldObject(admissionReviewReq) {
return false
}

Expand Down Expand Up @@ -115,21 +115,22 @@ func isNamespaceThatShouldBeSkipped(admissionReviewReq *admission.AdmissionRevie
return slices.Contains(namespacesToSkip, admissionReviewReq.Request.Namespace)
}

func isDiffBetweenObjectAndOldObject(admissionReviewReq *admission.AdmissionReview) bool {
func isEqualObjectAndOldObject(admissionReviewReq *admission.AdmissionReview) bool {
fmt.Println("@@admissionReviewReq", admissionReviewReq)
if admissionReviewReq.Request.OldObject.Raw == nil {
return true
return false
}
if admissionReviewReq.Request.Operation != admission.Update {
return true
return false
}
clonedObject := admissionReviewReq.Request.Object.DeepCopy()
clonedOldObject := admissionReviewReq.Request.OldObject.DeepCopy()

var objectMap map[string]interface{}
var oldObjectMap map[string]interface{}
json.Unmarshal(clonedObject.Raw, &objectMap)
json.Unmarshal(clonedOldObject.Raw, &oldObjectMap)
_ = json.Unmarshal(clonedObject.Raw, &objectMap)
_ = json.Unmarshal(clonedOldObject.Raw, &oldObjectMap)

if objectMetadata, ok := objectMap["metadata"]; ok {
delete(objectMetadata.(map[string]interface{}), "managedFields")
delete(objectMetadata.(map[string]interface{}), "selfLink")
Expand All @@ -147,7 +148,7 @@ func isDiffBetweenObjectAndOldObject(admissionReviewReq *admission.AdmissionRevi
diff := cmp.Diff(objectMap, oldObjectMap)
fmt.Println("@@isEqual", isEqual)
fmt.Println("@@diff", diff)
return !isEqual
return isEqual
}

func isKubectl(managedFields []ManagedFields) bool {
Expand Down

0 comments on commit 2c5cd06

Please sign in to comment.