Respond to feedback

pulumi · Aug 19, 2019 · c7da4c1 · c7da4c1
1 parent e42ae32
commit c7da4c1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/pkg/gen/python-templates/CustomResource.py b/pkg/gen/python-templates/CustomResource.py
@@ -22,8 +22,8 @@ class CustomResource(pulumi.CustomResource):
     def __init__(
             self,
             resource_name: str,
-            api_version: pulumi.Input[str],
-            kind: pulumi.Input[str],
+            api_version: str,
+            kind: str,
             spec: pulumi.Input[Any] = None,
             metadata: Optional[pulumi.Input[Any]] = None,
             opts: Optional[pulumi.ResourceOptions] = None,
@@ -62,8 +62,8 @@ def __init__(
 
     @staticmethod
     def get(resource_name: str,
-            api_version: pulumi.Input[str],
-            kind: pulumi.Input[str],
+            api_version: str,
+            kind: str,
             id: pulumi.Input[str],
             opts: Optional[ResourceOptions] = None):
         """
@@ -77,16 +77,11 @@ def get(resource_name: str,
                Takes the form <namespace>/<name> or <name>.
         :param Optional[ResourceOptions] opts: A bag of options that control this resource's behavior.
         """
-        _api_version = pulumi.Output.from_input(api_version)
-        _kind = pulumi.Output.from_input(kind)
-        _id = pulumi.Output.from_input(id)
+        def _unwrap(id):
+            _opts = ResourceOptions(id=id) if opts is None else opts.merge(ResourceOptions(id=id))
+            return CustomResource(resource_name=resource_name, api_version=api_version, kind=kind, opts=_opts)
 
-        def _unwrap(all_config):
-            api_version, kind, id = all_config
-            opts = ResourceOptions(id=id) if opts is None else opts.merge(ResourceOptions(id=id))
-            return CustomResource(resource_name=resource_name, api_version=api_version, kind=kind, opts=opts)
-
-        return pulumi.Output.all(_api_version, _kind, _id).apply(_unwrap)
+        return pulumi.Output.from_input(id).apply(_unwrap)
 
     def translate_output_property(self, prop: str) -> str:
         return tables._CASING_FORWARD_TABLE.get(prop) or prop

diff --git a/sdk/python/pulumi_kubernetes/apiextensions/CustomResource.py b/sdk/python/pulumi_kubernetes/apiextensions/CustomResource.py
@@ -22,8 +22,8 @@ class CustomResource(pulumi.CustomResource):
     def __init__(
             self,
             resource_name: str,
-            api_version: pulumi.Input[str],
-            kind: pulumi.Input[str],
+            api_version: str,
+            kind: str,
             spec: pulumi.Input[Any] = None,
             metadata: Optional[pulumi.Input[Any]] = None,
             opts: Optional[pulumi.ResourceOptions] = None,
@@ -62,8 +62,8 @@ def __init__(
 
     @staticmethod
     def get(resource_name: str,
-            api_version: pulumi.Input[str],
-            kind: pulumi.Input[str],
+            api_version: str,
+            kind: str,
             id: pulumi.Input[str],
             opts: Optional[ResourceOptions] = None):
         """
@@ -77,16 +77,11 @@ def get(resource_name: str,
                Takes the form <namespace>/<name> or <name>.
         :param Optional[ResourceOptions] opts: A bag of options that control this resource's behavior.
         """
-        _api_version = pulumi.Output.from_input(api_version)
-        _kind = pulumi.Output.from_input(kind)
-        _id = pulumi.Output.from_input(id)
+        def _unwrap(id):
+            _opts = ResourceOptions(id=id) if opts is None else opts.merge(ResourceOptions(id=id))
+            return CustomResource(resource_name=resource_name, api_version=api_version, kind=kind, opts=_opts)
 
-        def _unwrap(all_config):
-            api_version, kind, id = all_config
-            opts = ResourceOptions(id=id) if opts is None else opts.merge(ResourceOptions(id=id))
-            return CustomResource(resource_name=resource_name, api_version=api_version, kind=kind, opts=opts)
-
-        return pulumi.Output.all(_api_version, _kind, _id).apply(_unwrap)
+        return pulumi.Output.from_input(id).apply(_unwrap)
 
     def translate_output_property(self, prop: str) -> str:
         return tables._CASING_FORWARD_TABLE.get(prop) or prop