From bcd87826b7dcd19e891b39ac2dde86b0788706eb Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Tue, 8 Oct 2024 13:25:17 +0000 Subject: [PATCH 1/2] make tfgen --- examples/go.mod | 8 ++++++-- examples/go.sum | 12 ++++++------ provider/go.mod | 8 ++++++-- provider/go.sum | 12 ++++++------ sdk/go.mod | 4 ++++ sdk/go.sum | 4 ++-- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 7e5c87628..d57c4e52d 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -12,7 +12,7 @@ require ( github.com/pulumi/pulumi-terraform-bridge/pf v0.44.1 github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 github.com/pulumi/pulumi/pkg/v3 v3.133.0 - github.com/pulumi/pulumi/sdk/v3 v3.133.0 + github.com/pulumi/pulumi/sdk/v3 v3.136.0 github.com/stretchr/testify v1.9.0 ) @@ -176,7 +176,7 @@ require ( github.com/pulumi/pulumi-java/pkg v0.16.1 // indirect github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1 // indirect github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect - github.com/pulumi/pulumi-yaml v1.10.0 // indirect + github.com/pulumi/pulumi-yaml v1.10.3 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect @@ -239,3 +239,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/frand v1.4.2 // indirect ) + +replace github.com/pulumi/pulumi/pkg/v3 => github.com/pulumi/pulumi/pkg/v3 v3.136.1-0.20241008132017-7104edf52fc2 + +replace github.com/pulumi/pulumi/sdk/v3 => github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2 diff --git a/examples/go.sum b/examples/go.sum index e21fac014..d2437ce6d 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -759,12 +759,12 @@ github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1 h1:Twh0IKS1pGHP6LHDq1oR0vbH github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1/go.mod h1:DvueDDtOIbf7W1Or4oH0o7F990ozp/ROmlm/vgLoe+g= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8/go.mod h1:qUYk2c9i/yqMGNj9/bQyXpS39BxNDSXYjVN1njnq0zY= -github.com/pulumi/pulumi-yaml v1.10.0 h1:djbgMJCxJBmYMr4kOpAXH5iauxGohYjEuTLfxD3NUUI= -github.com/pulumi/pulumi-yaml v1.10.0/go.mod h1://lTvwHpgJ+WBKeMGiLrd/jinc4dl3eWV5LZ3G8iCfE= -github.com/pulumi/pulumi/pkg/v3 v3.133.0 h1:j1rd7ToLZIQc5H0427ISOXSbOIIemZ6B0MXtRhQ38Yg= -github.com/pulumi/pulumi/pkg/v3 v3.133.0/go.mod h1:JtMAnrsFIccO138WcMfPdhO0PioDukKihnZC0xTRLwo= -github.com/pulumi/pulumi/sdk/v3 v3.133.0 h1:o+7dbJZY9BVgAjOF5GYIWgjp/zpKAgWZwD4pPjUMXKQ= -github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8= +github.com/pulumi/pulumi-yaml v1.10.3 h1:j5cjPiE32ILmjrWnC1cfZ0MWdqCZ8fg9wlaWk7HOtM4= +github.com/pulumi/pulumi-yaml v1.10.3/go.mod h1:MFMQXkaUP5YQUKVJ6Z/aagZDl2f8hdU9oGaJfTcMf1Y= +github.com/pulumi/pulumi/pkg/v3 v3.136.1-0.20241008132017-7104edf52fc2 h1:Y4Y1CXzaFoVMwdyx3lZZwff03WAWEVQQ3cgktm37HCg= +github.com/pulumi/pulumi/pkg/v3 v3.136.1-0.20241008132017-7104edf52fc2/go.mod h1:foYAiaYWPGmEPXXVJJchTftmLNzpk6A3xGU2ra0gT3k= +github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2 h1:a3uICwcH8FmTJ8u11gV/jW8KJ847NkUe9VLb21iFkQM= +github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI= github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo= github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k= github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI= diff --git a/provider/go.mod b/provider/go.mod index 8dedba1c3..0c23f22de 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -6,7 +6,7 @@ require ( github.com/pulumi/providertest v0.0.14 github.com/pulumi/pulumi-terraform-bridge/pf v0.44.1 github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1 - github.com/pulumi/pulumi/sdk/v3 v3.133.0 + github.com/pulumi/pulumi/sdk/v3 v3.136.0 github.com/stretchr/testify v1.9.0 github.com/terraform-providers/terraform-provider-random/shim v0.0.0 ) @@ -173,7 +173,7 @@ require ( github.com/pulumi/inflector v0.1.1 // indirect github.com/pulumi/pulumi-java/pkg v0.16.1 // indirect github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect - github.com/pulumi/pulumi-yaml v1.10.0 // indirect + github.com/pulumi/pulumi-yaml v1.10.3 // indirect github.com/pulumi/pulumi/pkg/v3 v3.133.0 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/rivo/uniseg v0.4.4 // indirect @@ -239,3 +239,7 @@ require ( ) replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20240520223432-0c0bf0d65f10 + +replace github.com/pulumi/pulumi/pkg/v3 => github.com/pulumi/pulumi/pkg/v3 v3.136.1-0.20241008132017-7104edf52fc2 + +replace github.com/pulumi/pulumi/sdk/v3 => github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2 diff --git a/provider/go.sum b/provider/go.sum index f1f7033ec..e5d83125b 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -762,12 +762,12 @@ github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1 h1:Twh0IKS1pGHP6LHDq1oR0vbH github.com/pulumi/pulumi-terraform-bridge/v3 v3.91.1/go.mod h1:DvueDDtOIbf7W1Or4oH0o7F990ozp/ROmlm/vgLoe+g= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 h1:mav2tSitA9BPJPLLahKgepHyYsMzwaTm4cvp0dcTMYw= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8/go.mod h1:qUYk2c9i/yqMGNj9/bQyXpS39BxNDSXYjVN1njnq0zY= -github.com/pulumi/pulumi-yaml v1.10.0 h1:djbgMJCxJBmYMr4kOpAXH5iauxGohYjEuTLfxD3NUUI= -github.com/pulumi/pulumi-yaml v1.10.0/go.mod h1://lTvwHpgJ+WBKeMGiLrd/jinc4dl3eWV5LZ3G8iCfE= -github.com/pulumi/pulumi/pkg/v3 v3.133.0 h1:j1rd7ToLZIQc5H0427ISOXSbOIIemZ6B0MXtRhQ38Yg= -github.com/pulumi/pulumi/pkg/v3 v3.133.0/go.mod h1:JtMAnrsFIccO138WcMfPdhO0PioDukKihnZC0xTRLwo= -github.com/pulumi/pulumi/sdk/v3 v3.133.0 h1:o+7dbJZY9BVgAjOF5GYIWgjp/zpKAgWZwD4pPjUMXKQ= -github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8= +github.com/pulumi/pulumi-yaml v1.10.3 h1:j5cjPiE32ILmjrWnC1cfZ0MWdqCZ8fg9wlaWk7HOtM4= +github.com/pulumi/pulumi-yaml v1.10.3/go.mod h1:MFMQXkaUP5YQUKVJ6Z/aagZDl2f8hdU9oGaJfTcMf1Y= +github.com/pulumi/pulumi/pkg/v3 v3.136.1-0.20241008132017-7104edf52fc2 h1:Y4Y1CXzaFoVMwdyx3lZZwff03WAWEVQQ3cgktm37HCg= +github.com/pulumi/pulumi/pkg/v3 v3.136.1-0.20241008132017-7104edf52fc2/go.mod h1:foYAiaYWPGmEPXXVJJchTftmLNzpk6A3xGU2ra0gT3k= +github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2 h1:a3uICwcH8FmTJ8u11gV/jW8KJ847NkUe9VLb21iFkQM= +github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI= github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo= github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k= github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI= diff --git a/sdk/go.mod b/sdk/go.mod index 125932764..1f8fab28a 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -89,3 +89,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/frand v1.4.2 // indirect ) + +replace github.com/pulumi/pulumi/pkg/v3 => github.com/pulumi/pulumi/pkg/v3 v3.136.1-0.20241008132017-7104edf52fc2 + +replace github.com/pulumi/pulumi/sdk/v3 => github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2 diff --git a/sdk/go.sum b/sdk/go.sum index 6caac31cc..ff7624071 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -150,8 +150,8 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435 github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs= github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c= -github.com/pulumi/pulumi/sdk/v3 v3.133.0 h1:o+7dbJZY9BVgAjOF5GYIWgjp/zpKAgWZwD4pPjUMXKQ= -github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8= +github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2 h1:a3uICwcH8FmTJ8u11gV/jW8KJ847NkUe9VLb21iFkQM= +github.com/pulumi/pulumi/sdk/v3 v3.136.1-0.20241008132017-7104edf52fc2/go.mod h1:PvKsX88co8XuwuPdzolMvew5lZV+4JmZfkeSjj7A6dI= 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= From 5e322ab0b01fe430634e4bc26f52c8eb10024480 Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Tue, 8 Oct 2024 13:26:50 +0000 Subject: [PATCH 2/2] make build_sdks --- sdk/nodejs/package.json | 2 +- sdk/python/pulumi_random/_utilities.py | 2 +- sdk/python/pulumi_random/provider.py | 5 +++++ sdk/python/pulumi_random/random_bytes.py | 5 +++++ sdk/python/pulumi_random/random_id.py | 5 +++++ sdk/python/pulumi_random/random_integer.py | 5 +++++ sdk/python/pulumi_random/random_password.py | 5 +++++ sdk/python/pulumi_random/random_pet.py | 5 +++++ sdk/python/pulumi_random/random_shuffle.py | 5 +++++ sdk/python/pulumi_random/random_string.py | 5 +++++ sdk/python/pulumi_random/random_uuid.py | 5 +++++ sdk/python/pyproject.toml | 2 +- 12 files changed, 48 insertions(+), 3 deletions(-) diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index 101b5c63b..2271b3029 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -13,7 +13,7 @@ "build": "tsc" }, "dependencies": { - "@pulumi/pulumi": "^3.42.0" + "@pulumi/pulumi": "^3.136.0" }, "devDependencies": { "@types/node": "^10.0.0", diff --git a/sdk/python/pulumi_random/_utilities.py b/sdk/python/pulumi_random/_utilities.py index d14b49ace..3ce408d5f 100644 --- a/sdk/python/pulumi_random/_utilities.py +++ b/sdk/python/pulumi_random/_utilities.py @@ -264,7 +264,7 @@ def call_plain( output = pulumi.runtime.call(tok, props, res, typ) # Ingoring deps silently. They are typically non-empty, r.f() calls include r as a dependency. - result, known, secret, _ = _sync_await(asyncio.ensure_future(_await_output(output))) + result, known, secret, _ = _sync_await(asyncio.create_task(_await_output(output))) problem = None if not known: diff --git a/sdk/python/pulumi_random/provider.py b/sdk/python/pulumi_random/provider.py index 4a5736dd1..1280b612a 100644 --- a/sdk/python/pulumi_random/provider.py +++ b/sdk/python/pulumi_random/provider.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['ProviderArgs', 'Provider'] diff --git a/sdk/python/pulumi_random/random_bytes.py b/sdk/python/pulumi_random/random_bytes.py index af84075d8..54d431285 100644 --- a/sdk/python/pulumi_random/random_bytes.py +++ b/sdk/python/pulumi_random/random_bytes.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomBytesArgs', 'RandomBytes'] diff --git a/sdk/python/pulumi_random/random_id.py b/sdk/python/pulumi_random/random_id.py index f3597ed8e..fb37a7a64 100644 --- a/sdk/python/pulumi_random/random_id.py +++ b/sdk/python/pulumi_random/random_id.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomIdArgs', 'RandomId'] diff --git a/sdk/python/pulumi_random/random_integer.py b/sdk/python/pulumi_random/random_integer.py index 2e21d8c8b..b95455ef0 100644 --- a/sdk/python/pulumi_random/random_integer.py +++ b/sdk/python/pulumi_random/random_integer.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomIntegerArgs', 'RandomInteger'] diff --git a/sdk/python/pulumi_random/random_password.py b/sdk/python/pulumi_random/random_password.py index b6b7407a8..2bda72b6f 100644 --- a/sdk/python/pulumi_random/random_password.py +++ b/sdk/python/pulumi_random/random_password.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomPasswordArgs', 'RandomPassword'] diff --git a/sdk/python/pulumi_random/random_pet.py b/sdk/python/pulumi_random/random_pet.py index edde52ff0..ef09998b5 100644 --- a/sdk/python/pulumi_random/random_pet.py +++ b/sdk/python/pulumi_random/random_pet.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomPetArgs', 'RandomPet'] diff --git a/sdk/python/pulumi_random/random_shuffle.py b/sdk/python/pulumi_random/random_shuffle.py index 68aeafe2c..298636160 100644 --- a/sdk/python/pulumi_random/random_shuffle.py +++ b/sdk/python/pulumi_random/random_shuffle.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomShuffleArgs', 'RandomShuffle'] diff --git a/sdk/python/pulumi_random/random_string.py b/sdk/python/pulumi_random/random_string.py index 342b8491e..d4cdc4e5f 100644 --- a/sdk/python/pulumi_random/random_string.py +++ b/sdk/python/pulumi_random/random_string.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomStringArgs', 'RandomString'] diff --git a/sdk/python/pulumi_random/random_uuid.py b/sdk/python/pulumi_random/random_uuid.py index c6e973bd6..663abc84a 100644 --- a/sdk/python/pulumi_random/random_uuid.py +++ b/sdk/python/pulumi_random/random_uuid.py @@ -4,9 +4,14 @@ import copy import warnings +import sys import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload +if sys.version_info >= (3, 11): + from typing import NotRequired, TypedDict, TypeAlias +else: + from typing_extensions import NotRequired, TypedDict, TypeAlias from . import _utilities __all__ = ['RandomUuidArgs', 'RandomUuid'] diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml index 7f3af8d52..a3a5afaf0 100644 --- a/sdk/python/pyproject.toml +++ b/sdk/python/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "pulumi_random" description = "A Pulumi package to safely use randomness in Pulumi programs." - dependencies = ["parver>=0.2.1", "pulumi>=3.0.0,<4.0.0", "semver>=2.8.1"] + dependencies = ["parver>=0.2.1", "pulumi>=3.136.0,<4.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""] keywords = ["pulumi", "random"] readme = "README.md" requires-python = ">=3.8"