Update to support newest libs and EnvironmentConfig

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: false  # The golangci-lint action does its own caching.
@@ -60,7 +60,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -116,9 +116,9 @@ jobs:
         run: ./crossplane xpkg build --package-file=${{ matrix.arch }}.xpkg --package-root=package/ --embed-runtime-image-tarball=runtime-${{ matrix.arch }}.tar
 
       - name: Upload Single-Platform Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: packages
+          name: package-${{ matrix.arch }}
           path: "*.xpkg"
           if-no-files-found: error
           retention-days: 1
@@ -135,18 +135,22 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download Single-Platform Packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: packages
           path: .
+          merge-multiple: true
 
       - name: Setup the Crossplane CLI
         run: "curl -sL https://raw.githubusercontent.com/crossplane/crossplane/master/install.sh | sh"
 
       - name: Login to Upbound
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
         if: env.XPKG_ACCESS_ID != ''
-        run: "./crossplane xpkg login -a borrelli-org -t ${{ secrets.XPKG_TOKEN }}"
-
+        with:
+          registry: xpkg.upbound.io
+          username: ${{ secrets.XPKG_ACCESS_ID }}
+          password: ${{ secrets.XPKG_TOKEN }}
+
       # If a version wasn't explicitly passed as a workflow_dispatch input we
       # default to version v0.0.0-<git-commit-date>-<git-short-sha>, for example
       # v0.0.0-20231101115142-1091066df799. This is a simple implementation of

.golangci.yml

@@ -38,7 +38,7 @@ linters-settings:
       - default
       - prefix(github.com/crossplane/crossplane-runtime)
       - prefix(github.com/crossplane/function-sdk-go)
-      - prefix(github.com/stevendborrelli/function-conditional-patch-and-transform)
+      - prefix(github.com/upboundcare/function-conditional-patch-and-transform)
       - blank
       - dot
 

README.md

@@ -1,6 +1,6 @@
 # function-conditional-patch-and-transform
 
-[![CI](https://github.com/stevendborrelli/function-conditional-patch-and-transform/actions/workflows/ci.yml/badge.svg)](https://github.com/stevendborrelli/function-conditional-patch-and-transform/actions/workflows/ci.yml) ![GitHub release (latest SemVer)](https://img.shields.io/github/release/crossplane-contrib/function-conditional-patch-and-transform)
+[![CI](https://github.com/upboundcare/function-conditional-patch-and-transform/actions/workflows/ci.yml/badge.svg)](https://github.com/upboundcare/function-conditional-patch-and-transform/actions/workflows/ci.yml) ![GitHub release (latest SemVer)](https://img.shields.io/github/release/crossplane-contrib/function-conditional-patch-and-transform)
 
 This composition function is a fork of the upstream [function-patch-and-transform](https://github.com/crossplane-contrib/function-patch-and-transform)
 that adds support for Conditional invocation of the function and the rendering
@@ -18,7 +18,7 @@ metadata:
   annotations:
     render.crossplane.io/runtime: Development
 spec:
-  package: xpkg.upbound.io/borrelli-org/function-conditional-patch-and-transform:v0.4.0
+  package: xpkg.upbound.io/upboundcare/function-conditional-patch-and-transform:v0.4.0
 ```
 
 ## What this function does
@@ -240,9 +240,9 @@ $ crossplane xpkg build -f package --embed-runtime-image=runtime
 [docs-composition]: https://docs.crossplane.io/v1.14/getting-started/provider-aws-part-2/#create-a-deployment-template
 [docs-functions]: https://docs.crossplane.io/v1.14/concepts/composition-functions/
 [docs-pandt]: https://docs.crossplane.io/v1.14/concepts/patch-and-transform/
-[fn-go-templating]: https://github.com/stevendborrelli/function-go-templating
+[fn-go-templating]: https://github.com/upboundcare/function-go-templating
 [#4617]: https://github.com/crossplane/crossplane/issues/4617
 [#4746]: https://github.com/crossplane/crossplane/issues/4746
 [go]: https://go.dev
 [docker]: https://www.docker.com
-[cli]: https://docs.crossplane.io/latest/cli
+[cli]: https://docs.crossplane.io/latest/cli

condition_test.go

@@ -12,7 +12,7 @@ import (
 	fnv1beta1 "github.com/crossplane/function-sdk-go/proto/v1beta1"
 	"github.com/crossplane/function-sdk-go/resource"
 
-	"github.com/stevendborrelli/function-conditional-patch-and-transform/input/v1beta1"
+	"github.com/upboundcare/function-conditional-patch-and-transform/input/v1beta1"
 )
 
 func TestEvaluateCondition(t *testing.T) {

connection.go

@@ -9,7 +9,7 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
 	"github.com/crossplane/crossplane-runtime/pkg/resource"
 
-	"github.com/stevendborrelli/function-conditional-patch-and-transform/input/v1beta1"
+	"github.com/upboundcare/function-conditional-patch-and-transform/input/v1beta1"
 )
 
 // ConnectionDetailsExtractor extracts the connection details of a resource.

connection_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/resource/fake"
 	"github.com/crossplane/crossplane-runtime/pkg/test"
 
-	"github.com/stevendborrelli/function-conditional-patch-and-transform/input/v1beta1"
+	"github.com/upboundcare/function-conditional-patch-and-transform/input/v1beta1"
 )
 
 func TestExtractConnectionDetails(t *testing.T) {

examples/conditional-rendering/functions.yaml

@@ -3,5 +3,5 @@ kind: Function
 metadata:
   name: function-conditional-patch-and-transform
 spec:
-  package: xpkg.upbound.io/borrelli-org/function-conditional-patch-and-transform:v0.4.0
+  package: xpkg.upbound.io/upboundcare/function-conditional-patch-and-transform:v0.4.0
   packagePullPolicy: Always

examples/conditional-resources/functions.yaml

@@ -3,5 +3,5 @@ kind: Function
 metadata:
   name: function-conditional-patch-and-transform
 spec:
-  package: xpkg.upbound.io/borrelli-org/function-conditional-patch-and-transform:v0.4.0
+  package: xpkg.upbound.io/upboundcare/function-conditional-patch-and-transform:v0.4.0
   packagePullPolicy: Always

fn.go

@@ -5,8 +5,10 @@ import (
 
 	"google.golang.org/protobuf/types/known/structpb"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
+	"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
 	"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
 
@@ -17,7 +19,7 @@ import (
 	"github.com/crossplane/function-sdk-go/resource/composed"
 	"github.com/crossplane/function-sdk-go/response"
 
-	"github.com/stevendborrelli/function-conditional-patch-and-transform/input/v1beta1"
+	"github.com/upboundcare/function-conditional-patch-and-transform/input/v1beta1"
 )
 
 const conditionError = "Condition error"
@@ -131,10 +133,14 @@ func (f *Function) RunFunction(ctx context.Context, req *fnv1beta1.RunFunctionRe
 	}
 
 	if input.Environment != nil {
-		// Run all patches that are from the (observed) XR to the environment or from the environment to the (desired) XR.
-		if err := RenderEnvironmentPatches(env, oxr.Resource, dxr.Resource, input.Environment.Patches); err != nil {
-			response.Fatal(rsp, errors.Wrapf(err, "cannot render ToEnvironment patches from the composite resource"))
-			return rsp, nil
+		// Run all patches that are from the (observed) XR to the environment or
+		// from the environment to the (desired) XR.
+		for i := range input.Environment.Patches {
+			p := &input.Environment.Patches[i]
+			if err := ApplyEnvironmentPatch(p, env, oxr.Resource, dxr.Resource); err != nil {
+				response.Fatal(rsp, errors.Wrapf(err, "cannot apply the %q environment patch at index %d", p.GetType(), i))
+				return rsp, nil
+			}
 		}
 	}
 
@@ -181,14 +187,14 @@ func (f *Function) RunFunction(ctx context.Context, req *fnv1beta1.RunFunctionRe
 			// We want to return this resource unmutated if rendering fails.
 			dcd.Resource = cd.Resource.DeepCopy()
 		default:
-			if err := RenderFromJSON(dcd.Resource, t.Base.Raw); err != nil {
+			if err := json.Unmarshal(t.Base.Raw, dcd.Resource); err != nil {
 				response.Fatal(rsp, errors.Wrapf(err, "cannot parse base template of composed resource %q", t.Name))
 				return rsp, nil
 			}
 		}
 
-		ocd, ok := observed[resource.Name(t.Name)]
-		if ok {
+		ocd, exists := observed[resource.Name(t.Name)]
+		if exists {
 			existing++
 			log.Debug("Resource template corresponds to existing composed resource", "metadata-name", ocd.Resource.GetName())
 
@@ -224,17 +230,56 @@ func (f *Function) RunFunction(ctx context.Context, req *fnv1beta1.RunFunctionRe
 				"name", ocd.Resource.GetName())
 		}
 
-		errs, store := RenderComposedPatches(ocd.Resource, dcd.Resource, oxr.Resource, dxr.Resource, env, t.Patches)
-		for _, err := range errs {
-			response.Warning(rsp, errors.Wrapf(err, "cannot render patches for composed resource %q", t.Name))
-			log.Info("Cannot render patches for composed resource", "warning", err)
-			warnings++
+		// Run all patches that are to a desired composed resource, or from an
+		// observed composed resource.
+		skip := false
+		for i := range t.Patches {
+			p := &t.Patches[i]
+			if err := ApplyComposedPatch(p, ocd.Resource, dcd.Resource, oxr.Resource, dxr.Resource, env); err != nil {
+				if fieldpath.IsNotFound(err) {
+					// This is a patch from a required field path that does not
+					// exist. The point of FromFieldPathPolicyRequired is to
+					// block creation of the new 'to' resource until the 'from'
+					// field path exists.
+					//
+					// The only kind of resource we could be patching to that
+					// might not exist at this point is a composed resource. So
+					// if we're patching to a composed resource that doesn't
+					// exist we want to avoid creating it. Otherwise, we just
+					// treat the patch from a required field path the same way
+					// we'd treat a patch from an optional field path and skip
+					// it.
+					if p.GetPolicy().GetFromFieldPathPolicy() == v1beta1.FromFieldPathPolicyRequired {
+						if ToComposedResource(p) && !exists {
+							response.Warning(rsp, errors.Wrapf(err, "not adding new composed resource %q to desired state because %q patch at index %d has 'policy.fromFieldPath: Required'", t.Name, p.GetType(), i))
+
+							// There's no point processing further patches.
+							// They'll either be from an observed composed
+							// resource that doesn't exist yet, or to a desired
+							// composed resource that we'll discard.
+							skip = true
+							break
+						}
+						response.Warning(rsp, errors.Wrapf(err, "cannot render composed resource %q %q patch at index %d: ignoring 'policy.fromFieldPath: Required' because 'to' resource already exists", t.Name, p.GetType(), i))
+					}
+
+					// If any optional field path isn't found we just skip this
+					// patch and move on. The path may be populated by a
+					// subsequent patch.
+					continue
+				}
+				response.Fatal(rsp, errors.Wrapf(err, "cannot render composed resource %q %q patch at index %d", t.Name, p.GetType(), i))
+				return rsp, nil
+			}
 		}
 
-		if store {
-			// Add or replace our desired resource.
-			desired[resource.Name(t.Name)] = dcd
+		// Skip adding this resource to the desired state because it doesn't
+		// exist yet, and a required FromFieldPath was not (yet) found.
+		if skip {
+			continue
 		}
+
+		desired[resource.Name(t.Name)] = dcd
 	}
 
 	if err := response.SetDesiredCompositeResource(rsp, dxr); err != nil {