From e23926fed7f87654be8a184a3ac853e1718586ae Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:24:59 -0800 Subject: [PATCH] Upgrade pulumi-terraform-bridge to v3.72.0 (#393) This PR was generated via `$ upgrade-provider pulumi/pulumi-vault --kind=bridge --pr-reviewers=t0yv0`. --- - Upgrading pulumi-terraform-bridge from v3.71.0 to v3.72.0. --- examples/go.mod | 4 ++-- examples/go.sum | 8 ++++---- .../cmd/pulumi-resource-vault/schema.json | 2 +- provider/go.mod | 8 ++++---- provider/go.sum | 20 +++++++++---------- sdk/dotnet/Managed/Keys.cs | 10 ++++++++++ sdk/go.mod | 2 +- sdk/go.sum | 4 ++-- sdk/go/vault/managed/keys.go | 10 ++++++++++ .../java/com/pulumi/vault/managed/Keys.java | 10 ++++++++++ sdk/nodejs/managed/keys.ts | 10 ++++++++++ sdk/python/pulumi_vault/managed/keys.py | 20 +++++++++++++++++++ 12 files changed, 84 insertions(+), 24 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 338263d0f..2b9a5190f 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -2,7 +2,7 @@ module github.com/pulumi/pulumi-vault/examples/v5 go 1.21 -require github.com/pulumi/pulumi/pkg/v3 v3.101.1 +require github.com/pulumi/pulumi/pkg/v3 v3.103.1 require ( cloud.google.com/go v0.110.4 // indirect @@ -138,7 +138,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect github.com/pulumi/esc v0.6.2 // indirect - github.com/pulumi/pulumi/sdk/v3 v3.101.1 // indirect + github.com/pulumi/pulumi/sdk/v3 v3.103.1 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index d0440ec20..cc5773922 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1459,10 +1459,10 @@ 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.6.2 h1:+z+l8cuwIauLSwXQS0uoI3rqB+YG4SzsZYtHfNoXBvw= github.com/pulumi/esc v0.6.2/go.mod h1:jNnYNjzsOgVTjCp0LL24NsCk8ZJxq4IoLQdCT0X7l8k= -github.com/pulumi/pulumi/pkg/v3 v3.101.1 h1:6+fm+wIE4A7sF93nl9t8MwoaBXjjHgFwk/8LCAJXI/s= -github.com/pulumi/pulumi/pkg/v3 v3.101.1/go.mod h1:zh7NVOEB/ncG51l1+EwlR0pQVLB7RSkzMamFMGcadH0= -github.com/pulumi/pulumi/sdk/v3 v3.101.1 h1:jBUGbLZjfeQkpheacnqXbuw/zSJEq11Gmond2EENkwQ= -github.com/pulumi/pulumi/sdk/v3 v3.101.1/go.mod h1:SB8P0BEGBRaONBxwoTjUFhGPLU5P3+MHF6/tGitlHOM= +github.com/pulumi/pulumi/pkg/v3 v3.103.1 h1:sxacPM2TyDSCufZkescZGnMR22t+REu9nhv68u9rLQ8= +github.com/pulumi/pulumi/pkg/v3 v3.103.1/go.mod h1:AotODpuSfN4XommpmMifBExNmucrnH84cbEhVOeqEQM= +github.com/pulumi/pulumi/sdk/v3 v3.103.1 h1:6o0zt5srgIjDsOI5JWNSwMqoB8vGiI3xow0RDZ3JX2c= +github.com/pulumi/pulumi/sdk/v3 v3.103.1/go.mod h1:Ml3rpGfyZlI4zQCG7LN2XDSmH4XUNYdyBwJ3yEr/OpI= github.com/rakyll/embedmd v0.0.0-20171029212350-c8060a0752a2/go.mod h1:7jOTMgqac46PZcF54q6l2hkLEG8op93fZu61KmxWDV4= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= diff --git a/provider/cmd/pulumi-resource-vault/schema.json b/provider/cmd/pulumi-resource-vault/schema.json index d749ef0f8..4bde71591 100644 --- a/provider/cmd/pulumi-resource-vault/schema.json +++ b/provider/cmd/pulumi-resource-vault/schema.json @@ -22163,7 +22163,7 @@ } }, "vault:managed/keys:Keys": { - "description": "\n\n\n## Import\n\nMounts can be imported using the `id` of `default`, e.g.\n\n```sh\n $ pulumi import vault:managed/keys:Keys keys default\n```\n ", + "description": "A resource that manages the lifecycle of all [Managed Keys](https://www.vaultproject.io/docs/enterprise/managed-keys) in Vault.\n\n**Note** this feature is available only with Vault Enterprise.\n\n## Caveats\n\nThis single resource handles the lifecycle of _all_ the managed keys that must be created in Vault.\nThere can only be one such resource in the TF state, and if there are already provisioned managed\nkeys in Vault, we recommend using `pulumi import` instead.\n\n\n## Import\n\nMounts can be imported using the `id` of `default`, e.g.\n\n```sh\n $ pulumi import vault:managed/keys:Keys keys default\n```\n ", "properties": { "aws": { "type": "array", diff --git a/provider/go.mod b/provider/go.mod index d1de92026..7445cc4cd 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -4,8 +4,8 @@ go 1.21.3 require ( github.com/hashicorp/terraform-provider-vault v0.0.0 - github.com/pulumi/pulumi-terraform-bridge/v3 v3.71.0 - github.com/pulumi/pulumi/sdk/v3 v3.101.1 + github.com/pulumi/pulumi-terraform-bridge/v3 v3.72.0 + github.com/pulumi/pulumi/sdk/v3 v3.103.1 ) require ( @@ -224,8 +224,8 @@ require ( github.com/pulumi/esc v0.6.2 // indirect github.com/pulumi/pulumi-java/pkg v0.9.9 // indirect github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7 // indirect - github.com/pulumi/pulumi-yaml v1.4.5 // indirect - github.com/pulumi/pulumi/pkg/v3 v3.101.1 // indirect + github.com/pulumi/pulumi-yaml v1.5.0 // indirect + github.com/pulumi/pulumi/pkg/v3 v3.103.1 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/pulumi/terraform-diff-reader v0.0.2 // indirect github.com/rivo/uniseg v0.4.4 // indirect diff --git a/provider/go.sum b/provider/go.sum index c556ea62e..7bd270400 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -2511,20 +2511,20 @@ 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.6.2 h1:+z+l8cuwIauLSwXQS0uoI3rqB+YG4SzsZYtHfNoXBvw= github.com/pulumi/esc v0.6.2/go.mod h1:jNnYNjzsOgVTjCp0LL24NsCk8ZJxq4IoLQdCT0X7l8k= +github.com/pulumi/providertest v0.0.10 h1:bx77G0JYPO2Alf/SHRP05XpAYMrboKJkMIVkbFclVhI= +github.com/pulumi/providertest v0.0.10/go.mod h1:HsxjVsytcMIuNj19w1lT2W0QXY0oReXl1+h6eD2JXP8= github.com/pulumi/pulumi-java/pkg v0.9.9 h1:F3xJUtMFDVrTGCxb7Rh2Q8s6tj7gMfM5pcoUthz7vFY= github.com/pulumi/pulumi-java/pkg v0.9.9/go.mod h1:LVF1zeg3UkToHWxb67V+zEIxQc3EdMnlot5NWSt+FpA= -github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc= -github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1/go.mod h1:7OeUPH8rpt5ipyj9EFcnXpuzQ8SHL0dyqdfa8nOacdk= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.71.0 h1:NXBrgVt/5KzEosqB5Tu2grLCUpyL6gYE4EdecqGjsz4= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.71.0/go.mod h1:tQ8A0LWPlu21YrCLZoQq4CQD3zvPSZcqkA/3yKYniN4= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.72.0 h1:xdGSxTC2fOZwRZ2iGLu+s0SF2lts2L7R84Y2c6ndweU= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.72.0/go.mod h1:Yzb9hyI9UxJ+chr4JjOVjwkNtS+uIcq6eiyQoZaliAA= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7 h1:Z9vmfVTW0QtJrWh+DRR3UKiRZX23f45lFtdhQiUHEqE= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7/go.mod h1:T9zHpTHyVz2EyobzByFFpjfqgGtXO4C4bNqC0j29D2I= -github.com/pulumi/pulumi-yaml v1.4.5 h1:uSSCKYgbSxhJs3RJYEty5JsZOJFEIE0x8w38VyeSkNs= -github.com/pulumi/pulumi-yaml v1.4.5/go.mod h1:wEZjuwid6ZF8aWwLPQSG3h+1NpWGat87oHOKSHSN+eM= -github.com/pulumi/pulumi/pkg/v3 v3.101.1 h1:6+fm+wIE4A7sF93nl9t8MwoaBXjjHgFwk/8LCAJXI/s= -github.com/pulumi/pulumi/pkg/v3 v3.101.1/go.mod h1:zh7NVOEB/ncG51l1+EwlR0pQVLB7RSkzMamFMGcadH0= -github.com/pulumi/pulumi/sdk/v3 v3.101.1 h1:jBUGbLZjfeQkpheacnqXbuw/zSJEq11Gmond2EENkwQ= -github.com/pulumi/pulumi/sdk/v3 v3.101.1/go.mod h1:SB8P0BEGBRaONBxwoTjUFhGPLU5P3+MHF6/tGitlHOM= +github.com/pulumi/pulumi-yaml v1.5.0 h1:HfXu+WSFNpycref9CK935cViYJzXwSgHGWM/RepyrW0= +github.com/pulumi/pulumi-yaml v1.5.0/go.mod h1:AvKSmEQv2EkPbpvAQroR1eP1LkJGC8z5NDM34rVWOtg= +github.com/pulumi/pulumi/pkg/v3 v3.103.1 h1:sxacPM2TyDSCufZkescZGnMR22t+REu9nhv68u9rLQ8= +github.com/pulumi/pulumi/pkg/v3 v3.103.1/go.mod h1:AotODpuSfN4XommpmMifBExNmucrnH84cbEhVOeqEQM= +github.com/pulumi/pulumi/sdk/v3 v3.103.1 h1:6o0zt5srgIjDsOI5JWNSwMqoB8vGiI3xow0RDZ3JX2c= +github.com/pulumi/pulumi/sdk/v3 v3.103.1/go.mod h1:Ml3rpGfyZlI4zQCG7LN2XDSmH4XUNYdyBwJ3yEr/OpI= 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/dotnet/Managed/Keys.cs b/sdk/dotnet/Managed/Keys.cs index 998f402a4..31c6a5403 100644 --- a/sdk/dotnet/Managed/Keys.cs +++ b/sdk/dotnet/Managed/Keys.cs @@ -10,6 +10,16 @@ namespace Pulumi.Vault.Managed { /// + /// A resource that manages the lifecycle of all [Managed Keys](https://www.vaultproject.io/docs/enterprise/managed-keys) in Vault. + /// + /// **Note** this feature is available only with Vault Enterprise. + /// + /// ## Caveats + /// + /// This single resource handles the lifecycle of _all_ the managed keys that must be created in Vault. + /// There can only be one such resource in the TF state, and if there are already provisioned managed + /// keys in Vault, we recommend using `pulumi import` instead. + /// /// ## Import /// /// Mounts can be imported using the `id` of `default`, e.g. diff --git a/sdk/go.mod b/sdk/go.mod index a87504b9d..222e1b06d 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/blang/semver v3.5.1+incompatible - github.com/pulumi/pulumi/sdk/v3 v3.101.1 + github.com/pulumi/pulumi/sdk/v3 v3.103.1 ) require ( diff --git a/sdk/go.sum b/sdk/go.sum index 42355708d..62c3c180c 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.6.2 h1:+z+l8cuwIauLSwXQS0uoI3rqB+YG4SzsZYtHfNoXBvw= github.com/pulumi/esc v0.6.2/go.mod h1:jNnYNjzsOgVTjCp0LL24NsCk8ZJxq4IoLQdCT0X7l8k= -github.com/pulumi/pulumi/sdk/v3 v3.101.1 h1:jBUGbLZjfeQkpheacnqXbuw/zSJEq11Gmond2EENkwQ= -github.com/pulumi/pulumi/sdk/v3 v3.101.1/go.mod h1:SB8P0BEGBRaONBxwoTjUFhGPLU5P3+MHF6/tGitlHOM= +github.com/pulumi/pulumi/sdk/v3 v3.103.1 h1:6o0zt5srgIjDsOI5JWNSwMqoB8vGiI3xow0RDZ3JX2c= +github.com/pulumi/pulumi/sdk/v3 v3.103.1/go.mod h1:Ml3rpGfyZlI4zQCG7LN2XDSmH4XUNYdyBwJ3yEr/OpI= 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/sdk/go/vault/managed/keys.go b/sdk/go/vault/managed/keys.go index 2c5ecd457..75d626f5c 100644 --- a/sdk/go/vault/managed/keys.go +++ b/sdk/go/vault/managed/keys.go @@ -11,6 +11,16 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) +// A resource that manages the lifecycle of all [Managed Keys](https://www.vaultproject.io/docs/enterprise/managed-keys) in Vault. +// +// **Note** this feature is available only with Vault Enterprise. +// +// ## Caveats +// +// This single resource handles the lifecycle of _all_ the managed keys that must be created in Vault. +// There can only be one such resource in the TF state, and if there are already provisioned managed +// keys in Vault, we recommend using `pulumi import` instead. +// // ## Import // // Mounts can be imported using the `id` of `default`, e.g. diff --git a/sdk/java/src/main/java/com/pulumi/vault/managed/Keys.java b/sdk/java/src/main/java/com/pulumi/vault/managed/Keys.java index 28ba2bfb9..0b2a66dfe 100644 --- a/sdk/java/src/main/java/com/pulumi/vault/managed/Keys.java +++ b/sdk/java/src/main/java/com/pulumi/vault/managed/Keys.java @@ -19,6 +19,16 @@ import javax.annotation.Nullable; /** + * A resource that manages the lifecycle of all [Managed Keys](https://www.vaultproject.io/docs/enterprise/managed-keys) in Vault. + * + * **Note** this feature is available only with Vault Enterprise. + * + * ## Caveats + * + * This single resource handles the lifecycle of _all_ the managed keys that must be created in Vault. + * There can only be one such resource in the TF state, and if there are already provisioned managed + * keys in Vault, we recommend using `pulumi import` instead. + * * ## Import * * Mounts can be imported using the `id` of `default`, e.g. diff --git a/sdk/nodejs/managed/keys.ts b/sdk/nodejs/managed/keys.ts index a9ddd37be..52990c63e 100644 --- a/sdk/nodejs/managed/keys.ts +++ b/sdk/nodejs/managed/keys.ts @@ -7,6 +7,16 @@ import * as outputs from "../types/output"; import * as utilities from "../utilities"; /** + * A resource that manages the lifecycle of all [Managed Keys](https://www.vaultproject.io/docs/enterprise/managed-keys) in Vault. + * + * **Note** this feature is available only with Vault Enterprise. + * + * ## Caveats + * + * This single resource handles the lifecycle of _all_ the managed keys that must be created in Vault. + * There can only be one such resource in the TF state, and if there are already provisioned managed + * keys in Vault, we recommend using `pulumi import` instead. + * * ## Import * * Mounts can be imported using the `id` of `default`, e.g. diff --git a/sdk/python/pulumi_vault/managed/keys.py b/sdk/python/pulumi_vault/managed/keys.py index 11228ed4b..7e49fc431 100644 --- a/sdk/python/pulumi_vault/managed/keys.py +++ b/sdk/python/pulumi_vault/managed/keys.py @@ -180,6 +180,16 @@ def __init__(__self__, pkcs: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['KeysPkcArgs']]]]] = None, __props__=None): """ + A resource that manages the lifecycle of all [Managed Keys](https://www.vaultproject.io/docs/enterprise/managed-keys) in Vault. + + **Note** this feature is available only with Vault Enterprise. + + ## Caveats + + This single resource handles the lifecycle of _all_ the managed keys that must be created in Vault. + There can only be one such resource in the TF state, and if there are already provisioned managed + keys in Vault, we recommend using `pulumi import` instead. + ## Import Mounts can be imported using the `id` of `default`, e.g. @@ -205,6 +215,16 @@ def __init__(__self__, args: Optional[KeysArgs] = None, opts: Optional[pulumi.ResourceOptions] = None): """ + A resource that manages the lifecycle of all [Managed Keys](https://www.vaultproject.io/docs/enterprise/managed-keys) in Vault. + + **Note** this feature is available only with Vault Enterprise. + + ## Caveats + + This single resource handles the lifecycle of _all_ the managed keys that must be created in Vault. + There can only be one such resource in the TF state, and if there are already provisioned managed + keys in Vault, we recommend using `pulumi import` instead. + ## Import Mounts can be imported using the `id` of `default`, e.g.