Merge pull request crossplane#6121 from jbw976/render-conditions

feat(cli): include status conditions in output of render command

Author: negz

cmd/crank/render/render.go

@@ -207,6 +207,7 @@ func Render(ctx context.Context, log logging.Logger, in Inputs) (Outputs, error)
 	d := &fnv1.State{}
 
 	results := make([]unstructured.Unstructured, 0)
+	conditions := make([]xpv1.Condition, 0)
 
 	// The Function context starts empty.
 	fctx := &structpb.Struct{Fields: map[string]*structpb.Value{}}
@@ -271,6 +272,26 @@ func Render(ctx context.Context, log logging.Logger, in Inputs) (Outputs, error)
 		// We intentionally discard/ignore this after the last Function runs.
 		fctx = rsp.GetContext()
 
+		for _, c := range rsp.GetConditions() {
+			var status corev1.ConditionStatus
+			switch c.GetStatus() {
+			case fnv1.Status_STATUS_CONDITION_TRUE:
+				status = corev1.ConditionTrue
+			case fnv1.Status_STATUS_CONDITION_FALSE:
+				status = corev1.ConditionFalse
+			case fnv1.Status_STATUS_CONDITION_UNKNOWN, fnv1.Status_STATUS_CONDITION_UNSPECIFIED:
+				status = corev1.ConditionUnknown
+			}
+
+			conditions = append(conditions, xpv1.Condition{
+				Type:               xpv1.ConditionType(c.GetType()),
+				Status:             status,
+				LastTransitionTime: conditionTime(),
+				Reason:             xpv1.ConditionReason(c.GetReason()),
+				Message:            c.GetMessage(),
+			})
+		}
+
 		// Results of fatal severity stop the Composition process.
 		for _, rs := range rsp.GetResults() {
 			switch rs.GetSeverity() { //nolint:exhaustive // We intentionally have a broad default case.
@@ -335,11 +356,20 @@ func Render(ctx context.Context, log logging.Logger, in Inputs) (Outputs, error)
 	if len(unready) > 0 {
 		xrCond = xpv1.Creating().WithMessage(fmt.Sprintf("Unready resources: %s", resource.StableNAndSomeMore(resource.DefaultFirstN, unready)))
 	}
-	// lastTransitionTime would just be noise, but we can't drop it as it's a
-	// required field and null is not allowed, so we set a random time.
-	xrCond.LastTransitionTime = metav1.NewTime(time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC))
+	xrCond.LastTransitionTime = conditionTime()
 	xr.SetConditions(xrCond)
 
+	for _, c := range conditions {
+		if xpv1.IsSystemConditionType(c.Type) {
+			// Do not let users update system conditions.
+			continue
+		}
+		// update the XR with the current condition. If it targets the claim, we
+		// could also set it on the claim here, but we don't support Claims in
+		// render yet.
+		xr.SetConditions(c)
+	}
+
 	out := Outputs{CompositeResource: xr, ComposedResources: desired, Results: results}
 	if fctx != nil {
 		out.Context = &unstructured.Unstructured{Object: map[string]any{
@@ -414,3 +444,9 @@ func (f *FilteringFetcher) Fetch(_ context.Context, rs *fnv1.ResourceSelector) (
 
 	return out, nil
 }
+
+func conditionTime() metav1.Time {
+	// lastTransitionTime for conditions would just be noise, but we can't drop it
+	// as it's a required field and null is not allowed, so we set a random time.
+	return metav1.NewTime(time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC))
+}

cmd/crank/render/render_test.go

@@ -32,6 +32,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/utils/ptr"
 
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
 	"github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/composed"
@@ -249,6 +250,15 @@ func TestRender(t *testing.T) {
 										},
 									},
 								},
+								Conditions: []*fnv1.Condition{
+									{
+										Type:    "ProvisioningSuccess",
+										Status:  fnv1.Status_STATUS_CONDITION_TRUE,
+										Reason:  "Provisioned",
+										Message: ptr.To("Provisioned successfully"),
+										Target:  fnv1.Target_TARGET_COMPOSITE_AND_CLAIM.Enum(),
+									},
+								},
 							})
 							listeners = append(listeners, lis)
 
@@ -280,13 +290,22 @@ func TestRender(t *testing.T) {
 								},
 								"status": {
 									"widgets": 9001,
-									"conditions": [{
-										"lastTransitionTime": "2024-01-01T00:00:00Z",
-										"type": "Ready",
-										"status": "False",
-										"reason": "Creating",
-										"message": "Unready resources: a-cool-resource, b-cool-resource"
-									}]
+									"conditions": [
+										{
+											"lastTransitionTime": "2024-01-01T00:00:00Z",
+											"type": "Ready",
+											"status": "False",
+											"reason": "Creating",
+											"message": "Unready resources: a-cool-resource, b-cool-resource"
+										},
+										{
+											"lastTransitionTime": "2024-01-01T00:00:00Z",
+											"type": "ProvisioningSuccess",
+											"status": "True",
+											"reason": "Provisioned",
+											"message": "Provisioned successfully"
+										}
+									]
 								}
 							}`),
 						},