From 4c3f4377118cbf5906c90f049c51507cec4011bd Mon Sep 17 00:00:00 2001
From: Tim <32556895+Avarei@users.noreply.github.com>
Date: Sat, 29 Jun 2024 17:53:40 +0200
Subject: [PATCH] fixing download paths

Signed-off-by: Tim <32556895+Avarei@users.noreply.github.com>
---
 README.md                                         |  4 ++--
 example/full/composition.yaml                     |  4 ++--
 example/inline/composition.yaml                   | 13 ++++++-------
 pkl/crossplane.contrib.example/xrds/ExampleXR.pkl |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 2e1263d..acb9938 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,8 @@ spec:
       kind: Pkl
       spec:
         type: uri
-        # This pkl file is at `pkl/crossplane-example/full.pkl` in this repo
-        uri: "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane-example@1.0.0#/full.pkl"
+        # This pkl file is at `pkl/crossplane.contrib.example/full.pkl` in this repo
+        uri: "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane.contrib.example@1.0.0#/full.pkl"
 ```
 
 ### Example
diff --git a/example/full/composition.yaml b/example/full/composition.yaml
index 92c8ef7..4e4b625 100644
--- a/example/full/composition.yaml
+++ b/example/full/composition.yaml
@@ -16,5 +16,5 @@ spec:
       kind: Pkl
       spec:
         type: uri
-        # This pkl file is at `pkl/crossplane-example/full.pkl` in this repo
-        uri: "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane-example@1.0.0#/full.pkl"
+        # This pkl file is at `pkl/crossplane.contrib.example/full.pkl` in this repo
+        uri: "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane.contrib.example@1.0.0#/full.pkl"
diff --git a/example/inline/composition.yaml b/example/inline/composition.yaml
index f9d5de9..2eb3d8b 100644
--- a/example/inline/composition.yaml
+++ b/example/inline/composition.yaml
@@ -16,14 +16,14 @@ spec:
       kind: Pkl
       spec:
         type: inline
-        # This pkl file is at `pkl/crossplane-example/full.pkl` in this repo
+        # This pkl file is at `pkl/crossplane.contrib.example/full.pkl` in this repo
         inline: |
-          amends "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane@1.0.0#/CompositionResponse.pkl"
-          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane@1.0.0#/Resource.pkl"
-          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane@1.0.0#/Crossplane.pkl"
+          amends "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane.contrib@1.0.0#/CompositionResponse.pkl"
+          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane.contrib@1.0.0#/Resource.pkl"
+          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane.contrib@1.0.0#/Crossplane.pkl"
 
-          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane-example@1.0.0#/crds/XR.pkl"
-          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane-example@1.0.0#/crds/Object.pkl"
+          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane.contrib.example@1.0.0#/crds/XR.pkl"
+          import "package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/crossplane.contrib.example@1.0.0#/crds/Object.pkl"
 
           import "package://pkg.pkl-lang.org/pkl-k8s/k8s@1.0.1#/api/core/v1/ConfigMap.pkl"
 
@@ -101,6 +101,5 @@ spec:
           }
 
           meta = if (request.meta != null) new ResponseMeta {
-            tag = request.meta.tag
             ttl = 60.s
           } else null
diff --git a/pkl/crossplane.contrib.example/xrds/ExampleXR.pkl b/pkl/crossplane.contrib.example/xrds/ExampleXR.pkl
index 58009be..667978e 100644
--- a/pkl/crossplane.contrib.example/xrds/ExampleXR.pkl
+++ b/pkl/crossplane.contrib.example/xrds/ExampleXR.pkl
@@ -1,7 +1,7 @@
 amends "@crossplane.contrib.xrd/CompositeResourceDefinition.pkl"
 
 metadata {
-  name = "XRD"
+  name = spec.names.plural + "." + spec.group
 }
 
 spec {