Specify provider version for invokes (#982)

The SDK previously used invoke for Helm and YAML support,
but was not specifying the parent or version explicitly. As a result,
the provider plugin to use was nondeterministic, and could select
an incompatible version that lead to an error.

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD (Unreleased)
 
+### Bug fixes
+
+-   Specify provider version for invokes. (https://github.com/pulumi/pulumi-kubernetes/pull/982).
+
 ## 1.5.0 (February 4, 2020)
 
 ### Improvements

pkg/gen/nodejs-templates/helm/v2/helm.ts

@@ -18,11 +18,11 @@
 import * as pulumi from "@pulumi/pulumi";
 import { execSync } from "child_process";
 import * as fs from "fs";
-import * as jsyaml from "js-yaml";
 import * as nodepath from "path";
 import * as shell from "shell-quote";
 import * as tmp from "tmp";
 import * as path from "../../path";
+import { getVersion } from "../../version";
 import * as yaml from "../../yaml/index";
 
 interface BaseChartOpts {
@@ -218,7 +218,7 @@ export class Chart extends yaml.CollectionComponentResource {
                     },
                 ).toString();
                 return this.parseTemplate(
-                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace);
+                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace, opts);
             } catch (e) {
                 // Shed stack trace, only emit the error.
                 throw new pulumi.RunError(e.toString());
@@ -236,9 +236,20 @@ 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
+        // in package.json.
+        let invokeOpts: pulumi.InvokeOptions = {async: true};
+        if (opts?.parent) {
+            invokeOpts = {...invokeOpts, parent: opts.parent};
+        } else {
+            invokeOpts = {...invokeOpts, version: getVersion()};
+        }
+
         const promise = pulumi.runtime.invoke(
-            "kubernetes:yaml:decode", {text, defaultNamespace}, {async: true});
+            "kubernetes:yaml:decode", {text, defaultNamespace}, invokeOpts);
         return pulumi.output(promise).apply<{[key: string]: pulumi.CustomResource}>(p => yaml.parse(
             {
                 resourcePrefix: resourcePrefix,

pkg/gen/nodejs-templates/package.json.mustache

@@ -14,8 +14,6 @@
     },
     "dependencies": {
         "@pulumi/pulumi": "^1.8.1",
-        "@types/js-yaml": "^3.11.2",
-        "js-yaml": "^3.12.0",
         "shell-quote": "^1.6.1",
         "tmp": "^0.0.33",
         "@types/tmp": "^0.0.33",

pkg/gen/nodejs-templates/yaml.ts.mustache

@@ -6,6 +6,7 @@ import * as fs from "fs";
 import * as glob from "glob";
 import fetch from "node-fetch";
 import * as k8s from "../index";
+import { getVersion } from "../version";
 import * as outputs from "../types/output";
 
     export interface ConfigGroupOpts {
@@ -120,9 +121,19 @@ import * as outputs from "../types/output";
         resourcePrefix?: string;
     }
 
-    function yamlLoadAll(text: string): Promise<any[]> {
-        const promise = pulumi.runtime.invoke("kubernetes:yaml:decode", {text}, {async: true});
-        return promise.then(p => p.result);
+    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
+        // in package.json.
+        let invokeOpts: pulumi.InvokeOptions = {async: true};
+        if (opts?.parent) {
+            invokeOpts = {...invokeOpts, parent: opts.parent};
+        } else {
+            invokeOpts = {...invokeOpts, version: getVersion()};
+        }
+
+        return pulumi.runtime.invoke("kubernetes:yaml:decode", {text}, invokeOpts)
+            .then((p => p.result));
     }
 
     /** @ignore */ export function parse(
@@ -172,7 +183,7 @@ import * as outputs from "../types/output";
 
             for (const text of yamlTexts) {
                 const docResources = parseYamlDocument({
-                        objs: yamlLoadAll(text),
+                        objs: yamlLoadAll(text, opts),
                         transformations: config.transformations,
                         resourcePrefix: config.resourcePrefix
                     },
@@ -320,7 +331,7 @@ import * as outputs from "../types/output";
             this.resources = pulumi.output(text.then(t => {
                 try {
                     return parseYamlDocument({
-                        objs: yamlLoadAll(t),
+                        objs: yamlLoadAll(t, opts),
                         transformations: config && config.transformations || [],
                         resourcePrefix: config && config.resourcePrefix || undefined
                     }, {parent: this})

pkg/gen/python-templates/helm/v2/helm.py

@@ -9,6 +9,7 @@
 from typing import Any, Callable, List, Optional, TextIO, Tuple, Union
 
 import pulumi.runtime
+from ...version import get_version
 from pulumi_kubernetes.yaml import _parse_yaml_document
 
 
@@ -347,9 +348,19 @@ def _parse_chart(all_config: Tuple[str, Union[ChartOpts, LocalChartOpts], pulumi
     cmd.extend(home_arg)
 
     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
+    # in package.json.
+    invoke_opts = pulumi.InvokeOptions()
+    if opts.parent is not None:
+        invoke_opts.parent = opts.parent
+    else:
+        invoke_opts.version = get_version()
+
     objects = chart_resources.apply(
         lambda text: pulumi.runtime.invoke('kubernetes:yaml:decode', {
-            'text': text, 'defaultNamespace': config.namespace}).value['result'])
+            'text': text, 'defaultNamespace': config.namespace}, invoke_opts).value['result'])
 
     # Parse the manifest and create the specified resources.
     resources = objects.apply(

pkg/gen/python-templates/yaml.py.mustache

@@ -57,10 +57,20 @@ 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
+        # in package.json.
+        invoke_opts = pulumi.InvokeOptions()
+        if opts.parent is not None:
+            invoke_opts.parent = opts.parent
+        else:
+            invoke_opts.version = get_version()
+
+        __ret__ = pulumi.runtime.invoke('kubernetes:yaml:decode', {'text': text}, invoke_opts).value['result']
+
         # Note: Unlike NodeJS, Python requires that we "pull" on our futures in order to get them scheduled for
         # execution. In order to do this, we leverage the engine's RegisterResourceOutputs to wait for the
         # resolution of all resources that this YAML document created.
-        __ret__ = pulumi.runtime.invoke('kubernetes:yaml:decode', {'text': text}).value['result']
         self.resources = _parse_yaml_document(__ret__, opts, transformations, resource_prefix)
         self.register_outputs({"resources": self.resources})
 

sdk/nodejs/helm/v2/helm.ts

@@ -18,11 +18,11 @@
 import * as pulumi from "@pulumi/pulumi";
 import { execSync } from "child_process";
 import * as fs from "fs";
-import * as jsyaml from "js-yaml";
 import * as nodepath from "path";
 import * as shell from "shell-quote";
 import * as tmp from "tmp";
 import * as path from "../../path";
+import { getVersion } from "../../version";
 import * as yaml from "../../yaml/index";
 
 interface BaseChartOpts {
@@ -218,7 +218,7 @@ export class Chart extends yaml.CollectionComponentResource {
                     },
                 ).toString();
                 return this.parseTemplate(
-                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace);
+                    yamlStream, cfg.transformations, cfg.resourcePrefix, configDeps, cfg.namespace, opts);
             } catch (e) {
                 // Shed stack trace, only emit the error.
                 throw new pulumi.RunError(e.toString());
@@ -236,9 +236,20 @@ 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
+        // in package.json.
+        let invokeOpts: pulumi.InvokeOptions = {async: true};
+        if (opts?.parent) {
+            invokeOpts = {...invokeOpts, parent: opts.parent};
+        } else {
+            invokeOpts = {...invokeOpts, version: getVersion()};
+        }
+
         const promise = pulumi.runtime.invoke(
-            "kubernetes:yaml:decode", {text, defaultNamespace}, {async: true});
+            "kubernetes:yaml:decode", {text, defaultNamespace}, invokeOpts);
         return pulumi.output(promise).apply<{[key: string]: pulumi.CustomResource}>(p => yaml.parse(
             {
                 resourcePrefix: resourcePrefix,

sdk/nodejs/package.json

@@ -14,8 +14,6 @@
     },
     "dependencies": {
         "@pulumi/pulumi": "^1.8.1",
-        "@types/js-yaml": "^3.11.2",
-        "js-yaml": "^3.12.0",
         "shell-quote": "^1.6.1",
         "tmp": "^0.0.33",
         "@types/tmp": "^0.0.33",

sdk/nodejs/yaml/yaml.ts

@@ -6,6 +6,7 @@ import * as fs from "fs";
 import * as glob from "glob";
 import fetch from "node-fetch";
 import * as k8s from "../index";
+import { getVersion } from "../version";
 import * as outputs from "../types/output";
 
     export interface ConfigGroupOpts {
@@ -120,9 +121,19 @@ import * as outputs from "../types/output";
         resourcePrefix?: string;
     }
 
-    function yamlLoadAll(text: string): Promise<any[]> {
-        const promise = pulumi.runtime.invoke("kubernetes:yaml:decode", {text}, {async: true});
-        return promise.then(p => p.result);
+    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
+        // in package.json.
+        let invokeOpts: pulumi.InvokeOptions = {async: true};
+        if (opts?.parent) {
+            invokeOpts = {...invokeOpts, parent: opts.parent};
+        } else {
+            invokeOpts = {...invokeOpts, version: getVersion()};
+        }
+
+        return pulumi.runtime.invoke("kubernetes:yaml:decode", {text}, invokeOpts)
+            .then((p => p.result));
     }
 
     /** @ignore */ export function parse(
@@ -172,7 +183,7 @@ import * as outputs from "../types/output";
 
             for (const text of yamlTexts) {
                 const docResources = parseYamlDocument({
-                        objs: yamlLoadAll(text),
+                        objs: yamlLoadAll(text, opts),
                         transformations: config.transformations,
                         resourcePrefix: config.resourcePrefix
                     },
@@ -2462,7 +2473,7 @@ import * as outputs from "../types/output";
             this.resources = pulumi.output(text.then(t => {
                 try {
                     return parseYamlDocument({
-                        objs: yamlLoadAll(t),
+                        objs: yamlLoadAll(t, opts),
                         transformations: config && config.transformations || [],
                         resourcePrefix: config && config.resourcePrefix || undefined
                     }, {parent: this})

sdk/python/pulumi_kubernetes/helm/v2/helm.py

@@ -9,6 +9,7 @@
 from typing import Any, Callable, List, Optional, TextIO, Tuple, Union
 
 import pulumi.runtime
+from ...version import get_version
 from pulumi_kubernetes.yaml import _parse_yaml_document
 
 
@@ -347,9 +348,19 @@ def _parse_chart(all_config: Tuple[str, Union[ChartOpts, LocalChartOpts], pulumi
     cmd.extend(home_arg)
 
     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
+    # in package.json.
+    invoke_opts = pulumi.InvokeOptions()
+    if opts.parent is not None:
+        invoke_opts.parent = opts.parent
+    else:
+        invoke_opts.version = get_version()
+
     objects = chart_resources.apply(
         lambda text: pulumi.runtime.invoke('kubernetes:yaml:decode', {
-            'text': text, 'defaultNamespace': config.namespace}).value['result'])
+            'text': text, 'defaultNamespace': config.namespace}, invoke_opts).value['result'])
 
     # Parse the manifest and create the specified resources.
     resources = objects.apply(

sdk/python/pulumi_kubernetes/yaml.py

@@ -57,10 +57,20 @@ 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
+        # in package.json.
+        invoke_opts = pulumi.InvokeOptions()
+        if opts.parent is not None:
+            invoke_opts.parent = opts.parent
+        else:
+            invoke_opts.version = get_version()
+
+        __ret__ = pulumi.runtime.invoke('kubernetes:yaml:decode', {'text': text}, invoke_opts).value['result']
+
         # Note: Unlike NodeJS, Python requires that we "pull" on our futures in order to get them scheduled for
         # execution. In order to do this, we leverage the engine's RegisterResourceOutputs to wait for the
         # resolution of all resources that this YAML document created.
-        __ret__ = pulumi.runtime.invoke('kubernetes:yaml:decode', {'text': text}).value['result']
         self.resources = _parse_yaml_document(__ret__, opts, transformations, resource_prefix)
         self.register_outputs({"resources": self.resources})
 

tests/examples/examples_test.go

@@ -164,7 +164,7 @@ func TestAccHelmApiVersions(t *testing.T) {
 				t *testing.T, stackInfo integration.RuntimeValidationStackInfo,
 			) {
 				assert.NotNil(t, stackInfo.Deployment)
-				assert.Equal(t, 7, len(stackInfo.Deployment.Resources))
+				assert.Equal(t, 6, len(stackInfo.Deployment.Resources))
 			},
 		})
 
@@ -181,7 +181,7 @@ func TestAccHelmLocal(t *testing.T) {
 				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))
 			},
 		})
 

tests/integration/aliases/aliases_test.go

@@ -37,7 +37,7 @@ func TestAliases(t *testing.T) {
 		Quick:        true,
 		ExtraRuntimeValidation: func(t *testing.T, stackInfo integration.RuntimeValidationStackInfo) {
 			assert.NotNil(t, stackInfo.Deployment)
-			assert.Equal(t, 5, len(stackInfo.Deployment.Resources))
+			assert.Equal(t, 4, len(stackInfo.Deployment.Resources))
 
 			tests.SortResourcesByURN(stackInfo)
 
@@ -51,7 +51,7 @@ func TestAliases(t *testing.T) {
 				Additive: true,
 				ExtraRuntimeValidation: func(t *testing.T, stackInfo integration.RuntimeValidationStackInfo) {
 					assert.NotNil(t, stackInfo.Deployment)
-					assert.Equal(t, 5, len(stackInfo.Deployment.Resources))
+					assert.Equal(t, 4, len(stackInfo.Deployment.Resources))
 
 					tests.SortResourcesByURN(stackInfo)
 
@@ -69,7 +69,7 @@ func TestAliases(t *testing.T) {
 				Additive: true,
 				ExtraRuntimeValidation: func(t *testing.T, stackInfo integration.RuntimeValidationStackInfo) {
 					assert.NotNil(t, stackInfo.Deployment)
-					assert.Equal(t, 5, len(stackInfo.Deployment.Resources))
+					assert.Equal(t, 4, len(stackInfo.Deployment.Resources))
 
 					tests.SortResourcesByURN(stackInfo)
 

tests/integration/yaml-url/yaml_url_test.go

@@ -37,7 +37,7 @@ func TestYAMLURL(t *testing.T) {
 			assert.NotNil(t, stackInfo.Deployment)
 
 			// Assert that we've retrieved the YAML from the URL and provisioned them.
-			assert.Equal(t, 19, len(stackInfo.Deployment.Resources))
+			assert.Equal(t, 18, len(stackInfo.Deployment.Resources))
 		},
 	})
 }