From 4d33e5b0b3a0b2fe383c840f06cb0a2b32702531 Mon Sep 17 00:00:00 2001 From: pulumi-bot Date: Mon, 3 Feb 2025 17:21:53 +0000 Subject: [PATCH] make build_sdks --- .../appservice/slotVirtualNetworkSwiftConnection.go | 2 +- sdk/go/azure/backup/protectedFileShare.go | 2 +- sdk/go/azure/compute/diskEncryptionSet.go | 4 ++-- sdk/go/azure/machinelearning/workspace.go | 12 ++++++------ sdk/go/azure/network/virtualNetworkPeering.go | 8 ++++---- sdk/go/azure/siterecovery/replicatedVM.go | 4 ++-- sdk/go/azure/siterecovery/replicationRecoveryPlan.go | 6 +++--- sdk/java/build.gradle | 2 +- sdk/nodejs/authorization/getRoleDefinition.ts | 4 ++-- sdk/nodejs/lb/backendAddressPoolAddress.ts | 2 +- sdk/nodejs/role/getRoleDefinition.ts | 4 ++-- sdk/python/pulumi_azure/_utilities.py | 12 ++++++++---- 12 files changed, 33 insertions(+), 29 deletions(-) diff --git a/sdk/go/azure/appservice/slotVirtualNetworkSwiftConnection.go b/sdk/go/azure/appservice/slotVirtualNetworkSwiftConnection.go index a9a5e47f3e..69dc388036 100644 --- a/sdk/go/azure/appservice/slotVirtualNetworkSwiftConnection.go +++ b/sdk/go/azure/appservice/slotVirtualNetworkSwiftConnection.go @@ -91,7 +91,7 @@ import ( // if err != nil { // return err // } -// _, err = appservice.NewSlot(ctx, "example-staging", &appservice.SlotArgs{ +// example_staging, err := appservice.NewSlot(ctx, "example-staging", &appservice.SlotArgs{ // Name: pulumi.String("staging"), // AppServiceName: exampleAppService.Name, // Location: example.Location, diff --git a/sdk/go/azure/backup/protectedFileShare.go b/sdk/go/azure/backup/protectedFileShare.go index 3aa944fa3d..0d572d2df4 100644 --- a/sdk/go/azure/backup/protectedFileShare.go +++ b/sdk/go/azure/backup/protectedFileShare.go @@ -65,7 +65,7 @@ import ( // if err != nil { // return err // } -// _, err = backup.NewContainerStorageAccount(ctx, "protection-container", &backup.ContainerStorageAccountArgs{ +// protection_container, err := backup.NewContainerStorageAccount(ctx, "protection-container", &backup.ContainerStorageAccountArgs{ // ResourceGroupName: example.Name, // RecoveryVaultName: vault.Name, // StorageAccountId: sa.ID(), diff --git a/sdk/go/azure/compute/diskEncryptionSet.go b/sdk/go/azure/compute/diskEncryptionSet.go index ff2ad47fca..a1318751cc 100644 --- a/sdk/go/azure/compute/diskEncryptionSet.go +++ b/sdk/go/azure/compute/diskEncryptionSet.go @@ -56,7 +56,7 @@ import ( // if err != nil { // return err // } -// _, err = keyvault.NewAccessPolicy(ctx, "example-user", &keyvault.AccessPolicyArgs{ +// example_user, err := keyvault.NewAccessPolicy(ctx, "example-user", &keyvault.AccessPolicyArgs{ // KeyVaultId: exampleKeyVault.ID(), // TenantId: pulumi.String(current.TenantId), // ObjectId: pulumi.String(current.ObjectId), @@ -186,7 +186,7 @@ import ( // if err != nil { // return err // } -// _, err = keyvault.NewAccessPolicy(ctx, "example-user", &keyvault.AccessPolicyArgs{ +// example_user, err := keyvault.NewAccessPolicy(ctx, "example-user", &keyvault.AccessPolicyArgs{ // KeyVaultId: exampleKeyVault.ID(), // TenantId: pulumi.String(current.TenantId), // ObjectId: pulumi.String(current.ObjectId), diff --git a/sdk/go/azure/machinelearning/workspace.go b/sdk/go/azure/machinelearning/workspace.go index 854c07fc89..35483beb64 100644 --- a/sdk/go/azure/machinelearning/workspace.go +++ b/sdk/go/azure/machinelearning/workspace.go @@ -304,7 +304,7 @@ import ( // if err != nil { // return err // } -// _, err = keyvault.NewAccessPolicy(ctx, "example-sp", &keyvault.AccessPolicyArgs{ +// example_sp, err := keyvault.NewAccessPolicy(ctx, "example-sp", &keyvault.AccessPolicyArgs{ // KeyVaultId: exampleKeyVault.ID(), // TenantId: pulumi.String(current.TenantId), // ObjectId: pulumi.String(current.ObjectId), @@ -326,7 +326,7 @@ import ( // if err != nil { // return err // } -// _, err = keyvault.NewAccessPolicy(ctx, "example-cosmosdb", &keyvault.AccessPolicyArgs{ +// example_cosmosdb, err := keyvault.NewAccessPolicy(ctx, "example-cosmosdb", &keyvault.AccessPolicyArgs{ // KeyVaultId: exampleKeyVault.ID(), // TenantId: pulumi.String(current.TenantId), // ObjectId: pulumi.String(test.ObjectId), @@ -363,7 +363,7 @@ import ( // if err != nil { // return err // } -// _, err = authorization.NewAssignment(ctx, "example-role1", &authorization.AssignmentArgs{ +// example_role1, err := authorization.NewAssignment(ctx, "example-role1", &authorization.AssignmentArgs{ // Scope: exampleKeyVault.ID(), // RoleDefinitionName: pulumi.String("Contributor"), // PrincipalId: exampleUserAssignedIdentity.PrincipalId, @@ -371,7 +371,7 @@ import ( // if err != nil { // return err // } -// _, err = authorization.NewAssignment(ctx, "example-role2", &authorization.AssignmentArgs{ +// example_role2, err := authorization.NewAssignment(ctx, "example-role2", &authorization.AssignmentArgs{ // Scope: exampleAccount.ID(), // RoleDefinitionName: pulumi.String("Storage Blob Data Contributor"), // PrincipalId: exampleUserAssignedIdentity.PrincipalId, @@ -379,7 +379,7 @@ import ( // if err != nil { // return err // } -// _, err = authorization.NewAssignment(ctx, "example-role3", &authorization.AssignmentArgs{ +// example_role3, err := authorization.NewAssignment(ctx, "example-role3", &authorization.AssignmentArgs{ // Scope: exampleAccount.ID(), // RoleDefinitionName: pulumi.String("Contributor"), // PrincipalId: exampleUserAssignedIdentity.PrincipalId, @@ -387,7 +387,7 @@ import ( // if err != nil { // return err // } -// _, err = authorization.NewAssignment(ctx, "example-role4", &authorization.AssignmentArgs{ +// example_role4, err := authorization.NewAssignment(ctx, "example-role4", &authorization.AssignmentArgs{ // Scope: exampleInsights.ID(), // RoleDefinitionName: pulumi.String("Contributor"), // PrincipalId: exampleUserAssignedIdentity.PrincipalId, diff --git a/sdk/go/azure/network/virtualNetworkPeering.go b/sdk/go/azure/network/virtualNetworkPeering.go index 799b62784a..a96d782832 100644 --- a/sdk/go/azure/network/virtualNetworkPeering.go +++ b/sdk/go/azure/network/virtualNetworkPeering.go @@ -37,7 +37,7 @@ import ( // if err != nil { // return err // } -// _, err = network.NewVirtualNetwork(ctx, "example-1", &network.VirtualNetworkArgs{ +// example_1, err := network.NewVirtualNetwork(ctx, "example-1", &network.VirtualNetworkArgs{ // Name: pulumi.String("peternetwork1"), // ResourceGroupName: example.Name, // AddressSpaces: pulumi.StringArray{ @@ -48,7 +48,7 @@ import ( // if err != nil { // return err // } -// _, err = network.NewVirtualNetwork(ctx, "example-2", &network.VirtualNetworkArgs{ +// example_2, err := network.NewVirtualNetwork(ctx, "example-2", &network.VirtualNetworkArgs{ // Name: pulumi.String("peternetwork2"), // ResourceGroupName: example.Name, // AddressSpaces: pulumi.StringArray{ @@ -106,7 +106,7 @@ import ( // if err != nil { // return err // } -// _, err = network.NewVirtualNetwork(ctx, "example-1", &network.VirtualNetworkArgs{ +// example_1, err := network.NewVirtualNetwork(ctx, "example-1", &network.VirtualNetworkArgs{ // Name: pulumi.String("peternetwork1"), // ResourceGroupName: example.Name, // AddressSpaces: pulumi.StringArray{ @@ -117,7 +117,7 @@ import ( // if err != nil { // return err // } -// _, err = network.NewVirtualNetwork(ctx, "example-2", &network.VirtualNetworkArgs{ +// example_2, err := network.NewVirtualNetwork(ctx, "example-2", &network.VirtualNetworkArgs{ // Name: pulumi.String("peternetwork2"), // ResourceGroupName: example.Name, // AddressSpaces: pulumi.StringArray{ diff --git a/sdk/go/azure/siterecovery/replicatedVM.go b/sdk/go/azure/siterecovery/replicatedVM.go index 370297474b..ef780f511b 100644 --- a/sdk/go/azure/siterecovery/replicatedVM.go +++ b/sdk/go/azure/siterecovery/replicatedVM.go @@ -183,7 +183,7 @@ import ( // if err != nil { // return err // } -// _, err = siterecovery.NewProtectionContainerMapping(ctx, "container-mapping", &siterecovery.ProtectionContainerMappingArgs{ +// container_mapping, err := siterecovery.NewProtectionContainerMapping(ctx, "container-mapping", &siterecovery.ProtectionContainerMappingArgs{ // Name: pulumi.String("container-mapping"), // ResourceGroupName: secondary.Name, // RecoveryVaultName: vault.Name, @@ -206,7 +206,7 @@ import ( // if err != nil { // return err // } -// _, err = siterecovery.NewNetworkMapping(ctx, "network-mapping", &siterecovery.NetworkMappingArgs{ +// network_mapping, err := siterecovery.NewNetworkMapping(ctx, "network-mapping", &siterecovery.NetworkMappingArgs{ // Name: pulumi.String("network-mapping"), // ResourceGroupName: secondary.Name, // RecoveryVaultName: vault.Name, diff --git a/sdk/go/azure/siterecovery/replicationRecoveryPlan.go b/sdk/go/azure/siterecovery/replicationRecoveryPlan.go index e3e5efcced..a54a7116ff 100644 --- a/sdk/go/azure/siterecovery/replicationRecoveryPlan.go +++ b/sdk/go/azure/siterecovery/replicationRecoveryPlan.go @@ -183,7 +183,7 @@ import ( // if err != nil { // return err // } -// _, err = siterecovery.NewProtectionContainerMapping(ctx, "container-mapping", &siterecovery.ProtectionContainerMappingArgs{ +// container_mapping, err := siterecovery.NewProtectionContainerMapping(ctx, "container-mapping", &siterecovery.ProtectionContainerMappingArgs{ // Name: pulumi.String("container-mapping"), // ResourceGroupName: secondary.Name, // RecoveryVaultName: vault.Name, @@ -206,7 +206,7 @@ import ( // if err != nil { // return err // } -// _, err = siterecovery.NewNetworkMapping(ctx, "network-mapping", &siterecovery.NetworkMappingArgs{ +// network_mapping, err := siterecovery.NewNetworkMapping(ctx, "network-mapping", &siterecovery.NetworkMappingArgs{ // Name: pulumi.String("network-mapping"), // ResourceGroupName: secondary.Name, // RecoveryVaultName: vault.Name, @@ -249,7 +249,7 @@ import ( // if err != nil { // return err // } -// _, err = siterecovery.NewReplicatedVM(ctx, "vm-replication", &siterecovery.ReplicatedVMArgs{ +// vm_replication, err := siterecovery.NewReplicatedVM(ctx, "vm-replication", &siterecovery.ReplicatedVMArgs{ // Name: pulumi.String("vm-replication"), // ResourceGroupName: secondary.Name, // RecoveryVaultName: vault.Name, diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index 13104cb36a..6ce5bdfb5d 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/nodejs/authorization/getRoleDefinition.ts b/sdk/nodejs/authorization/getRoleDefinition.ts index 78d897bff6..e702cb019b 100644 --- a/sdk/nodejs/authorization/getRoleDefinition.ts +++ b/sdk/nodejs/authorization/getRoleDefinition.ts @@ -25,7 +25,7 @@ import * as utilities from "../utilities"; * roleDefinitionId: roleDefinitionId, * scope: primary.id, * })); - * const custom-byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ + * const custom_byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ * name: name, * scope: primary.id, * })); @@ -115,7 +115,7 @@ export interface GetRoleDefinitionResult { * roleDefinitionId: roleDefinitionId, * scope: primary.id, * })); - * const custom-byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ + * const custom_byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ * name: name, * scope: primary.id, * })); diff --git a/sdk/nodejs/lb/backendAddressPoolAddress.ts b/sdk/nodejs/lb/backendAddressPoolAddress.ts index dcd0875d26..dff1c56283 100644 --- a/sdk/nodejs/lb/backendAddressPoolAddress.ts +++ b/sdk/nodejs/lb/backendAddressPoolAddress.ts @@ -35,7 +35,7 @@ import * as utilities from "../utilities"; * virtualNetworkId: example.then(example => example.id), * ipAddress: "10.0.0.1", * }); - * const backend-pool-cr = exampleGetLB.then(exampleGetLB => azure.lb.getBackendAddressPool({ + * const backend_pool_cr = exampleGetLB.then(exampleGetLB => azure.lb.getBackendAddressPool({ * name: "globalLBBackendPool", * loadbalancerId: exampleGetLB.id, * })); diff --git a/sdk/nodejs/role/getRoleDefinition.ts b/sdk/nodejs/role/getRoleDefinition.ts index 72c5d374cf..74422be241 100644 --- a/sdk/nodejs/role/getRoleDefinition.ts +++ b/sdk/nodejs/role/getRoleDefinition.ts @@ -25,7 +25,7 @@ import * as utilities from "../utilities"; * roleDefinitionId: roleDefinitionId, * scope: primary.id, * })); - * const custom-byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ + * const custom_byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ * name: name, * scope: primary.id, * })); @@ -117,7 +117,7 @@ export interface GetRoleDefinitionResult { * roleDefinitionId: roleDefinitionId, * scope: primary.id, * })); - * const custom-byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ + * const custom_byname = pulumi.all([customRoleDefinition.name, primary]).apply(([name, primary]) => azure.authorization.getRoleDefinitionOutput({ * name: name, * scope: primary.id, * })); diff --git a/sdk/python/pulumi_azure/_utilities.py b/sdk/python/pulumi_azure/_utilities.py index 3ce408d5ff..56d3cfb87c 100644 --- a/sdk/python/pulumi_azure/_utilities.py +++ b/sdk/python/pulumi_azure/_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)