Change invoke call to always use latest version (#987)

pulumi · Feb 11, 2020 · de362a8 · de362a8
1 parent 5714a10
commit de362a8
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 81 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## HEAD (Unreleased)
 
+### Bug fixes
+
+-   Change invoke call to always use latest version. (https://github.com/pulumi/pulumi-kubernetes/pull/987).
+
 ## 1.5.2 (February 10, 2020)
 
 ### Improvements

diff --git a/pkg/gen/nodejs-templates/helm/v2/helm.ts b/pkg/gen/nodejs-templates/helm/v2/helm.ts
@@ -218,7 +218,7 @@ export class Chart extends yaml.CollectionComponentResource {
                     },
                 ).toString();
                 return this.parseTemplate(
-                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace, opts);
+                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace);
             } catch (e) {
                 // Shed stack trace, only emit the error.
                 throw new pulumi.RunError(e.toString());
@@ -236,20 +236,12 @@ export class Chart extends yaml.CollectionComponentResource {
         resourcePrefix: string | undefined,
         dependsOn: pulumi.Resource[],
         defaultNamespace: string | undefined,
-        opts?: pulumi.ComponentResourceOptions,
     ): pulumi.Output<{ [key: string]: pulumi.CustomResource }> {
-        // Rather than using the default provider for the following invoke call, determine the
-        // provider from the parent if specified, or fallback to using the version specified
+        // Rather than using the default provider for the following invoke call, use the version specified
         // in package.json.
-        let invokeOpts: pulumi.InvokeOptions = {async: true};
-        if (opts?.parent) {
-            invokeOpts = {...invokeOpts, parent: opts.parent};
-        } else {
-            invokeOpts = {...invokeOpts, version: getVersion()};
-        }
+        let invokeOpts: pulumi.InvokeOptions = { async: true, version: getVersion() };
 
-        const promise = pulumi.runtime.invoke(
-            "kubernetes:yaml:decode", {text, defaultNamespace}, invokeOpts);
+        const promise = pulumi.runtime.invoke("kubernetes:yaml:decode", {text, defaultNamespace}, invokeOpts);
         return pulumi.output(promise).apply<{[key: string]: pulumi.CustomResource}>(p => yaml.parse(
             {
                 resourcePrefix: resourcePrefix,

diff --git a/pkg/gen/nodejs-templates/yaml.ts.mustache b/pkg/gen/nodejs-templates/yaml.ts.mustache
@@ -121,16 +121,10 @@ import * as outputs from "../types/output";
         resourcePrefix?: string;
     }
 
-    function yamlLoadAll(text: string, opts?: pulumi.CustomResourceOptions): Promise<any[]> {
-        // Rather than using the default provider for the following invoke call, determine the
-        // provider from the parent if specified, or fallback to using the version specified
+    function yamlLoadAll(text: string): Promise<any[]> {
+        // Rather than using the default provider for the following invoke call, use the version specified
         // in package.json.
-        let invokeOpts: pulumi.InvokeOptions = {async: true};
-        if (opts?.parent) {
-            invokeOpts = {...invokeOpts, parent: opts.parent};
-        } else {
-            invokeOpts = {...invokeOpts, version: getVersion()};
-        }
+        let invokeOpts: pulumi.InvokeOptions = { async: true, version: getVersion() };
 
         return pulumi.runtime.invoke("kubernetes:yaml:decode", {text}, invokeOpts)
             .then((p => p.result));
@@ -183,7 +177,7 @@ import * as outputs from "../types/output";
 
             for (const text of yamlTexts) {
                 const docResources = parseYamlDocument({
-                        objs: yamlLoadAll(text, opts),
+                        objs: yamlLoadAll(text),
                         transformations: config.transformations,
                         resourcePrefix: config.resourcePrefix
                     },
@@ -331,7 +325,7 @@ import * as outputs from "../types/output";
             this.resources = pulumi.output(text.then(t => {
                 try {
                     return parseYamlDocument({
-                        objs: yamlLoadAll(t, opts),
+                        objs: yamlLoadAll(t),
                         transformations: config && config.transformations || [],
                         resourcePrefix: config && config.resourcePrefix || undefined
                     }, {parent: this})

diff --git a/pkg/gen/python-templates/helm/v2/helm.py b/pkg/gen/python-templates/helm/v2/helm.py
@@ -349,14 +349,9 @@ def _parse_chart(all_config: Tuple[str, Union[ChartOpts, LocalChartOpts], pulumi
 
     chart_resources = pulumi.Output.all(cmd, data).apply(_run_helm_cmd)
 
-    # Rather than using the default provider for the following invoke call, determine the
-    # provider from the parent if specified, or fallback to using the version specified
+    # Rather than using the default provider for the following invoke call, use the version specified
     # in package.json.
-    invoke_opts = pulumi.InvokeOptions()
-    if opts.parent is not None:
-        invoke_opts.parent = opts.parent
-    else:
-        invoke_opts.version = get_version()
+    invoke_opts = pulumi.InvokeOptions(version=get_version())
 
     objects = chart_resources.apply(
         lambda text: pulumi.runtime.invoke('kubernetes:yaml:decode', {

diff --git a/pkg/gen/python-templates/yaml.py.mustache b/pkg/gen/python-templates/yaml.py.mustache
@@ -9,8 +9,8 @@ from typing import Callable, Dict, List, Optional
 import pulumi.runtime
 import requests
 from pulumi_kubernetes.apiextensions import CustomResource
-
 from . import tables
+from .version import get_version
 
 
 class ConfigFile(pulumi.ComponentResource):
@@ -57,14 +57,9 @@ class ConfigFile(pulumi.ComponentResource):
 
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(parent=self))
 
-        # Rather than using the default provider for the following invoke call, determine the
-        # provider from the parent if specified, or fallback to using the version specified
+        # Rather than using the default provider for the following invoke call, use the version specified
         # in package.json.
-        invoke_opts = pulumi.InvokeOptions()
-        if opts.parent is not None:
-            invoke_opts.parent = opts.parent
-        else:
-            invoke_opts.version = get_version()
+        invoke_opts = pulumi.InvokeOptions(version=get_version())
 
         __ret__ = pulumi.runtime.invoke('kubernetes:yaml:decode', {'text': text}, invoke_opts).value['result']
 

diff --git a/sdk/nodejs/helm/v2/helm.ts b/sdk/nodejs/helm/v2/helm.ts
@@ -218,7 +218,7 @@ export class Chart extends yaml.CollectionComponentResource {
                     },
                 ).toString();
                 return this.parseTemplate(
-                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace, opts);
+                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace);
             } catch (e) {
                 // Shed stack trace, only emit the error.
                 throw new pulumi.RunError(e.toString());
@@ -236,20 +236,12 @@ export class Chart extends yaml.CollectionComponentResource {
         resourcePrefix: string | undefined,
         dependsOn: pulumi.Resource[],
         defaultNamespace: string | undefined,
-        opts?: pulumi.ComponentResourceOptions,
     ): pulumi.Output<{ [key: string]: pulumi.CustomResource }> {
-        // Rather than using the default provider for the following invoke call, determine the
-        // provider from the parent if specified, or fallback to using the version specified
+        // Rather than using the default provider for the following invoke call, use the version specified
         // in package.json.
-        let invokeOpts: pulumi.InvokeOptions = {async: true};
-        if (opts?.parent) {
-            invokeOpts = {...invokeOpts, parent: opts.parent};
-        } else {
-            invokeOpts = {...invokeOpts, version: getVersion()};
-        }
+        let invokeOpts: pulumi.InvokeOptions = { async: true, version: getVersion() };
 
-        const promise = pulumi.runtime.invoke(
-            "kubernetes:yaml:decode", {text, defaultNamespace}, invokeOpts);
+        const promise = pulumi.runtime.invoke("kubernetes:yaml:decode", {text, defaultNamespace}, invokeOpts);
         return pulumi.output(promise).apply<{[key: string]: pulumi.CustomResource}>(p => yaml.parse(
             {
                 resourcePrefix: resourcePrefix,

diff --git a/sdk/nodejs/yaml/yaml.ts b/sdk/nodejs/yaml/yaml.ts
@@ -121,16 +121,10 @@ import * as outputs from "../types/output";
         resourcePrefix?: string;
     }
 
-    function yamlLoadAll(text: string, opts?: pulumi.CustomResourceOptions): Promise<any[]> {
-        // Rather than using the default provider for the following invoke call, determine the
-        // provider from the parent if specified, or fallback to using the version specified
+    function yamlLoadAll(text: string): Promise<any[]> {
+        // Rather than using the default provider for the following invoke call, use the version specified
         // in package.json.
-        let invokeOpts: pulumi.InvokeOptions = {async: true};
-        if (opts?.parent) {
-            invokeOpts = {...invokeOpts, parent: opts.parent};
-        } else {
-            invokeOpts = {...invokeOpts, version: getVersion()};
-        }
+        let invokeOpts: pulumi.InvokeOptions = { async: true, version: getVersion() };
 
         return pulumi.runtime.invoke("kubernetes:yaml:decode", {text}, invokeOpts)
             .then((p => p.result));
@@ -183,7 +177,7 @@ import * as outputs from "../types/output";
 
             for (const text of yamlTexts) {
                 const docResources = parseYamlDocument({
-                        objs: yamlLoadAll(text, opts),
+                        objs: yamlLoadAll(text),
                         transformations: config.transformations,
                         resourcePrefix: config.resourcePrefix
                     },
@@ -2473,7 +2467,7 @@ import * as outputs from "../types/output";
             this.resources = pulumi.output(text.then(t => {
                 try {
                     return parseYamlDocument({
-                        objs: yamlLoadAll(t, opts),
+                        objs: yamlLoadAll(t),
                         transformations: config && config.transformations || [],
                         resourcePrefix: config && config.resourcePrefix || undefined
                     }, {parent: this})

diff --git a/sdk/python/pulumi_kubernetes/helm/v2/helm.py b/sdk/python/pulumi_kubernetes/helm/v2/helm.py
@@ -349,14 +349,9 @@ def _parse_chart(all_config: Tuple[str, Union[ChartOpts, LocalChartOpts], pulumi
 
     chart_resources = pulumi.Output.all(cmd, data).apply(_run_helm_cmd)
 
-    # Rather than using the default provider for the following invoke call, determine the
-    # provider from the parent if specified, or fallback to using the version specified
+    # Rather than using the default provider for the following invoke call, use the version specified
     # in package.json.
-    invoke_opts = pulumi.InvokeOptions()
-    if opts.parent is not None:
-        invoke_opts.parent = opts.parent
-    else:
-        invoke_opts.version = get_version()
+    invoke_opts = pulumi.InvokeOptions(version=get_version())
 
     objects = chart_resources.apply(
         lambda text: pulumi.runtime.invoke('kubernetes:yaml:decode', {

diff --git a/sdk/python/pulumi_kubernetes/yaml.py b/sdk/python/pulumi_kubernetes/yaml.py
@@ -9,8 +9,8 @@
 import pulumi.runtime
 import requests
 from pulumi_kubernetes.apiextensions import CustomResource
-
 from . import tables
+from .version import get_version
 
 
 class ConfigFile(pulumi.ComponentResource):
@@ -57,14 +57,9 @@ def __init__(self, name, file_id, opts=None, transformations=None, resource_pref
 
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(parent=self))
 
-        # Rather than using the default provider for the following invoke call, determine the
-        # provider from the parent if specified, or fallback to using the version specified
+        # Rather than using the default provider for the following invoke call, use the version specified
         # in package.json.
-        invoke_opts = pulumi.InvokeOptions()
-        if opts.parent is not None:
-            invoke_opts.parent = opts.parent
-        else:
-            invoke_opts.version = get_version()
+        invoke_opts = pulumi.InvokeOptions(version=get_version())
 
         __ret__ = pulumi.runtime.invoke('kubernetes:yaml:decode', {'text': text}, invoke_opts).value['result']
 

diff --git a/tests/examples/python/python_test.go b/tests/examples/python/python_test.go
@@ -85,7 +85,7 @@ func TestYaml(t *testing.T) {
 		ExpectRefreshChanges: true,
 		ExtraRuntimeValidation: func(t *testing.T, stackInfo integration.RuntimeValidationStackInfo) {
 			assert.NotNil(t, stackInfo.Deployment)
-			assert.Equal(t, 15, len(stackInfo.Deployment.Resources))
+			assert.Equal(t, 14, len(stackInfo.Deployment.Resources))
 
 			sort.Slice(stackInfo.Deployment.Resources, func(i, j int) bool {
 				ri := stackInfo.Deployment.Resources[i]
@@ -159,11 +159,9 @@ func TestYaml(t *testing.T) {
 			// Verify the provider resources.
 			provRes := stackInfo.Deployment.Resources[12]
 			assert.True(t, providers.IsProviderType(provRes.URN.Type()))
-			provRes = stackInfo.Deployment.Resources[13]
-			assert.True(t, providers.IsProviderType(provRes.URN.Type()))
 
 			// Verify root resource.
-			stackRes := stackInfo.Deployment.Resources[14]
+			stackRes := stackInfo.Deployment.Resources[13]
 			assert.Equal(t, resource.RootStackType, stackRes.URN.Type())
 
 			// TODO[pulumi/pulumi#2782] Testing of secrets blocked on a bug in Python support for secrets.
@@ -312,7 +310,7 @@ func TestHelm(t *testing.T) {
 		ExpectRefreshChanges: true, // PodDisruptionBudget status gets updated by the Deployment.
 		ExtraRuntimeValidation: func(t *testing.T, stackInfo integration.RuntimeValidationStackInfo) {
 			assert.NotNil(t, stackInfo.Deployment)
-			assert.Equal(t, 16, len(stackInfo.Deployment.Resources))
+			assert.Equal(t, 15, len(stackInfo.Deployment.Resources))
 
 			sort.Slice(stackInfo.Deployment.Resources, func(i, j int) bool {
 				ri := stackInfo.Deployment.Resources[i]