Don't require names for anything that looks like a list

pulumi · Nov 24, 2018 · 5ed7938 · 5ed7938
1 parent 067ef8a
commit 5ed7938
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/gen/nodejs-templates/provider.ts.mustache b/pkg/gen/nodejs-templates/provider.ts.mustache
@@ -219,7 +219,7 @@ export namespace yaml {
 
         // Flatten `v1.List`. `v1.List` is an undocumented Kubernetes resource, and does not appear
         // in the Kubernetes OpenAPI spec. `kubectl`, ksonnet, and Helm all flatten it.
-        if (apiVersion == "v1" && kind == "List") {
+        if ((apiVersion == "v1" && kind == "List") || ("items" in obj && !("metadata" in obj) || !("name" in obj["metadata"]))) {
             const objs = [];
             const items = obj["items"] || [];
             for (const item of items) {
@@ -229,7 +229,7 @@ export namespace yaml {
         }
 
         if (!("metadata" in obj) || !("name" in obj["metadata"])) {
-            throw new Error(`YAML object does not have a .metadata.name: ${JSON.stringify(obj)}`)
+            throw new Error(`YAML object does not have a .metadata.name: ${obj.apiVersion}/${obj.kind} ${JSON.stringify(obj.metadata)}`)
         }
 
         const meta = obj["metadata"];

diff --git a/sdk/nodejs/provider.ts b/sdk/nodejs/provider.ts
@@ -2043,7 +2043,7 @@ export namespace yaml {
 
         // Flatten `v1.List`. `v1.List` is an undocumented Kubernetes resource, and does not appear
         // in the Kubernetes OpenAPI spec. `kubectl`, ksonnet, and Helm all flatten it.
-        if (apiVersion == "v1" && kind == "List") {
+        if ((apiVersion == "v1" && kind == "List") || ("items" in obj && !("metadata" in obj) || !("name" in obj["metadata"]))) {
             const objs = [];
             const items = obj["items"] || [];
             for (const item of items) {
@@ -2053,7 +2053,7 @@ export namespace yaml {
         }
 
         if (!("metadata" in obj) || !("name" in obj["metadata"])) {
-            throw new Error(`YAML object does not have a .metadata.name: ${JSON.stringify(obj)}`)
+            throw new Error(`YAML object does not have a .metadata.name: ${obj.apiVersion}/${obj.kind} ${JSON.stringify(obj.metadata)}`)
         }
 
         const meta = obj["metadata"];