re-add import statement for PklPoject for local make generate runs.

Signed-off-by: Tim <[email protected]>
crossplane-contrib · Jul 13, 2024 · c7d1135 · c7d1135
1 parent 8af4df0
commit c7d1135
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ generate: pkl-resolve-hack pkl-resolve
 	pkl eval --working-dir $(PROJECT_DIR)hack/pklcrd -m ../../pkl/crossplane.contrib crd2module-composition-fix.pkl
 	pkl eval --working-dir $(PROJECT_DIR)pkl/crossplane.contrib.example -m crds xrds/ExampleXR.pkl
 	pkl eval --working-dir $(PROJECT_DIR)pkl/crossplane.contrib.example compositions/inline.pkl > $(PROJECT_DIR)example/inline/composition.yaml
-	pkl eval --working-dir $(PROJECT_DIR)pkl/crossplane.contrib.example compositions/uri.pkl > $(PROJECT_DIR)example/full/composition.yaml
+	pkl eval --working-dir $(PROJECT_DIR)pkl/crossplane.contrib.example $(EXAMPLE_PARAM) compositions/uri.pkl > $(PROJECT_DIR)example/full/composition.yaml
 	pkl eval --working-dir $(PROJECT_DIR)pkl/crossplane.contrib.example xrs/inline.pkl > $(PROJECT_DIR)example/inline/xr.yaml
 	pkl eval --working-dir $(PROJECT_DIR)pkl/crossplane.contrib.example xrs/uri.pkl > $(PROJECT_DIR)example/full/xr.yaml
 

diff --git a/example/full/composition.yaml b/example/full/composition.yaml
@@ -15,5 +15,5 @@ spec:
       kind: Pkl
       spec:
         type: uri
-        uri: package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/[email protected].0#/compositions/steps/full.pkl
+        uri: package://pkg.pkl-lang.org/github.com/crossplane-contrib/function-pkl/[email protected].1#/compositions/steps/full.pkl
     step: pkl-template
diff --git a/example/inline/composition.yaml b/example/inline/composition.yaml
@@ -23,14 +23,10 @@ spec:
             resources {
               ["cm-minimal"] = new {
                 resource = new Object {
-                  metadata {
-                    name = "cm-one"
-                  }
                   spec {
                     forProvider {
                       manifest = new ConfigMap {
                         metadata {
-                          name = "cm-minimal"
                           namespace = "crossplane-system"
                         }
                         data {

diff --git a/pkl/crossplane.contrib.example/compositions/uri.pkl b/pkl/crossplane.contrib.example/compositions/uri.pkl
@@ -24,7 +24,13 @@ spec {
       input = new Pkl {
         spec {
           type = "uri"
-          uri = reflect.Module(full).uri
+          uri =
+            let (uri = reflect.Module(full).uri)
+            if (uri.startsWith("file:"))
+              let (pkg = import("../PklProject").package)
+              pkg.baseUri + "@" + pkg.version + "#/compositions/steps/full.pkl"
+            else
+              uri
         }
       }
     }