feat: allow RGD resources to reference instance status fields

feat: allow RGD resources to reference instance status fields

Author: bschaatsbergen

pkg/graph/builder.go

@@ -202,16 +202,14 @@ func (b *Builder) NewResourceGraphDefinition(originalCR *v1alpha1.ResourceGraphD
 		}
 	}
 
-	// include the instance spec schema in the context as "schema". This will let us
-	// validate expressions such as ${schema.spec.someField}.
-	//
-	// not that we only include the spec and metadata fields, instance status references
-	// are not allowed in RGDs (yet)
-	schemaWithoutStatus, err := getSchemaWithoutStatus(instance.crd)
+	// include the instance schema in the context as "schema". This will let us
+	// validate expressions such as ${schema.spec.someField}, ${schema.metadata.name},
+	// and ${schema.status.someField}.
+	instanceSchema, err := getInstanceSchema(instance.crd)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get schema without status: %w", err)
+		return nil, fmt.Errorf("failed to get instance schema: %w", err)
 	}
-	schemas["schema"] = schemaWithoutStatus
+	schemas["schema"] = instanceSchema
 
 	// First, build the dependency graph by inspecting CEL expressions.
 	// This extracts all resource dependencies and validates that:
@@ -831,8 +829,10 @@ func validateReadyWhenExpressions(env *cel.Env, resource *Resource) error {
 	return nil
 }
 
-// getSchemaWithoutStatus returns a schema from the CRD with the status field removed.
-func getSchemaWithoutStatus(crd *extv1.CustomResourceDefinition) (*spec.Schema, error) {
+// getInstanceSchema returns a schema from the CRD including spec, status, and metadata fields.
+// This schema is used for CEL expression validation, allowing references to instance fields like
+// ${schema.spec.field}, ${schema.status.field}, and ${schema.metadata.name}.
+func getInstanceSchema(crd *extv1.CustomResourceDefinition) (*spec.Schema, error) {
 	crdCopy := crd.DeepCopy()
 
 	// TODO(a-hilaly) expand this function when we start support CRD upgrades.
@@ -846,8 +846,6 @@ func getSchemaWithoutStatus(crd *extv1.CustomResourceDefinition) (*spec.Schema,
 		openAPISchema.Properties = make(map[string]extv1.JSONSchemaProps)
 	}
 
-	delete(openAPISchema.Properties, "status")
-
 	specSchema, err := schema.ConvertJSONSchemaPropsToSpecSchema(openAPISchema)
 	if err != nil {
 		return nil, err

pkg/graph/builder_test.go

@@ -1766,6 +1766,42 @@ func TestGraphBuilder_CELTypeChecking(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "valid schema.status field reference",
+			resourceGraphDefinitionOpts: []generator.ResourceGraphDefinitionOption{
+				generator.WithSchema(
+					"Application", "v1alpha1",
+					map[string]interface{}{
+						"region": "string",
+					},
+					map[string]interface{}{
+						"vpcID": "${vpc.status.vpcID}",
+					},
+				),
+				generator.WithResource("vpc", map[string]interface{}{
+					"apiVersion": "ec2.services.k8s.aws/v1alpha1",
+					"kind":       "VPC",
+					"metadata": map[string]interface{}{
+						"name": "app-vpc",
+					},
+					"spec": map[string]interface{}{
+						"cidrBlocks": []interface{}{"10.0.0.0/16"},
+					},
+				}, nil, nil),
+				generator.WithResource("subnet", map[string]interface{}{
+					"apiVersion": "ec2.services.k8s.aws/v1alpha1",
+					"kind":       "Subnet",
+					"metadata": map[string]interface{}{
+						"name": "app-subnet",
+					},
+					"spec": map[string]interface{}{
+						"cidrBlock": "10.0.1.0/24",
+						"vpcID":     "${schema.status.vpcID}",
+					},
+				}, nil, nil),
+			},
+			wantErr: false,
+		},
 	}
 
 	for _, tt := range tests {