From 03a1234c72bbd8bc67dfa6694014d3b8cb4b2ae4 Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Tue, 4 Feb 2025 11:06:21 +0000 Subject: [PATCH 1/2] make tfgen --- .pulumi-java-gen.version | 2 +- examples/go.mod | 4 ++++ examples/go.sum | 8 ++++---- provider/go.mod | 4 ++++ provider/go.sum | 8 ++++---- sdk/go.mod | 4 ++++ sdk/go.sum | 4 ++-- 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version index afaf360d3..1cc5f657e 100644 --- a/.pulumi-java-gen.version +++ b/.pulumi-java-gen.version @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.1.0 \ No newline at end of file diff --git a/examples/go.mod b/examples/go.mod index c58f28f98..06f44122d 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -238,3 +238,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.147.1-0.20250204110054-ef37ccd6ccc6 + +replace github.com/pulumi/pulumi/sdk/v3 => github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 diff --git a/examples/go.sum b/examples/go.sum index f798055f3..323597f5e 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -762,10 +762,10 @@ github.com/pulumi/pulumi-terraform-bridge/v3 v3.102.0 h1:shzw3WluUr/TcK92njRDFxp github.com/pulumi/pulumi-terraform-bridge/v3 v3.102.0/go.mod h1:LwhiXOl9rpoRImUuDTfQQH2vTjL1JACnIFm/kWp1znU= github.com/pulumi/pulumi-yaml v1.12.0 h1:ThJP+EBqeJyCnS6w6/PwcEFOT5o112qv0lObhefmFCk= github.com/pulumi/pulumi-yaml v1.12.0/go.mod h1:EhZd1XDfuLa15O51qVVE16U6r8ldK9mLIBclqWCX27Y= -github.com/pulumi/pulumi/pkg/v3 v3.147.0 h1:aFzP2kXBL/nPPDao625xIkjAhqT5GKe3XfPXbG07oFA= -github.com/pulumi/pulumi/pkg/v3 v3.147.0/go.mod h1:WqLJy8lfzbGTEqz5Rukd+GrqBYNBf8Y3dJ+Wde+G6g4= -github.com/pulumi/pulumi/sdk/v3 v3.147.0 h1:8ZDZnEsCZa6shw1dwIDUssbYMooYyebhpmx5feuZCqM= -github.com/pulumi/pulumi/sdk/v3 v3.147.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA= +github.com/pulumi/pulumi/pkg/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 h1:Owln0Gvs3xRM4wiN8e7g2LMiyw8bB78MIicni1DqS6M= +github.com/pulumi/pulumi/pkg/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6/go.mod h1:WqLJy8lfzbGTEqz5Rukd+GrqBYNBf8Y3dJ+Wde+G6g4= +github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 h1:UDC+mokojDo66CQQltNMcbnYsHb8g3TBuxQJIpyeesA= +github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA= 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 7ff1cbd43..f07680439 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -241,3 +241,7 @@ require ( ) replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20250124205414-92ccb3765401 + +replace github.com/pulumi/pulumi/pkg/v3 => github.com/pulumi/pulumi/pkg/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 + +replace github.com/pulumi/pulumi/sdk/v3 => github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 diff --git a/provider/go.sum b/provider/go.sum index 86f41cbb6..a4a4af870 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -769,10 +769,10 @@ github.com/pulumi/pulumi-terraform-bridge/v3 v3.102.0 h1:shzw3WluUr/TcK92njRDFxp github.com/pulumi/pulumi-terraform-bridge/v3 v3.102.0/go.mod h1:LwhiXOl9rpoRImUuDTfQQH2vTjL1JACnIFm/kWp1znU= github.com/pulumi/pulumi-yaml v1.12.0 h1:ThJP+EBqeJyCnS6w6/PwcEFOT5o112qv0lObhefmFCk= github.com/pulumi/pulumi-yaml v1.12.0/go.mod h1:EhZd1XDfuLa15O51qVVE16U6r8ldK9mLIBclqWCX27Y= -github.com/pulumi/pulumi/pkg/v3 v3.147.0 h1:aFzP2kXBL/nPPDao625xIkjAhqT5GKe3XfPXbG07oFA= -github.com/pulumi/pulumi/pkg/v3 v3.147.0/go.mod h1:WqLJy8lfzbGTEqz5Rukd+GrqBYNBf8Y3dJ+Wde+G6g4= -github.com/pulumi/pulumi/sdk/v3 v3.147.0 h1:8ZDZnEsCZa6shw1dwIDUssbYMooYyebhpmx5feuZCqM= -github.com/pulumi/pulumi/sdk/v3 v3.147.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA= +github.com/pulumi/pulumi/pkg/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 h1:Owln0Gvs3xRM4wiN8e7g2LMiyw8bB78MIicni1DqS6M= +github.com/pulumi/pulumi/pkg/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6/go.mod h1:WqLJy8lfzbGTEqz5Rukd+GrqBYNBf8Y3dJ+Wde+G6g4= +github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 h1:UDC+mokojDo66CQQltNMcbnYsHb8g3TBuxQJIpyeesA= +github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA= 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 0d1b4fd75..d978e8026 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -91,3 +91,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.147.1-0.20250204110054-ef37ccd6ccc6 + +replace github.com/pulumi/pulumi/sdk/v3 => github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 diff --git a/sdk/go.sum b/sdk/go.sum index bb434e0f4..4cce27b71 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -148,8 +148,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.147.0 h1:8ZDZnEsCZa6shw1dwIDUssbYMooYyebhpmx5feuZCqM= -github.com/pulumi/pulumi/sdk/v3 v3.147.0/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA= +github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6 h1:UDC+mokojDo66CQQltNMcbnYsHb8g3TBuxQJIpyeesA= +github.com/pulumi/pulumi/sdk/v3 v3.147.1-0.20250204110054-ef37ccd6ccc6/go.mod h1:+WC9aIDo8fMgd2g0jCHuZU2S/VYNLRAZ3QXt6YVgwaA= 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 f5932778ce65d703052827af1d4b4af349f5d539 Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Tue, 4 Feb 2025 11:07:30 +0000 Subject: [PATCH 2/2] make build_sdks --- sdk/java/build.gradle | 2 +- sdk/python/pulumi_random/_utilities.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index 33a0b5110..a08799a9e 100644 --- a/sdk/java/build.gradle +++ b/sdk/java/build.gradle @@ -44,7 +44,7 @@ repositories { dependencies { implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.code.gson:gson:2.8.9") - implementation("com.pulumi:pulumi:1.0.0") + implementation("com.pulumi:pulumi:1.1.0") } task sourcesJar(type: Jar) { diff --git a/sdk/python/pulumi_random/_utilities.py b/sdk/python/pulumi_random/_utilities.py index 3ce408d5f..56d3cfb87 100644 --- a/sdk/python/pulumi_random/_utilities.py +++ b/sdk/python/pulumi_random/_utilities.py @@ -89,12 +89,16 @@ def _get_semver_version(): elif pep440_version.pre_tag == 'rc': prerelease = f"rc.{pep440_version.pre}" elif pep440_version.dev is not None: + # PEP440 has explicit support for dev builds, while semver encodes them as "prerelease" versions. To bridge + # between the two, we convert our dev build version into a prerelease tag. This matches what all of our other + # packages do when constructing their own semver string. prerelease = f"dev.{pep440_version.dev}" + elif pep440_version.local is not None: + # PEP440 only allows a small set of prerelease tags, so when converting an arbitrary prerelease, + # PypiVersion in /pkg/codegen/python/utilities.go converts it to a local version. Therefore, we need to + # do the reverse conversion here and set the local version as the prerelease tag. + prerelease = pep440_version.local - # The only significant difference between PEP440 and semver as it pertains to us is that PEP440 has explicit support - # for dev builds, while semver encodes them as "prerelease" versions. In order to bridge between the two, we convert - # our dev build version into a prerelease tag. This matches what all of our other packages do when constructing - # their own semver string. return SemverVersion(major=major, minor=minor, patch=patch, prerelease=prerelease)