diff --git a/go.mod b/go.mod index 948b7953f..7bb4ed8ce 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/coocood/freecache v1.2.4 github.com/pulumi/pulumi-command/sdk v0.11.1 - github.com/pulumi/pulumi-random/sdk/v4 v4.16.1 + github.com/pulumi/pulumi-random/sdk/v4 v4.16.2 github.com/pulumi/pulumi/sdk/v3 v3.116.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 diff --git a/go.sum b/go.sum index a1adbc7a7..5ec8092ab 100644 --- a/go.sum +++ b/go.sum @@ -240,8 +240,8 @@ github.com/pulumi/pulumi-azure-native-sdk/v2 v2.42.1 h1:u11UBY/uHUbNDPYyQF6MuDtT github.com/pulumi/pulumi-azure-native-sdk/v2 v2.42.1/go.mod h1:sXtxcyIW/V67zIwmGEZJ5F61EO/S6+1lH8c7zUYNhVA= github.com/pulumi/pulumi-command/sdk v0.11.1 h1:5LCte8TvYlnOfD2Cn6Xm7ZA1fRtT74XAP0QvCPFpIcA= github.com/pulumi/pulumi-command/sdk v0.11.1/go.mod h1:NfMh7+awKDW3r8Z91JkAN4/lRPsXcCsMqGID0YJHjkk= -github.com/pulumi/pulumi-random/sdk/v4 v4.16.1 h1:CJ/NbT1CRNQzuv0RohCj0Qe1+zDx/2fuggbhTqz66Do= -github.com/pulumi/pulumi-random/sdk/v4 v4.16.1/go.mod h1:NJz7V1cIIbCrUlbZD/TkBUa6wqkCpVxONYVkCHBKkR0= +github.com/pulumi/pulumi-random/sdk/v4 v4.16.2 h1:5el+INHB9exKLbuQMaz1OEmnasU1A6/GoOMFHCveXb8= +github.com/pulumi/pulumi-random/sdk/v4 v4.16.2/go.mod h1:FuKLicnDYepG3W/tGmqCYkgdML5GK9RE/Ti984E/Tq8= github.com/pulumi/pulumi-tls/sdk/v5 v5.0.3 h1:kbdrJVO1PczQakfZZ2Ke2P5G4jlPgTw2geGHR2+7zYc= github.com/pulumi/pulumi-tls/sdk/v5 v5.0.3/go.mod h1:onWsBMCIYPEHfGAQ24FRZ67JtJDkuUQQLd9zp5MDoTM= github.com/pulumi/pulumi/sdk/v3 v3.116.1 h1:P/bIDPQYy1UJogLeV/zY+bG4iTZgEEJLlwyUYEW3NPc= diff --git a/oci/Containerfile b/oci/Containerfile index 0173ac69a..3a4663ee4 100644 --- a/oci/Containerfile +++ b/oci/Containerfile @@ -43,7 +43,7 @@ ARG PULUMI_COMMAND_VERSION=v0.11.1 # renovate: datasource=github-releases depName=pulumi/pulumi-tls ARG PULUMI_TLS_VERSION=v5.0.3 # renovate: datasource=github-releases depName=pulumi/pulumi-random -ARG PULUMI_RANDOM_VERSION=v4.16.1 +ARG PULUMI_RANDOM_VERSION=v4.16.2 RUN curl ${AWS_CLI_URL} -o awscliv2.zip \ && dnf install -y unzip \ diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiUtilities.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiUtilities.go index a1057e6c9..e8ea5590a 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiUtilities.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiUtilities.go @@ -165,7 +165,7 @@ func callPlainInner( func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { defaults := []pulumi.ResourceOption{} - version := SdkVersion + version := semver.MustParse("4.16.2") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } @@ -176,7 +176,7 @@ func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOptio func PkgInvokeDefaultOpts(opts []pulumi.InvokeOption) []pulumi.InvokeOption { defaults := []pulumi.InvokeOption{} - version := SdkVersion + version := semver.MustParse("4.16.2") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/pulumi-plugin.json b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/pulumi-plugin.json index d5b66d564..6fd6453bb 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/pulumi-plugin.json +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/pulumi-plugin.json @@ -1,4 +1,5 @@ { "resource": true, - "name": "random" + "name": "random", + "version": "4.16.2" } diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomBytes.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomBytes.go index 3840a6b80..96e7bc50a 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomBytes.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomBytes.go @@ -18,13 +18,12 @@ import ( // // ## Example Usage // -// // ```go // package main // // import ( // -// "github.com/pulumi/pulumi-azure/sdk/v5/go/azure/keyvault" +// "github.com/pulumi/pulumi-azurerm/sdk/v1/go/azurerm" // "github.com/pulumi/pulumi-random/sdk/v4/go/random" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -32,15 +31,16 @@ import ( // // func main() { // pulumi.Run(func(ctx *pulumi.Context) error { -// jwtSecretRandomBytes, err := random.NewRandomBytes(ctx, "jwtSecretRandomBytes", &random.RandomBytesArgs{ +// jwtSecret, err := random.NewRandomBytes(ctx, "jwt_secret", &random.RandomBytesArgs{ // Length: pulumi.Int(64), // }) // if err != nil { // return err // } -// _, err = keyvault.NewSecret(ctx, "jwtSecretSecret", &keyvault.SecretArgs{ -// KeyVaultId: pulumi.String("some-azure-key-vault-id"), -// Value: jwtSecretRandomBytes.Base64, +// _, err = index.NewKeyVaultSecret(ctx, "jwt_secret", &index.KeyVaultSecretArgs{ +// KeyVaultId: "some-azure-key-vault-id", +// Name: "JwtSecret", +// Value: jwtSecret.Base64, // }) // if err != nil { // return err @@ -50,7 +50,6 @@ import ( // } // // ``` -// // // ## Import // diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomId.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomId.go index eb056bdc0..c3ce48db8 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomId.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomId.go @@ -29,7 +29,6 @@ import ( // // ## Example Usage // -// // ```go // package main // @@ -37,7 +36,7 @@ import ( // // "fmt" // -// "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/ec2" +// "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2" // "github.com/pulumi/pulumi-random/sdk/v4/go/random" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -47,22 +46,22 @@ import ( // pulumi.Run(func(ctx *pulumi.Context) error { // // The following example shows how to generate a unique name for an AWS EC2 // // instance that changes each time a new AMI id is selected. -// serverRandomId, err := random.NewRandomId(ctx, "serverRandomId", &random.RandomIdArgs{ +// server, err := random.NewRandomId(ctx, "server", &random.RandomIdArgs{ // Keepers: pulumi.StringMap{ -// "ami_id": pulumi.Any(_var.Ami_id), +// "ami_id": pulumi.Any(amiId), // }, // ByteLength: pulumi.Int(8), // }) // if err != nil { // return err // } -// _, err = ec2.NewInstance(ctx, "serverInstance", &ec2.InstanceArgs{ +// _, err = ec2.NewInstance(ctx, "server", &ec2.InstanceArgs{ // Tags: pulumi.StringMap{ -// "Name": serverRandomId.Hex.ApplyT(func(hex string) (string, error) { +// "Name": server.Hex.ApplyT(func(hex string) (string, error) { // return fmt.Sprintf("web-server %v", hex), nil // }).(pulumi.StringOutput), // }, -// Ami: serverRandomId.Keepers.ApplyT(func(keepers interface{}) (*string, error) { +// Ami: server.Keepers.ApplyT(func(keepers interface{}) (*string, error) { // return &keepers.AmiId, nil // }).(pulumi.StringPtrOutput), // }) @@ -74,7 +73,6 @@ import ( // } // // ``` -// // // ## Import // diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomInteger.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomInteger.go index c6b61d200..56aaf6c7b 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomInteger.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomInteger.go @@ -18,13 +18,12 @@ import ( // // ## Example Usage // -// // ```go // package main // // import ( // -// "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/alb" +// "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/alb" // "github.com/pulumi/pulumi-random/sdk/v4/go/random" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -38,7 +37,7 @@ import ( // Min: pulumi.Int(1), // Max: pulumi.Int(50000), // Keepers: pulumi.StringMap{ -// "listener_arn": pulumi.Any(_var.Listener_arn), +// "listener_arn": pulumi.Any(listenerArn), // }, // }) // if err != nil { @@ -52,7 +51,7 @@ import ( // Actions: alb.ListenerRuleActionArray{ // &alb.ListenerRuleActionArgs{ // Type: pulumi.String("forward"), -// TargetGroupArn: pulumi.Any(_var.Target_group_arn), +// TargetGroupArn: pulumi.Any(targetGroupArn), // }, // }, // }) @@ -64,7 +63,6 @@ import ( // } // // ``` -// // // ## Import // diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPassword.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPassword.go index fd05ccde9..8c04a4dc6 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPassword.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPassword.go @@ -18,13 +18,12 @@ import ( // // ## Example Usage // -// // ```go // package main // // import ( // -// "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/rds" +// "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/rds" // "github.com/pulumi/pulumi-random/sdk/v4/go/random" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -55,7 +54,6 @@ import ( // } // // ``` -// // // ## Import // diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPet.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPet.go index a0e2a0c91..81f469a1e 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPet.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomPet.go @@ -17,7 +17,6 @@ import ( // // ## Example Usage // -// // ```go // package main // @@ -25,7 +24,7 @@ import ( // // "fmt" // -// "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/ec2" +// "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2" // "github.com/pulumi/pulumi-random/sdk/v4/go/random" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -36,21 +35,21 @@ import ( // // The following example shows how to generate a unique pet name // // for an AWS EC2 instance that changes each time a new AMI id is // // selected. -// serverRandomPet, err := random.NewRandomPet(ctx, "serverRandomPet", &random.RandomPetArgs{ +// server, err := random.NewRandomPet(ctx, "server", &random.RandomPetArgs{ // Keepers: pulumi.StringMap{ -// "ami_id": pulumi.Any(_var.Ami_id), +// "ami_id": pulumi.Any(amiId), // }, // }) // if err != nil { // return err // } -// _, err = ec2.NewInstance(ctx, "serverInstance", &ec2.InstanceArgs{ +// _, err = ec2.NewInstance(ctx, "server", &ec2.InstanceArgs{ // Tags: pulumi.StringMap{ -// "Name": serverRandomPet.ID().ApplyT(func(id string) (string, error) { +// "Name": server.ID().ApplyT(func(id string) (string, error) { // return fmt.Sprintf("web-server-%v", id), nil // }).(pulumi.StringOutput), // }, -// Ami: serverRandomPet.Keepers.ApplyT(func(keepers interface{}) (*string, error) { +// Ami: server.Keepers.ApplyT(func(keepers interface{}) (*string, error) { // return &keepers.AmiId, nil // }).(pulumi.StringPtrOutput), // }) @@ -62,7 +61,6 @@ import ( // } // // ``` -// type RandomPet struct { pulumi.CustomResourceState diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomShuffle.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomShuffle.go index e7867aca3..4b2defef7 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomShuffle.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomShuffle.go @@ -16,13 +16,12 @@ import ( // // ## Example Usage // -// // ```go // package main // // import ( // -// "github.com/pulumi/pulumi-aws/sdk/v5/go/aws/elb" +// "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/elb" // "github.com/pulumi/pulumi-random/sdk/v4/go/random" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -53,7 +52,6 @@ import ( // } // // ``` -// type RandomShuffle struct { pulumi.CustomResourceState @@ -63,7 +61,7 @@ type RandomShuffle struct { Keepers pulumi.StringMapOutput `pulumi:"keepers"` // The number of results to return. Defaults to the number of items in the `input` list. If fewer items are requested, some elements will be excluded from the result. If more items are requested, items will be repeated in the result but not more frequently than the number of items in the input list. ResultCount pulumi.IntPtrOutput `pulumi:"resultCount"` - // Random permutation of the list of strings given in `input`. The number of elements is determined by `result_count` if + // Random permutation of the list of strings given in `input`. The number of elements is determined by `resultCount` if // set, or the number of elements in `input`. Results pulumi.StringArrayOutput `pulumi:"results"` // Arbitrary string with which to seed the random number generator, in order to produce less-volatile permutations of the list. @@ -109,7 +107,7 @@ type randomShuffleState struct { Keepers map[string]string `pulumi:"keepers"` // The number of results to return. Defaults to the number of items in the `input` list. If fewer items are requested, some elements will be excluded from the result. If more items are requested, items will be repeated in the result but not more frequently than the number of items in the input list. ResultCount *int `pulumi:"resultCount"` - // Random permutation of the list of strings given in `input`. The number of elements is determined by `result_count` if + // Random permutation of the list of strings given in `input`. The number of elements is determined by `resultCount` if // set, or the number of elements in `input`. Results []string `pulumi:"results"` // Arbitrary string with which to seed the random number generator, in order to produce less-volatile permutations of the list. @@ -123,7 +121,7 @@ type RandomShuffleState struct { Keepers pulumi.StringMapInput // The number of results to return. Defaults to the number of items in the `input` list. If fewer items are requested, some elements will be excluded from the result. If more items are requested, items will be repeated in the result but not more frequently than the number of items in the input list. ResultCount pulumi.IntPtrInput - // Random permutation of the list of strings given in `input`. The number of elements is determined by `result_count` if + // Random permutation of the list of strings given in `input`. The number of elements is determined by `resultCount` if // set, or the number of elements in `input`. Results pulumi.StringArrayInput // Arbitrary string with which to seed the random number generator, in order to produce less-volatile permutations of the list. @@ -259,7 +257,7 @@ func (o RandomShuffleOutput) ResultCount() pulumi.IntPtrOutput { return o.ApplyT(func(v *RandomShuffle) pulumi.IntPtrOutput { return v.ResultCount }).(pulumi.IntPtrOutput) } -// Random permutation of the list of strings given in `input`. The number of elements is determined by `result_count` if +// Random permutation of the list of strings given in `input`. The number of elements is determined by `resultCount` if // set, or the number of elements in `input`. func (o RandomShuffleOutput) Results() pulumi.StringArrayOutput { return o.ApplyT(func(v *RandomShuffle) pulumi.StringArrayOutput { return v.Results }).(pulumi.StringArrayOutput) diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomString.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomString.go index 3ab5f834e..353fd1c80 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomString.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomString.go @@ -20,7 +20,6 @@ import ( // // ## Example Usage // -// // ```go // package main // @@ -35,8 +34,8 @@ import ( // pulumi.Run(func(ctx *pulumi.Context) error { // _, err := random.NewRandomString(ctx, "random", &random.RandomStringArgs{ // Length: pulumi.Int(16), -// OverrideSpecial: pulumi.String("/@£$"), // Special: pulumi.Bool(true), +// OverrideSpecial: pulumi.String("/@£$"), // }) // if err != nil { // return err @@ -46,7 +45,6 @@ import ( // } // // ``` -// // // ## Import // diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomUuid.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomUuid.go index 9ffea6a57..2b5917f18 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomUuid.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/randomUuid.go @@ -13,13 +13,14 @@ import ( // ## Example Usage // -// // ```go // package main // // import ( // -// "github.com/pulumi/pulumi-azure/sdk/v5/go/azure/core" +// "fmt" +// +// "github.com/pulumi/pulumi-azurerm/sdk/v1/go/azurerm" // "github.com/pulumi/pulumi-random/sdk/v4/go/random" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -27,12 +28,14 @@ import ( // // func main() { // pulumi.Run(func(ctx *pulumi.Context) error { -// _, err := random.NewRandomUuid(ctx, "testRandomUuid", nil) +// // The following example shows how to generate a unique name for an Azure Resource Group. +// test, err := random.NewRandomUuid(ctx, "test", nil) // if err != nil { // return err // } -// _, err = core.NewResourceGroup(ctx, "testResourceGroup", &core.ResourceGroupArgs{ -// Location: pulumi.String("Central US"), +// _, err = index.NewResourceGroup(ctx, "test", &index.ResourceGroupArgs{ +// Name: pulumi.String(fmt.Sprintf("%v-rg", test.Result)), +// Location: "Central US", // }) // if err != nil { // return err @@ -42,7 +45,6 @@ import ( // } // // ``` -// // // ## Import // diff --git a/vendor/modules.txt b/vendor/modules.txt index f059e19cb..375e14523 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -499,7 +499,7 @@ github.com/pulumi/pulumi-azure-native-sdk/v2/utilities ## explicit; go 1.21 github.com/pulumi/pulumi-command/sdk/go/command/internal github.com/pulumi/pulumi-command/sdk/go/command/remote -# github.com/pulumi/pulumi-random/sdk/v4 v4.16.1 +# github.com/pulumi/pulumi-random/sdk/v4 v4.16.2 ## explicit; go 1.21 github.com/pulumi/pulumi-random/sdk/v4/go/random github.com/pulumi/pulumi-random/sdk/v4/go/random/internal