Merge pull request #80 from crossplane-contrib/renovate/examples

Signed-off-by: Philippe Scorsolini <p.scorsolini@gmail.com>

Author: phisco

example/functions.yaml

@@ -8,7 +8,7 @@ metadata:
     #render.crossplane.io/runtime: Development
 spec:
   # This is ignored when using the Development runtime.
-  package: xpkg.upbound.io/crossplane-contrib/function-extra-resources:v0.2.0
+  package: xpkg.upbound.io/crossplane-contrib/function-extra-resources:v0.3.0
 ---
 apiVersion: pkg.crossplane.io/v1
 kind: Function

fn.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"cmp"
 	"context"
 	"encoding/json"
 	"reflect"
@@ -63,7 +64,7 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1.RunFunctionRequest)
 
 	// The request response cycle for the Crossplane ExtraResources API requires that function-extra-resources
 	// tells Crossplane what it wants.
-	// Then a new rquest is sent to function-extra-resources with those resources present at the ExtraResources field.
+	// Then a new request is sent to function-extra-resources with those resources present at the RequiredResources field.
 	//
 	// function-extra-resources does not know if it has requested the resources already or not.
 	//
@@ -73,7 +74,7 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1.RunFunctionRequest)
 		return rsp, nil
 	}
 
-	// Pull extra resources from the ExtraResources request field.
+	// Pull extra resources from the RequiredResources request field.
 	extraResources, err := request.GetRequiredResources(req)
 	if err != nil {
 		response.Fatal(rsp, errors.Errorf("fetching extra resources %T: %w", req, err))
@@ -92,7 +93,7 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1.RunFunctionRequest)
 	//
 	// TODO(reedjosh): look into resources.AsStruct or simlar since unsturctured k8s objects are already almost json.
 	//    structpb.NewList(v []interface{}) should create an array like.
-	//    Combining this and similar structures from the structpb lib should should be done to create
+	//    Combining this and similar structures from the structpb lib should be done to create
 	//    a map[string][object] container into which the found extra resources can be dumped.
 	//
 	//    The found extra resources should then be directly marhsal-able via:
@@ -116,13 +117,13 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1.RunFunctionRequest)
 
 // Build requirements takes input and outputs an array of external resoruce requirements to request
 // from Crossplane's external resource API.
-func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Requirements, error) { //nolint:gocyclo // Adding non-nil validations increases function complexity.
-	extraResources := make(map[string]*fnv1.ResourceSelector, len(in.Spec.ExtraResources))
+func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Requirements, error) { //nolint:gocyclo,gocognit // Adding non-nil validations increases function complexity.
+	resources := make(map[string]*fnv1.ResourceSelector, len(in.Spec.ExtraResources))
 	for _, extraResource := range in.Spec.ExtraResources {
 		extraResName := extraResource.Into
 		switch extraResource.Type {
 		case v1beta1.ResourceSourceTypeReference, "":
-			extraResources[extraResName] = &fnv1.ResourceSelector{
+			resources[extraResName] = &fnv1.ResourceSelector{
 				ApiVersion: extraResource.APIVersion,
 				Kind:       extraResource.Kind,
 				Match: &fnv1.ResourceSelector_MatchName{
@@ -156,7 +157,7 @@ func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Require
 			if len(matchLabels) == 0 {
 				continue
 			}
-			extraResources[extraResName] = &fnv1.ResourceSelector{
+			resources[extraResName] = &fnv1.ResourceSelector{
 				ApiVersion: extraResource.APIVersion,
 				Kind:       extraResource.Kind,
 				Match: &fnv1.ResourceSelector_MatchLabels{
@@ -166,7 +167,7 @@ func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Require
 			}
 		}
 	}
-	return &fnv1.Requirements{Resources: extraResources}, nil
+	return &fnv1.Requirements{Resources: resources}, nil
 }
 
 // Verify Min/Max and sort extra resources by field path within a single kind.
@@ -254,35 +255,56 @@ func sortExtrasByFieldPath(extras []resource.Required, path string) error { //no
 		if valj == nil {
 			valj = reflect.Zero(t).Interface()
 		}
-		switch t.Kind() { //nolint:exhaustive // we only support these types
-		case reflect.Float64:
-			return vali.(float64) < valj.(float64)
-		case reflect.Float32:
-			return vali.(float32) < valj.(float32)
-		case reflect.Int64:
-			return vali.(int64) < valj.(int64)
-		case reflect.Int32:
-			return vali.(int32) < valj.(int32)
-		case reflect.Int16:
-			return vali.(int16) < valj.(int16)
-		case reflect.Int8:
-			return vali.(int8) < valj.(int8)
-		case reflect.Int:
-			return vali.(int) < valj.(int)
-		case reflect.String:
-			return vali.(string) < valj.(string)
-		default:
-			// should never happen
-			err = errors.Errorf("unsupported type %q for sorting", t)
+		less, lessErr := lessByKind(t.Kind(), vali, valj)
+		if lessErr != nil {
+			err = lessErr
 			return false
 		}
+		return less
 	})
 	if err != nil {
 		return err
 	}
 
-	for i := 0; i < len(extras); i++ {
+	for i := range extras {
 		extras[i] = p[i].ec
 	}
 	return nil
 }
+
+func lessByKind(kind reflect.Kind, a, b any) (bool, error) {
+	switch kind { //nolint:exhaustive // we only support these types
+	case reflect.Float64:
+		return lessAs[float64](a, b)
+	case reflect.Float32:
+		return lessAs[float32](a, b)
+	case reflect.Int64:
+		return lessAs[int64](a, b)
+	case reflect.Int32:
+		return lessAs[int32](a, b)
+	case reflect.Int16:
+		return lessAs[int16](a, b)
+	case reflect.Int8:
+		return lessAs[int8](a, b)
+	case reflect.Int:
+		return lessAs[int](a, b)
+	case reflect.String:
+		return lessAs[string](a, b)
+	default:
+		return false, errors.Errorf("unsupported type %q for sorting", kind)
+	}
+}
+
+func lessAs[T cmp.Ordered](a, b any) (bool, error) {
+	av, ok := a.(T)
+	if !ok {
+		var t T
+		return false, errors.Errorf("cannot compare type %T as %T", a, t)
+	}
+	bv, ok := b.(T)
+	if !ok {
+		var t T
+		return false, errors.Errorf("cannot compare type %T as %T", b, t)
+	}
+	return cmp.Less(av, bv), nil
+}

input/v1beta1/resource_select.go

@@ -179,7 +179,7 @@ type ResourceSourceSelectorLabelMatcher struct {
 }
 
 // FromFieldPathIsOptional returns true if the FromFieldPathPolicy is set to
-// +optional
+// Optional.
 func (e *ResourceSourceSelectorLabelMatcher) FromFieldPathIsOptional() bool {
 	return e.FromFieldPathPolicy != nil && *e.FromFieldPathPolicy == FromFieldPathPolicyOptional
 }

package/crossplane.yaml

@@ -17,3 +17,5 @@ metadata:
 spec:
   crossplane:
     version: ">=v2.0.0-0"
+  capabilities:
+    - composition