Update pulumi/pulumi to 3.91.1 (#2647)

Includes fixes to python codegen.

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Unreleased
 
+- Fix: Update pulumi version to 3.91.1 to pick up fixes in python codegen (https://github.com/pulumi/pulumi-kubernetes/pull/2647)
+
 ## 4.5.2 (October 26, 2023)
 - Fix: Do not patch field managers for Patch resources (https://github.com/pulumi/pulumi-kubernetes/pull/2640)
 

provider/go.mod

@@ -12,8 +12,8 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/pulumi/cloud-ready-checks v1.0.1-0.20230201174945-00fe9c1b68fd
-	github.com/pulumi/pulumi/pkg/v3 v3.91.0
-	github.com/pulumi/pulumi/sdk/v3 v3.91.0
+	github.com/pulumi/pulumi/pkg/v3 v3.91.1
+	github.com/pulumi/pulumi/sdk/v3 v3.91.1
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/crypto v0.14.0
 	google.golang.org/grpc v1.58.2

provider/go.sum

@@ -1655,10 +1655,10 @@ github.com/pulumi/cloud-ready-checks v1.0.1-0.20230201174945-00fe9c1b68fd h1:shF
 github.com/pulumi/cloud-ready-checks v1.0.1-0.20230201174945-00fe9c1b68fd/go.mod h1:C6HmNtth9oPAWKyRJveZSU4rK/tvzhSGuoOV5y+S17g=
 github.com/pulumi/esc v0.5.6 h1:4WV3X7OEVcChIwbSG+JxhZDdmq/q7lFPaSjHRYlPwmI=
 github.com/pulumi/esc v0.5.6/go.mod h1:wpwNfVS5fV7Kd51j4dJ6FWYlKfxdqyppgp0gtkzqH04=
-github.com/pulumi/pulumi/pkg/v3 v3.91.0 h1:b92HyImeh4iRyHkxa8Xg3YGYZh0x4O4f8X+j4v/Oyco=
-github.com/pulumi/pulumi/pkg/v3 v3.91.0/go.mod h1:sbx8Y+s6PJAronV8cs+V2OuRmUPGBLZzn9ciHumm9kw=
-github.com/pulumi/pulumi/sdk/v3 v3.91.0 h1:zhoua60JWhxvGBAhEakVper+oBMd9dhXODSEx2XR9X0=
-github.com/pulumi/pulumi/sdk/v3 v3.91.0/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
+github.com/pulumi/pulumi/pkg/v3 v3.91.1 h1:xHnyEwJO9we2zCiM9gHTkJxjZ6a6yi5vYCwWHCYRj9Y=
+github.com/pulumi/pulumi/pkg/v3 v3.91.1/go.mod h1:dzBQDJyCOEhtBVN5INA5/i9yG9DZlsStl/mAkrhs9II=
+github.com/pulumi/pulumi/sdk/v3 v3.91.1 h1:6I9GMmHv23X+G6hoduU1XE6hBWSNtB+zcb1MX17YvlA=
+github.com/pulumi/pulumi/sdk/v3 v3.91.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
 github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=

sdk/go.mod

@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi/sdk/v3 v3.91.0
+	github.com/pulumi/pulumi/sdk/v3 v3.91.1
 )
 
 require (

sdk/go.sum

@@ -144,8 +144,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pulumi/esc v0.5.6 h1:4WV3X7OEVcChIwbSG+JxhZDdmq/q7lFPaSjHRYlPwmI=
 github.com/pulumi/esc v0.5.6/go.mod h1:wpwNfVS5fV7Kd51j4dJ6FWYlKfxdqyppgp0gtkzqH04=
-github.com/pulumi/pulumi/sdk/v3 v3.91.0 h1:zhoua60JWhxvGBAhEakVper+oBMd9dhXODSEx2XR9X0=
-github.com/pulumi/pulumi/sdk/v3 v3.91.0/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
+github.com/pulumi/pulumi/sdk/v3 v3.91.1 h1:6I9GMmHv23X+G6hoduU1XE6hBWSNtB+zcb1MX17YvlA=
+github.com/pulumi/pulumi/sdk/v3 v3.91.1/go.mod h1:zYaQQibB2pYKy/uG4c4YkX7lQIBpZ0KsuMaq/3HsIBQ=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=

sdk/python/pulumi_kubernetes/_inputs.py

@@ -6,7 +6,7 @@
 import warnings
 import pulumi
 import pulumi.runtime
-from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
+from typing import Any, Mapping, Optional, Sequence, Union, overload
 from . import _utilities
 
 __all__ = [
@@ -30,53 +30,26 @@ def __init__(__self__, *,
         :param pulumi.Input[str] repository_cache: The path to the file containing cached repository indexes.
         :param pulumi.Input[str] repository_config_path: The path to the file containing repository names and URLs.
         """
-        HelmReleaseSettingsArgs._configure(
-            lambda key, value: pulumi.set(__self__, key, value),
-            driver=driver,
-            plugins_path=plugins_path,
-            registry_config_path=registry_config_path,
-            repository_cache=repository_cache,
-            repository_config_path=repository_config_path,
-        )
-    @staticmethod
-    def _configure(
-             _setter: Callable[[Any, Any], None],
-             driver: Optional[pulumi.Input[str]] = None,
-             plugins_path: Optional[pulumi.Input[str]] = None,
-             registry_config_path: Optional[pulumi.Input[str]] = None,
-             repository_cache: Optional[pulumi.Input[str]] = None,
-             repository_config_path: Optional[pulumi.Input[str]] = None,
-             opts: Optional[pulumi.ResourceOptions] = None,
-             **kwargs):
-        if plugins_path is None and 'pluginsPath' in kwargs:
-            plugins_path = kwargs['pluginsPath']
-        if registry_config_path is None and 'registryConfigPath' in kwargs:
-            registry_config_path = kwargs['registryConfigPath']
-        if repository_cache is None and 'repositoryCache' in kwargs:
-            repository_cache = kwargs['repositoryCache']
-        if repository_config_path is None and 'repositoryConfigPath' in kwargs:
-            repository_config_path = kwargs['repositoryConfigPath']
-
         if driver is None:
             driver = _utilities.get_env('PULUMI_K8S_HELM_DRIVER')
         if driver is not None:
-            _setter("driver", driver)
+            pulumi.set(__self__, "driver", driver)
         if plugins_path is None:
             plugins_path = _utilities.get_env('PULUMI_K8S_HELM_PLUGINS_PATH')
         if plugins_path is not None:
-            _setter("plugins_path", plugins_path)
+            pulumi.set(__self__, "plugins_path", plugins_path)
         if registry_config_path is None:
             registry_config_path = _utilities.get_env('PULUMI_K8S_HELM_REGISTRY_CONFIG_PATH')
         if registry_config_path is not None:
-            _setter("registry_config_path", registry_config_path)
+            pulumi.set(__self__, "registry_config_path", registry_config_path)
         if repository_cache is None:
             repository_cache = _utilities.get_env('PULUMI_K8S_HELM_REPOSITORY_CACHE')
         if repository_cache is not None:
-            _setter("repository_cache", repository_cache)
+            pulumi.set(__self__, "repository_cache", repository_cache)
         if repository_config_path is None:
             repository_config_path = _utilities.get_env('PULUMI_K8S_HELM_REPOSITORY_CONFIG_PATH')
         if repository_config_path is not None:
-            _setter("repository_config_path", repository_config_path)
+            pulumi.set(__self__, "repository_config_path", repository_config_path)
 
     @property
     @pulumi.getter
@@ -151,33 +124,18 @@ def __init__(__self__, *,
         :param pulumi.Input[float] qps: Maximum queries per second (QPS) to the API server from this client. Default value is 5.
         :param pulumi.Input[int] timeout: Maximum time in seconds to wait before cancelling a HTTP request to the Kubernetes server. Default value is 32.
         """
-        KubeClientSettingsArgs._configure(
-            lambda key, value: pulumi.set(__self__, key, value),
-            burst=burst,
-            qps=qps,
-            timeout=timeout,
-        )
-    @staticmethod
-    def _configure(
-             _setter: Callable[[Any, Any], None],
-             burst: Optional[pulumi.Input[int]] = None,
-             qps: Optional[pulumi.Input[float]] = None,
-             timeout: Optional[pulumi.Input[int]] = None,
-             opts: Optional[pulumi.ResourceOptions] = None,
-             **kwargs):
-
         if burst is None:
             burst = _utilities.get_env_int('PULUMI_K8S_CLIENT_BURST')
         if burst is not None:
-            _setter("burst", burst)
+            pulumi.set(__self__, "burst", burst)
         if qps is None:
             qps = _utilities.get_env_float('PULUMI_K8S_CLIENT_QPS')
         if qps is not None:
-            _setter("qps", qps)
+            pulumi.set(__self__, "qps", qps)
         if timeout is None:
             timeout = _utilities.get_env_int('PULUMI_K8S_CLIENT_TIMEOUT')
         if timeout is not None:
-            _setter("timeout", timeout)
+            pulumi.set(__self__, "timeout", timeout)
 
     @property
     @pulumi.getter

sdk/python/pulumi_kubernetes/_utilities.py

@@ -246,24 +246,5 @@ def lifted_func(*args, opts=None, **kwargs):
 
     return (lambda _: lifted_func)
 
-
-def configure(val, cls: type, input: bool):
-    def _apply(v):
-        if isinstance(v, typing.Mapping):
-            def _setter(key, value):
-                v[key] = value
-            cls._configure(_setter, **v)
-        return v
-
-    # Check that cls has a static _configure method. External classes may
-    # not have it if it was generated with older codegen.
-    if hasattr(cls, "_configure"):
-        if isinstance(val, typing.Mapping):
-            return _apply(val)
-        elif input and val is not None and not isinstance(val, cls):
-            return pulumi.Output.from_input(val).apply(_apply)
-
-    return val
-
 def get_plugin_download_url():
 	return None

sdk/python/pulumi_kubernetes/admissionregistration/v1/MutatingWebhookConfiguration.py

@@ -6,7 +6,7 @@
 import warnings
 import pulumi
 import pulumi.runtime
-from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
+from typing import Any, Mapping, Optional, Sequence, Union, overload
 from ... import _utilities
 from . import outputs
 from ... import meta as _meta
@@ -28,33 +28,14 @@ def __init__(__self__, *,
         :param pulumi.Input['_meta.v1.ObjectMetaArgs'] metadata: Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
         :param pulumi.Input[Sequence[pulumi.Input['MutatingWebhookArgs']]] webhooks: Webhooks is a list of webhooks and the affected resources and operations.
         """
-        MutatingWebhookConfigurationInitArgs._configure(
-            lambda key, value: pulumi.set(__self__, key, value),
-            api_version=api_version,
-            kind=kind,
-            metadata=metadata,
-            webhooks=webhooks,
-        )
-    @staticmethod
-    def _configure(
-             _setter: Callable[[Any, Any], None],
-             api_version: Optional[pulumi.Input[str]] = None,
-             kind: Optional[pulumi.Input[str]] = None,
-             metadata: Optional[pulumi.Input['_meta.v1.ObjectMetaArgs']] = None,
-             webhooks: Optional[pulumi.Input[Sequence[pulumi.Input['MutatingWebhookArgs']]]] = None,
-             opts: Optional[pulumi.ResourceOptions] = None,
-             **kwargs):
-        if api_version is None and 'apiVersion' in kwargs:
-            api_version = kwargs['apiVersion']
-
         if api_version is not None:
-            _setter("api_version", 'admissionregistration.k8s.io/v1')
+            pulumi.set(__self__, "api_version", 'admissionregistration.k8s.io/v1')
         if kind is not None:
-            _setter("kind", 'MutatingWebhookConfiguration')
+            pulumi.set(__self__, "kind", 'MutatingWebhookConfiguration')
         if metadata is not None:
-            _setter("metadata", metadata)
+            pulumi.set(__self__, "metadata", metadata)
         if webhooks is not None:
-            _setter("webhooks", webhooks)
+            pulumi.set(__self__, "webhooks", webhooks)
 
     @property
     @pulumi.getter(name="apiVersion")
@@ -144,10 +125,6 @@ def __init__(__self__, resource_name: str, *args, **kwargs):
         if resource_args is not None:
             __self__._internal_init(resource_name, opts, **resource_args.__dict__)
         else:
-            kwargs = kwargs or {}
-            def _setter(key, value):
-                kwargs[key] = value
-            MutatingWebhookConfigurationInitArgs._configure(_setter, **kwargs)
             __self__._internal_init(resource_name, *args, **kwargs)
 
     def _internal_init(__self__,
@@ -168,7 +145,6 @@ def _internal_init(__self__,
 
             __props__.__dict__["api_version"] = 'admissionregistration.k8s.io/v1'
             __props__.__dict__["kind"] = 'MutatingWebhookConfiguration'
-            metadata = _utilities.configure(metadata, _meta.v1.ObjectMetaArgs, True)
             __props__.__dict__["metadata"] = metadata
             __props__.__dict__["webhooks"] = webhooks
         alias_opts = pulumi.ResourceOptions(aliases=[pulumi.Alias(type_="kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfiguration")])

sdk/python/pulumi_kubernetes/admissionregistration/v1/MutatingWebhookConfigurationList.py

@@ -6,7 +6,7 @@
 import warnings
 import pulumi
 import pulumi.runtime
-from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
+from typing import Any, Mapping, Optional, Sequence, Union, overload
 from ... import _utilities
 from . import outputs
 from ... import meta as _meta
@@ -28,34 +28,13 @@ def __init__(__self__, *,
         :param pulumi.Input[str] kind: Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
         :param pulumi.Input['_meta.v1.ListMetaArgs'] metadata: Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
         """
-        MutatingWebhookConfigurationListArgs._configure(
-            lambda key, value: pulumi.set(__self__, key, value),
-            items=items,
-            api_version=api_version,
-            kind=kind,
-            metadata=metadata,
-        )
-    @staticmethod
-    def _configure(
-             _setter: Callable[[Any, Any], None],
-             items: Optional[pulumi.Input[Sequence[pulumi.Input['MutatingWebhookConfigurationArgs']]]] = None,
-             api_version: Optional[pulumi.Input[str]] = None,
-             kind: Optional[pulumi.Input[str]] = None,
-             metadata: Optional[pulumi.Input['_meta.v1.ListMetaArgs']] = None,
-             opts: Optional[pulumi.ResourceOptions] = None,
-             **kwargs):
-        if items is None:
-            raise TypeError("Missing 'items' argument")
-        if api_version is None and 'apiVersion' in kwargs:
-            api_version = kwargs['apiVersion']
-
-        _setter("items", items)
+        pulumi.set(__self__, "items", items)
         if api_version is not None:
-            _setter("api_version", 'admissionregistration.k8s.io/v1')
+            pulumi.set(__self__, "api_version", 'admissionregistration.k8s.io/v1')
         if kind is not None:
-            _setter("kind", 'MutatingWebhookConfigurationList')
+            pulumi.set(__self__, "kind", 'MutatingWebhookConfigurationList')
         if metadata is not None:
-            _setter("metadata", metadata)
+            pulumi.set(__self__, "metadata", metadata)
 
     @property
     @pulumi.getter
@@ -145,10 +124,6 @@ def __init__(__self__, resource_name: str, *args, **kwargs):
         if resource_args is not None:
             __self__._internal_init(resource_name, opts, **resource_args.__dict__)
         else:
-            kwargs = kwargs or {}
-            def _setter(key, value):
-                kwargs[key] = value
-            MutatingWebhookConfigurationListArgs._configure(_setter, **kwargs)
             __self__._internal_init(resource_name, *args, **kwargs)
 
     def _internal_init(__self__,
@@ -172,7 +147,6 @@ def _internal_init(__self__,
                 raise TypeError("Missing required property 'items'")
             __props__.__dict__["items"] = items
             __props__.__dict__["kind"] = 'MutatingWebhookConfigurationList'
-            metadata = _utilities.configure(metadata, _meta.v1.ListMetaArgs, True)
             __props__.__dict__["metadata"] = metadata
         super(MutatingWebhookConfigurationList, __self__).__init__(
             'kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationList',

sdk/python/pulumi_kubernetes/admissionregistration/v1/MutatingWebhookConfigurationPatch.py

@@ -6,7 +6,7 @@
 import warnings
 import pulumi
 import pulumi.runtime
-from typing import Any, Callable, Mapping, Optional, Sequence, Union, overload
+from typing import Any, Mapping, Optional, Sequence, Union, overload
 from ... import _utilities
 from . import outputs
 from ... import meta as _meta
@@ -28,33 +28,14 @@ def __init__(__self__, *,
         :param pulumi.Input['_meta.v1.ObjectMetaPatchArgs'] metadata: Standard object metadata; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata.
         :param pulumi.Input[Sequence[pulumi.Input['MutatingWebhookPatchArgs']]] webhooks: Webhooks is a list of webhooks and the affected resources and operations.
         """
-        MutatingWebhookConfigurationPatchArgs._configure(
-            lambda key, value: pulumi.set(__self__, key, value),
-            api_version=api_version,
-            kind=kind,
-            metadata=metadata,
-            webhooks=webhooks,
-        )
-    @staticmethod
-    def _configure(
-             _setter: Callable[[Any, Any], None],
-             api_version: Optional[pulumi.Input[str]] = None,
-             kind: Optional[pulumi.Input[str]] = None,
-             metadata: Optional[pulumi.Input['_meta.v1.ObjectMetaPatchArgs']] = None,
-             webhooks: Optional[pulumi.Input[Sequence[pulumi.Input['MutatingWebhookPatchArgs']]]] = None,
-             opts: Optional[pulumi.ResourceOptions] = None,
-             **kwargs):
-        if api_version is None and 'apiVersion' in kwargs:
-            api_version = kwargs['apiVersion']
-
         if api_version is not None:
-            _setter("api_version", 'admissionregistration.k8s.io/v1')
+            pulumi.set(__self__, "api_version", 'admissionregistration.k8s.io/v1')
         if kind is not None:
-            _setter("kind", 'MutatingWebhookConfiguration')
+            pulumi.set(__self__, "kind", 'MutatingWebhookConfiguration')
         if metadata is not None:
-            _setter("metadata", metadata)
+            pulumi.set(__self__, "metadata", metadata)
         if webhooks is not None:
-            _setter("webhooks", webhooks)
+            pulumi.set(__self__, "webhooks", webhooks)
 
     @property
     @pulumi.getter(name="apiVersion")
@@ -156,10 +137,6 @@ def __init__(__self__, resource_name: str, *args, **kwargs):
         if resource_args is not None:
             __self__._internal_init(resource_name, opts, **resource_args.__dict__)
         else:
-            kwargs = kwargs or {}
-            def _setter(key, value):
-                kwargs[key] = value
-            MutatingWebhookConfigurationPatchArgs._configure(_setter, **kwargs)
             __self__._internal_init(resource_name, *args, **kwargs)
 
     def _internal_init(__self__,
@@ -180,7 +157,6 @@ def _internal_init(__self__,
 
             __props__.__dict__["api_version"] = 'admissionregistration.k8s.io/v1'
             __props__.__dict__["kind"] = 'MutatingWebhookConfiguration'
-            metadata = _utilities.configure(metadata, _meta.v1.ObjectMetaPatchArgs, True)
             __props__.__dict__["metadata"] = metadata
             __props__.__dict__["webhooks"] = webhooks
         alias_opts = pulumi.ResourceOptions(aliases=[pulumi.Alias(type_="kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfigurationPatch")])