Fix: Do not over-specify SDK versions (#1390)

Re: pulumi/ci-mgmt#1091 This additionally bumps the pu/pu version to 3.135.0.
pulumi · Oct 2, 2024 · 1144634 · 1144634
1 parent 1f3e204
commit 1144634
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/schema.json b/schema.json
@@ -43,7 +43,6 @@
                 "@aws-sdk/client-ecs": "^3.405.0",
                 "@pulumi/aws": "^6.47.0",
                 "@pulumi/docker": "^4.5.1",
-                "@pulumi/pulumi": "^3.0.0",
                 "@types/aws-lambda": "^8.10.23",
                 "aws-sdk": "^2.1450.0",
                 "docker-classic": "npm:@pulumi/[email protected]",
@@ -63,7 +62,6 @@
             },
             "readme": "Pulumi Amazon Web Services (AWS) AWSX Components.",
             "requires": {
-                "pulumi": "\u003e=3.91.1,\u003c4.0.0",
                 "pulumi-aws": "\u003e=6.0.4,\u003c7.0.0",
                 "pulumi-docker": "\u003e=4.5.1,\u003c5.0.0"
             },

diff --git a/schemagen/go.mod b/schemagen/go.mod
@@ -4,8 +4,8 @@ go 1.21
 
 require (
 	github.com/pkg/errors v0.9.1
-	github.com/pulumi/pulumi/pkg/v3 v3.134.1
-	github.com/pulumi/pulumi/sdk/v3 v3.134.1
+	github.com/pulumi/pulumi/pkg/v3 v3.135.0
+	github.com/pulumi/pulumi/sdk/v3 v3.135.0
 )
 
 require (

diff --git a/schemagen/go.sum b/schemagen/go.sum
@@ -438,10 +438,10 @@ github.com/pulumi/esc v0.10.0 h1:jzBKzkLVW0mePeanDRfqSQoCJ5yrkux0jIwAkUxpRKE=
 github.com/pulumi/esc v0.10.0/go.mod h1:2Bfa+FWj/xl8CKqRTWbWgDX0SOD4opdQgvYSURTGK2c=
 github.com/pulumi/inflector v0.1.1 h1:dvlxlWtXwOJTUUtcYDvwnl6Mpg33prhK+7mzeF+SobA=
 github.com/pulumi/inflector v0.1.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY=
-github.com/pulumi/pulumi/pkg/v3 v3.134.1 h1:iGKvaSHEoPCGBqDoIGQUXUm3qkrawfd513lL0I9vnNQ=
-github.com/pulumi/pulumi/pkg/v3 v3.134.1/go.mod h1:1iCee1QIwXYvkIQJ/HnBjsPsmYJ/arBPWX6hAao/Pro=
-github.com/pulumi/pulumi/sdk/v3 v3.134.1 h1:v1zd0d+B9gpUhsdJ483YUMHwHXqDvXvZ+mh/A4HhPWg=
-github.com/pulumi/pulumi/sdk/v3 v3.134.1/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
+github.com/pulumi/pulumi/pkg/v3 v3.135.0 h1:f4pBtLUf9+fa0+vVmLB4Mkdlh1KboXEt7h3pkF1seVs=
+github.com/pulumi/pulumi/pkg/v3 v3.135.0/go.mod h1:6RkK4xeCtl54+PljZFwLASs6TADOE+IMofX0wj1SocY=
+github.com/pulumi/pulumi/sdk/v3 v3.135.0 h1:oBP7QsmZv6uUf3eJ9j6av0nrZpipV9IguNu6rVpHlFU=
+github.com/pulumi/pulumi/sdk/v3 v3.135.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
 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=

diff --git a/schemagen/pkg/gen/schema.go b/schemagen/pkg/gen/schema.go
@@ -79,7 +79,6 @@ func GenerateSchema(packageDir string) schema.PackageSpec {
 			"nodejs": rawMessage(map[string]interface{}{
 				"dependencies": map[string]string{
 					"@aws-sdk/client-ecs": "^3.405.0",
-					"@pulumi/pulumi":      "^3.0.0",
 					"@pulumi/aws":         "^" + dependencies.Aws,
 					"@pulumi/docker":      "^" + dependencies.Docker,
 					"docker-classic":      "npm:@pulumi/[email protected]",
@@ -96,7 +95,6 @@ func GenerateSchema(packageDir string) schema.PackageSpec {
 			}),
 			"python": rawMessage(map[string]interface{}{
 				"requires": map[string]string{
-					"pulumi":        ">=3.91.1,<4.0.0",
 					"pulumi-aws":    ">=6.0.4,<7.0.0",
 					"pulumi-docker": fmt.Sprintf(">=%s,<5.0.0", dependencies.Docker),
 				},

diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json
@@ -18,7 +18,7 @@
         "@aws-sdk/client-ecs": "^3.405.0",
         "@pulumi/aws": "^6.47.0",
         "@pulumi/docker": "^4.5.1",
-        "@pulumi/pulumi": "^3.0.0",
+        "@pulumi/pulumi": "^3.134.1",
         "@types/aws-lambda": "^8.10.23",
         "aws-sdk": "^2.1450.0",
         "docker-classic": "npm:@pulumi/[email protected]",

diff --git a/sdk/python/pulumi_awsx/_utilities.py b/sdk/python/pulumi_awsx/_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/pyproject.toml b/sdk/python/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
   name = "pulumi_awsx"
   description = "Pulumi Amazon Web Services (AWS) AWSX Components."
-  dependencies = ["parver>=0.2.1", "pulumi>=3.91.1,<4.0.0", "pulumi-aws>=6.0.4,<7.0.0", "pulumi-docker>=4.5.1,<5.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""]
+  dependencies = ["parver>=0.2.1", "pulumi>=3.134.1,<4.0.0", "pulumi-aws>=6.0.4,<7.0.0", "pulumi-docker>=4.5.1,<5.0.0", "semver>=2.8.1", "typing-extensions>=4.11; python_version < \"3.11\""]
   keywords = ["pulumi", "aws", "awsx", "kind/component", "category/cloud"]
   readme = "README.md"
   requires-python = ">=3.8"