E587 Rename compareSpecs · nginx/kubernetes-ingress@12a0296 · GitHub
[go: up one dir, main page]

Skip to content

Commit 12a0296

Browse files
committed
Rename compareSpecs
1 parent 3d7a891 commit 12a0296

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

internal/k8s/handlers.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,12 @@ func createIngressLinkHandlers(lbc *LoadBalancerController) cache.ResourceEventH
483483
UpdateFunc: func(old, cur interface{}) {
484484
oldLink := old.(*unstructured.Unstructured)
485485
curLink := cur.(*unstructured.Unstructured)
486-
updated, err := compareSpecs(oldLink, curLink)
486+
different, err := areResourcesDifferent(oldLink, curLink)
487487
if err != nil {
488488
glog.V(3).Infof("Error when comparing IngressLinks: %v", err)
489489
lbc.AddSyncQueue(curLink)
490490
}
491-
if updated {
491+
if different {
492492
glog.V(3).Infof("IngressLink %v changed, syncing", oldLink.GetName())
493493
lbc.AddSyncQueue(curLink)
494494
}
@@ -506,12 +506,12 @@ func createAppProtectPolicyHandlers(lbc *LoadBalancerController) cache.ResourceE
506506
UpdateFunc: func(oldObj, obj interface{}) {
507507
oldPol := oldObj.(*unstructured.Unstructured)
508508
newPol := obj.(*unstructured.Unstructured)
509-
updated, err := compareSpecs(oldPol, newPol)
509+
different, err := areResourcesDifferent(oldPol, newPol)
510510
if err != nil {
511511
glog.V(3).Infof("Error when comparing policy %v", err)
512512
lbc.AddSyncQueue(newPol)
513513
}
514-
if updated {
514+
if different {
515515
glog.V(3).Infof("ApPolicy %v changed, syncing", oldPol.GetName())
516516
lbc.AddSyncQueue(newPol)
517517
}
@@ -523,8 +523,8 @@ func createAppProtectPolicyHandlers(lbc *LoadBalancerController) cache.ResourceE
523523
return handlers
524524
}
525525

526-
// compareSpecs returns true if the resources are different.
527-
func compareSpecs(oldresource, resource *unstructured.Unstructured) (bool, error) {
526+
// areResourcesDifferent returns true if the resources are different based on their spec.
527+
func areResourcesDifferent(oldresource, resource *unstructured.Unstructured) (bool, error) {
528528
oldSpec, found, err := unstructured.NestedMap(oldresource.Object, "spec")
529529
if !found {
530530
glog.V(3).Infof("Warning, oldspec has unexpected format")
@@ -556,12 +556,12 @@ func createAppProtectLogConfHandlers(lbc *LoadBalancerController) cache.Resource
556556
UpdateFunc: func(oldObj, obj interface{}) {
557557
oldConf := oldObj.(*unstructured.Unstructured)
558558
newConf := obj.(*unstructured.Unstructured)
559-
updated, err := compareSpecs(oldConf, newConf)
559+
different, err := areResourcesDifferent(oldConf, newConf)
560560
if err != nil {
561561
glog.V(3).Infof("Error when comparing LogConfs %v", err)
562562
lbc.AddSyncQueue(newConf)
563563
}
564-
if updated {
564+
if different {
565565
glog.V(3).Infof("ApLogConf %v changed, syncing", oldConf.GetName())
566566
lbc.AddSyncQueue(newConf)
567567
}
@@ -583,12 +583,12 @@ func createAppProtectUserSigHandlers(lbc *LoadBalancerController) cache.Resource
583583
UpdateFunc: func(oldObj, obj interface{}) {
584584
oldSig := oldObj.(*unstructured.Unstructured)
585585
newSig := obj.(*unstructured.Unstructured)
586-
updated, err := compareSpecs(oldSig, newSig)
586+
different, err := areResourcesDifferent(oldSig, newSig)
587587
if err != nil {
588588
glog.V(3).Infof("Error when comparing UserSigs %v", err)
589589
lbc.AddSyncQueue(newSig)
590590
}
591-
if updated {
591+
if different {
592592
glog.V(3).Infof("ApUserSig %v changed, syncing", oldSig.GetName())
593593
lbc.AddSyncQueue(newSig)
594594
}

internal/k8s/handlers_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func TestHasServicePortChanges(t *testing.T) {
156156
}
157157
}
158158

159-
func TestCompareSpecs(t *testing.T) {
159+
func TestAreResourcesDifferent(t *testing.T) {
160160
tests := []struct {
161161
oldR, newR *unstructured.Unstructured
162162
expected, expectErr bool
@@ -261,15 +261,15 @@ func TestCompareSpecs(t *testing.T) {
261261
}
262262

263263
for _, test := range tests {
264-
result, err := compareSpecs(test.oldR, test.newR)
264+
result, err := areResourcesDifferent(test.oldR, test.newR)
265265
if result != test.expected {
266-
t.Errorf("compareSpecs() returned %v but expected %v for the case of %s", result, test.expected, test.msg)
266+
t.Errorf("areResourcesDifferent() returned %v but expected %v for the case of %s", result, test.expected, test.msg)
267267
}
268268
if test.expectErr && err == nil {
269-
t.Errorf("compareSpecs() returned no error for the case of %s", test.msg)
269+
t.Errorf("areResourcesDifferent() returned no error for the case of %s", test.msg)
270270
}
271271
if !test.expectErr && err != nil {
272-
t.Errorf("compareSpecs() returned unexpected error %v for the case of %s", err, test.msg)
272+
t.Errorf("areResourcesDifferent() returned unexpected error %v for the case of %s", err, test.msg)
273273
}
274274
}
275275
}

0 commit comments

Comments
 (0)
0