test: @READ* in objectsPath not allowed; fix tests

noris-network · Jan 10, 2023 · ea8ef5c · ea8ef5c
1 parent cfec0a7
commit ea8ef5c
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 28 deletions.
diff --git a/tests/local/kustomize.txtar b/tests/local/kustomize.txtar
@@ -35,11 +35,13 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
     metadata: name: "dummy"   // name and kind are
     kind: "ConfigMap"         // required by kustomize
     data: aaa: string @readfile(file=trim)
-}]
+}
+
+objects: [obj]
 
 -- chart/file --
 FILE
diff --git a/tests/local/read-structured-all.txtar b/tests/local/read-structured-all.txtar
@@ -10,9 +10,11 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
 	dir: {} @read(dir, data.env, data.yaml, data.json)
-}]
+}
+
+objects: [obj]
 
 -- chart/dir/a --
 A

diff --git a/tests/local/read-structured-dir.txtar b/tests/local/read-structured-dir.txtar
@@ -10,9 +10,11 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
 	dir: {} @read(dir)
-}]
+}
+
+objects: [obj]
 
 -- chart/dir/a --
 A

diff --git a/tests/local/read-structured-env.txtar b/tests/local/read-structured-env.txtar
@@ -10,9 +10,11 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
 	dir: {} @read(data.env)
-}]
+}
+
+objects: [obj]
 
 -- chart/data.env --
 c=data-c

diff --git a/tests/local/read-structured-fail.txtar b/tests/local/read-structured-fail.txtar
@@ -21,9 +21,11 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
   a: {} @read(data.yaml)
-}]
+}
+
+objects: [obj]
 
 -- chart/data.yaml --
 a=b

diff --git a/tests/local/read-structured-json.txtar b/tests/local/read-structured-json.txtar
@@ -10,9 +10,11 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
 	dir: {} @read(data.json)
-}]
+}
+
+objects: [obj]
 
 -- chart/data.json --
 {"g":{"k":{"l": "data-l","m": "data-m"}}}

diff --git a/tests/local/read-structured-yaml.txtar b/tests/local/read-structured-yaml.txtar
@@ -10,9 +10,11 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
 	dir: {} @read(data.yaml)
-}]
+}
+
+objects: [obj]
 
 -- chart/data.yaml --
 g:

diff --git a/tests/local/readfile-not-found.txtar b/tests/local/readfile-not-found.txtar
@@ -10,6 +10,8 @@ objectsPath: objects
 -- chart/a.cue --
 package kube
 
-objects: [{
+obj: {
     b: string @readfile(no-such-file)
-}]
+}
+
+objects: [obj]
diff --git a/tests/local/readfile-sops.txtar b/tests/local/readfile-sops.txtar
@@ -15,19 +15,23 @@ objectsPath: objects
 -- chart1/a.cue --
 package kube
 
-objects: [{
+obj: {
     secret: string @readfile(secret.txt=trim)
-}]
+}
+
+objects: [obj]
 
 -- chart2/cuegen.yaml --
 objectsPath: objects
 
 -- chart2/a.cue --
 package kube
 
-objects: [{
+obj: {
     secret: string @readfile(secret.txt=trim)
-}]
+}
+
+objects: [obj]
 
 -- keys.txt --
 # * * *  this key is just for testing, never use it for anything else  * * *

diff --git a/tests/local/readfile-trim-nl.txtar b/tests/local/readfile-trim-nl.txtar
@@ -17,19 +17,23 @@ objectsPath: objects
 -- chart1/a.cue --
 package kube
 
-objects: [{
+obj: {
     a: string @readfile(file=trim,file=trim,file=trim)
-}]
+}
+
+objects: [obj]
 
 -- chart2/cuegen.yaml --
 objectsPath: objects
 
 -- chart2/a.cue --
 package kube
 
-objects: [{
+obj: {
     b: string @readfile(file1=nl,file2=nl,file3=nl)
-}]
+}
+
+objects: [obj]
 
 -- chart1/file --
 FILE1

diff --git a/tests/local/readfile.txtar b/tests/local/readfile.txtar
@@ -14,19 +14,23 @@ objectsPath: objects
 -- chart1/a.cue --
 package kube
 
-objects: [{
+obj: {
     a: string @readfile(file1)
-}]
+}
+
+objects: [obj]
 
 -- chart2/cuegen.yaml --
 objectsPath: objects
 
 -- chart2/a.cue --
 package kube
 
-objects: [{
+obj: {
     b: string @readfile(file1,file2)
-}]
+}
+
+objects: [obj]
 
 -- chart1/file1 --
 FILE-A