Use constants

Author: pleshakov

internal/status/gateway.go

@@ -26,14 +26,17 @@ func prepareGatewayStatus(statuses newstate.ListenerStatuses, transitionTime met
 	for _, name := range names {
 		s := statuses[name]
 
-		var status, reason string
+		var (
+			status metav1.ConditionStatus
+			reason v1alpha2.ListenerConditionReason
+		)
 
 		if s.Valid {
-			status = "True"
-			reason = string(v1alpha2.ListenerReasonReady)
+			status = metav1.ConditionTrue
+			reason = v1alpha2.ListenerReasonReady
 		} else {
-			status = "False"
-			reason = string(v1alpha2.ListenerReasonInvalid)
+			status = metav1.ConditionFalse
+			reason = v1alpha2.ListenerReasonInvalid
 		}
 
 		cond := metav1.Condition{
@@ -42,7 +45,7 @@ func prepareGatewayStatus(statuses newstate.ListenerStatuses, transitionTime met
 			// FIXME(pleshakov) Set the observed generation to the last processed generation of the Gateway resource.
 			ObservedGeneration: 123,
 			LastTransitionTime: transitionTime,
-			Reason:             reason,
+			Reason:             string(reason),
 			Message:            "", // FIXME(pleshakov) Come up with a good message
 		}
 

internal/status/gateway_test.go

@@ -38,7 +38,7 @@ func TestPrepareGatewayStatus(t *testing.T) {
 				Conditions: []metav1.Condition{
 					{
 						Type:               string(v1alpha2.ListenerConditionReady),
-						Status:             "False",
+						Status:             metav1.ConditionFalse,
 						ObservedGeneration: 123,
 						LastTransitionTime: transitionTime,
 						Reason:             string(v1alpha2.ListenerReasonInvalid),
@@ -56,7 +56,7 @@ func TestPrepareGatewayStatus(t *testing.T) {
 				Conditions: []metav1.Condition{
 					{
 						Type:               string(v1alpha2.ListenerConditionReady),
-						Status:             "True",
+						Status:             metav1.ConditionTrue,
 						ObservedGeneration: 123,
 						LastTransitionTime: transitionTime,
 						Reason:             string(v1alpha2.ListenerReasonReady),

internal/status/httproute.go

@@ -32,13 +32,17 @@ func prepareHTTPRouteStatus(
 	for _, name := range names {
 		ps := status.ParentStatuses[name]
 
-		var status, reason string
+		var (
+			status metav1.ConditionStatus
+			reason string // FIXME(pleshakov) use RouteConditionReason once we upgrade to v1beta1
+		)
+
 		if ps.Attached {
-			status = "True"
-			reason = "Attached"
+			status = metav1.ConditionTrue
+			reason = "Accepted" // FIXME(pleshakov): use RouteReasonAccepted once we upgrade to v1beta1
 		} else {
-			status = "False"
-			reason = "Not attached"
+			status = metav1.ConditionFalse
+			reason = "Not attached" // FIXME(pleshakov): use a more specific message from the defined constants (available in v1beta1)
 		}
 
 		sectionName := name
@@ -53,7 +57,7 @@ func prepareHTTPRouteStatus(
 			Conditions: []metav1.Condition{
 				{
 					Type:   string(v1alpha2.ConditionRouteAccepted),
-					Status: metav1.ConditionStatus(status),
+					Status: status,
 					// FIXME(pleshakov) Set the observed generation to the last processed generation of the HTTPRoute resource.
 					ObservedGeneration: 123,
 					LastTransitionTime: transitionTime,

internal/status/httproute_test.go

@@ -43,10 +43,10 @@ func TestPrepareHTTPRouteStatus(t *testing.T) {
 					Conditions: []metav1.Condition{
 						{
 							Type:               string(v1alpha2.ConditionRouteAccepted),
-							Status:             "True",
+							Status:             metav1.ConditionTrue,
 							ObservedGeneration: 123,
 							LastTransitionTime: transitionTime,
-							Reason:             "Attached",
+							Reason:             "Accepted",
 						},
 					},
 				},
@@ -60,7 +60,7 @@ func TestPrepareHTTPRouteStatus(t *testing.T) {
 					Conditions: []metav1.Condition{
 						{
 							Type:               string(v1alpha2.ConditionRouteAccepted),
-							Status:             "False",
+							Status:             metav1.ConditionFalse,
 							ObservedGeneration: 123,
 							LastTransitionTime: transitionTime,
 							Reason:             "Not attached",

internal/status/updater_test.go

@@ -127,10 +127,10 @@ var _ = Describe("Updater", func() {
 									Conditions: []metav1.Condition{
 										{
 											Type:               string(gatewayv1alpha2.ConditionRouteAccepted),
-											Status:             "True",
+											Status:             metav1.ConditionTrue,
 											ObservedGeneration: 123,
 											LastTransitionTime: fakeClockTime,
-											Reason:             "Attached",
+											Reason:             "Accepted",
 										},
 									},
 								},
@@ -199,7 +199,7 @@ var _ = Describe("Updater", func() {
 
 		It("should have the updated status of Gateway in the API server", func() {
 			latestGw := &v1alpha2.Gateway{}
-			expectedGw := createExpectedGw("True", string(v1alpha2.ListenerReasonReady))
+			expectedGw := createExpectedGw(metav1.ConditionTrue, string(v1alpha2.ListenerReasonReady))
 
 			err := client.Get(context.Background(), types.NamespacedName{Namespace: "test", Name: "gateway"}, latestGw)
 			Expect(err).Should(Not(HaveOccurred()))
@@ -229,7 +229,7 @@ var _ = Describe("Updater", func() {
 
 		It("should have the updated status of Gateway in the API server after updating with canceled context", func() {
 			latestGw := &v1alpha2.Gateway{}
-			expectedGw := createExpectedGw("False", string(v1alpha2.ListenerReasonInvalid))
+			expectedGw := createExpectedGw(metav1.ConditionFalse, string(v1alpha2.ListenerReasonInvalid))
 
 			err := client.Get(context.Background(), types.NamespacedName{Namespace: "test", Name: "gateway"}, latestGw)
 			Expect(err).Should(Not(HaveOccurred()))