Use resourcePrefix on all code paths (#977)

One code path in yaml.ts inadvertently omitted the resourcePrefix. Helm support recently started using this code path, so this fix affects both Helm and YAML support.
pulumi · Feb 4, 2020 · eaa14be · eaa14be
1 parent d48dff0
commit eaa14be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Bug fixes
 
 -   Fix hang on large YAML files. (https://github.com/pulumi/pulumi-kubernetes/pull/974).
+-   Use resourcePrefix all code paths. (https://github.com/pulumi/pulumi-kubernetes/pull/977).
 
 ## 1.4.5 (January 22, 2020)
 

diff --git a/pkg/gen/nodejs-templates/yaml.ts.mustache b/pkg/gen/nodejs-templates/yaml.ts.mustache
@@ -183,7 +183,11 @@ import * as outputs from "../types/output";
 
         if (config.objs !== undefined) {
             const objs: Promise<any[]> = Array.isArray(config.objs) ? Promise.resolve(config.objs) : Promise.resolve([config.objs]);
-            const docResources = parseYamlDocument({objs, transformations: config.transformations}, opts);
+            const docResources = parseYamlDocument({
+                objs,
+                transformations: config.transformations,
+                resourcePrefix: config.resourcePrefix
+            }, opts);
             resources = pulumi.all([resources, docResources]).apply(([rs, drs]) => ({...rs, ...drs}));
         }
 

diff --git a/sdk/nodejs/yaml/yaml.ts b/sdk/nodejs/yaml/yaml.ts
@@ -183,7 +183,11 @@ import * as outputs from "../types/output";
 
         if (config.objs !== undefined) {
             const objs: Promise<any[]> = Array.isArray(config.objs) ? Promise.resolve(config.objs) : Promise.resolve([config.objs]);
-            const docResources = parseYamlDocument({objs, transformations: config.transformations}, opts);
+            const docResources = parseYamlDocument({
+                objs,
+                transformations: config.transformations,
+                resourcePrefix: config.resourcePrefix
+            }, opts);
             resources = pulumi.all([resources, docResources]).apply(([rs, drs]) => ({...rs, ...drs}));
         }