changing mirror, aggregate and summary to private; rename correspondig setters methods

Author: fabriziopandini

controllers/machine_controller_phases.go

@@ -185,7 +185,7 @@ func (r *MachineReconciler) reconcileBootstrap(ctx context.Context, cluster *clu
 	}
 
 	// Report a summary of current status of the bootstrap object defined for this machine.
-	conditions.SetMirrorCondition(m, clusterv1.BootstrapReadyCondition,
+	conditions.SetMirror(m, clusterv1.BootstrapReadyCondition,
 		conditions.UnstructuredGetter(bootstrapConfig),
 		conditions.WithFallbackValue(ready, clusterv1.WaitingForDataSecretFallbackReason, clusterv1.ConditionSeverityInfo, ""),
 	)
@@ -248,7 +248,7 @@ func (r *MachineReconciler) reconcileInfrastructure(ctx context.Context, cluster
 	m.Status.InfrastructureReady = ready
 
 	// Report a summary of current status of the infrastructure object defined for this machine.
-	conditions.SetMirrorCondition(m, clusterv1.InfrastructureReadyCondition,
+	conditions.SetMirror(m, clusterv1.InfrastructureReadyCondition,
 		conditions.UnstructuredGetter(infraConfig),
 		conditions.WithFallbackValue(ready, clusterv1.WaitingForInfrastructureFallbackReason, clusterv1.ConditionSeverityInfo, ""),
 	)

util/conditions/getter.go

@@ -114,9 +114,9 @@ func GetLastTransitionTime(from Getter, t clusterv1.ConditionType) *metav1.Time
 	return nil
 }
 
-// Summary returns a Ready condition with the summary of all the conditions existing
+// summary returns a Ready condition with the summary of all the conditions existing
 // on an object. If the object does not have other conditions, no summary condition is generated.
-func Summary(from Getter, options ...MergeOption) *clusterv1.Condition {
+func summary(from Getter, options ...MergeOption) *clusterv1.Condition {
 	conditions := from.GetConditions()
 
 	conditionsInScope := make([]localizedCondition, 0, len(conditions))
@@ -159,9 +159,9 @@ func WithFallbackValue(fallbackValue bool, reason string, severity clusterv1.Con
 	}
 }
 
-// Mirror mirrors the Ready condition from a dependent object into the target condition;
+// mirror mirrors the Ready condition from a dependent object into the target condition;
 // if the Ready condition does not exists in the source object, no target conditions is generated.
-func Mirror(from Getter, targetCondition clusterv1.ConditionType, options ...MirrorOptions) *clusterv1.Condition {
+func mirror(from Getter, targetCondition clusterv1.ConditionType, options ...MirrorOptions) *clusterv1.Condition {
 	mirrorOpt := &mirrorOptions{}
 	for _, o := range options {
 		o(mirrorOpt)
@@ -188,7 +188,7 @@ func Mirror(from Getter, targetCondition clusterv1.ConditionType, options ...Mir
 // Aggregates all the the Ready condition from a list of dependent objects into the target object;
 // if the Ready condition does not exists in one of the source object, the object is excluded from
 // the aggregation; if none of the source object have ready condition, no target conditions is generated.
-func Aggregate(from []Getter, targetCondition clusterv1.ConditionType, options ...MergeOption) *clusterv1.Condition {
+func aggregate(from []Getter, targetCondition clusterv1.ConditionType, options ...MergeOption) *clusterv1.Condition {
 	conditionsInScope := make([]localizedCondition, 0, len(from))
 	for i := range from {
 		condition := Get(from[i], clusterv1.ReadyCondition)

util/conditions/getter_test.go

@@ -120,7 +120,7 @@ func TestMirror(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
-			got := Mirror(tt.from, tt.t)
+			got := mirror(tt.from, tt.t)
 			if tt.want == nil {
 				g.Expect(got).To(BeNil())
 				return
@@ -161,7 +161,7 @@ func TestSummary(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
-			got := Summary(tt.from)
+			got := summary(tt.from)
 			if tt.want == nil {
 				g.Expect(got).To(BeNil())
 				return
@@ -205,7 +205,7 @@ func TestAggregate(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			g := NewWithT(t)
 
-			got := Aggregate(tt.from, tt.t)
+			got := aggregate(tt.from, tt.t)
 			if tt.want == nil {
 				g.Expect(got).To(BeNil())
 				return

util/conditions/merge_test.go

@@ -89,12 +89,12 @@ func TestMergeRespectPriority(t *testing.T) {
 		want       *clusterv1.Condition
 	}{
 		{
-			name:       "Aggregate nil list return nil",
+			name:       "aggregate nil list return nil",
 			conditions: nil,
 			want:       nil,
 		},
 		{
-			name:       "Aggregate empty list return nil",
+			name:       "aggregate empty list return nil",
 			conditions: []*clusterv1.Condition{},
 			want:       nil,
 		},

util/conditions/setter.go

@@ -115,21 +115,21 @@ func MarkFalse(to Setter, t clusterv1.ConditionType, reason string, severity clu
 // SetSummary sets a Ready condition with the summary of all the conditions existing
 // on an object. If the object does not have other conditions, no summary condition is generated.
 func SetSummary(to Setter, options ...MergeOption) {
-	Set(to, Summary(to, options...))
+	Set(to, summary(to, options...))
 }
 
-// SetMirrorCondition creates a new condition by mirroring the the Ready condition from a dependent object;
+// SetMirror creates a new condition by mirroring the the Ready condition from a dependent object;
 // if the Ready condition does not exists in the source object, no target conditions is generated.
-func SetMirrorCondition(to Setter, targetCondition clusterv1.ConditionType, from Getter, options ...MirrorOptions) {
-	Set(to, Mirror(from, targetCondition, options...))
+func SetMirror(to Setter, targetCondition clusterv1.ConditionType, from Getter, options ...MirrorOptions) {
+	Set(to, mirror(from, targetCondition, options...))
 }
 
-// SetAggregateCondition creates a new condition with the aggregation of all the the Ready condition
+// SetAggregate creates a new condition with the aggregation of all the the Ready condition
 // from a list of dependent objects; if the Ready condition does not exists in one of the source object,
 // the object is excluded from the aggregation; if none of the source object have ready condition,
 // no target conditions is generated.
-func SetAggregateCondition(to Setter, targetCondition clusterv1.ConditionType, from []Getter, options ...MergeOption) {
-	Set(to, Aggregate(from, targetCondition, options...))
+func SetAggregate(to Setter, targetCondition clusterv1.ConditionType, from []Getter, options ...MergeOption) {
+	Set(to, aggregate(from, targetCondition, options...))
 }
 
 // Delete deletes the condition with the given type.