Address feedback

pulumi · Aug 20, 2019 · 126c447 · 126c447
1 parent 28e2a59
commit 126c447
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/pkg/gen/python-templates/CustomResource.py b/pkg/gen/python-templates/CustomResource.py
@@ -49,10 +49,7 @@ def __init__(
         __props__['spec'] = spec
         __props__['metadata'] = metadata
 
-        if opts is None:
-            opts = pulumi.ResourceOptions()
-        if opts.version is None:
-            opts.version = version.get_version()
+        opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(version=version.get_version()))
 
         super(CustomResource, self).__init__(
             f"kubernetes:{api_version}:{kind}",
@@ -77,6 +74,7 @@ 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.
         """
+
         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)

diff --git a/sdk/python/pulumi_kubernetes/apiextensions/CustomResource.py b/sdk/python/pulumi_kubernetes/apiextensions/CustomResource.py
@@ -49,10 +49,7 @@ def __init__(
         __props__['spec'] = spec
         __props__['metadata'] = metadata
 
-        if opts is None:
-            opts = pulumi.ResourceOptions()
-        if opts.version is None:
-            opts.version = version.get_version()
+        opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(version=version.get_version()))
 
         super(CustomResource, self).__init__(
             f"kubernetes:{api_version}:{kind}",
@@ -77,6 +74,7 @@ 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.
         """
+
         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)