Also disambiguate the ConfigFile name

pulumi · Jun 17, 2019 · f3b2809 · f3b2809
1 parent ba92ddb
commit f3b2809
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/pkg/gen/nodejs-templates/yaml.ts.mustache b/pkg/gen/nodejs-templates/yaml.ts.mustache
@@ -229,6 +229,9 @@ import * as outputApi from "../types/output";
             config?: ConfigFileOpts,
             opts?: pulumi.ComponentResourceOptions
         ) {
+            if (config && config.resourcePrefix !== undefined) {
+                name = `${config.resourcePrefix}-${name}`
+            }
             super("kubernetes:yaml:ConfigFile", name, config, opts);
             const fileId = config && config.file || name;
             let text: Promise<string>;

diff --git a/pkg/gen/python-templates/yaml.py.mustache b/pkg/gen/python-templates/yaml.py.mustache
@@ -51,6 +51,8 @@ class ConfigFile(pulumi.ComponentResource):
 
         __props__ = dict()
 
+        if resource_prefix:
+            name = f"{resource_prefix}-{name}"
         super(ConfigFile, self).__init__(
             "kubernetes:yaml:ConfigFile",
             name,

diff --git a/sdk/nodejs/yaml/yaml.ts b/sdk/nodejs/yaml/yaml.ts
@@ -2199,6 +2199,9 @@ import * as outputApi from "../types/output";
             config?: ConfigFileOpts,
             opts?: pulumi.ComponentResourceOptions
         ) {
+            if (config && config.resourcePrefix !== undefined) {
+                name = `${config.resourcePrefix}-${name}`
+            }
             super("kubernetes:yaml:ConfigFile", name, config, opts);
             const fileId = config && config.file || name;
             let text: Promise<string>;

diff --git a/sdk/python/pulumi_kubernetes/yaml.py b/sdk/python/pulumi_kubernetes/yaml.py
@@ -86,6 +86,8 @@ def __init__(
 
         __props__ = dict()
 
+        if resource_prefix:
+            name = f"{resource_prefix}-{name}"
         super(ConfigFile, self).__init__(
             "kubernetes:yaml:ConfigFile",
             name,

diff --git a/tests/examples/python/yaml-test/__main__.py b/tests/examples/python/yaml-test/__main__.py
@@ -51,7 +51,7 @@ def secret_status(obj, opts):
     transformations=[set_namespace(ns)],
 )
 cf_url2 = ConfigFile(
-    "guestbook2",
+    "guestbook",
     file_id="https://raw.githubusercontent.com/pulumi/pulumi-kubernetes/master/tests/examples/yaml-guestbook/yaml"
             "/guestbook.yaml",
     transformations=[set_namespace(ns2)],

diff --git a/tests/integration/yaml-url/step1/index.ts b/tests/integration/yaml-url/step1/index.ts
@@ -36,7 +36,7 @@ new k8s.yaml.ConfigFile("guestbook", {
 
 // Create resources from standard Kubernetes guestbook YAML example in the second test namespace.
 // Disambiguate resource names with a specified prefix.
-new k8s.yaml.ConfigFile("guestbook2", {
+new k8s.yaml.ConfigFile("guestbook", {
   file: "https://raw.githubusercontent.com/pulumi/pulumi-kubernetes/master/tests/examples/yaml-guestbook/yaml/guestbook.yaml",
   transformations: [
   (obj: any) => {