From 77c20095cb962c966b46357a3cd15c716147bf4d Mon Sep 17 00:00:00 2001 From: null Date: Mon, 25 Sep 2023 01:12:58 +0000 Subject: [PATCH] chore(deps): update all dependencies --- .github/workflows/build-and-push-image.yml | 2 +- .github/workflows/make-check.yml | 2 +- go.mod | 20 +- go.sum | 40 +- oci/Containerfile | 12 +- requirements.txt | 2 +- .../go-crypto/openpgp/internal/ecc/x448.go | 4 +- .../pulumi-aws/sdk/v6/go/aws/ebs/snapshot.go | 12 + .../sdk/v6/go/aws/ebs/snapshotCopy.go | 12 + .../sdk/v6/go/aws/ebs/snapshotImport.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ebs/volume.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/ami.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/amiCopy.go | 14 +- .../sdk/v6/go/aws/ec2/amiFromInstance.go | 14 +- .../sdk/v6/go/aws/ec2/capacityReservation.go | 12 + .../sdk/v6/go/aws/ec2/carrierGateway.go | 12 + .../sdk/v6/go/aws/ec2/customerGateway.go | 12 + .../sdk/v6/go/aws/ec2/dedicatedHost.go | 12 + .../sdk/v6/go/aws/ec2/defaultNetworkAcl.go | 12 + .../sdk/v6/go/aws/ec2/defaultRouteTable.go | 12 + .../sdk/v6/go/aws/ec2/defaultSecurityGroup.go | 12 + .../sdk/v6/go/aws/ec2/defaultSubnet.go | 14 +- .../sdk/v6/go/aws/ec2/defaultVpc.go | 14 +- .../v6/go/aws/ec2/defaultVpcDhcpOptions.go | 14 +- .../go/aws/ec2/egressOnlyInternetGateway.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/eip.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/fleet.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/flowLog.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/instance.go | 12 + .../sdk/v6/go/aws/ec2/internetGateway.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/keyPair.go | 12 + .../sdk/v6/go/aws/ec2/launchTemplate.go | 12 + .../localGatewayRouteTableVpcAssociation.go | 12 + .../sdk/v6/go/aws/ec2/managedPrefixList.go | 12 + .../sdk/v6/go/aws/ec2/natGateway.go | 12 + .../sdk/v6/go/aws/ec2/networkAcl.go | 12 + .../v6/go/aws/ec2/networkInsightsAnalysis.go | 12 + .../sdk/v6/go/aws/ec2/networkInsightsPath.go | 12 + .../sdk/v6/go/aws/ec2/networkInterface.go | 12 + .../sdk/v6/go/aws/ec2/placementGroup.go | 12 + .../sdk/v6/go/aws/ec2/routeTable.go | 12 + .../sdk/v6/go/aws/ec2/securityGroup.go | 12 + .../sdk/v6/go/aws/ec2/spotFleetRequest.go | 12 + .../sdk/v6/go/aws/ec2/spotInstanceRequest.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/subnet.go | 12 + .../sdk/v6/go/aws/ec2/trafficMirrorFilter.go | 12 + .../sdk/v6/go/aws/ec2/trafficMirrorSession.go | 12 + .../sdk/v6/go/aws/ec2/trafficMirrorTarget.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/vpc.go | 12 + .../sdk/v6/go/aws/ec2/vpcDhcpOptions.go | 12 + .../sdk/v6/go/aws/ec2/vpcEndpoint.go | 12 + .../sdk/v6/go/aws/ec2/vpcEndpointService.go | 12 + .../pulumi-aws/sdk/v6/go/aws/ec2/vpcIpam.go | 12 + .../sdk/v6/go/aws/ec2/vpcIpamPool.go | 12 + .../v6/go/aws/ec2/vpcIpamResourceDiscovery.go | 12 + .../vpcIpamResourceDiscoveryAssociation.go | 12 + .../sdk/v6/go/aws/ec2/vpcIpamScope.go | 14 +- .../sdk/v6/go/aws/ec2/vpcPeeringConnection.go | 12 + .../aws/ec2/vpcPeeringConnectionAccepter.go | 12 + .../sdk/v6/go/aws/ec2/vpnConnection.go | 9 + .../sdk/v6/go/aws/ec2/vpnGateway.go | 12 + .../sdk/v6/go/aws/iam/instanceProfile.go | 12 + .../v6/go/aws/iam/openIdConnectProvider.go | 12 + .../pulumi-aws/sdk/v6/go/aws/iam/policy.go | 12 + .../pulumi-aws/sdk/v6/go/aws/iam/role.go | 12 + .../sdk/v6/go/aws/iam/samlProvider.go | 12 + .../sdk/v6/go/aws/iam/serverCertificate.go | 9 + .../sdk/v6/go/aws/iam/serviceLinkedRole.go | 12 + .../pulumi-aws/sdk/v6/go/aws/iam/user.go | 12 + .../sdk/v6/go/aws/iam/virtualMfaDevice.go | 12 + .../pulumi-aws/sdk/v6/go/aws/s3/bucket.go | 12 + .../sdk/v6/go/aws/s3/bucketObject.go | 12 + .../sdk/v6/go/aws/s3/bucketObjectv2.go | 12 + .../pulumi-aws/sdk/v6/go/aws/s3/bucketV2.go | 12 + .../pulumi-aws/sdk/v6/go/aws/s3/objectCopy.go | 9 + .../sdk/go/command/local/command.go | 37 ++ .../sdk/go/command/local/run.go | 7 + .../sdk/go/command/remote/command.go | 37 ++ .../sdk/go/command/remote/copyFile.go | 37 ++ .../sdk/go/command/remote/pulumiTypes.go | 412 +++++++++++++- .../pulumi-random/sdk/v4/go/random/init.go | 6 +- .../random/{ => internal}/pulumiUtilities.go | 42 +- .../v4/go/random/internal/pulumiVersion.go | 11 + .../sdk/v4/go/random/provider.go | 15 + .../sdk/v4/go/random/randomId.go | 39 ++ .../sdk/v4/go/random/randomInteger.go | 39 ++ .../sdk/v4/go/random/randomPassword.go | 101 ++-- .../sdk/v4/go/random/randomPet.go | 39 ++ .../sdk/v4/go/random/randomShuffle.go | 39 ++ .../sdk/v4/go/random/randomString.go | 93 ++-- .../sdk/v4/go/random/randomUuid.go | 39 ++ .../pulumi-tls/sdk/v4/go/tls/certRequest.go | 69 ++- .../sdk/v4/go/tls/getCertificate.go | 9 + .../pulumi-tls/sdk/v4/go/tls/getPublicKey.go | 21 +- .../pulumi/pulumi-tls/sdk/v4/go/tls/init.go | 6 +- .../go/tls/{ => internal}/pulumiUtilities.go | 42 +- .../sdk/v4/go/tls/internal/pulumiVersion.go | 11 + .../sdk/v4/go/tls/locallySignedCert.go | 65 ++- .../pulumi-tls/sdk/v4/go/tls/privateKey.go | 101 ++-- .../pulumi-tls/sdk/v4/go/tls/provider.go | 15 + .../pulumi-tls/sdk/v4/go/tls/pulumiTypes.go | 103 ++++ .../sdk/v4/go/tls/selfSignedCert.go | 65 ++- .../pulumi/sdk/v3/go/common/resource/asset.go | 110 ++-- .../v3/go/common/resource/plugin/converter.go | 1 + .../resource/plugin/converter_plugin.go | 1 + .../resource/plugin/converter_server.go | 1 + .../v3/go/common/resource/plugin/provider.go | 7 +- .../common/resource/plugin/provider_plugin.go | 34 +- .../common/resource/plugin/provider_server.go | 12 +- .../resource/plugin/provider_unimplemented.go | 6 +- .../sdk/v3/go/common/workspace/templates.go | 90 --- .../pulumi/sdk/v3/proto/go/converter.pb.go | 57 +- .../pulumi/sdk/v3/proto/go/provider.pb.go | 525 +++++++++++------- .../sdk/v3/proto/go/provider_grpc.pb.go | 42 ++ .../skeema/knownhosts/knownhosts.go | 30 +- vendor/github.com/spf13/afero/const_bsds.go | 4 +- .../github.com/spf13/afero/const_win_unix.go | 4 +- vendor/github.com/spf13/afero/memmap.go | 65 ++- vendor/google.golang.org/grpc/version.go | 2 +- vendor/modules.txt | 26 +- 120 files changed, 2727 insertions(+), 691 deletions(-) rename vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/{ => internal}/pulumiUtilities.go (59%) create mode 100644 vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiVersion.go rename vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/{ => internal}/pulumiUtilities.go (58%) create mode 100644 vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal/pulumiVersion.go diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml index d841e033..7ba3e5c7 100644 --- a/.github/workflows/build-and-push-image.yml +++ b/.github/workflows/build-and-push-image.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Login to GitHub Container Registry uses: docker/login-action@v3.0.0 diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml index a8d385c6..2ea968a2 100644 --- a/.github/workflows/make-check.yml +++ b/.github/workflows/make-check.yml @@ -18,7 +18,7 @@ jobs: - 1.19 steps: - name: Check out repository code - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - name: Set up Go uses: actions/setup-go@v4.1.0 with: diff --git a/go.mod b/go.mod index 5c85b285..25d2bf00 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/crc/crc-cloud go 1.19 require ( - github.com/pulumi/pulumi-aws/sdk/v6 v6.1.0 + github.com/pulumi/pulumi-aws/sdk/v6 v6.2.1 github.com/pulumi/pulumi-azure-native-sdk/resources/v2 v2.8.0 github.com/pulumi/pulumi-azure-native-sdk/storage/v2 v2.8.0 - github.com/pulumi/pulumi-tls/sdk/v4 v4.10.0 - github.com/pulumi/pulumi/sdk/v3 v3.83.0 + github.com/pulumi/pulumi-tls/sdk/v4 v4.11.0 + github.com/pulumi/pulumi/sdk/v3 v3.85.0 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 @@ -38,17 +38,17 @@ require ( github.com/muesli/termenv v0.15.2 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pulumi/pulumi-azure-native-sdk/v2 v2.8.0 // indirect - github.com/skeema/knownhosts v1.2.0 // indirect + github.com/skeema/knownhosts v1.2.1 // indirect github.com/zclconf/go-cty v1.14.0 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/tools v0.13.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect ) require ( github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect github.com/acomagu/bufpipe v1.0.4 // indirect github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect github.com/blang/semver v3.5.1+incompatible // indirect @@ -78,14 +78,14 @@ require ( github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.1.0 // indirect - github.com/pulumi/pulumi-command/sdk v0.8.2 - github.com/pulumi/pulumi-random/sdk/v4 v4.13.4 + github.com/pulumi/pulumi-command/sdk v0.9.1 + github.com/pulumi/pulumi-random/sdk/v4 v4.14.0 github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/sergi/go-diff v1.3.1 // indirect - github.com/spf13/afero v1.9.5 // indirect + github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect @@ -101,7 +101,7 @@ require ( golang.org/x/sys v0.12.0 // indirect golang.org/x/term v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect - google.golang.org/grpc v1.58.1 // indirect + google.golang.org/grpc v1.58.2 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect diff --git a/go.sum b/go.sum index c00a5301..f8510566 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= +github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= @@ -267,22 +267,22 @@ github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/pulumi/pulumi-aws/sdk/v6 v6.1.0 h1:kwI1tDo+v3btJUy9D/td51ZVL7/huKn6GqfSTJyMEac= -github.com/pulumi/pulumi-aws/sdk/v6 v6.1.0/go.mod h1:UeOesX8l9ntIiiKXdQue8/rQDAvSf7Spd5qf15qngcY= +github.com/pulumi/pulumi-aws/sdk/v6 v6.2.1 h1:/eWONFbmSyMt/0CwurMukh86wwgD5+N7jUesTa2hYVU= +github.com/pulumi/pulumi-aws/sdk/v6 v6.2.1/go.mod h1:UeOesX8l9ntIiiKXdQue8/rQDAvSf7Spd5qf15qngcY= github.com/pulumi/pulumi-azure-native-sdk/resources/v2 v2.8.0 h1:+W6yCqaI+fIcZiPbVqVYzuhIyYSA2pbx57GIr1rk4GI= github.com/pulumi/pulumi-azure-native-sdk/resources/v2 v2.8.0/go.mod h1:X4GBG6E05h3a2gmr+COaaHZOnT+cQupu3VlnT6FeD/w= github.com/pulumi/pulumi-azure-native-sdk/storage/v2 v2.8.0 h1:GBvUXMg/39zWN/1yx7jWBKsWpxdyq6hzbw68vkhaYJw= github.com/pulumi/pulumi-azure-native-sdk/storage/v2 v2.8.0/go.mod h1:gV6s6/UfNGlUrFtpDSBJkQ+sGoxowPCOiauh76MsMOI= github.com/pulumi/pulumi-azure-native-sdk/v2 v2.8.0 h1:xwSEdRgGqWKzyl9AN98X0nmOb6GrY3gpmjm3IMnTMxo= github.com/pulumi/pulumi-azure-native-sdk/v2 v2.8.0/go.mod h1:0M4mUmmpe41qj02HAGJnLYLpf8TBkrtdqD6H8J9XPo4= -github.com/pulumi/pulumi-command/sdk v0.8.2 h1:ODz9nEjjX9/G0Xr+K99994xAs2ZBociLMssFKAWphBs= -github.com/pulumi/pulumi-command/sdk v0.8.2/go.mod h1:DAYVqHdbyWJopPk8/zJbB44XkwXj+kqUsPP4ZORiPWc= -github.com/pulumi/pulumi-random/sdk/v4 v4.13.4 h1:g3jdktE5L5IDrOw4OiB+yhgxSw0okRPJnyV6PlIzTEQ= -github.com/pulumi/pulumi-random/sdk/v4 v4.13.4/go.mod h1:cFlJw0eQnqN+62QpITEF9M08gVyzNCeXrKRsuJptFak= -github.com/pulumi/pulumi-tls/sdk/v4 v4.10.0 h1:4MC0GyEomAjEZJPXEzBZpZ4+TOUg5WE77k38tMDIvS0= -github.com/pulumi/pulumi-tls/sdk/v4 v4.10.0/go.mod h1:tNXsM/+RsiVVmBdzJMOOp6gMoi3sPko5u0FKdiei+cE= -github.com/pulumi/pulumi/sdk/v3 v3.83.0 h1:Qjek0K/GaHYAMahMR5m5v/JWQuWg6eG0M/7swy9Ls8U= -github.com/pulumi/pulumi/sdk/v3 v3.83.0/go.mod h1:RMilNNVMlmK1h4Nl/qylb9vzbgh4F3mufZoUOnPy98o= +github.com/pulumi/pulumi-command/sdk v0.9.1 h1:mYwCv2fJuEuka6gyZHOcRozQ+Il5f9WjyfHGVAxZnKw= +github.com/pulumi/pulumi-command/sdk v0.9.1/go.mod h1:AoZMftEj3cWUhoBSFwGx5Z9/RXxaYEfinyZS8Wl0jdg= +github.com/pulumi/pulumi-random/sdk/v4 v4.14.0 h1:ljy/gUeur2kZZWL3JPy0J9zLDYKKA0zMd1mT7xrpI7s= +github.com/pulumi/pulumi-random/sdk/v4 v4.14.0/go.mod h1:XqGATLB6KKuWRDhWvHO6YVwv0DRW/cK/pWzNkuhMB24= +github.com/pulumi/pulumi-tls/sdk/v4 v4.11.0 h1:sg5CuKpiKUaVmklW7xXSJ9XNisY+TXR55KHXR4n+Xwg= +github.com/pulumi/pulumi-tls/sdk/v4 v4.11.0/go.mod h1:CIpy+GbhEIj/Ywtxu8jRdrt/V7n4QBGUo0swWnwsLO4= +github.com/pulumi/pulumi/sdk/v3 v3.85.0 h1:DRhwuwpd9lmo2gJUCAftsv/7avjUZio2NlLSprloh8Q= +github.com/pulumi/pulumi/sdk/v3 v3.85.0/go.mod h1:vexSGJ5L834l3T7Fo/KpdywjGAgZ2CvChuqGFl+ebS0= 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= @@ -298,10 +298,10 @@ github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPO github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skeema/knownhosts v1.2.0 h1:h9r9cf0+u7wSE+M183ZtMGgOJKiL96brpaz5ekfJCpM= -github.com/skeema/knownhosts v1.2.0/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= +github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= @@ -662,8 +662,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb h1:Isk1sSH7bovx8Rti2wZK0UZF6oraBDK74uoyLEEVFN0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -680,8 +680,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/oci/Containerfile b/oci/Containerfile index 65e08f11..c68af660 100644 --- a/oci/Containerfile +++ b/oci/Containerfile @@ -1,11 +1,11 @@ -FROM registry.access.redhat.com/ubi9/go-toolset:1.19.10-14@sha256:620d6e757aa9469cfdbcf9a5ca8356cef3964f447c82994b2cd26937ce51d44b as builder +FROM registry.access.redhat.com/ubi9/go-toolset:1.19.10-14.1695131433@sha256:d55ff49e9b6907d5f50290f8bcffa15657470da009a5f982202780c4122ce2dd as builder USER root WORKDIR /workspace COPY . . # renovate: datasource=github-releases depName=pulumi/pulumi -ENV PULUMI_VERSION=v3.83.0 +ENV PULUMI_VERSION=v3.85.0 ENV PULUMI_URL https://github.com/pulumi/pulumi/releases/download/${PULUMI_VERSION}/pulumi-${PULUMI_VERSION}-linux-x64.tar.gz RUN make build \ @@ -25,16 +25,16 @@ COPY requirements.txt ./ USER root # renovate: datasource=github-releases depName=pulumi/pulumi-command -ARG PULUMI_COMMAND_VERSION=v0.8.2 +ARG PULUMI_COMMAND_VERSION=v0.9.1 # renovate: datasource=github-releases depName=pulumi/pulumi-tls -ARG PULUMI_TLS_VERSION=v4.10.0 +ARG PULUMI_TLS_VERSION=v4.11.0 # renovate: datasource=github-releases depName=pulumi/pulumi-random -ARG PULUMI_RANDOM_VERSION=v4.13.4 +ARG PULUMI_RANDOM_VERSION=v4.14.0 # renovate: datasource=github-releases depName=pulumi/pulumi-aws -ARG PULUMI_AWS_VERSION=v6.1.0 +ARG PULUMI_AWS_VERSION=v6.2.1 # renovate: datasource=github-releases depName=pulumi/pulumi-azure-native ARG PULUMI_AZURE_NATIVE_VERSION=v2.8.0 diff --git a/requirements.txt b/requirements.txt index 3ce2f875..a3178519 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -awscli==1.29.49 +awscli==1.29.53 diff --git a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/x448.go b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/x448.go index ffdd5151..df04262e 100644 --- a/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/x448.go +++ b/vendor/github.com/ProtonMail/go-crypto/openpgp/internal/ecc/x448.go @@ -73,7 +73,9 @@ func (c *x448) GenerateECDH(rand io.Reader) (point []byte, secret []byte, err er func (c *x448) Encaps(rand io.Reader, point []byte) (ephemeral, sharedSecret []byte, err error) { var pk, ss x448lib.Key seed, e, err := c.generateKeyPairBytes(rand) - + if err != nil { + return nil, nil, err + } copy(pk[:], point) x448lib.Shared(&ss, &seed, &pk) diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshot.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshot.go index e63b62fb..db8eb8ca 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshot.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshot.go @@ -89,6 +89,8 @@ type Snapshot struct { // A map of tags to assign to the snapshot. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays pulumi.IntPtrOutput `pulumi:"temporaryRestoreDays"` @@ -108,6 +110,10 @@ func NewSnapshot(ctx *pulumi.Context, if args.VolumeId == nil { return nil, errors.New("invalid value for required argument 'VolumeId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Snapshot err := ctx.RegisterResource("aws:ebs/snapshot:Snapshot", name, args, &resource, opts...) @@ -154,6 +160,8 @@ type snapshotState struct { // A map of tags to assign to the snapshot. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays *int `pulumi:"temporaryRestoreDays"` @@ -187,6 +195,8 @@ type SnapshotState struct { // A map of tags to assign to the snapshot. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays pulumi.IntPtrInput @@ -402,6 +412,8 @@ func (o SnapshotOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SnapshotOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Snapshot) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotCopy.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotCopy.go index 42e52bb0..65ab23d3 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotCopy.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotCopy.go @@ -92,6 +92,8 @@ type SnapshotCopy struct { // A map of tags for the snapshot. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays pulumi.IntPtrOutput `pulumi:"temporaryRestoreDays"` @@ -113,6 +115,10 @@ func NewSnapshotCopy(ctx *pulumi.Context, if args.SourceSnapshotId == nil { return nil, errors.New("invalid value for required argument 'SourceSnapshotId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource SnapshotCopy err := ctx.RegisterResource("aws:ebs/snapshotCopy:SnapshotCopy", name, args, &resource, opts...) @@ -162,6 +168,8 @@ type snapshotCopyState struct { // A map of tags for the snapshot. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays *int `pulumi:"temporaryRestoreDays"` @@ -197,6 +205,8 @@ type SnapshotCopyState struct { // A map of tags for the snapshot. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays pulumi.IntPtrInput @@ -428,6 +438,8 @@ func (o SnapshotCopyOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SnapshotCopyOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *SnapshotCopy) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotImport.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotImport.go index 00e3b6e5..e6220883 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotImport.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/snapshotImport.go @@ -81,6 +81,8 @@ type SnapshotImport struct { // A map of tags to assign to the snapshot. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays pulumi.IntPtrOutput `pulumi:"temporaryRestoreDays"` @@ -99,6 +101,10 @@ func NewSnapshotImport(ctx *pulumi.Context, if args.DiskContainer == nil { return nil, errors.New("invalid value for required argument 'DiskContainer'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource SnapshotImport err := ctx.RegisterResource("aws:ebs/snapshotImport:SnapshotImport", name, args, &resource, opts...) @@ -150,6 +156,8 @@ type snapshotImportState struct { // A map of tags to assign to the snapshot. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays *int `pulumi:"temporaryRestoreDays"` @@ -187,6 +195,8 @@ type SnapshotImportState struct { // A map of tags to assign to the snapshot. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Specifies the number of days for which to temporarily restore an archived snapshot. Required for temporary restores only. The snapshot will be automatically re-archived after this period. TemporaryRestoreDays pulumi.IntPtrInput @@ -427,6 +437,8 @@ func (o SnapshotImportOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SnapshotImportOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *SnapshotImport) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/volume.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/volume.go index 858bf79f..6dee992f 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/volume.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs/volume.go @@ -82,6 +82,8 @@ type Volume struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The throughput that the volume supports, in MiB/s. Only valid for `type` of `gp3`. // @@ -101,6 +103,10 @@ func NewVolume(ctx *pulumi.Context, if args.AvailabilityZone == nil { return nil, errors.New("invalid value for required argument 'AvailabilityZone'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Volume err := ctx.RegisterResource("aws:ebs/volume:Volume", name, args, &resource, opts...) @@ -147,6 +153,8 @@ type volumeState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The throughput that the volume supports, in MiB/s. Only valid for `type` of `gp3`. // @@ -180,6 +188,8 @@ type VolumeState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The throughput that the volume supports, in MiB/s. Only valid for `type` of `gp3`. // @@ -419,6 +429,8 @@ func (o VolumeOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VolumeOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Volume) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/ami.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/ami.go index 71e105cc..8bebf778 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/ami.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/ami.go @@ -124,6 +124,8 @@ type Ami struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport pulumi.StringPtrOutput `pulumi:"tpmSupport"` @@ -142,6 +144,10 @@ func NewAmi(ctx *pulumi.Context, args = &AmiArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Ami err := ctx.RegisterResource("aws:ec2/ami:Ami", name, args, &resource, opts...) @@ -221,6 +227,8 @@ type amiState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport *string `pulumi:"tpmSupport"` @@ -289,6 +297,8 @@ type AmiState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport pulumi.StringPtrInput @@ -637,6 +647,8 @@ func (o AmiOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o AmiOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Ami) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiCopy.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiCopy.go index 18e00a72..9b6c4fb2 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiCopy.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiCopy.go @@ -117,7 +117,8 @@ type AmiCopy struct { // for created instances. No other value is supported at this time. SriovNetSupport pulumi.StringOutput `pulumi:"sriovNetSupport"` // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags pulumi.StringMapOutput `pulumi:"tags"` + Tags pulumi.StringMapOutput `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport pulumi.StringOutput `pulumi:"tpmSupport"` @@ -141,6 +142,10 @@ func NewAmiCopy(ctx *pulumi.Context, if args.SourceAmiRegion == nil { return nil, errors.New("invalid value for required argument 'SourceAmiRegion'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource AmiCopy err := ctx.RegisterResource("aws:ec2/amiCopy:AmiCopy", name, args, &resource, opts...) @@ -223,7 +228,8 @@ type amiCopyState struct { // for created instances. No other value is supported at this time. SriovNetSupport *string `pulumi:"sriovNetSupport"` // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags map[string]string `pulumi:"tags"` + Tags map[string]string `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport *string `pulumi:"tpmSupport"` @@ -294,7 +300,8 @@ type AmiCopyState struct { // for created instances. No other value is supported at this time. SriovNetSupport pulumi.StringPtrInput // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags pulumi.StringMapInput + Tags pulumi.StringMapInput + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport pulumi.StringPtrInput @@ -631,6 +638,7 @@ func (o AmiCopyOutput) Tags() pulumi.StringMapOutput { return o.ApplyT(func(v *AmiCopy) pulumi.StringMapOutput { return v.Tags }).(pulumi.StringMapOutput) } +// Deprecated: Please use `tags` instead. func (o AmiCopyOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *AmiCopy) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiFromInstance.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiFromInstance.go index 752c1290..94ea0191 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiFromInstance.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/amiFromInstance.go @@ -112,7 +112,8 @@ type AmiFromInstance struct { // for created instances. No other value is supported at this time. SriovNetSupport pulumi.StringOutput `pulumi:"sriovNetSupport"` // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags pulumi.StringMapOutput `pulumi:"tags"` + Tags pulumi.StringMapOutput `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport pulumi.StringOutput `pulumi:"tpmSupport"` @@ -133,6 +134,10 @@ func NewAmiFromInstance(ctx *pulumi.Context, if args.SourceInstanceId == nil { return nil, errors.New("invalid value for required argument 'SourceInstanceId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource AmiFromInstance err := ctx.RegisterResource("aws:ec2/amiFromInstance:AmiFromInstance", name, args, &resource, opts...) @@ -209,7 +214,8 @@ type amiFromInstanceState struct { // for created instances. No other value is supported at this time. SriovNetSupport *string `pulumi:"sriovNetSupport"` // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags map[string]string `pulumi:"tags"` + Tags map[string]string `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport *string `pulumi:"tpmSupport"` @@ -274,7 +280,8 @@ type AmiFromInstanceState struct { // for created instances. No other value is supported at this time. SriovNetSupport pulumi.StringPtrInput // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags pulumi.StringMapInput + Tags pulumi.StringMapInput + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // If the image is configured for NitroTPM support, the value is `v2.0`. For more information, see [NitroTPM](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nitrotpm.html) in the Amazon Elastic Compute Cloud User Guide. TpmSupport pulumi.StringPtrInput @@ -586,6 +593,7 @@ func (o AmiFromInstanceOutput) Tags() pulumi.StringMapOutput { return o.ApplyT(func(v *AmiFromInstance) pulumi.StringMapOutput { return v.Tags }).(pulumi.StringMapOutput) } +// Deprecated: Please use `tags` instead. func (o AmiFromInstanceOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *AmiFromInstance) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/capacityReservation.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/capacityReservation.go index 7ef0b261..3ee966b4 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/capacityReservation.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/capacityReservation.go @@ -85,6 +85,8 @@ type CapacityReservation struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Indicates the tenancy of the Capacity Reservation. Specify either `default` or `dedicated`. Tenancy pulumi.StringPtrOutput `pulumi:"tenancy"` @@ -109,6 +111,10 @@ func NewCapacityReservation(ctx *pulumi.Context, if args.InstanceType == nil { return nil, errors.New("invalid value for required argument 'InstanceType'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource CapacityReservation err := ctx.RegisterResource("aws:ec2/capacityReservation:CapacityReservation", name, args, &resource, opts...) @@ -161,6 +167,8 @@ type capacityReservationState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Indicates the tenancy of the Capacity Reservation. Specify either `default` or `dedicated`. Tenancy *string `pulumi:"tenancy"` @@ -196,6 +204,8 @@ type CapacityReservationState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Indicates the tenancy of the Capacity Reservation. Specify either `default` or `dedicated`. Tenancy pulumi.StringPtrInput @@ -446,6 +456,8 @@ func (o CapacityReservationOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block +// +// Deprecated: Please use `tags` instead. func (o CapacityReservationOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *CapacityReservation) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/carrierGateway.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/carrierGateway.go index d6a0f742..a02da976 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/carrierGateway.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/carrierGateway.go @@ -63,6 +63,8 @@ type CarrierGateway struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The ID of the VPC to associate with the carrier gateway. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -78,6 +80,10 @@ func NewCarrierGateway(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource CarrierGateway err := ctx.RegisterResource("aws:ec2/carrierGateway:CarrierGateway", name, args, &resource, opts...) @@ -108,6 +114,8 @@ type carrierGatewayState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The ID of the VPC to associate with the carrier gateway. VpcId *string `pulumi:"vpcId"` @@ -121,6 +129,8 @@ type CarrierGatewayState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The ID of the VPC to associate with the carrier gateway. VpcId pulumi.StringPtrInput @@ -272,6 +282,8 @@ func (o CarrierGatewayOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o CarrierGatewayOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *CarrierGateway) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/customerGateway.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/customerGateway.go index 0ba31d70..a53ab1b5 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/customerGateway.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/customerGateway.go @@ -71,6 +71,8 @@ type CustomerGateway struct { // Tags to apply to the gateway. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The type of customer gateway. The only type AWS // supports at this time is "ipsec.1". @@ -90,6 +92,10 @@ func NewCustomerGateway(ctx *pulumi.Context, if args.Type == nil { return nil, errors.New("invalid value for required argument 'Type'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource CustomerGateway err := ctx.RegisterResource("aws:ec2/customerGateway:CustomerGateway", name, args, &resource, opts...) @@ -126,6 +132,8 @@ type customerGatewayState struct { // Tags to apply to the gateway. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The type of customer gateway. The only type AWS // supports at this time is "ipsec.1". @@ -146,6 +154,8 @@ type CustomerGatewayState struct { // Tags to apply to the gateway. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The type of customer gateway. The only type AWS // supports at this time is "ipsec.1". @@ -331,6 +341,8 @@ func (o CustomerGatewayOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o CustomerGatewayOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *CustomerGateway) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/dedicatedHost.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/dedicatedHost.go index d415452a..4819c97f 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/dedicatedHost.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/dedicatedHost.go @@ -77,6 +77,8 @@ type DedicatedHost struct { // Map of tags to assign to this resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -90,6 +92,10 @@ func NewDedicatedHost(ctx *pulumi.Context, if args.AvailabilityZone == nil { return nil, errors.New("invalid value for required argument 'AvailabilityZone'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource DedicatedHost err := ctx.RegisterResource("aws:ec2/dedicatedHost:DedicatedHost", name, args, &resource, opts...) @@ -134,6 +140,8 @@ type dedicatedHostState struct { // Map of tags to assign to this resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -159,6 +167,8 @@ type DedicatedHostState struct { // Map of tags to assign to this resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -367,6 +377,8 @@ func (o DedicatedHostOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o DedicatedHostOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *DedicatedHost) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultNetworkAcl.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultNetworkAcl.go index 4d4fa401..d088be5c 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultNetworkAcl.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultNetworkAcl.go @@ -217,6 +217,8 @@ type DefaultNetworkAcl struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // ID of the associated VPC VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -232,6 +234,10 @@ func NewDefaultNetworkAcl(ctx *pulumi.Context, if args.DefaultNetworkAclId == nil { return nil, errors.New("invalid value for required argument 'DefaultNetworkAclId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource DefaultNetworkAcl err := ctx.RegisterResource("aws:ec2/defaultNetworkAcl:DefaultNetworkAcl", name, args, &resource, opts...) @@ -272,6 +278,8 @@ type defaultNetworkAclState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // ID of the associated VPC VpcId *string `pulumi:"vpcId"` @@ -295,6 +303,8 @@ type DefaultNetworkAclState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // ID of the associated VPC VpcId pulumi.StringPtrInput @@ -484,6 +494,8 @@ func (o DefaultNetworkAclOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o DefaultNetworkAclOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultNetworkAcl) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultRouteTable.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultRouteTable.go index 27269290..96578847 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultRouteTable.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultRouteTable.go @@ -117,6 +117,8 @@ type DefaultRouteTable struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // ID of the VPC. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -132,6 +134,10 @@ func NewDefaultRouteTable(ctx *pulumi.Context, if args.DefaultRouteTableId == nil { return nil, errors.New("invalid value for required argument 'DefaultRouteTableId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource DefaultRouteTable err := ctx.RegisterResource("aws:ec2/defaultRouteTable:DefaultRouteTable", name, args, &resource, opts...) @@ -170,6 +176,8 @@ type defaultRouteTableState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // ID of the VPC. VpcId *string `pulumi:"vpcId"` @@ -191,6 +199,8 @@ type DefaultRouteTableState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // ID of the VPC. VpcId pulumi.StringPtrInput @@ -371,6 +381,8 @@ func (o DefaultRouteTableOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o DefaultRouteTableOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultRouteTable) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSecurityGroup.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSecurityGroup.go index b894272d..b303ee6a 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSecurityGroup.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSecurityGroup.go @@ -147,6 +147,8 @@ type DefaultSecurityGroup struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // VPC ID. **Note that changing the `vpcId` will _not_ restore any default security group rules that were modified, added, or removed.** It will be left in its current state. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -159,6 +161,10 @@ func NewDefaultSecurityGroup(ctx *pulumi.Context, args = &DefaultSecurityGroupArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource DefaultSecurityGroup err := ctx.RegisterResource("aws:ec2/defaultSecurityGroup:DefaultSecurityGroup", name, args, &resource, opts...) @@ -199,6 +205,8 @@ type defaultSecurityGroupState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // VPC ID. **Note that changing the `vpcId` will _not_ restore any default security group rules that were modified, added, or removed.** It will be left in its current state. VpcId *string `pulumi:"vpcId"` @@ -222,6 +230,8 @@ type DefaultSecurityGroupState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // VPC ID. **Note that changing the `vpcId` will _not_ restore any default security group rules that were modified, added, or removed.** It will be left in its current state. VpcId pulumi.StringPtrInput @@ -411,6 +421,8 @@ func (o DefaultSecurityGroupOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o DefaultSecurityGroupOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultSecurityGroup) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSubnet.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSubnet.go index 02b2a632..80a3a95f 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSubnet.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultSubnet.go @@ -92,7 +92,8 @@ type DefaultSubnet struct { OwnerId pulumi.StringOutput `pulumi:"ownerId"` PrivateDnsHostnameTypeOnLaunch pulumi.StringOutput `pulumi:"privateDnsHostnameTypeOnLaunch"` Tags pulumi.StringMapOutput `pulumi:"tags"` - TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` + // Deprecated: Please use `tags` instead. + TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The ID of the VPC the subnet is in VpcId pulumi.StringOutput `pulumi:"vpcId"` } @@ -107,6 +108,10 @@ func NewDefaultSubnet(ctx *pulumi.Context, if args.AvailabilityZone == nil { return nil, errors.New("invalid value for required argument 'AvailabilityZone'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource DefaultSubnet err := ctx.RegisterResource("aws:ec2/defaultSubnet:DefaultSubnet", name, args, &resource, opts...) @@ -159,7 +164,8 @@ type defaultSubnetState struct { OwnerId *string `pulumi:"ownerId"` PrivateDnsHostnameTypeOnLaunch *string `pulumi:"privateDnsHostnameTypeOnLaunch"` Tags map[string]string `pulumi:"tags"` - TagsAll map[string]string `pulumi:"tagsAll"` + // Deprecated: Please use `tags` instead. + TagsAll map[string]string `pulumi:"tagsAll"` // The ID of the VPC the subnet is in VpcId *string `pulumi:"vpcId"` } @@ -194,7 +200,8 @@ type DefaultSubnetState struct { OwnerId pulumi.StringPtrInput PrivateDnsHostnameTypeOnLaunch pulumi.StringPtrInput Tags pulumi.StringMapInput - TagsAll pulumi.StringMapInput + // Deprecated: Please use `tags` instead. + TagsAll pulumi.StringMapInput // The ID of the VPC the subnet is in VpcId pulumi.StringPtrInput } @@ -451,6 +458,7 @@ func (o DefaultSubnetOutput) Tags() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultSubnet) pulumi.StringMapOutput { return v.Tags }).(pulumi.StringMapOutput) } +// Deprecated: Please use `tags` instead. func (o DefaultSubnetOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultSubnet) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpc.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpc.go index 78417aef..c66dd167 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpc.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpc.go @@ -90,7 +90,8 @@ type DefaultVpc struct { MainRouteTableId pulumi.StringOutput `pulumi:"mainRouteTableId"` OwnerId pulumi.StringOutput `pulumi:"ownerId"` Tags pulumi.StringMapOutput `pulumi:"tags"` - TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` + // Deprecated: Please use `tags` instead. + TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } // NewDefaultVpc registers a new resource with the given unique name, arguments, and options. @@ -100,6 +101,10 @@ func NewDefaultVpc(ctx *pulumi.Context, args = &DefaultVpcArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource DefaultVpc err := ctx.RegisterResource("aws:ec2/defaultVpc:DefaultVpc", name, args, &resource, opts...) @@ -147,7 +152,8 @@ type defaultVpcState struct { MainRouteTableId *string `pulumi:"mainRouteTableId"` OwnerId *string `pulumi:"ownerId"` Tags map[string]string `pulumi:"tags"` - TagsAll map[string]string `pulumi:"tagsAll"` + // Deprecated: Please use `tags` instead. + TagsAll map[string]string `pulumi:"tagsAll"` } type DefaultVpcState struct { @@ -175,7 +181,8 @@ type DefaultVpcState struct { MainRouteTableId pulumi.StringPtrInput OwnerId pulumi.StringPtrInput Tags pulumi.StringMapInput - TagsAll pulumi.StringMapInput + // Deprecated: Please use `tags` instead. + TagsAll pulumi.StringMapInput } func (DefaultVpcState) ElementType() reflect.Type { @@ -409,6 +416,7 @@ func (o DefaultVpcOutput) Tags() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultVpc) pulumi.StringMapOutput { return v.Tags }).(pulumi.StringMapOutput) } +// Deprecated: Please use `tags` instead. func (o DefaultVpcOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultVpc) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpcDhcpOptions.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpcDhcpOptions.go index aa59a132..03b947a1 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpcDhcpOptions.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/defaultVpcDhcpOptions.go @@ -77,7 +77,8 @@ type DefaultVpcDhcpOptions struct { // The ID of the AWS account that owns the DHCP options set. OwnerId pulumi.StringOutput `pulumi:"ownerId"` // A map of tags to assign to the resource. - Tags pulumi.StringMapOutput `pulumi:"tags"` + Tags pulumi.StringMapOutput `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -88,6 +89,10 @@ func NewDefaultVpcDhcpOptions(ctx *pulumi.Context, args = &DefaultVpcDhcpOptionsArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource DefaultVpcDhcpOptions err := ctx.RegisterResource("aws:ec2/defaultVpcDhcpOptions:DefaultVpcDhcpOptions", name, args, &resource, opts...) @@ -123,7 +128,8 @@ type defaultVpcDhcpOptionsState struct { // The ID of the AWS account that owns the DHCP options set. OwnerId *string `pulumi:"ownerId"` // A map of tags to assign to the resource. - Tags map[string]string `pulumi:"tags"` + Tags map[string]string `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -140,7 +146,8 @@ type DefaultVpcDhcpOptionsState struct { // The ID of the AWS account that owns the DHCP options set. OwnerId pulumi.StringPtrInput // A map of tags to assign to the resource. - Tags pulumi.StringMapInput + Tags pulumi.StringMapInput + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -311,6 +318,7 @@ func (o DefaultVpcDhcpOptionsOutput) Tags() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultVpcDhcpOptions) pulumi.StringMapOutput { return v.Tags }).(pulumi.StringMapOutput) } +// Deprecated: Please use `tags` instead. func (o DefaultVpcDhcpOptionsOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *DefaultVpcDhcpOptions) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/egressOnlyInternetGateway.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/egressOnlyInternetGateway.go index 9589787b..fdb1fe09 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/egressOnlyInternetGateway.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/egressOnlyInternetGateway.go @@ -69,6 +69,8 @@ type EgressOnlyInternetGateway struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The VPC ID to create in. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -84,6 +86,10 @@ func NewEgressOnlyInternetGateway(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource EgressOnlyInternetGateway err := ctx.RegisterResource("aws:ec2/egressOnlyInternetGateway:EgressOnlyInternetGateway", name, args, &resource, opts...) @@ -110,6 +116,8 @@ type egressOnlyInternetGatewayState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The VPC ID to create in. VpcId *string `pulumi:"vpcId"` @@ -119,6 +127,8 @@ type EgressOnlyInternetGatewayState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The VPC ID to create in. VpcId pulumi.StringPtrInput @@ -260,6 +270,8 @@ func (o EgressOnlyInternetGatewayOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o EgressOnlyInternetGatewayOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *EgressOnlyInternetGateway) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/eip.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/eip.go index 3f7d07cd..5fb755e4 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/eip.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/eip.go @@ -226,6 +226,8 @@ type Eip struct { // Map of tags to assign to the resource. Tags can only be applied to EIPs in a VPC. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Boolean if the EIP is in a VPC or not. Use `domain` instead. // Defaults to `true` unless the region supports EC2-Classic. @@ -246,6 +248,10 @@ func NewEip(ctx *pulumi.Context, args = &EipArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Eip err := ctx.RegisterResource("aws:ec2/eip:Eip", name, args, &resource, opts...) @@ -305,6 +311,8 @@ type eipState struct { // Map of tags to assign to the resource. Tags can only be applied to EIPs in a VPC. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Boolean if the EIP is in a VPC or not. Use `domain` instead. // Defaults to `true` unless the region supports EC2-Classic. @@ -355,6 +363,8 @@ type EipState struct { // Map of tags to assign to the resource. Tags can only be applied to EIPs in a VPC. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Boolean if the EIP is in a VPC or not. Use `domain` instead. // Defaults to `true` unless the region supports EC2-Classic. @@ -635,6 +645,8 @@ func (o EipOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o EipOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Eip) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/fleet.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/fleet.go index 5523bcf4..0235e984 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/fleet.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/fleet.go @@ -89,6 +89,8 @@ type Fleet struct { // Map of Fleet tags. To tag instances at launch, specify the tags in the Launch Template. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Nested argument containing target capacity configurations. Defined below. TargetCapacitySpecification FleetTargetCapacitySpecificationOutput `pulumi:"targetCapacitySpecification"` @@ -117,6 +119,10 @@ func NewFleet(ctx *pulumi.Context, if args.TargetCapacitySpecification == nil { return nil, errors.New("invalid value for required argument 'TargetCapacitySpecification'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Fleet err := ctx.RegisterResource("aws:ec2/fleet:Fleet", name, args, &resource, opts...) @@ -165,6 +171,8 @@ type fleetState struct { // Map of Fleet tags. To tag instances at launch, specify the tags in the Launch Template. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Nested argument containing target capacity configurations. Defined below. TargetCapacitySpecification *FleetTargetCapacitySpecification `pulumi:"targetCapacitySpecification"` @@ -206,6 +214,8 @@ type FleetState struct { // Map of Fleet tags. To tag instances at launch, specify the tags in the Launch Template. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Nested argument containing target capacity configurations. Defined below. TargetCapacitySpecification FleetTargetCapacitySpecificationPtrInput @@ -472,6 +482,8 @@ func (o FleetOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o FleetOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Fleet) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/flowLog.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/flowLog.go index 4eb80b9c..7f996217 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/flowLog.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/flowLog.go @@ -217,6 +217,8 @@ type FlowLog struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The type of traffic to capture. Valid values: `ACCEPT`,`REJECT`, `ALL`. TrafficType pulumi.StringPtrOutput `pulumi:"trafficType"` @@ -235,6 +237,10 @@ func NewFlowLog(ctx *pulumi.Context, args = &FlowLogArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource FlowLog err := ctx.RegisterResource("aws:ec2/flowLog:FlowLog", name, args, &resource, opts...) @@ -288,6 +294,8 @@ type flowLogState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The type of traffic to capture. Valid values: `ACCEPT`,`REJECT`, `ALL`. TrafficType *string `pulumi:"trafficType"` @@ -330,6 +338,8 @@ type FlowLogState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The type of traffic to capture. Valid values: `ACCEPT`,`REJECT`, `ALL`. TrafficType pulumi.StringPtrInput @@ -599,6 +609,8 @@ func (o FlowLogOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o FlowLogOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *FlowLog) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/instance.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/instance.go index 4718b07d..084d4d86 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/instance.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/instance.go @@ -418,6 +418,8 @@ type Instance struct { // Map of tags to assign to the resource. Note that these tags apply to the instance and not block storage devices. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of `dedicated` runs on single-tenant hardware. The `host` tenancy is not supported for the import-instance command. Valid values are `default`, `dedicated`, and `host`. Tenancy pulumi.StringOutput `pulumi:"tenancy"` @@ -442,6 +444,10 @@ func NewInstance(ctx *pulumi.Context, args = &InstanceArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Instance err := ctx.RegisterResource("aws:ec2/instance:Instance", name, args, &resource, opts...) @@ -576,6 +582,8 @@ type instanceState struct { // Map of tags to assign to the resource. Note that these tags apply to the instance and not block storage devices. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of `dedicated` runs on single-tenant hardware. The `host` tenancy is not supported for the import-instance command. Valid values are `default`, `dedicated`, and `host`. Tenancy *string `pulumi:"tenancy"` @@ -705,6 +713,8 @@ type InstanceState struct { // Map of tags to assign to the resource. Note that these tags apply to the instance and not block storage devices. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of `dedicated` runs on single-tenant hardware. The `host` tenancy is not supported for the import-instance command. Valid values are `default`, `dedicated`, and `host`. Tenancy pulumi.StringPtrInput @@ -1315,6 +1325,8 @@ func (o InstanceOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o InstanceOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Instance) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/internetGateway.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/internetGateway.go index f13bf279..7a5c0dae 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/internetGateway.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/internetGateway.go @@ -91,6 +91,8 @@ type InternetGateway struct { // ``` Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The VPC ID to create in. See the ec2.InternetGatewayAttachment resource for an alternate way to attach an Internet Gateway to a VPC. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -103,6 +105,10 @@ func NewInternetGateway(ctx *pulumi.Context, args = &InternetGatewayArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource InternetGateway err := ctx.RegisterResource("aws:ec2/internetGateway:InternetGateway", name, args, &resource, opts...) @@ -162,6 +168,8 @@ type internetGatewayState struct { // ``` Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The VPC ID to create in. See the ec2.InternetGatewayAttachment resource for an alternate way to attach an Internet Gateway to a VPC. VpcId *string `pulumi:"vpcId"` @@ -204,6 +212,8 @@ type InternetGatewayState struct { // ``` Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The VPC ID to create in. See the ec2.InternetGatewayAttachment resource for an alternate way to attach an Internet Gateway to a VPC. VpcId pulumi.StringPtrInput @@ -445,6 +455,8 @@ func (o InternetGatewayOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o InternetGatewayOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *InternetGateway) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/keyPair.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/keyPair.go index 435031b2..ec33ec53 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/keyPair.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/keyPair.go @@ -80,6 +80,8 @@ type KeyPair struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -93,6 +95,10 @@ func NewKeyPair(ctx *pulumi.Context, if args.PublicKey == nil { return nil, errors.New("invalid value for required argument 'PublicKey'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource KeyPair err := ctx.RegisterResource("aws:ec2/keyPair:KeyPair", name, args, &resource, opts...) @@ -133,6 +139,8 @@ type keyPairState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -154,6 +162,8 @@ type KeyPairState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -336,6 +346,8 @@ func (o KeyPairOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o KeyPairOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *KeyPair) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/launchTemplate.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/launchTemplate.go index edbf8975..33410bd5 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/launchTemplate.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/launchTemplate.go @@ -220,6 +220,8 @@ type LaunchTemplate struct { // A map of tags to assign to the launch template. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Whether to update Default Version each update. Conflicts with `defaultVersion`. UpdateDefaultVersion pulumi.BoolPtrOutput `pulumi:"updateDefaultVersion"` @@ -236,6 +238,10 @@ func NewLaunchTemplate(ctx *pulumi.Context, args = &LaunchTemplateArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource LaunchTemplate err := ctx.RegisterResource("aws:ec2/launchTemplate:LaunchTemplate", name, args, &resource, opts...) @@ -341,6 +347,8 @@ type launchTemplateState struct { // A map of tags to assign to the launch template. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Whether to update Default Version each update. Conflicts with `defaultVersion`. UpdateDefaultVersion *bool `pulumi:"updateDefaultVersion"` @@ -433,6 +441,8 @@ type LaunchTemplateState struct { // A map of tags to assign to the launch template. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Whether to update Default Version each update. Conflicts with `defaultVersion`. UpdateDefaultVersion pulumi.BoolPtrInput @@ -926,6 +936,8 @@ func (o LaunchTemplateOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o LaunchTemplateOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *LaunchTemplate) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/localGatewayRouteTableVpcAssociation.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/localGatewayRouteTableVpcAssociation.go index 0d9d42ab..3931dc46 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/localGatewayRouteTableVpcAssociation.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/localGatewayRouteTableVpcAssociation.go @@ -72,6 +72,8 @@ type LocalGatewayRouteTableVpcAssociation struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Identifier of EC2 VPC. // @@ -92,6 +94,10 @@ func NewLocalGatewayRouteTableVpcAssociation(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource LocalGatewayRouteTableVpcAssociation err := ctx.RegisterResource("aws:ec2/localGatewayRouteTableVpcAssociation:LocalGatewayRouteTableVpcAssociation", name, args, &resource, opts...) @@ -121,6 +127,8 @@ type localGatewayRouteTableVpcAssociationState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Identifier of EC2 VPC. // @@ -135,6 +143,8 @@ type LocalGatewayRouteTableVpcAssociationState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Identifier of EC2 VPC. // @@ -295,6 +305,8 @@ func (o LocalGatewayRouteTableVpcAssociationOutput) Tags() pulumi.StringMapOutpu } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o LocalGatewayRouteTableVpcAssociationOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *LocalGatewayRouteTableVpcAssociation) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/managedPrefixList.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/managedPrefixList.go index 225f821a..00e86a2d 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/managedPrefixList.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/managedPrefixList.go @@ -96,6 +96,8 @@ type ManagedPrefixList struct { // Map of tags to assign to this resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Latest version of this prefix list. Version pulumi.IntOutput `pulumi:"version"` @@ -114,6 +116,10 @@ func NewManagedPrefixList(ctx *pulumi.Context, if args.MaxEntries == nil { return nil, errors.New("invalid value for required argument 'MaxEntries'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource ManagedPrefixList err := ctx.RegisterResource("aws:ec2/managedPrefixList:ManagedPrefixList", name, args, &resource, opts...) @@ -152,6 +158,8 @@ type managedPrefixListState struct { // Map of tags to assign to this resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Latest version of this prefix list. Version *int `pulumi:"version"` @@ -173,6 +181,8 @@ type ManagedPrefixListState struct { // Map of tags to assign to this resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Latest version of this prefix list. Version pulumi.IntPtrInput @@ -356,6 +366,8 @@ func (o ManagedPrefixListOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o ManagedPrefixListOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *ManagedPrefixList) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/natGateway.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/natGateway.go index 7a0ac100..1c2a36cf 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/natGateway.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/natGateway.go @@ -168,6 +168,8 @@ type NatGateway struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -181,6 +183,10 @@ func NewNatGateway(ctx *pulumi.Context, if args.SubnetId == nil { return nil, errors.New("invalid value for required argument 'SubnetId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource NatGateway err := ctx.RegisterResource("aws:ec2/natGateway:NatGateway", name, args, &resource, opts...) @@ -227,6 +233,8 @@ type natGatewayState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -254,6 +262,8 @@ type NatGatewayState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -467,6 +477,8 @@ func (o NatGatewayOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o NatGatewayOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *NatGateway) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkAcl.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkAcl.go index 8991aca8..6a95aa24 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkAcl.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkAcl.go @@ -100,6 +100,8 @@ type NetworkAcl struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The ID of the associated VPC. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -115,6 +117,10 @@ func NewNetworkAcl(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource NetworkAcl err := ctx.RegisterResource("aws:ec2/networkAcl:NetworkAcl", name, args, &resource, opts...) @@ -151,6 +157,8 @@ type networkAclState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The ID of the associated VPC. VpcId *string `pulumi:"vpcId"` @@ -170,6 +178,8 @@ type NetworkAclState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The ID of the associated VPC. VpcId pulumi.StringPtrInput @@ -348,6 +358,8 @@ func (o NetworkAclOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o NetworkAclOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *NetworkAcl) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsAnalysis.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsAnalysis.go index d257d3c6..31f67718 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsAnalysis.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsAnalysis.go @@ -88,6 +88,8 @@ type NetworkInsightsAnalysis struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // If enabled, the resource will wait for the Network Insights Analysis status to change to `succeeded` or `failed`. Setting this to `false` will skip the process. Default: `true`. WaitForCompletion pulumi.BoolPtrOutput `pulumi:"waitForCompletion"` @@ -105,6 +107,10 @@ func NewNetworkInsightsAnalysis(ctx *pulumi.Context, if args.NetworkInsightsPathId == nil { return nil, errors.New("invalid value for required argument 'NetworkInsightsPathId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource NetworkInsightsAnalysis err := ctx.RegisterResource("aws:ec2/networkInsightsAnalysis:NetworkInsightsAnalysis", name, args, &resource, opts...) @@ -155,6 +161,8 @@ type networkInsightsAnalysisState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // If enabled, the resource will wait for the Network Insights Analysis status to change to `succeeded` or `failed`. Setting this to `false` will skip the process. Default: `true`. WaitForCompletion *bool `pulumi:"waitForCompletion"` @@ -190,6 +198,8 @@ type NetworkInsightsAnalysisState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // If enabled, the resource will wait for the Network Insights Analysis status to change to `succeeded` or `failed`. Setting this to `false` will skip the process. Default: `true`. WaitForCompletion pulumi.BoolPtrInput @@ -408,6 +418,8 @@ func (o NetworkInsightsAnalysisOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o NetworkInsightsAnalysisOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *NetworkInsightsAnalysis) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsPath.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsPath.go index 7bb3ee0a..e8c074a4 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsPath.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInsightsPath.go @@ -78,6 +78,8 @@ type NetworkInsightsPath struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -97,6 +99,10 @@ func NewNetworkInsightsPath(ctx *pulumi.Context, if args.Source == nil { return nil, errors.New("invalid value for required argument 'Source'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource NetworkInsightsPath err := ctx.RegisterResource("aws:ec2/networkInsightsPath:NetworkInsightsPath", name, args, &resource, opts...) @@ -143,6 +149,8 @@ type networkInsightsPathState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -170,6 +178,8 @@ type NetworkInsightsPathState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -380,6 +390,8 @@ func (o NetworkInsightsPathOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o NetworkInsightsPathOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *NetworkInsightsPath) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInterface.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInterface.go index 884fae6f..ff91641f 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInterface.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/networkInterface.go @@ -130,6 +130,8 @@ type NetworkInterface struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -143,6 +145,10 @@ func NewNetworkInterface(ctx *pulumi.Context, if args.SubnetId == nil { return nil, errors.New("invalid value for required argument 'SubnetId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource NetworkInterface err := ctx.RegisterResource("aws:ec2/networkInterface:NetworkInterface", name, args, &resource, opts...) @@ -217,6 +223,8 @@ type networkInterfaceState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -272,6 +280,8 @@ type NetworkInterfaceState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -605,6 +615,8 @@ func (o NetworkInterfaceOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o NetworkInterfaceOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *NetworkInterface) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/placementGroup.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/placementGroup.go index f9c65a52..3a441c12 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/placementGroup.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/placementGroup.go @@ -72,6 +72,8 @@ type PlacementGroup struct { // Key-value map of resource tags. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -85,6 +87,10 @@ func NewPlacementGroup(ctx *pulumi.Context, if args.Strategy == nil { return nil, errors.New("invalid value for required argument 'Strategy'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource PlacementGroup err := ctx.RegisterResource("aws:ec2/placementGroup:PlacementGroup", name, args, &resource, opts...) @@ -126,6 +132,8 @@ type placementGroupState struct { // Key-value map of resource tags. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -148,6 +156,8 @@ type PlacementGroupState struct { // Key-value map of resource tags. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -338,6 +348,8 @@ func (o PlacementGroupOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o PlacementGroupOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *PlacementGroup) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/routeTable.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/routeTable.go index 0c90656c..d5d152a2 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/routeTable.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/routeTable.go @@ -222,6 +222,8 @@ type RouteTable struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The VPC ID. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -237,6 +239,10 @@ func NewRouteTable(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource RouteTable err := ctx.RegisterResource("aws:ec2/routeTable:RouteTable", name, args, &resource, opts...) @@ -272,6 +278,8 @@ type routeTableState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The VPC ID. VpcId *string `pulumi:"vpcId"` @@ -290,6 +298,8 @@ type RouteTableState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The VPC ID. VpcId pulumi.StringPtrInput @@ -462,6 +472,8 @@ func (o RouteTableOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o RouteTableOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *RouteTable) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/securityGroup.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/securityGroup.go index 90782a9a..7322dc2b 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/securityGroup.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/securityGroup.go @@ -324,6 +324,8 @@ type SecurityGroup struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // VPC ID. Defaults to the region's default VPC. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -339,6 +341,10 @@ func NewSecurityGroup(ctx *pulumi.Context, if args.Description == nil { args.Description = pulumi.StringPtr("Managed by Pulumi") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource SecurityGroup err := ctx.RegisterResource("aws:ec2/securityGroup:SecurityGroup", name, args, &resource, opts...) @@ -381,6 +387,8 @@ type securityGroupState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // VPC ID. Defaults to the region's default VPC. VpcId *string `pulumi:"vpcId"` @@ -406,6 +414,8 @@ type SecurityGroupState struct { // Map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // VPC ID. Defaults to the region's default VPC. VpcId pulumi.StringPtrInput @@ -611,6 +621,8 @@ func (o SecurityGroupOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SecurityGroupOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *SecurityGroup) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotFleetRequest.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotFleetRequest.go index 79fdfafb..ac07e976 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotFleetRequest.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotFleetRequest.go @@ -266,6 +266,8 @@ type SpotFleetRequest struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The number of units to request. You can choose to set the // target capacity in terms of instances or a performance characteristic that is @@ -305,6 +307,10 @@ func NewSpotFleetRequest(ctx *pulumi.Context, if args.TargetCapacity == nil { return nil, errors.New("invalid value for required argument 'TargetCapacity'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource SpotFleetRequest err := ctx.RegisterResource("aws:ec2/spotFleetRequest:SpotFleetRequest", name, args, &resource, opts...) @@ -387,6 +393,8 @@ type spotFleetRequestState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The number of units to request. You can choose to set the // target capacity in terms of instances or a performance characteristic that is @@ -473,6 +481,8 @@ type SpotFleetRequestState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The number of units to request. You can choose to set the // target capacity in terms of instances or a performance characteristic that is @@ -899,6 +909,8 @@ func (o SpotFleetRequestOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SpotFleetRequestOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *SpotFleetRequest) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotInstanceRequest.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotInstanceRequest.go index cc2f49e9..ffd9e14c 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotInstanceRequest.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/spotInstanceRequest.go @@ -197,6 +197,8 @@ type SpotInstanceRequest struct { // Map of tags to assign to the resource. Note that these tags apply to the instance and not block storage devices. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of `dedicated` runs on single-tenant hardware. The `host` tenancy is not supported for the import-instance command. Valid values are `default`, `dedicated`, and `host`. Tenancy pulumi.StringOutput `pulumi:"tenancy"` @@ -229,6 +231,10 @@ func NewSpotInstanceRequest(ctx *pulumi.Context, args = &SpotInstanceRequestArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource SpotInstanceRequest err := ctx.RegisterResource("aws:ec2/spotInstanceRequest:SpotInstanceRequest", name, args, &resource, opts...) @@ -378,6 +384,8 @@ type spotInstanceRequestState struct { // Map of tags to assign to the resource. Note that these tags apply to the instance and not block storage devices. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of `dedicated` runs on single-tenant hardware. The `host` tenancy is not supported for the import-instance command. Valid values are `default`, `dedicated`, and `host`. Tenancy *string `pulumi:"tenancy"` @@ -530,6 +538,8 @@ type SpotInstanceRequestState struct { // Map of tags to assign to the resource. Note that these tags apply to the instance and not block storage devices. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of `dedicated` runs on single-tenant hardware. The `host` tenancy is not supported for the import-instance command. Valid values are `default`, `dedicated`, and `host`. Tenancy pulumi.StringPtrInput @@ -1222,6 +1232,8 @@ func (o SpotInstanceRequestOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SpotInstanceRequestOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *SpotInstanceRequest) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/subnet.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/subnet.go index 7949102c..82fe7317 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/subnet.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/subnet.go @@ -140,6 +140,8 @@ type Subnet struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The VPC ID. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -155,6 +157,10 @@ func NewSubnet(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Subnet err := ctx.RegisterResource("aws:ec2/subnet:Subnet", name, args, &resource, opts...) @@ -222,6 +228,8 @@ type subnetState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The VPC ID. VpcId *string `pulumi:"vpcId"` @@ -272,6 +280,8 @@ type SubnetState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The VPC ID. VpcId pulumi.StringPtrInput @@ -578,6 +588,8 @@ func (o SubnetOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SubnetOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Subnet) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorFilter.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorFilter.go index d8c75949..4d402825 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorFilter.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorFilter.go @@ -67,6 +67,8 @@ type TrafficMirrorFilter struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -77,6 +79,10 @@ func NewTrafficMirrorFilter(ctx *pulumi.Context, args = &TrafficMirrorFilterArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource TrafficMirrorFilter err := ctx.RegisterResource("aws:ec2/trafficMirrorFilter:TrafficMirrorFilter", name, args, &resource, opts...) @@ -109,6 +115,8 @@ type trafficMirrorFilterState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -122,6 +130,8 @@ type TrafficMirrorFilterState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -280,6 +290,8 @@ func (o TrafficMirrorFilterOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o TrafficMirrorFilterOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *TrafficMirrorFilter) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorSession.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorSession.go index a8f73a79..374a8409 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorSession.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorSession.go @@ -90,6 +90,8 @@ type TrafficMirrorSession struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // ID of the traffic mirror filter to be used TrafficMirrorFilterId pulumi.StringOutput `pulumi:"trafficMirrorFilterId"` @@ -118,6 +120,10 @@ func NewTrafficMirrorSession(ctx *pulumi.Context, if args.TrafficMirrorTargetId == nil { return nil, errors.New("invalid value for required argument 'TrafficMirrorTargetId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource TrafficMirrorSession err := ctx.RegisterResource("aws:ec2/trafficMirrorSession:TrafficMirrorSession", name, args, &resource, opts...) @@ -156,6 +162,8 @@ type trafficMirrorSessionState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // ID of the traffic mirror filter to be used TrafficMirrorFilterId *string `pulumi:"trafficMirrorFilterId"` @@ -181,6 +189,8 @@ type TrafficMirrorSessionState struct { // Key-value map of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // ID of the traffic mirror filter to be used TrafficMirrorFilterId pulumi.StringPtrInput @@ -380,6 +390,8 @@ func (o TrafficMirrorSessionOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o TrafficMirrorSessionOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *TrafficMirrorSession) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorTarget.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorTarget.go index 03d82a16..d27734e4 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorTarget.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/trafficMirrorTarget.go @@ -87,6 +87,8 @@ type TrafficMirrorTarget struct { // **NOTE:** Either `networkInterfaceId` or `networkLoadBalancerArn` should be specified and both should not be specified together Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -97,6 +99,10 @@ func NewTrafficMirrorTarget(ctx *pulumi.Context, args = &TrafficMirrorTargetArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource TrafficMirrorTarget err := ctx.RegisterResource("aws:ec2/trafficMirrorTarget:TrafficMirrorTarget", name, args, &resource, opts...) @@ -137,6 +143,8 @@ type trafficMirrorTargetState struct { // **NOTE:** Either `networkInterfaceId` or `networkLoadBalancerArn` should be specified and both should not be specified together Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -158,6 +166,8 @@ type TrafficMirrorTargetState struct { // **NOTE:** Either `networkInterfaceId` or `networkLoadBalancerArn` should be specified and both should not be specified together Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -345,6 +355,8 @@ func (o TrafficMirrorTargetOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o TrafficMirrorTargetOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *TrafficMirrorTarget) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpc.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpc.go index 403ba3c7..aa674520 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpc.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpc.go @@ -187,6 +187,8 @@ type Vpc struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -197,6 +199,10 @@ func NewVpc(ctx *pulumi.Context, args = &VpcArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Vpc err := ctx.RegisterResource("aws:ec2/vpc:Vpc", name, args, &resource, opts...) @@ -264,6 +270,8 @@ type vpcState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -312,6 +320,8 @@ type VpcState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -596,6 +606,8 @@ func (o VpcOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Vpc) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcDhcpOptions.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcDhcpOptions.go index 047cb268..629a2ac0 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcDhcpOptions.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcDhcpOptions.go @@ -121,6 +121,8 @@ type VpcDhcpOptions struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -131,6 +133,10 @@ func NewVpcDhcpOptions(ctx *pulumi.Context, args = &VpcDhcpOptionsArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcDhcpOptions err := ctx.RegisterResource("aws:ec2/vpcDhcpOptions:VpcDhcpOptions", name, args, &resource, opts...) @@ -171,6 +177,8 @@ type vpcDhcpOptionsState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -192,6 +200,8 @@ type VpcDhcpOptionsState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -382,6 +392,8 @@ func (o VpcDhcpOptionsOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcDhcpOptionsOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcDhcpOptions) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpoint.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpoint.go index 1e289045..01e9b8e8 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpoint.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpoint.go @@ -209,6 +209,8 @@ type VpcEndpoint struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The VPC endpoint type, `Gateway`, `GatewayLoadBalancer`, or `Interface`. Defaults to `Gateway`. VpcEndpointType pulumi.StringPtrOutput `pulumi:"vpcEndpointType"` @@ -229,6 +231,10 @@ func NewVpcEndpoint(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcEndpoint err := ctx.RegisterResource("aws:ec2/vpcEndpoint:VpcEndpoint", name, args, &resource, opts...) @@ -291,6 +297,8 @@ type vpcEndpointState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The VPC endpoint type, `Gateway`, `GatewayLoadBalancer`, or `Interface`. Defaults to `Gateway`. VpcEndpointType *string `pulumi:"vpcEndpointType"` @@ -338,6 +346,8 @@ type VpcEndpointState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The VPC endpoint type, `Gateway`, `GatewayLoadBalancer`, or `Interface`. Defaults to `Gateway`. VpcEndpointType pulumi.StringPtrInput @@ -612,6 +622,8 @@ func (o VpcEndpointOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcEndpointOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcEndpoint) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpointService.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpointService.go index 6f3cb752..41f17be0 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpointService.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcEndpointService.go @@ -123,6 +123,8 @@ type VpcEndpointService struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -136,6 +138,10 @@ func NewVpcEndpointService(ctx *pulumi.Context, if args.AcceptanceRequired == nil { return nil, errors.New("invalid value for required argument 'AcceptanceRequired'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcEndpointService err := ctx.RegisterResource("aws:ec2/vpcEndpointService:VpcEndpointService", name, args, &resource, opts...) @@ -190,6 +196,8 @@ type vpcEndpointServiceState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -225,6 +233,8 @@ type VpcEndpointServiceState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -456,6 +466,8 @@ func (o VpcEndpointServiceOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcEndpointServiceOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcEndpointService) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpam.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpam.go index 2cc9af62..6e9cbcec 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpam.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpam.go @@ -49,6 +49,8 @@ type VpcIpam struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -62,6 +64,10 @@ func NewVpcIpam(ctx *pulumi.Context, if args.OperatingRegions == nil { return nil, errors.New("invalid value for required argument 'OperatingRegions'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcIpam err := ctx.RegisterResource("aws:ec2/vpcIpam:VpcIpam", name, args, &resource, opts...) @@ -107,6 +113,8 @@ type vpcIpamState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -133,6 +141,8 @@ type VpcIpamState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -326,6 +336,8 @@ func (o VpcIpamOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcIpamOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcIpam) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamPool.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamPool.go index cd517b97..46096820 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamPool.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamPool.go @@ -173,6 +173,8 @@ type VpcIpamPool struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -189,6 +191,10 @@ func NewVpcIpamPool(ctx *pulumi.Context, if args.IpamScopeId == nil { return nil, errors.New("invalid value for required argument 'IpamScopeId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcIpamPool err := ctx.RegisterResource("aws:ec2/vpcIpamPool:VpcIpamPool", name, args, &resource, opts...) @@ -248,6 +254,8 @@ type vpcIpamPoolState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -288,6 +296,8 @@ type VpcIpamPoolState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -561,6 +571,8 @@ func (o VpcIpamPoolOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcIpamPoolOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcIpamPool) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscovery.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscovery.go index 6a88d401..998abbe3 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscovery.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscovery.go @@ -83,6 +83,8 @@ type VpcIpamResourceDiscovery struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -96,6 +98,10 @@ func NewVpcIpamResourceDiscovery(ctx *pulumi.Context, if args.OperatingRegions == nil { return nil, errors.New("invalid value for required argument 'OperatingRegions'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcIpamResourceDiscovery err := ctx.RegisterResource("aws:ec2/vpcIpamResourceDiscovery:VpcIpamResourceDiscovery", name, args, &resource, opts...) @@ -134,6 +140,8 @@ type vpcIpamResourceDiscoveryState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -153,6 +161,8 @@ type VpcIpamResourceDiscoveryState struct { // A map of tags to assign to the resource. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -328,6 +338,8 @@ func (o VpcIpamResourceDiscoveryOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcIpamResourceDiscoveryOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcIpamResourceDiscovery) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscoveryAssociation.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscoveryAssociation.go index 2f7f2628..3da3a5d8 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscoveryAssociation.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamResourceDiscoveryAssociation.go @@ -80,6 +80,8 @@ type VpcIpamResourceDiscoveryAssociation struct { // A map of tags to add to the IPAM resource discovery association resource. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -96,6 +98,10 @@ func NewVpcIpamResourceDiscoveryAssociation(ctx *pulumi.Context, if args.IpamResourceDiscoveryId == nil { return nil, errors.New("invalid value for required argument 'IpamResourceDiscoveryId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcIpamResourceDiscoveryAssociation err := ctx.RegisterResource("aws:ec2/vpcIpamResourceDiscoveryAssociation:VpcIpamResourceDiscoveryAssociation", name, args, &resource, opts...) @@ -138,6 +144,8 @@ type vpcIpamResourceDiscoveryAssociationState struct { // A map of tags to add to the IPAM resource discovery association resource. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -161,6 +169,8 @@ type VpcIpamResourceDiscoveryAssociationState struct { // A map of tags to add to the IPAM resource discovery association resource. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -344,6 +354,8 @@ func (o VpcIpamResourceDiscoveryAssociationOutput) Tags() pulumi.StringMapOutput } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcIpamResourceDiscoveryAssociationOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcIpamResourceDiscoveryAssociation) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamScope.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamScope.go index dab4aa42..ea03cd45 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamScope.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcIpamScope.go @@ -85,7 +85,8 @@ type VpcIpamScope struct { // The number of pools in the scope. PoolCount pulumi.IntOutput `pulumi:"poolCount"` // Key-value mapping of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags pulumi.StringMapOutput `pulumi:"tags"` + Tags pulumi.StringMapOutput `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -99,6 +100,10 @@ func NewVpcIpamScope(ctx *pulumi.Context, if args.IpamId == nil { return nil, errors.New("invalid value for required argument 'IpamId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcIpamScope err := ctx.RegisterResource("aws:ec2/vpcIpamScope:VpcIpamScope", name, args, &resource, opts...) @@ -136,7 +141,8 @@ type vpcIpamScopeState struct { // The number of pools in the scope. PoolCount *int `pulumi:"poolCount"` // Key-value mapping of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags map[string]string `pulumi:"tags"` + Tags map[string]string `pulumi:"tags"` + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -155,7 +161,8 @@ type VpcIpamScopeState struct { // The number of pools in the scope. PoolCount pulumi.IntPtrInput // Key-value mapping of resource tags. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. - Tags pulumi.StringMapInput + Tags pulumi.StringMapInput + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -332,6 +339,7 @@ func (o VpcIpamScopeOutput) Tags() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcIpamScope) pulumi.StringMapOutput { return v.Tags }).(pulumi.StringMapOutput) } +// Deprecated: Please use `tags` instead. func (o VpcIpamScopeOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcIpamScope) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnection.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnection.go index 06e6da91..e4eb6e77 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnection.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnection.go @@ -214,6 +214,8 @@ type VpcPeeringConnection struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The ID of the requester VPC. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -232,6 +234,10 @@ func NewVpcPeeringConnection(ctx *pulumi.Context, if args.VpcId == nil { return nil, errors.New("invalid value for required argument 'VpcId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcPeeringConnection err := ctx.RegisterResource("aws:ec2/vpcPeeringConnection:VpcPeeringConnection", name, args, &resource, opts...) @@ -276,6 +282,8 @@ type vpcPeeringConnectionState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The ID of the requester VPC. VpcId *string `pulumi:"vpcId"` @@ -303,6 +311,8 @@ type VpcPeeringConnectionState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The ID of the requester VPC. VpcId pulumi.StringPtrInput @@ -515,6 +525,8 @@ func (o VpcPeeringConnectionOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcPeeringConnectionOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcPeeringConnection) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnectionAccepter.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnectionAccepter.go index aaed9893..1c04644f 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnectionAccepter.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpcPeeringConnectionAccepter.go @@ -121,6 +121,8 @@ type VpcPeeringConnectionAccepter struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The ID of the accepter VPC. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -138,6 +140,10 @@ func NewVpcPeeringConnectionAccepter(ctx *pulumi.Context, if args.VpcPeeringConnectionId == nil { return nil, errors.New("invalid value for required argument 'VpcPeeringConnectionId'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpcPeeringConnectionAccepter err := ctx.RegisterResource("aws:ec2/vpcPeeringConnectionAccepter:VpcPeeringConnectionAccepter", name, args, &resource, opts...) @@ -180,6 +186,8 @@ type vpcPeeringConnectionAccepterState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The ID of the accepter VPC. VpcId *string `pulumi:"vpcId"` @@ -207,6 +215,8 @@ type VpcPeeringConnectionAccepterState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The ID of the accepter VPC. VpcId pulumi.StringPtrInput @@ -403,6 +413,8 @@ func (o VpcPeeringConnectionAccepterOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpcPeeringConnectionAccepterOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpcPeeringConnectionAccepter) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnConnection.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnConnection.go index bebb5971..73902686 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnConnection.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnConnection.go @@ -227,6 +227,8 @@ type VpnConnection struct { // Tags to apply to the connection. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // When associated with an EC2 Transit Gateway (`transitGatewayId` argument), the attachment ID. See also the `ec2.Tag` resource for tagging the EC2 Transit Gateway VPN Attachment. TransitGatewayAttachmentId pulumi.StringOutput `pulumi:"transitGatewayAttachmentId"` @@ -365,6 +367,7 @@ func NewVpnConnection(ctx *pulumi.Context, } secrets := pulumi.AdditionalSecretOutputs([]string{ "customerGatewayConfiguration", + "tagsAll", "tunnel1PresharedKey", "tunnel2PresharedKey", }) @@ -421,6 +424,8 @@ type vpnConnectionState struct { // Tags to apply to the connection. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // When associated with an EC2 Transit Gateway (`transitGatewayId` argument), the attachment ID. See also the `ec2.Tag` resource for tagging the EC2 Transit Gateway VPN Attachment. TransitGatewayAttachmentId *string `pulumi:"transitGatewayAttachmentId"` @@ -568,6 +573,8 @@ type VpnConnectionState struct { // Tags to apply to the connection. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // When associated with an EC2 Transit Gateway (`transitGatewayId` argument), the attachment ID. See also the `ec2.Tag` resource for tagging the EC2 Transit Gateway VPN Attachment. TransitGatewayAttachmentId pulumi.StringPtrInput @@ -1094,6 +1101,8 @@ func (o VpnConnectionOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpnConnectionOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpnConnection) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnGateway.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnGateway.go index d3ad7756..7442ed61 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnGateway.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2/vpnGateway.go @@ -64,6 +64,8 @@ type VpnGateway struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The VPC ID to create in. VpcId pulumi.StringOutput `pulumi:"vpcId"` @@ -76,6 +78,10 @@ func NewVpnGateway(ctx *pulumi.Context, args = &VpnGatewayArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VpnGateway err := ctx.RegisterResource("aws:ec2/vpnGateway:VpnGateway", name, args, &resource, opts...) @@ -108,6 +114,8 @@ type vpnGatewayState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The VPC ID to create in. VpcId *string `pulumi:"vpcId"` @@ -123,6 +131,8 @@ type VpnGatewayState struct { // A map of tags to assign to the resource. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The VPC ID to create in. VpcId pulumi.StringPtrInput @@ -287,6 +297,8 @@ func (o VpnGatewayOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VpnGatewayOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VpnGateway) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/instanceProfile.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/instanceProfile.go index 86f9d5f0..3d6b04b3 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/instanceProfile.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/instanceProfile.go @@ -95,6 +95,8 @@ type InstanceProfile struct { // Map of resource tags for the IAM Instance Profile. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // [Unique ID][1] assigned by AWS. UniqueId pulumi.StringOutput `pulumi:"uniqueId"` @@ -107,6 +109,10 @@ func NewInstanceProfile(ctx *pulumi.Context, args = &InstanceProfileArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource InstanceProfile err := ctx.RegisterResource("aws:iam/instanceProfile:InstanceProfile", name, args, &resource, opts...) @@ -145,6 +151,8 @@ type instanceProfileState struct { // Map of resource tags for the IAM Instance Profile. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // [Unique ID][1] assigned by AWS. UniqueId *string `pulumi:"uniqueId"` @@ -166,6 +174,8 @@ type InstanceProfileState struct { // Map of resource tags for the IAM Instance Profile. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // [Unique ID][1] assigned by AWS. UniqueId pulumi.StringPtrInput @@ -349,6 +359,8 @@ func (o InstanceProfileOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o InstanceProfileOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *InstanceProfile) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/openIdConnectProvider.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/openIdConnectProvider.go index 3f77992f..b79ee4de 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/openIdConnectProvider.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/openIdConnectProvider.go @@ -66,6 +66,8 @@ type OpenIdConnectProvider struct { // Map of resource tags for the IAM OIDC provider. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // A list of server certificate thumbprints for the OpenID Connect (OIDC) identity provider's server certificate(s). ThumbprintLists pulumi.StringArrayOutput `pulumi:"thumbprintLists"` @@ -89,6 +91,10 @@ func NewOpenIdConnectProvider(ctx *pulumi.Context, if args.Url == nil { return nil, errors.New("invalid value for required argument 'Url'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource OpenIdConnectProvider err := ctx.RegisterResource("aws:iam/openIdConnectProvider:OpenIdConnectProvider", name, args, &resource, opts...) @@ -119,6 +125,8 @@ type openIdConnectProviderState struct { // Map of resource tags for the IAM OIDC provider. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // A list of server certificate thumbprints for the OpenID Connect (OIDC) identity provider's server certificate(s). ThumbprintLists []string `pulumi:"thumbprintLists"` @@ -134,6 +142,8 @@ type OpenIdConnectProviderState struct { // Map of resource tags for the IAM OIDC provider. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // A list of server certificate thumbprints for the OpenID Connect (OIDC) identity provider's server certificate(s). ThumbprintLists pulumi.StringArrayInput @@ -295,6 +305,8 @@ func (o OpenIdConnectProviderOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o OpenIdConnectProviderOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *OpenIdConnectProvider) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/policy.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/policy.go index b0505675..43313ee6 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/policy.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/policy.go @@ -91,6 +91,8 @@ type Policy struct { // Map of resource tags for the IAM Policy. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` } @@ -104,6 +106,10 @@ func NewPolicy(ctx *pulumi.Context, if args.Policy == nil { return nil, errors.New("invalid value for required argument 'Policy'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Policy err := ctx.RegisterResource("aws:iam/policy:Policy", name, args, &resource, opts...) @@ -145,6 +151,8 @@ type policyState struct { // Map of resource tags for the IAM Policy. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` } @@ -167,6 +175,8 @@ type PolicyState struct { // Map of resource tags for the IAM Policy. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput } @@ -360,6 +370,8 @@ func (o PolicyOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o PolicyOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Policy) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/role.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/role.go index d3a089e2..3f99812e 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/role.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/role.go @@ -363,6 +363,8 @@ type Role struct { // Key-value mapping of tags for the IAM role. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Stable and unique string identifying the role. UniqueId pulumi.StringOutput `pulumi:"uniqueId"` @@ -378,6 +380,10 @@ func NewRole(ctx *pulumi.Context, if args.AssumeRolePolicy == nil { return nil, errors.New("invalid value for required argument 'AssumeRolePolicy'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Role err := ctx.RegisterResource("aws:iam/role:Role", name, args, &resource, opts...) @@ -431,6 +437,8 @@ type roleState struct { // Key-value mapping of tags for the IAM role. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Stable and unique string identifying the role. UniqueId *string `pulumi:"uniqueId"` @@ -467,6 +475,8 @@ type RoleState struct { // Key-value mapping of tags for the IAM role. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Stable and unique string identifying the role. UniqueId pulumi.StringPtrInput @@ -713,6 +723,8 @@ func (o RoleOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o RoleOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Role) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/samlProvider.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/samlProvider.go index 3b09a9f0..d59eeee9 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/samlProvider.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/samlProvider.go @@ -72,6 +72,8 @@ type SamlProvider struct { // Map of resource tags for the IAM SAML provider. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The expiration date and time for the SAML provider in RFC1123 format, e.g., `Mon, 02 Jan 2006 15:04:05 MST`. ValidUntil pulumi.StringOutput `pulumi:"validUntil"` @@ -87,6 +89,10 @@ func NewSamlProvider(ctx *pulumi.Context, if args.SamlMetadataDocument == nil { return nil, errors.New("invalid value for required argument 'SamlMetadataDocument'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource SamlProvider err := ctx.RegisterResource("aws:iam/samlProvider:SamlProvider", name, args, &resource, opts...) @@ -119,6 +125,8 @@ type samlProviderState struct { // Map of resource tags for the IAM SAML provider. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The expiration date and time for the SAML provider in RFC1123 format, e.g., `Mon, 02 Jan 2006 15:04:05 MST`. ValidUntil *string `pulumi:"validUntil"` @@ -134,6 +142,8 @@ type SamlProviderState struct { // Map of resource tags for the IAM SAML provider. .If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The expiration date and time for the SAML provider in RFC1123 format, e.g., `Mon, 02 Jan 2006 15:04:05 MST`. ValidUntil pulumi.StringPtrInput @@ -294,6 +304,8 @@ func (o SamlProviderOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o SamlProviderOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *SamlProvider) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serverCertificate.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serverCertificate.go index ac334522..28d07e1e 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serverCertificate.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serverCertificate.go @@ -195,6 +195,8 @@ type ServerCertificate struct { // > **NOTE:** AWS performs behind-the-scenes modifications to some certificate files if they do not adhere to a specific format. These modifications will result in this provider forever believing that it needs to update the resources since the local and AWS file contents will not match after theses modifications occur. In order to prevent this from happening you must ensure that all your PEM-encoded files use UNIX line-breaks and that `certificateBody` contains only one certificate. All other certificates should go in `certificateChain`. It is common for some Certificate Authorities to issue certificate files that have DOS line-breaks and that are actually multiple certificates concatenated together in order to form a full certificate chain. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Date and time in [RFC3339 format](https://tools.ietf.org/html/rfc3339#section-5.8) when the server certificate was uploaded. UploadDate pulumi.StringOutput `pulumi:"uploadDate"` @@ -218,6 +220,7 @@ func NewServerCertificate(ctx *pulumi.Context, } secrets := pulumi.AdditionalSecretOutputs([]string{ "privateKey", + "tagsAll", }) opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) @@ -272,6 +275,8 @@ type serverCertificateState struct { // > **NOTE:** AWS performs behind-the-scenes modifications to some certificate files if they do not adhere to a specific format. These modifications will result in this provider forever believing that it needs to update the resources since the local and AWS file contents will not match after theses modifications occur. In order to prevent this from happening you must ensure that all your PEM-encoded files use UNIX line-breaks and that `certificateBody` contains only one certificate. All other certificates should go in `certificateChain`. It is common for some Certificate Authorities to issue certificate files that have DOS line-breaks and that are actually multiple certificates concatenated together in order to form a full certificate chain. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Date and time in [RFC3339 format](https://tools.ietf.org/html/rfc3339#section-5.8) when the server certificate was uploaded. UploadDate *string `pulumi:"uploadDate"` @@ -307,6 +312,8 @@ type ServerCertificateState struct { // > **NOTE:** AWS performs behind-the-scenes modifications to some certificate files if they do not adhere to a specific format. These modifications will result in this provider forever believing that it needs to update the resources since the local and AWS file contents will not match after theses modifications occur. In order to prevent this from happening you must ensure that all your PEM-encoded files use UNIX line-breaks and that `certificateBody` contains only one certificate. All other certificates should go in `certificateChain`. It is common for some Certificate Authorities to issue certificate files that have DOS line-breaks and that are actually multiple certificates concatenated together in order to form a full certificate chain. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Date and time in [RFC3339 format](https://tools.ietf.org/html/rfc3339#section-5.8) when the server certificate was uploaded. UploadDate pulumi.StringPtrInput @@ -538,6 +545,8 @@ func (o ServerCertificateOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o ServerCertificateOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *ServerCertificate) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serviceLinkedRole.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serviceLinkedRole.go index 9b8c0014..9481f6ef 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serviceLinkedRole.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/serviceLinkedRole.go @@ -70,6 +70,8 @@ type ServiceLinkedRole struct { // Key-value mapping of tags for the IAM role. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The stable and unique string identifying the role. UniqueId pulumi.StringOutput `pulumi:"uniqueId"` @@ -85,6 +87,10 @@ func NewServiceLinkedRole(ctx *pulumi.Context, if args.AwsServiceName == nil { return nil, errors.New("invalid value for required argument 'AwsServiceName'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource ServiceLinkedRole err := ctx.RegisterResource("aws:iam/serviceLinkedRole:ServiceLinkedRole", name, args, &resource, opts...) @@ -125,6 +131,8 @@ type serviceLinkedRoleState struct { // Key-value mapping of tags for the IAM role. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The stable and unique string identifying the role. UniqueId *string `pulumi:"uniqueId"` @@ -148,6 +156,8 @@ type ServiceLinkedRoleState struct { // Key-value mapping of tags for the IAM role. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The stable and unique string identifying the role. UniqueId pulumi.StringPtrInput @@ -332,6 +342,8 @@ func (o ServiceLinkedRoleOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o ServiceLinkedRoleOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *ServiceLinkedRole) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/user.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/user.go index 31b9f1f7..b5237364 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/user.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/user.go @@ -101,6 +101,8 @@ type User struct { // Key-value mapping of tags for the IAM user. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The [unique ID][1] assigned by AWS. UniqueId pulumi.StringOutput `pulumi:"uniqueId"` @@ -113,6 +115,10 @@ func NewUser(ctx *pulumi.Context, args = &UserArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource User err := ctx.RegisterResource("aws:iam/user:User", name, args, &resource, opts...) @@ -151,6 +157,8 @@ type userState struct { // Key-value mapping of tags for the IAM user. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The [unique ID][1] assigned by AWS. UniqueId *string `pulumi:"uniqueId"` @@ -172,6 +180,8 @@ type UserState struct { // Key-value mapping of tags for the IAM user. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The [unique ID][1] assigned by AWS. UniqueId pulumi.StringPtrInput @@ -356,6 +366,8 @@ func (o UserOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o UserOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *User) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/virtualMfaDevice.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/virtualMfaDevice.go index 46a98f64..ea92cb71 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/virtualMfaDevice.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/iam/virtualMfaDevice.go @@ -74,6 +74,8 @@ type VirtualMfaDevice struct { // Map of resource tags for the virtual mfa device. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // The associated IAM User name if the virtual MFA device is enabled. UserName pulumi.StringOutput `pulumi:"userName"` @@ -91,6 +93,10 @@ func NewVirtualMfaDevice(ctx *pulumi.Context, if args.VirtualMfaDeviceName == nil { return nil, errors.New("invalid value for required argument 'VirtualMfaDeviceName'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource VirtualMfaDevice err := ctx.RegisterResource("aws:iam/virtualMfaDevice:VirtualMfaDevice", name, args, &resource, opts...) @@ -127,6 +133,8 @@ type virtualMfaDeviceState struct { // Map of resource tags for the virtual mfa device. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // The associated IAM User name if the virtual MFA device is enabled. UserName *string `pulumi:"userName"` @@ -148,6 +156,8 @@ type VirtualMfaDeviceState struct { // Map of resource tags for the virtual mfa device. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // The associated IAM User name if the virtual MFA device is enabled. UserName pulumi.StringPtrInput @@ -320,6 +330,8 @@ func (o VirtualMfaDeviceOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o VirtualMfaDeviceOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *VirtualMfaDevice) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucket.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucket.go index f1a79b88..38df492e 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucket.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucket.go @@ -585,6 +585,8 @@ type Bucket struct { // A map of tags to assign to the bucket. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // A state of [versioning](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html) (documented below) Versioning BucketVersioningOutput `pulumi:"versioning"` @@ -603,6 +605,10 @@ func NewBucket(ctx *pulumi.Context, args = &BucketArgs{} } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource Bucket err := ctx.RegisterResource("aws:s3/bucket:Bucket", name, args, &resource, opts...) @@ -672,6 +678,8 @@ type bucketState struct { // A map of tags to assign to the bucket. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // A state of [versioning](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html) (documented below) Versioning *BucketVersioning `pulumi:"versioning"` @@ -730,6 +738,8 @@ type BucketState struct { // A map of tags to assign to the bucket. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // A state of [versioning](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html) (documented below) Versioning BucketVersioningPtrInput @@ -1065,6 +1075,8 @@ func (o BucketOutput) Tags() pulumi.StringMapOutput { } // A map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o BucketOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *Bucket) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObject.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObject.go index d45f4b0c..8dec5020 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObject.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObject.go @@ -272,6 +272,8 @@ type BucketObject struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Unique version ID value for the object, if bucket versioning is enabled. VersionId pulumi.StringOutput `pulumi:"versionId"` @@ -291,6 +293,10 @@ func NewBucketObject(ctx *pulumi.Context, if args.Bucket == nil { return nil, errors.New("invalid value for required argument 'Bucket'") } + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource BucketObject err := ctx.RegisterResource("aws:s3/bucketObject:BucketObject", name, args, &resource, opts...) @@ -363,6 +369,8 @@ type bucketObjectState struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Unique version ID value for the object, if bucket versioning is enabled. VersionId *string `pulumi:"versionId"` @@ -422,6 +430,8 @@ type BucketObjectState struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Unique version ID value for the object, if bucket versioning is enabled. VersionId pulumi.StringPtrInput @@ -775,6 +785,8 @@ func (o BucketObjectOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o BucketObjectOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *BucketObject) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObjectv2.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObjectv2.go index 9c0f679d..2f33bbc8 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObjectv2.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketObjectv2.go @@ -272,6 +272,8 @@ type BucketObjectv2 struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Unique version ID value for the object, if bucket versioning is enabled. VersionId pulumi.StringOutput `pulumi:"versionId"` @@ -299,6 +301,10 @@ func NewBucketObjectv2(ctx *pulumi.Context, }, }) opts = append(opts, aliases) + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource BucketObjectv2 err := ctx.RegisterResource("aws:s3/bucketObjectv2:BucketObjectv2", name, args, &resource, opts...) @@ -371,6 +377,8 @@ type bucketObjectv2State struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Unique version ID value for the object, if bucket versioning is enabled. VersionId *string `pulumi:"versionId"` @@ -432,6 +440,8 @@ type BucketObjectv2State struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Unique version ID value for the object, if bucket versioning is enabled. VersionId pulumi.StringPtrInput @@ -791,6 +801,8 @@ func (o BucketObjectv2Output) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o BucketObjectv2Output) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *BucketObjectv2) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketV2.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketV2.go index 50afeb60..a2446731 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketV2.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/bucketV2.go @@ -185,6 +185,8 @@ type BucketV2 struct { // The following arguments are deprecated, and will be removed in a future major version: Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Configuration of the [S3 bucket versioning state](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html). See Versioning below for details. The provider will only perform drift detection if a configuration value is provided. Use the resource `s3.BucketVersioningV2` instead. // @@ -218,6 +220,10 @@ func NewBucketV2(ctx *pulumi.Context, }, }) opts = append(opts, aliases) + secrets := pulumi.AdditionalSecretOutputs([]string{ + "tagsAll", + }) + opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) var resource BucketV2 err := ctx.RegisterResource("aws:s3/bucketV2:BucketV2", name, args, &resource, opts...) @@ -322,6 +328,8 @@ type bucketV2State struct { // The following arguments are deprecated, and will be removed in a future major version: Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Configuration of the [S3 bucket versioning state](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html). See Versioning below for details. The provider will only perform drift detection if a configuration value is provided. Use the resource `s3.BucketVersioningV2` instead. // @@ -424,6 +432,8 @@ type BucketV2State struct { // The following arguments are deprecated, and will be removed in a future major version: Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Configuration of the [S3 bucket versioning state](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html). See Versioning below for details. The provider will only perform drift detection if a configuration value is provided. Use the resource `s3.BucketVersioningV2` instead. // @@ -870,6 +880,8 @@ func (o BucketV2Output) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o BucketV2Output) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *BucketV2) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/objectCopy.go b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/objectCopy.go index 09181fbf..eadf67c8 100644 --- a/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/objectCopy.go +++ b/vendor/github.com/pulumi/pulumi-aws/sdk/v6/go/aws/s3/objectCopy.go @@ -140,6 +140,8 @@ type ObjectCopy struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapOutput `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapOutput `pulumi:"tagsAll"` // Version ID of the newly created copy. VersionId pulumi.StringOutput `pulumi:"versionId"` @@ -180,6 +182,7 @@ func NewObjectCopy(ctx *pulumi.Context, "kmsEncryptionContext", "kmsKeyId", "sourceCustomerKey", + "tagsAll", }) opts = append(opts, secrets) opts = internal.PkgResourceDefaultOpts(opts) @@ -291,6 +294,8 @@ type objectCopyState struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags map[string]string `pulumi:"tags"` // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll map[string]string `pulumi:"tagsAll"` // Version ID of the newly created copy. VersionId *string `pulumi:"versionId"` @@ -385,6 +390,8 @@ type ObjectCopyState struct { // Map of tags to assign to the object. If configured with a provider `defaultTags` configuration block present, tags with matching keys will overwrite those defined at the provider-level. Tags pulumi.StringMapInput // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. + // + // Deprecated: Please use `tags` instead. TagsAll pulumi.StringMapInput // Version ID of the newly created copy. VersionId pulumi.StringPtrInput @@ -880,6 +887,8 @@ func (o ObjectCopyOutput) Tags() pulumi.StringMapOutput { } // Map of tags assigned to the resource, including those inherited from the provider `defaultTags` configuration block. +// +// Deprecated: Please use `tags` instead. func (o ObjectCopyOutput) TagsAll() pulumi.StringMapOutput { return o.ApplyT(func(v *ObjectCopy) pulumi.StringMapOutput { return v.TagsAll }).(pulumi.StringMapOutput) } diff --git a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/command.go b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/command.go index 7966efbd..768615ae 100644 --- a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/command.go +++ b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/command.go @@ -9,6 +9,7 @@ import ( "github.com/pulumi/pulumi-command/sdk/go/command/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // A local command to be executed. @@ -292,6 +293,12 @@ func (i *Command) ToCommandOutputWithContext(ctx context.Context) CommandOutput return pulumi.ToOutputWithContext(ctx, i).(CommandOutput) } +func (i *Command) ToOutput(ctx context.Context) pulumix.Output[*Command] { + return pulumix.Output[*Command]{ + OutputState: i.ToCommandOutputWithContext(ctx).OutputState, + } +} + // CommandArrayInput is an input type that accepts CommandArray and CommandArrayOutput values. // You can construct a concrete instance of `CommandArrayInput` via: // @@ -317,6 +324,12 @@ func (i CommandArray) ToCommandArrayOutputWithContext(ctx context.Context) Comma return pulumi.ToOutputWithContext(ctx, i).(CommandArrayOutput) } +func (i CommandArray) ToOutput(ctx context.Context) pulumix.Output[[]*Command] { + return pulumix.Output[[]*Command]{ + OutputState: i.ToCommandArrayOutputWithContext(ctx).OutputState, + } +} + // CommandMapInput is an input type that accepts CommandMap and CommandMapOutput values. // You can construct a concrete instance of `CommandMapInput` via: // @@ -342,6 +355,12 @@ func (i CommandMap) ToCommandMapOutputWithContext(ctx context.Context) CommandMa return pulumi.ToOutputWithContext(ctx, i).(CommandMapOutput) } +func (i CommandMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Command] { + return pulumix.Output[map[string]*Command]{ + OutputState: i.ToCommandMapOutputWithContext(ctx).OutputState, + } +} + type CommandOutput struct{ *pulumi.OutputState } func (CommandOutput) ElementType() reflect.Type { @@ -356,6 +375,12 @@ func (o CommandOutput) ToCommandOutputWithContext(ctx context.Context) CommandOu return o } +func (o CommandOutput) ToOutput(ctx context.Context) pulumix.Output[*Command] { + return pulumix.Output[*Command]{ + OutputState: o.OutputState, + } +} + // An archive asset containing files found after running the command. func (o CommandOutput) Archive() pulumi.ArchiveOutput { return o.ApplyT(func(v *Command) pulumi.ArchiveOutput { return v.Archive }).(pulumi.ArchiveOutput) @@ -484,6 +509,12 @@ func (o CommandArrayOutput) ToCommandArrayOutputWithContext(ctx context.Context) return o } +func (o CommandArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Command] { + return pulumix.Output[[]*Command]{ + OutputState: o.OutputState, + } +} + func (o CommandArrayOutput) Index(i pulumi.IntInput) CommandOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Command { return vs[0].([]*Command)[vs[1].(int)] @@ -504,6 +535,12 @@ func (o CommandMapOutput) ToCommandMapOutputWithContext(ctx context.Context) Com return o } +func (o CommandMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Command] { + return pulumix.Output[map[string]*Command]{ + OutputState: o.OutputState, + } +} + func (o CommandMapOutput) MapIndex(k pulumi.StringInput) CommandOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Command { return vs[0].(map[string]*Command)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/run.go b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/run.go index dd509381..2cd2f108 100644 --- a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/run.go +++ b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/local/run.go @@ -9,6 +9,7 @@ import ( "github.com/pulumi/pulumi-command/sdk/go/command/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // A local command to be executed. @@ -228,6 +229,12 @@ func (o RunResultOutput) ToRunResultOutputWithContext(ctx context.Context) RunRe return o } +func (o RunResultOutput) ToOutput(ctx context.Context) pulumix.Output[RunResult] { + return pulumix.Output[RunResult]{ + OutputState: o.OutputState, + } +} + // An archive asset containing files found after running the command. func (o RunResultOutput) Archive() pulumi.ArchiveOutput { return o.ApplyT(func(v RunResult) pulumi.Archive { return v.Archive }).(pulumi.ArchiveOutput) diff --git a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/command.go b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/command.go index d6dccd2f..128dcf66 100644 --- a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/command.go +++ b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/command.go @@ -10,6 +10,7 @@ import ( "errors" "github.com/pulumi/pulumi-command/sdk/go/command/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // A command to run on a remote host. @@ -164,6 +165,12 @@ func (i *Command) ToCommandOutputWithContext(ctx context.Context) CommandOutput return pulumi.ToOutputWithContext(ctx, i).(CommandOutput) } +func (i *Command) ToOutput(ctx context.Context) pulumix.Output[*Command] { + return pulumix.Output[*Command]{ + OutputState: i.ToCommandOutputWithContext(ctx).OutputState, + } +} + // CommandArrayInput is an input type that accepts CommandArray and CommandArrayOutput values. // You can construct a concrete instance of `CommandArrayInput` via: // @@ -189,6 +196,12 @@ func (i CommandArray) ToCommandArrayOutputWithContext(ctx context.Context) Comma return pulumi.ToOutputWithContext(ctx, i).(CommandArrayOutput) } +func (i CommandArray) ToOutput(ctx context.Context) pulumix.Output[[]*Command] { + return pulumix.Output[[]*Command]{ + OutputState: i.ToCommandArrayOutputWithContext(ctx).OutputState, + } +} + // CommandMapInput is an input type that accepts CommandMap and CommandMapOutput values. // You can construct a concrete instance of `CommandMapInput` via: // @@ -214,6 +227,12 @@ func (i CommandMap) ToCommandMapOutputWithContext(ctx context.Context) CommandMa return pulumi.ToOutputWithContext(ctx, i).(CommandMapOutput) } +func (i CommandMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*Command] { + return pulumix.Output[map[string]*Command]{ + OutputState: i.ToCommandMapOutputWithContext(ctx).OutputState, + } +} + type CommandOutput struct{ *pulumi.OutputState } func (CommandOutput) ElementType() reflect.Type { @@ -228,6 +247,12 @@ func (o CommandOutput) ToCommandOutputWithContext(ctx context.Context) CommandOu return o } +func (o CommandOutput) ToOutput(ctx context.Context) pulumix.Output[*Command] { + return pulumix.Output[*Command]{ + OutputState: o.OutputState, + } +} + // The parameters with which to connect to the remote host. func (o CommandOutput) Connection() ConnectionOutput { return o.ApplyT(func(v *Command) ConnectionOutput { return v.Connection }).(ConnectionOutput) @@ -292,6 +317,12 @@ func (o CommandArrayOutput) ToCommandArrayOutputWithContext(ctx context.Context) return o } +func (o CommandArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*Command] { + return pulumix.Output[[]*Command]{ + OutputState: o.OutputState, + } +} + func (o CommandArrayOutput) Index(i pulumi.IntInput) CommandOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *Command { return vs[0].([]*Command)[vs[1].(int)] @@ -312,6 +343,12 @@ func (o CommandMapOutput) ToCommandMapOutputWithContext(ctx context.Context) Com return o } +func (o CommandMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*Command] { + return pulumix.Output[map[string]*Command]{ + OutputState: o.OutputState, + } +} + func (o CommandMapOutput) MapIndex(k pulumi.StringInput) CommandOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *Command { return vs[0].(map[string]*Command)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/copyFile.go b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/copyFile.go index ce2dcdd9..c1d55601 100644 --- a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/copyFile.go +++ b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/copyFile.go @@ -10,6 +10,7 @@ import ( "errors" "github.com/pulumi/pulumi-command/sdk/go/command/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // Copy a local file to a remote host. @@ -128,6 +129,12 @@ func (i *CopyFile) ToCopyFileOutputWithContext(ctx context.Context) CopyFileOutp return pulumi.ToOutputWithContext(ctx, i).(CopyFileOutput) } +func (i *CopyFile) ToOutput(ctx context.Context) pulumix.Output[*CopyFile] { + return pulumix.Output[*CopyFile]{ + OutputState: i.ToCopyFileOutputWithContext(ctx).OutputState, + } +} + // CopyFileArrayInput is an input type that accepts CopyFileArray and CopyFileArrayOutput values. // You can construct a concrete instance of `CopyFileArrayInput` via: // @@ -153,6 +160,12 @@ func (i CopyFileArray) ToCopyFileArrayOutputWithContext(ctx context.Context) Cop return pulumi.ToOutputWithContext(ctx, i).(CopyFileArrayOutput) } +func (i CopyFileArray) ToOutput(ctx context.Context) pulumix.Output[[]*CopyFile] { + return pulumix.Output[[]*CopyFile]{ + OutputState: i.ToCopyFileArrayOutputWithContext(ctx).OutputState, + } +} + // CopyFileMapInput is an input type that accepts CopyFileMap and CopyFileMapOutput values. // You can construct a concrete instance of `CopyFileMapInput` via: // @@ -178,6 +191,12 @@ func (i CopyFileMap) ToCopyFileMapOutputWithContext(ctx context.Context) CopyFil return pulumi.ToOutputWithContext(ctx, i).(CopyFileMapOutput) } +func (i CopyFileMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*CopyFile] { + return pulumix.Output[map[string]*CopyFile]{ + OutputState: i.ToCopyFileMapOutputWithContext(ctx).OutputState, + } +} + type CopyFileOutput struct{ *pulumi.OutputState } func (CopyFileOutput) ElementType() reflect.Type { @@ -192,6 +211,12 @@ func (o CopyFileOutput) ToCopyFileOutputWithContext(ctx context.Context) CopyFil return o } +func (o CopyFileOutput) ToOutput(ctx context.Context) pulumix.Output[*CopyFile] { + return pulumix.Output[*CopyFile]{ + OutputState: o.OutputState, + } +} + // The parameters with which to connect to the remote host. func (o CopyFileOutput) Connection() ConnectionOutput { return o.ApplyT(func(v *CopyFile) ConnectionOutput { return v.Connection }).(ConnectionOutput) @@ -226,6 +251,12 @@ func (o CopyFileArrayOutput) ToCopyFileArrayOutputWithContext(ctx context.Contex return o } +func (o CopyFileArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*CopyFile] { + return pulumix.Output[[]*CopyFile]{ + OutputState: o.OutputState, + } +} + func (o CopyFileArrayOutput) Index(i pulumi.IntInput) CopyFileOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *CopyFile { return vs[0].([]*CopyFile)[vs[1].(int)] @@ -246,6 +277,12 @@ func (o CopyFileMapOutput) ToCopyFileMapOutputWithContext(ctx context.Context) C return o } +func (o CopyFileMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*CopyFile] { + return pulumix.Output[map[string]*CopyFile]{ + OutputState: o.OutputState, + } +} + func (o CopyFileMapOutput) MapIndex(k pulumi.StringInput) CopyFileOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *CopyFile { return vs[0].(map[string]*CopyFile)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/pulumiTypes.go b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/pulumiTypes.go index 24a61c1b..fcd6d9a9 100644 --- a/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/pulumiTypes.go +++ b/vendor/github.com/pulumi/pulumi-command/sdk/go/command/remote/pulumiTypes.go @@ -9,6 +9,7 @@ import ( "github.com/pulumi/pulumi-command/sdk/go/command/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) var _ = internal.GetEnvOrDefault @@ -17,18 +18,22 @@ var _ = internal.GetEnvOrDefault type Connection struct { // SSH Agent socket path. Default to environment variable SSH_AUTH_SOCK if present. AgentSocketPath *string `pulumi:"agentSocketPath"` - // Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10 + // Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10. DialErrorLimit *int `pulumi:"dialErrorLimit"` // The address of the resource to connect to. Host string `pulumi:"host"` // The password we should use for the connection. Password *string `pulumi:"password"` + // Max number of seconds for each dial attempt. 0 implies no maximum. Default value is 15 seconds. + PerDialTimeout *int `pulumi:"perDialTimeout"` // The port to connect to. Port *float64 `pulumi:"port"` // The contents of an SSH key to use for the connection. This takes preference over the password if provided. PrivateKey *string `pulumi:"privateKey"` // The password to use in case the private key is encrypted. PrivateKeyPassword *string `pulumi:"privateKeyPassword"` + // The connection settings for the bastion/proxy host. + Proxy *ProxyConnection `pulumi:"proxy"` // The user that we should use for the connection. User *string `pulumi:"user"` } @@ -43,10 +48,16 @@ func (val *Connection) Defaults() *Connection { dialErrorLimit_ := 10 tmp.DialErrorLimit = &dialErrorLimit_ } + if tmp.PerDialTimeout == nil { + perDialTimeout_ := 15 + tmp.PerDialTimeout = &perDialTimeout_ + } if tmp.Port == nil { port_ := 22.0 tmp.Port = &port_ } + tmp.Proxy = tmp.Proxy.Defaults() + if tmp.User == nil { user_ := "root" tmp.User = &user_ @@ -69,18 +80,22 @@ type ConnectionInput interface { type ConnectionArgs struct { // SSH Agent socket path. Default to environment variable SSH_AUTH_SOCK if present. AgentSocketPath pulumi.StringPtrInput `pulumi:"agentSocketPath"` - // Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10 + // Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10. DialErrorLimit pulumi.IntPtrInput `pulumi:"dialErrorLimit"` // The address of the resource to connect to. Host pulumi.StringInput `pulumi:"host"` // The password we should use for the connection. Password pulumi.StringPtrInput `pulumi:"password"` + // Max number of seconds for each dial attempt. 0 implies no maximum. Default value is 15 seconds. + PerDialTimeout pulumi.IntPtrInput `pulumi:"perDialTimeout"` // The port to connect to. Port pulumi.Float64PtrInput `pulumi:"port"` // The contents of an SSH key to use for the connection. This takes preference over the password if provided. PrivateKey pulumi.StringPtrInput `pulumi:"privateKey"` // The password to use in case the private key is encrypted. PrivateKeyPassword pulumi.StringPtrInput `pulumi:"privateKeyPassword"` + // The connection settings for the bastion/proxy host. + Proxy ProxyConnectionPtrInput `pulumi:"proxy"` // The user that we should use for the connection. User pulumi.StringPtrInput `pulumi:"user"` } @@ -94,9 +109,13 @@ func (val *ConnectionArgs) Defaults() *ConnectionArgs { if tmp.DialErrorLimit == nil { tmp.DialErrorLimit = pulumi.IntPtr(10) } + if tmp.PerDialTimeout == nil { + tmp.PerDialTimeout = pulumi.IntPtr(15) + } if tmp.Port == nil { tmp.Port = pulumi.Float64Ptr(22.0) } + if tmp.User == nil { tmp.User = pulumi.StringPtr("root") } @@ -114,6 +133,12 @@ func (i ConnectionArgs) ToConnectionOutputWithContext(ctx context.Context) Conne return pulumi.ToOutputWithContext(ctx, i).(ConnectionOutput) } +func (i ConnectionArgs) ToOutput(ctx context.Context) pulumix.Output[Connection] { + return pulumix.Output[Connection]{ + OutputState: i.ToConnectionOutputWithContext(ctx).OutputState, + } +} + // Instructions for how to connect to a remote endpoint. type ConnectionOutput struct{ *pulumi.OutputState } @@ -129,12 +154,18 @@ func (o ConnectionOutput) ToConnectionOutputWithContext(ctx context.Context) Con return o } +func (o ConnectionOutput) ToOutput(ctx context.Context) pulumix.Output[Connection] { + return pulumix.Output[Connection]{ + OutputState: o.OutputState, + } +} + // SSH Agent socket path. Default to environment variable SSH_AUTH_SOCK if present. func (o ConnectionOutput) AgentSocketPath() pulumi.StringPtrOutput { return o.ApplyT(func(v Connection) *string { return v.AgentSocketPath }).(pulumi.StringPtrOutput) } -// Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10 +// Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10. func (o ConnectionOutput) DialErrorLimit() pulumi.IntPtrOutput { return o.ApplyT(func(v Connection) *int { return v.DialErrorLimit }).(pulumi.IntPtrOutput) } @@ -149,6 +180,11 @@ func (o ConnectionOutput) Password() pulumi.StringPtrOutput { return o.ApplyT(func(v Connection) *string { return v.Password }).(pulumi.StringPtrOutput) } +// Max number of seconds for each dial attempt. 0 implies no maximum. Default value is 15 seconds. +func (o ConnectionOutput) PerDialTimeout() pulumi.IntPtrOutput { + return o.ApplyT(func(v Connection) *int { return v.PerDialTimeout }).(pulumi.IntPtrOutput) +} + // The port to connect to. func (o ConnectionOutput) Port() pulumi.Float64PtrOutput { return o.ApplyT(func(v Connection) *float64 { return v.Port }).(pulumi.Float64PtrOutput) @@ -164,12 +200,382 @@ func (o ConnectionOutput) PrivateKeyPassword() pulumi.StringPtrOutput { return o.ApplyT(func(v Connection) *string { return v.PrivateKeyPassword }).(pulumi.StringPtrOutput) } +// The connection settings for the bastion/proxy host. +func (o ConnectionOutput) Proxy() ProxyConnectionPtrOutput { + return o.ApplyT(func(v Connection) *ProxyConnection { return v.Proxy }).(ProxyConnectionPtrOutput) +} + // The user that we should use for the connection. func (o ConnectionOutput) User() pulumi.StringPtrOutput { return o.ApplyT(func(v Connection) *string { return v.User }).(pulumi.StringPtrOutput) } +// Instructions for how to connect to a remote endpoint via a bastion host. +type ProxyConnection struct { + // SSH Agent socket path. Default to environment variable SSH_AUTH_SOCK if present. + AgentSocketPath *string `pulumi:"agentSocketPath"` + // Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10. + DialErrorLimit *int `pulumi:"dialErrorLimit"` + // The address of the bastion host to connect to. + Host string `pulumi:"host"` + // The password we should use for the connection to the bastion host. + Password *string `pulumi:"password"` + // Max number of seconds for each dial attempt. 0 implies no maximum. Default value is 15 seconds. + PerDialTimeout *int `pulumi:"perDialTimeout"` + // The port of the bastion host to connect to. + Port *float64 `pulumi:"port"` + // The contents of an SSH key to use for the connection. This takes preference over the password if provided. + PrivateKey *string `pulumi:"privateKey"` + // The password to use in case the private key is encrypted. + PrivateKeyPassword *string `pulumi:"privateKeyPassword"` + // The user that we should use for the connection to the bastion host. + User *string `pulumi:"user"` +} + +// Defaults sets the appropriate defaults for ProxyConnection +func (val *ProxyConnection) Defaults() *ProxyConnection { + if val == nil { + return nil + } + tmp := *val + if tmp.DialErrorLimit == nil { + dialErrorLimit_ := 10 + tmp.DialErrorLimit = &dialErrorLimit_ + } + if tmp.PerDialTimeout == nil { + perDialTimeout_ := 15 + tmp.PerDialTimeout = &perDialTimeout_ + } + if tmp.Port == nil { + port_ := 22.0 + tmp.Port = &port_ + } + if tmp.User == nil { + user_ := "root" + tmp.User = &user_ + } + return &tmp +} + +// ProxyConnectionInput is an input type that accepts ProxyConnectionArgs and ProxyConnectionOutput values. +// You can construct a concrete instance of `ProxyConnectionInput` via: +// +// ProxyConnectionArgs{...} +type ProxyConnectionInput interface { + pulumi.Input + + ToProxyConnectionOutput() ProxyConnectionOutput + ToProxyConnectionOutputWithContext(context.Context) ProxyConnectionOutput +} + +// Instructions for how to connect to a remote endpoint via a bastion host. +type ProxyConnectionArgs struct { + // SSH Agent socket path. Default to environment variable SSH_AUTH_SOCK if present. + AgentSocketPath pulumi.StringPtrInput `pulumi:"agentSocketPath"` + // Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10. + DialErrorLimit pulumi.IntPtrInput `pulumi:"dialErrorLimit"` + // The address of the bastion host to connect to. + Host pulumi.StringInput `pulumi:"host"` + // The password we should use for the connection to the bastion host. + Password pulumi.StringPtrInput `pulumi:"password"` + // Max number of seconds for each dial attempt. 0 implies no maximum. Default value is 15 seconds. + PerDialTimeout pulumi.IntPtrInput `pulumi:"perDialTimeout"` + // The port of the bastion host to connect to. + Port pulumi.Float64PtrInput `pulumi:"port"` + // The contents of an SSH key to use for the connection. This takes preference over the password if provided. + PrivateKey pulumi.StringPtrInput `pulumi:"privateKey"` + // The password to use in case the private key is encrypted. + PrivateKeyPassword pulumi.StringPtrInput `pulumi:"privateKeyPassword"` + // The user that we should use for the connection to the bastion host. + User pulumi.StringPtrInput `pulumi:"user"` +} + +// Defaults sets the appropriate defaults for ProxyConnectionArgs +func (val *ProxyConnectionArgs) Defaults() *ProxyConnectionArgs { + if val == nil { + return nil + } + tmp := *val + if tmp.DialErrorLimit == nil { + tmp.DialErrorLimit = pulumi.IntPtr(10) + } + if tmp.PerDialTimeout == nil { + tmp.PerDialTimeout = pulumi.IntPtr(15) + } + if tmp.Port == nil { + tmp.Port = pulumi.Float64Ptr(22.0) + } + if tmp.User == nil { + tmp.User = pulumi.StringPtr("root") + } + return &tmp +} +func (ProxyConnectionArgs) ElementType() reflect.Type { + return reflect.TypeOf((*ProxyConnection)(nil)).Elem() +} + +func (i ProxyConnectionArgs) ToProxyConnectionOutput() ProxyConnectionOutput { + return i.ToProxyConnectionOutputWithContext(context.Background()) +} + +func (i ProxyConnectionArgs) ToProxyConnectionOutputWithContext(ctx context.Context) ProxyConnectionOutput { + return pulumi.ToOutputWithContext(ctx, i).(ProxyConnectionOutput) +} + +func (i ProxyConnectionArgs) ToOutput(ctx context.Context) pulumix.Output[ProxyConnection] { + return pulumix.Output[ProxyConnection]{ + OutputState: i.ToProxyConnectionOutputWithContext(ctx).OutputState, + } +} + +func (i ProxyConnectionArgs) ToProxyConnectionPtrOutput() ProxyConnectionPtrOutput { + return i.ToProxyConnectionPtrOutputWithContext(context.Background()) +} + +func (i ProxyConnectionArgs) ToProxyConnectionPtrOutputWithContext(ctx context.Context) ProxyConnectionPtrOutput { + return pulumi.ToOutputWithContext(ctx, i).(ProxyConnectionOutput).ToProxyConnectionPtrOutputWithContext(ctx) +} + +// ProxyConnectionPtrInput is an input type that accepts ProxyConnectionArgs, ProxyConnectionPtr and ProxyConnectionPtrOutput values. +// You can construct a concrete instance of `ProxyConnectionPtrInput` via: +// +// ProxyConnectionArgs{...} +// +// or: +// +// nil +type ProxyConnectionPtrInput interface { + pulumi.Input + + ToProxyConnectionPtrOutput() ProxyConnectionPtrOutput + ToProxyConnectionPtrOutputWithContext(context.Context) ProxyConnectionPtrOutput +} + +type proxyConnectionPtrType ProxyConnectionArgs + +func ProxyConnectionPtr(v *ProxyConnectionArgs) ProxyConnectionPtrInput { + return (*proxyConnectionPtrType)(v) +} + +func (*proxyConnectionPtrType) ElementType() reflect.Type { + return reflect.TypeOf((**ProxyConnection)(nil)).Elem() +} + +func (i *proxyConnectionPtrType) ToProxyConnectionPtrOutput() ProxyConnectionPtrOutput { + return i.ToProxyConnectionPtrOutputWithContext(context.Background()) +} + +func (i *proxyConnectionPtrType) ToProxyConnectionPtrOutputWithContext(ctx context.Context) ProxyConnectionPtrOutput { + return pulumi.ToOutputWithContext(ctx, i).(ProxyConnectionPtrOutput) +} + +func (i *proxyConnectionPtrType) ToOutput(ctx context.Context) pulumix.Output[*ProxyConnection] { + return pulumix.Output[*ProxyConnection]{ + OutputState: i.ToProxyConnectionPtrOutputWithContext(ctx).OutputState, + } +} + +// Instructions for how to connect to a remote endpoint via a bastion host. +type ProxyConnectionOutput struct{ *pulumi.OutputState } + +func (ProxyConnectionOutput) ElementType() reflect.Type { + return reflect.TypeOf((*ProxyConnection)(nil)).Elem() +} + +func (o ProxyConnectionOutput) ToProxyConnectionOutput() ProxyConnectionOutput { + return o +} + +func (o ProxyConnectionOutput) ToProxyConnectionOutputWithContext(ctx context.Context) ProxyConnectionOutput { + return o +} + +func (o ProxyConnectionOutput) ToProxyConnectionPtrOutput() ProxyConnectionPtrOutput { + return o.ToProxyConnectionPtrOutputWithContext(context.Background()) +} + +func (o ProxyConnectionOutput) ToProxyConnectionPtrOutputWithContext(ctx context.Context) ProxyConnectionPtrOutput { + return o.ApplyTWithContext(ctx, func(_ context.Context, v ProxyConnection) *ProxyConnection { + return &v + }).(ProxyConnectionPtrOutput) +} + +func (o ProxyConnectionOutput) ToOutput(ctx context.Context) pulumix.Output[ProxyConnection] { + return pulumix.Output[ProxyConnection]{ + OutputState: o.OutputState, + } +} + +// SSH Agent socket path. Default to environment variable SSH_AUTH_SOCK if present. +func (o ProxyConnectionOutput) AgentSocketPath() pulumi.StringPtrOutput { + return o.ApplyT(func(v ProxyConnection) *string { return v.AgentSocketPath }).(pulumi.StringPtrOutput) +} + +// Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10. +func (o ProxyConnectionOutput) DialErrorLimit() pulumi.IntPtrOutput { + return o.ApplyT(func(v ProxyConnection) *int { return v.DialErrorLimit }).(pulumi.IntPtrOutput) +} + +// The address of the bastion host to connect to. +func (o ProxyConnectionOutput) Host() pulumi.StringOutput { + return o.ApplyT(func(v ProxyConnection) string { return v.Host }).(pulumi.StringOutput) +} + +// The password we should use for the connection to the bastion host. +func (o ProxyConnectionOutput) Password() pulumi.StringPtrOutput { + return o.ApplyT(func(v ProxyConnection) *string { return v.Password }).(pulumi.StringPtrOutput) +} + +// Max number of seconds for each dial attempt. 0 implies no maximum. Default value is 15 seconds. +func (o ProxyConnectionOutput) PerDialTimeout() pulumi.IntPtrOutput { + return o.ApplyT(func(v ProxyConnection) *int { return v.PerDialTimeout }).(pulumi.IntPtrOutput) +} + +// The port of the bastion host to connect to. +func (o ProxyConnectionOutput) Port() pulumi.Float64PtrOutput { + return o.ApplyT(func(v ProxyConnection) *float64 { return v.Port }).(pulumi.Float64PtrOutput) +} + +// The contents of an SSH key to use for the connection. This takes preference over the password if provided. +func (o ProxyConnectionOutput) PrivateKey() pulumi.StringPtrOutput { + return o.ApplyT(func(v ProxyConnection) *string { return v.PrivateKey }).(pulumi.StringPtrOutput) +} + +// The password to use in case the private key is encrypted. +func (o ProxyConnectionOutput) PrivateKeyPassword() pulumi.StringPtrOutput { + return o.ApplyT(func(v ProxyConnection) *string { return v.PrivateKeyPassword }).(pulumi.StringPtrOutput) +} + +// The user that we should use for the connection to the bastion host. +func (o ProxyConnectionOutput) User() pulumi.StringPtrOutput { + return o.ApplyT(func(v ProxyConnection) *string { return v.User }).(pulumi.StringPtrOutput) +} + +type ProxyConnectionPtrOutput struct{ *pulumi.OutputState } + +func (ProxyConnectionPtrOutput) ElementType() reflect.Type { + return reflect.TypeOf((**ProxyConnection)(nil)).Elem() +} + +func (o ProxyConnectionPtrOutput) ToProxyConnectionPtrOutput() ProxyConnectionPtrOutput { + return o +} + +func (o ProxyConnectionPtrOutput) ToProxyConnectionPtrOutputWithContext(ctx context.Context) ProxyConnectionPtrOutput { + return o +} + +func (o ProxyConnectionPtrOutput) ToOutput(ctx context.Context) pulumix.Output[*ProxyConnection] { + return pulumix.Output[*ProxyConnection]{ + OutputState: o.OutputState, + } +} + +func (o ProxyConnectionPtrOutput) Elem() ProxyConnectionOutput { + return o.ApplyT(func(v *ProxyConnection) ProxyConnection { + if v != nil { + return *v + } + var ret ProxyConnection + return ret + }).(ProxyConnectionOutput) +} + +// SSH Agent socket path. Default to environment variable SSH_AUTH_SOCK if present. +func (o ProxyConnectionPtrOutput) AgentSocketPath() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *string { + if v == nil { + return nil + } + return v.AgentSocketPath + }).(pulumi.StringPtrOutput) +} + +// Max allowed errors on trying to dial the remote host. -1 set count to unlimited. Default value is 10. +func (o ProxyConnectionPtrOutput) DialErrorLimit() pulumi.IntPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *int { + if v == nil { + return nil + } + return v.DialErrorLimit + }).(pulumi.IntPtrOutput) +} + +// The address of the bastion host to connect to. +func (o ProxyConnectionPtrOutput) Host() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *string { + if v == nil { + return nil + } + return &v.Host + }).(pulumi.StringPtrOutput) +} + +// The password we should use for the connection to the bastion host. +func (o ProxyConnectionPtrOutput) Password() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *string { + if v == nil { + return nil + } + return v.Password + }).(pulumi.StringPtrOutput) +} + +// Max number of seconds for each dial attempt. 0 implies no maximum. Default value is 15 seconds. +func (o ProxyConnectionPtrOutput) PerDialTimeout() pulumi.IntPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *int { + if v == nil { + return nil + } + return v.PerDialTimeout + }).(pulumi.IntPtrOutput) +} + +// The port of the bastion host to connect to. +func (o ProxyConnectionPtrOutput) Port() pulumi.Float64PtrOutput { + return o.ApplyT(func(v *ProxyConnection) *float64 { + if v == nil { + return nil + } + return v.Port + }).(pulumi.Float64PtrOutput) +} + +// The contents of an SSH key to use for the connection. This takes preference over the password if provided. +func (o ProxyConnectionPtrOutput) PrivateKey() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *string { + if v == nil { + return nil + } + return v.PrivateKey + }).(pulumi.StringPtrOutput) +} + +// The password to use in case the private key is encrypted. +func (o ProxyConnectionPtrOutput) PrivateKeyPassword() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *string { + if v == nil { + return nil + } + return v.PrivateKeyPassword + }).(pulumi.StringPtrOutput) +} + +// The user that we should use for the connection to the bastion host. +func (o ProxyConnectionPtrOutput) User() pulumi.StringPtrOutput { + return o.ApplyT(func(v *ProxyConnection) *string { + if v == nil { + return nil + } + return v.User + }).(pulumi.StringPtrOutput) +} + func init() { pulumi.RegisterInputType(reflect.TypeOf((*ConnectionInput)(nil)).Elem(), ConnectionArgs{}) + pulumi.RegisterInputType(reflect.TypeOf((*ProxyConnectionInput)(nil)).Elem(), ProxyConnectionArgs{}) + pulumi.RegisterInputType(reflect.TypeOf((*ProxyConnectionPtrInput)(nil)).Elem(), ProxyConnectionArgs{}) pulumi.RegisterOutputType(ConnectionOutput{}) + pulumi.RegisterOutputType(ProxyConnectionOutput{}) + pulumi.RegisterOutputType(ProxyConnectionPtrOutput{}) } diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/init.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/init.go index f3df3112..d7758f23 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/init.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/init.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/blang/semver" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -61,7 +62,10 @@ func (p *pkg) ConstructProvider(ctx *pulumi.Context, name, typ, urn string) (pul } func init() { - version, _ := PkgVersion() + version, err := internal.PkgVersion() + if err != nil { + version = semver.Version{Major: 1} + } pulumi.RegisterResourceModule( "random", "index/randomId", diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/pulumiUtilities.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiUtilities.go similarity index 59% rename from vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/pulumiUtilities.go rename to vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiUtilities.go index 7ee36b79..975581f7 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/pulumiUtilities.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiUtilities.go @@ -1,7 +1,7 @@ // Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. // *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** -package random +package internal import ( "fmt" @@ -17,7 +17,7 @@ import ( type envParser func(v string) interface{} -func parseEnvBool(v string) interface{} { +func ParseEnvBool(v string) interface{} { b, err := strconv.ParseBool(v) if err != nil { return nil @@ -25,7 +25,7 @@ func parseEnvBool(v string) interface{} { return b } -func parseEnvInt(v string) interface{} { +func ParseEnvInt(v string) interface{} { i, err := strconv.ParseInt(v, 0, 0) if err != nil { return nil @@ -33,7 +33,7 @@ func parseEnvInt(v string) interface{} { return int(i) } -func parseEnvFloat(v string) interface{} { +func ParseEnvFloat(v string) interface{} { f, err := strconv.ParseFloat(v, 64) if err != nil { return nil @@ -41,7 +41,7 @@ func parseEnvFloat(v string) interface{} { return f } -func parseEnvStringArray(v string) interface{} { +func ParseEnvStringArray(v string) interface{} { var result pulumi.StringArray for _, item := range strings.Split(v, ";") { result = append(result, pulumi.String(item)) @@ -49,9 +49,9 @@ func parseEnvStringArray(v string) interface{} { return result } -func getEnvOrDefault(def interface{}, parser envParser, vars ...string) interface{} { +func GetEnvOrDefault(def interface{}, parser envParser, vars ...string) interface{} { for _, v := range vars { - if value := os.Getenv(v); value != "" { + if value, ok := os.LookupEnv(v); ok { if parser != nil { return parser(value) } @@ -65,6 +65,10 @@ func getEnvOrDefault(def interface{}, parser envParser, vars ...string) interfac // If a version cannot be determined, v1 will be assumed. The second return // value is always nil. func PkgVersion() (semver.Version, error) { + // emptyVersion defaults to v0.0.0 + if !SdkVersion.Equals(semver.Version{}) { + return SdkVersion, nil + } type sentinal struct{} pkgPath := reflect.TypeOf(sentinal{}).PkgPath() re := regexp.MustCompile("^.*/pulumi-random/sdk(/v\\d+)?") @@ -79,9 +83,31 @@ func PkgVersion() (semver.Version, error) { } // isZero is a null safe check for if a value is it's types zero value. -func isZero(v interface{}) bool { +func IsZero(v interface{}) bool { if v == nil { return true } return reflect.ValueOf(v).IsZero() } + +// PkgResourceDefaultOpts provides package level defaults to pulumi.OptionResource. +func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { + defaults := []pulumi.ResourceOption{} + + version := SdkVersion + if !version.Equals(semver.Version{}) { + defaults = append(defaults, pulumi.Version(version.String())) + } + return append(defaults, opts...) +} + +// PkgInvokeDefaultOpts provides package level defaults to pulumi.OptionInvoke. +func PkgInvokeDefaultOpts(opts []pulumi.InvokeOption) []pulumi.InvokeOption { + defaults := []pulumi.InvokeOption{} + + version := SdkVersion + if !version.Equals(semver.Version{}) { + defaults = append(defaults, pulumi.Version(version.String())) + } + return append(defaults, opts...) +} diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiVersion.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiVersion.go new file mode 100644 index 00000000..d5916876 --- /dev/null +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/internal/pulumiVersion.go @@ -0,0 +1,11 @@ +// Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. +// *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** + +package internal + +import ( + "github.com/blang/semver" +) + +var SdkVersion semver.Version = semver.Version{} +var pluginDownloadURL string = "" diff --git a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/provider.go b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/provider.go index 4d996274..f243dca2 100644 --- a/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/provider.go +++ b/vendor/github.com/pulumi/pulumi-random/sdk/v4/go/random/provider.go @@ -7,7 +7,9 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The provider type for the random package. By default, resources use package-wide configuration @@ -25,6 +27,7 @@ func NewProvider(ctx *pulumi.Context, args = &ProviderArgs{} } + opts = internal.PkgResourceDefaultOpts(opts) var resource Provider err := ctx.RegisterResource("pulumi:providers:random", name, args, &resource, opts...) if err != nil { @@ -63,6 +66,12 @@ func (i *Provider) ToProviderOutputWithContext(ctx context.Context) ProviderOutp return pulumi.ToOutputWithContext(ctx, i).(ProviderOutput) } +func (i *Provider) ToOutput(ctx context.Context) pulumix.Output[*Provider] { + return pulumix.Output[*Provider]{ + OutputState: i.ToProviderOutputWithContext(ctx).OutputState, + } +} + type ProviderOutput struct{ *pulumi.OutputState } func (ProviderOutput) ElementType() reflect.Type { @@ -77,6 +86,12 @@ func (o ProviderOutput) ToProviderOutputWithContext(ctx context.Context) Provide return o } +func (o ProviderOutput) ToOutput(ctx context.Context) pulumix.Output[*Provider] { + return pulumix.Output[*Provider]{ + OutputState: o.OutputState, + } +} + func init() { pulumi.RegisterInputType(reflect.TypeOf((*ProviderInput)(nil)).Elem(), &Provider{}) pulumi.RegisterOutputType(ProviderOutput{}) 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 65d9a338..b1427db3 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 @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The resource `RandomId` generates random numbers that are intended to be @@ -115,6 +117,7 @@ func NewRandomId(ctx *pulumi.Context, if args.ByteLength == nil { return nil, errors.New("invalid value for required argument 'ByteLength'") } + opts = internal.PkgResourceDefaultOpts(opts) var resource RandomId err := ctx.RegisterResource("random:index/randomId:RandomId", name, args, &resource, opts...) if err != nil { @@ -216,6 +219,12 @@ func (i *RandomId) ToRandomIdOutputWithContext(ctx context.Context) RandomIdOutp return pulumi.ToOutputWithContext(ctx, i).(RandomIdOutput) } +func (i *RandomId) ToOutput(ctx context.Context) pulumix.Output[*RandomId] { + return pulumix.Output[*RandomId]{ + OutputState: i.ToRandomIdOutputWithContext(ctx).OutputState, + } +} + // RandomIdArrayInput is an input type that accepts RandomIdArray and RandomIdArrayOutput values. // You can construct a concrete instance of `RandomIdArrayInput` via: // @@ -241,6 +250,12 @@ func (i RandomIdArray) ToRandomIdArrayOutputWithContext(ctx context.Context) Ran return pulumi.ToOutputWithContext(ctx, i).(RandomIdArrayOutput) } +func (i RandomIdArray) ToOutput(ctx context.Context) pulumix.Output[[]*RandomId] { + return pulumix.Output[[]*RandomId]{ + OutputState: i.ToRandomIdArrayOutputWithContext(ctx).OutputState, + } +} + // RandomIdMapInput is an input type that accepts RandomIdMap and RandomIdMapOutput values. // You can construct a concrete instance of `RandomIdMapInput` via: // @@ -266,6 +281,12 @@ func (i RandomIdMap) ToRandomIdMapOutputWithContext(ctx context.Context) RandomI return pulumi.ToOutputWithContext(ctx, i).(RandomIdMapOutput) } +func (i RandomIdMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomId] { + return pulumix.Output[map[string]*RandomId]{ + OutputState: i.ToRandomIdMapOutputWithContext(ctx).OutputState, + } +} + type RandomIdOutput struct{ *pulumi.OutputState } func (RandomIdOutput) ElementType() reflect.Type { @@ -280,6 +301,12 @@ func (o RandomIdOutput) ToRandomIdOutputWithContext(ctx context.Context) RandomI return o } +func (o RandomIdOutput) ToOutput(ctx context.Context) pulumix.Output[*RandomId] { + return pulumix.Output[*RandomId]{ + OutputState: o.OutputState, + } +} + // The generated id presented in base64 without additional transformations. func (o RandomIdOutput) B64Std() pulumi.StringOutput { return o.ApplyT(func(v *RandomId) pulumi.StringOutput { return v.B64Std }).(pulumi.StringOutput) @@ -329,6 +356,12 @@ func (o RandomIdArrayOutput) ToRandomIdArrayOutputWithContext(ctx context.Contex return o } +func (o RandomIdArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*RandomId] { + return pulumix.Output[[]*RandomId]{ + OutputState: o.OutputState, + } +} + func (o RandomIdArrayOutput) Index(i pulumi.IntInput) RandomIdOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *RandomId { return vs[0].([]*RandomId)[vs[1].(int)] @@ -349,6 +382,12 @@ func (o RandomIdMapOutput) ToRandomIdMapOutputWithContext(ctx context.Context) R return o } +func (o RandomIdMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomId] { + return pulumix.Output[map[string]*RandomId]{ + OutputState: o.OutputState, + } +} + func (o RandomIdMapOutput) MapIndex(k pulumi.StringInput) RandomIdOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *RandomId { return vs[0].(map[string]*RandomId)[vs[1].(string)] 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 02408281..b65ac93e 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 @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The resource `RandomInteger` generates random values from a given range, described by the `min` and `max` attributes of a given resource. @@ -98,6 +100,7 @@ func NewRandomInteger(ctx *pulumi.Context, if args.Min == nil { return nil, errors.New("invalid value for required argument 'Min'") } + opts = internal.PkgResourceDefaultOpts(opts) var resource RandomInteger err := ctx.RegisterResource("random:index/randomInteger:RandomInteger", name, args, &resource, opts...) if err != nil { @@ -195,6 +198,12 @@ func (i *RandomInteger) ToRandomIntegerOutputWithContext(ctx context.Context) Ra return pulumi.ToOutputWithContext(ctx, i).(RandomIntegerOutput) } +func (i *RandomInteger) ToOutput(ctx context.Context) pulumix.Output[*RandomInteger] { + return pulumix.Output[*RandomInteger]{ + OutputState: i.ToRandomIntegerOutputWithContext(ctx).OutputState, + } +} + // RandomIntegerArrayInput is an input type that accepts RandomIntegerArray and RandomIntegerArrayOutput values. // You can construct a concrete instance of `RandomIntegerArrayInput` via: // @@ -220,6 +229,12 @@ func (i RandomIntegerArray) ToRandomIntegerArrayOutputWithContext(ctx context.Co return pulumi.ToOutputWithContext(ctx, i).(RandomIntegerArrayOutput) } +func (i RandomIntegerArray) ToOutput(ctx context.Context) pulumix.Output[[]*RandomInteger] { + return pulumix.Output[[]*RandomInteger]{ + OutputState: i.ToRandomIntegerArrayOutputWithContext(ctx).OutputState, + } +} + // RandomIntegerMapInput is an input type that accepts RandomIntegerMap and RandomIntegerMapOutput values. // You can construct a concrete instance of `RandomIntegerMapInput` via: // @@ -245,6 +260,12 @@ func (i RandomIntegerMap) ToRandomIntegerMapOutputWithContext(ctx context.Contex return pulumi.ToOutputWithContext(ctx, i).(RandomIntegerMapOutput) } +func (i RandomIntegerMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomInteger] { + return pulumix.Output[map[string]*RandomInteger]{ + OutputState: i.ToRandomIntegerMapOutputWithContext(ctx).OutputState, + } +} + type RandomIntegerOutput struct{ *pulumi.OutputState } func (RandomIntegerOutput) ElementType() reflect.Type { @@ -259,6 +280,12 @@ func (o RandomIntegerOutput) ToRandomIntegerOutputWithContext(ctx context.Contex return o } +func (o RandomIntegerOutput) ToOutput(ctx context.Context) pulumix.Output[*RandomInteger] { + return pulumix.Output[*RandomInteger]{ + OutputState: o.OutputState, + } +} + // Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for more information. func (o RandomIntegerOutput) Keepers() pulumi.StringMapOutput { return o.ApplyT(func(v *RandomInteger) pulumi.StringMapOutput { return v.Keepers }).(pulumi.StringMapOutput) @@ -298,6 +325,12 @@ func (o RandomIntegerArrayOutput) ToRandomIntegerArrayOutputWithContext(ctx cont return o } +func (o RandomIntegerArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*RandomInteger] { + return pulumix.Output[[]*RandomInteger]{ + OutputState: o.OutputState, + } +} + func (o RandomIntegerArrayOutput) Index(i pulumi.IntInput) RandomIntegerOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *RandomInteger { return vs[0].([]*RandomInteger)[vs[1].(int)] @@ -318,6 +351,12 @@ func (o RandomIntegerMapOutput) ToRandomIntegerMapOutputWithContext(ctx context. return o } +func (o RandomIntegerMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomInteger] { + return pulumix.Output[map[string]*RandomInteger]{ + OutputState: o.OutputState, + } +} + func (o RandomIntegerMapOutput) MapIndex(k pulumi.StringInput) RandomIntegerOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *RandomInteger { return vs[0].(map[string]*RandomInteger)[vs[1].(string)] 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 c1043f69..eff9261f 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 @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // Identical to random_string. @@ -56,67 +58,19 @@ import ( // // ## Import // -// ### Avoiding Replacement +// You can import external passwords into your Pulumi programs as follows: // // ```sh // -// $ pulumi import random:index/randomPassword:RandomPassword If the resource were imported using `random_password.password securepassword`, +// $ import random:index/randomPassword:RandomPassword newPassword supersecret // // ``` // -// replacement could be avoided by using1. Attribute values that match the imported ID and defaults: -// -// terraform -// -// resource "random_password" "password" { -// -// length = 14 -// -// lower -// -// = true -// -// } 2. Attribute values that match the imported ID and omit the attributes with defaults: -// -// terraform -// -// resource "random_password" "password" { -// -// length = 14 -// -// } 3. `ignore_changes` specifying the attributes to ignore: -// -// terraform -// -// resource "random_password" "password" { -// -// length = 16 -// -// lower -// -// = false -// -// lifecycle { -// -// ignore_changes = [ -// -// length, -// -// lower, -// -// ] -// -// } -// -// } -// -// **NOTE** `ignore_changes` is only required until the resource is recreated after import, -// -// after which it will use the configuration values specified. +// This command will encode the `supersecret` token in Pulumi state and generate a code suggestion to include a new RandomPassword resource in your Pulumi program. Include the suggested code and do a `pulumi up`. Your secret password is now securely stored in Pulumi, and you can reference it in your Pulumi program as `newPassword.result`. type RandomPassword struct { pulumi.CustomResourceState - // A bcrypt hash of the generated random string. + // A bcrypt hash of the generated random string. **NOTE**: If the generated random string is greater than 72 bytes in length, `bcryptHash` will contain a hash of the first 72 bytes. BcryptHash pulumi.StringOutput `pulumi:"bcryptHash"` // Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for more information. Keepers pulumi.StringMapOutput `pulumi:"keepers"` @@ -163,6 +117,7 @@ func NewRandomPassword(ctx *pulumi.Context, "result", }) opts = append(opts, secrets) + opts = internal.PkgResourceDefaultOpts(opts) var resource RandomPassword err := ctx.RegisterResource("random:index/randomPassword:RandomPassword", name, args, &resource, opts...) if err != nil { @@ -185,7 +140,7 @@ func GetRandomPassword(ctx *pulumi.Context, // Input properties used for looking up and filtering RandomPassword resources. type randomPasswordState struct { - // A bcrypt hash of the generated random string. + // A bcrypt hash of the generated random string. **NOTE**: If the generated random string is greater than 72 bytes in length, `bcryptHash` will contain a hash of the first 72 bytes. BcryptHash *string `pulumi:"bcryptHash"` // Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for more information. Keepers map[string]string `pulumi:"keepers"` @@ -218,7 +173,7 @@ type randomPasswordState struct { } type RandomPasswordState struct { - // A bcrypt hash of the generated random string. + // A bcrypt hash of the generated random string. **NOTE**: If the generated random string is greater than 72 bytes in length, `bcryptHash` will contain a hash of the first 72 bytes. BcryptHash pulumi.StringPtrInput // Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for more information. Keepers pulumi.StringMapInput @@ -336,6 +291,12 @@ func (i *RandomPassword) ToRandomPasswordOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(RandomPasswordOutput) } +func (i *RandomPassword) ToOutput(ctx context.Context) pulumix.Output[*RandomPassword] { + return pulumix.Output[*RandomPassword]{ + OutputState: i.ToRandomPasswordOutputWithContext(ctx).OutputState, + } +} + // RandomPasswordArrayInput is an input type that accepts RandomPasswordArray and RandomPasswordArrayOutput values. // You can construct a concrete instance of `RandomPasswordArrayInput` via: // @@ -361,6 +322,12 @@ func (i RandomPasswordArray) ToRandomPasswordArrayOutputWithContext(ctx context. return pulumi.ToOutputWithContext(ctx, i).(RandomPasswordArrayOutput) } +func (i RandomPasswordArray) ToOutput(ctx context.Context) pulumix.Output[[]*RandomPassword] { + return pulumix.Output[[]*RandomPassword]{ + OutputState: i.ToRandomPasswordArrayOutputWithContext(ctx).OutputState, + } +} + // RandomPasswordMapInput is an input type that accepts RandomPasswordMap and RandomPasswordMapOutput values. // You can construct a concrete instance of `RandomPasswordMapInput` via: // @@ -386,6 +353,12 @@ func (i RandomPasswordMap) ToRandomPasswordMapOutputWithContext(ctx context.Cont return pulumi.ToOutputWithContext(ctx, i).(RandomPasswordMapOutput) } +func (i RandomPasswordMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomPassword] { + return pulumix.Output[map[string]*RandomPassword]{ + OutputState: i.ToRandomPasswordMapOutputWithContext(ctx).OutputState, + } +} + type RandomPasswordOutput struct{ *pulumi.OutputState } func (RandomPasswordOutput) ElementType() reflect.Type { @@ -400,7 +373,13 @@ func (o RandomPasswordOutput) ToRandomPasswordOutputWithContext(ctx context.Cont return o } -// A bcrypt hash of the generated random string. +func (o RandomPasswordOutput) ToOutput(ctx context.Context) pulumix.Output[*RandomPassword] { + return pulumix.Output[*RandomPassword]{ + OutputState: o.OutputState, + } +} + +// A bcrypt hash of the generated random string. **NOTE**: If the generated random string is greater than 72 bytes in length, `bcryptHash` will contain a hash of the first 72 bytes. func (o RandomPasswordOutput) BcryptHash() pulumi.StringOutput { return o.ApplyT(func(v *RandomPassword) pulumi.StringOutput { return v.BcryptHash }).(pulumi.StringOutput) } @@ -486,6 +465,12 @@ func (o RandomPasswordArrayOutput) ToRandomPasswordArrayOutputWithContext(ctx co return o } +func (o RandomPasswordArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*RandomPassword] { + return pulumix.Output[[]*RandomPassword]{ + OutputState: o.OutputState, + } +} + func (o RandomPasswordArrayOutput) Index(i pulumi.IntInput) RandomPasswordOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *RandomPassword { return vs[0].([]*RandomPassword)[vs[1].(int)] @@ -506,6 +491,12 @@ func (o RandomPasswordMapOutput) ToRandomPasswordMapOutputWithContext(ctx contex return o } +func (o RandomPasswordMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomPassword] { + return pulumix.Output[map[string]*RandomPassword]{ + OutputState: o.OutputState, + } +} + func (o RandomPasswordMapOutput) MapIndex(k pulumi.StringInput) RandomPasswordOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *RandomPassword { return vs[0].(map[string]*RandomPassword)[vs[1].(string)] 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 8107fab0..55771e09 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 @@ -7,7 +7,9 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The resource `RandomPet` generates random pet names that are intended to be used as unique identifiers for other resources. @@ -77,6 +79,7 @@ func NewRandomPet(ctx *pulumi.Context, args = &RandomPetArgs{} } + opts = internal.PkgResourceDefaultOpts(opts) var resource RandomPet err := ctx.RegisterResource("random:index/randomPet:RandomPet", name, args, &resource, opts...) if err != nil { @@ -170,6 +173,12 @@ func (i *RandomPet) ToRandomPetOutputWithContext(ctx context.Context) RandomPetO return pulumi.ToOutputWithContext(ctx, i).(RandomPetOutput) } +func (i *RandomPet) ToOutput(ctx context.Context) pulumix.Output[*RandomPet] { + return pulumix.Output[*RandomPet]{ + OutputState: i.ToRandomPetOutputWithContext(ctx).OutputState, + } +} + // RandomPetArrayInput is an input type that accepts RandomPetArray and RandomPetArrayOutput values. // You can construct a concrete instance of `RandomPetArrayInput` via: // @@ -195,6 +204,12 @@ func (i RandomPetArray) ToRandomPetArrayOutputWithContext(ctx context.Context) R return pulumi.ToOutputWithContext(ctx, i).(RandomPetArrayOutput) } +func (i RandomPetArray) ToOutput(ctx context.Context) pulumix.Output[[]*RandomPet] { + return pulumix.Output[[]*RandomPet]{ + OutputState: i.ToRandomPetArrayOutputWithContext(ctx).OutputState, + } +} + // RandomPetMapInput is an input type that accepts RandomPetMap and RandomPetMapOutput values. // You can construct a concrete instance of `RandomPetMapInput` via: // @@ -220,6 +235,12 @@ func (i RandomPetMap) ToRandomPetMapOutputWithContext(ctx context.Context) Rando return pulumi.ToOutputWithContext(ctx, i).(RandomPetMapOutput) } +func (i RandomPetMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomPet] { + return pulumix.Output[map[string]*RandomPet]{ + OutputState: i.ToRandomPetMapOutputWithContext(ctx).OutputState, + } +} + type RandomPetOutput struct{ *pulumi.OutputState } func (RandomPetOutput) ElementType() reflect.Type { @@ -234,6 +255,12 @@ func (o RandomPetOutput) ToRandomPetOutputWithContext(ctx context.Context) Rando return o } +func (o RandomPetOutput) ToOutput(ctx context.Context) pulumix.Output[*RandomPet] { + return pulumix.Output[*RandomPet]{ + OutputState: o.OutputState, + } +} + // Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for more information. func (o RandomPetOutput) Keepers() pulumi.StringMapOutput { return o.ApplyT(func(v *RandomPet) pulumi.StringMapOutput { return v.Keepers }).(pulumi.StringMapOutput) @@ -268,6 +295,12 @@ func (o RandomPetArrayOutput) ToRandomPetArrayOutputWithContext(ctx context.Cont return o } +func (o RandomPetArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*RandomPet] { + return pulumix.Output[[]*RandomPet]{ + OutputState: o.OutputState, + } +} + func (o RandomPetArrayOutput) Index(i pulumi.IntInput) RandomPetOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *RandomPet { return vs[0].([]*RandomPet)[vs[1].(int)] @@ -288,6 +321,12 @@ func (o RandomPetMapOutput) ToRandomPetMapOutputWithContext(ctx context.Context) return o } +func (o RandomPetMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomPet] { + return pulumix.Output[map[string]*RandomPet]{ + OutputState: o.OutputState, + } +} + func (o RandomPetMapOutput) MapIndex(k pulumi.StringInput) RandomPetOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *RandomPet { return vs[0].(map[string]*RandomPet)[vs[1].(string)] 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 042689ca..f2b38d83 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 @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The resource `RandomShuffle` generates a random permutation of a list of strings given as an argument. @@ -78,6 +80,7 @@ func NewRandomShuffle(ctx *pulumi.Context, if args.Inputs == nil { return nil, errors.New("invalid value for required argument 'Inputs'") } + opts = internal.PkgResourceDefaultOpts(opts) var resource RandomShuffle err := ctx.RegisterResource("random:index/randomShuffle:RandomShuffle", name, args, &resource, opts...) if err != nil { @@ -175,6 +178,12 @@ func (i *RandomShuffle) ToRandomShuffleOutputWithContext(ctx context.Context) Ra return pulumi.ToOutputWithContext(ctx, i).(RandomShuffleOutput) } +func (i *RandomShuffle) ToOutput(ctx context.Context) pulumix.Output[*RandomShuffle] { + return pulumix.Output[*RandomShuffle]{ + OutputState: i.ToRandomShuffleOutputWithContext(ctx).OutputState, + } +} + // RandomShuffleArrayInput is an input type that accepts RandomShuffleArray and RandomShuffleArrayOutput values. // You can construct a concrete instance of `RandomShuffleArrayInput` via: // @@ -200,6 +209,12 @@ func (i RandomShuffleArray) ToRandomShuffleArrayOutputWithContext(ctx context.Co return pulumi.ToOutputWithContext(ctx, i).(RandomShuffleArrayOutput) } +func (i RandomShuffleArray) ToOutput(ctx context.Context) pulumix.Output[[]*RandomShuffle] { + return pulumix.Output[[]*RandomShuffle]{ + OutputState: i.ToRandomShuffleArrayOutputWithContext(ctx).OutputState, + } +} + // RandomShuffleMapInput is an input type that accepts RandomShuffleMap and RandomShuffleMapOutput values. // You can construct a concrete instance of `RandomShuffleMapInput` via: // @@ -225,6 +240,12 @@ func (i RandomShuffleMap) ToRandomShuffleMapOutputWithContext(ctx context.Contex return pulumi.ToOutputWithContext(ctx, i).(RandomShuffleMapOutput) } +func (i RandomShuffleMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomShuffle] { + return pulumix.Output[map[string]*RandomShuffle]{ + OutputState: i.ToRandomShuffleMapOutputWithContext(ctx).OutputState, + } +} + type RandomShuffleOutput struct{ *pulumi.OutputState } func (RandomShuffleOutput) ElementType() reflect.Type { @@ -239,6 +260,12 @@ func (o RandomShuffleOutput) ToRandomShuffleOutputWithContext(ctx context.Contex return o } +func (o RandomShuffleOutput) ToOutput(ctx context.Context) pulumix.Output[*RandomShuffle] { + return pulumix.Output[*RandomShuffle]{ + OutputState: o.OutputState, + } +} + // The list of strings to shuffle. func (o RandomShuffleOutput) Inputs() pulumi.StringArrayOutput { return o.ApplyT(func(v *RandomShuffle) pulumi.StringArrayOutput { return v.Inputs }).(pulumi.StringArrayOutput) @@ -278,6 +305,12 @@ func (o RandomShuffleArrayOutput) ToRandomShuffleArrayOutputWithContext(ctx cont return o } +func (o RandomShuffleArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*RandomShuffle] { + return pulumix.Output[[]*RandomShuffle]{ + OutputState: o.OutputState, + } +} + func (o RandomShuffleArrayOutput) Index(i pulumi.IntInput) RandomShuffleOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *RandomShuffle { return vs[0].([]*RandomShuffle)[vs[1].(int)] @@ -298,6 +331,12 @@ func (o RandomShuffleMapOutput) ToRandomShuffleMapOutputWithContext(ctx context. return o } +func (o RandomShuffleMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomShuffle] { + return pulumix.Output[map[string]*RandomShuffle]{ + OutputState: o.OutputState, + } +} + func (o RandomShuffleMapOutput) MapIndex(k pulumi.StringInput) RandomShuffleOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *RandomShuffle { return vs[0].(map[string]*RandomShuffle)[vs[1].(string)] 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 f8b661d2..cbbbebef 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 @@ -8,7 +8,9 @@ import ( "reflect" "errors" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The resource `RandomString` generates a random permutation of alphanumeric characters and optionally special characters. @@ -47,63 +49,17 @@ import ( // // ## Import // -// ### Avoiding Replacement +// You can import external strings into your Pulumi programs as RandomString resources as follows: // // ```sh // -// $ pulumi import random:index/randomString:RandomString If the resource were imported using `random_string.test test`, +// $ import random:index/randomString:RandomString newString myspecialdata // // ``` // -// replacement can be avoided by using1. Attribute values that match the imported ID and defaults: +// This command will encode the `myspecialdata` token in Pulumi state and generate a code suggestion to include a new RandomString resource in your Pulumi program. Include the suggested code and do a `pulumi up`. Your data is now stored in Pulumi, and you can reference it in your Pulumi program as `newString.result`. // -// terraform -// -// resource "random_string" "test" { -// -// length = 4 -// -// lower -// -// = true -// -// } 2. Attribute values that match the imported ID and omit the attributes with defaults: -// -// terraform -// -// resource "random_string" "test" { -// -// length = 4 -// -// } 3. `ignore_changes` specifying the attributes to ignore: -// -// terraform -// -// resource "random_string" "test" { -// -// length = 16 -// -// lower -// -// = false -// -// lifecycle { -// -// ignore_changes = [ -// -// length, -// -// lower, -// -// ] -// -// } -// -// } -// -// **NOTE** `ignore_changes` is only required until the resource is recreated after import, -// -// after which it will use the configuration values specified. +// If the data needs to be stored securily as a secret, consider using the RandomPassword resource instead. type RandomString struct { pulumi.CustomResourceState @@ -147,6 +103,7 @@ func NewRandomString(ctx *pulumi.Context, if args.Length == nil { return nil, errors.New("invalid value for required argument 'Length'") } + opts = internal.PkgResourceDefaultOpts(opts) var resource RandomString err := ctx.RegisterResource("random:index/randomString:RandomString", name, args, &resource, opts...) if err != nil { @@ -316,6 +273,12 @@ func (i *RandomString) ToRandomStringOutputWithContext(ctx context.Context) Rand return pulumi.ToOutputWithContext(ctx, i).(RandomStringOutput) } +func (i *RandomString) ToOutput(ctx context.Context) pulumix.Output[*RandomString] { + return pulumix.Output[*RandomString]{ + OutputState: i.ToRandomStringOutputWithContext(ctx).OutputState, + } +} + // RandomStringArrayInput is an input type that accepts RandomStringArray and RandomStringArrayOutput values. // You can construct a concrete instance of `RandomStringArrayInput` via: // @@ -341,6 +304,12 @@ func (i RandomStringArray) ToRandomStringArrayOutputWithContext(ctx context.Cont return pulumi.ToOutputWithContext(ctx, i).(RandomStringArrayOutput) } +func (i RandomStringArray) ToOutput(ctx context.Context) pulumix.Output[[]*RandomString] { + return pulumix.Output[[]*RandomString]{ + OutputState: i.ToRandomStringArrayOutputWithContext(ctx).OutputState, + } +} + // RandomStringMapInput is an input type that accepts RandomStringMap and RandomStringMapOutput values. // You can construct a concrete instance of `RandomStringMapInput` via: // @@ -366,6 +335,12 @@ func (i RandomStringMap) ToRandomStringMapOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(RandomStringMapOutput) } +func (i RandomStringMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomString] { + return pulumix.Output[map[string]*RandomString]{ + OutputState: i.ToRandomStringMapOutputWithContext(ctx).OutputState, + } +} + type RandomStringOutput struct{ *pulumi.OutputState } func (RandomStringOutput) ElementType() reflect.Type { @@ -380,6 +355,12 @@ func (o RandomStringOutput) ToRandomStringOutputWithContext(ctx context.Context) return o } +func (o RandomStringOutput) ToOutput(ctx context.Context) pulumix.Output[*RandomString] { + return pulumix.Output[*RandomString]{ + OutputState: o.OutputState, + } +} + // Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for more information. func (o RandomStringOutput) Keepers() pulumi.StringMapOutput { return o.ApplyT(func(v *RandomString) pulumi.StringMapOutput { return v.Keepers }).(pulumi.StringMapOutput) @@ -461,6 +442,12 @@ func (o RandomStringArrayOutput) ToRandomStringArrayOutputWithContext(ctx contex return o } +func (o RandomStringArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*RandomString] { + return pulumix.Output[[]*RandomString]{ + OutputState: o.OutputState, + } +} + func (o RandomStringArrayOutput) Index(i pulumi.IntInput) RandomStringOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *RandomString { return vs[0].([]*RandomString)[vs[1].(int)] @@ -481,6 +468,12 @@ func (o RandomStringMapOutput) ToRandomStringMapOutputWithContext(ctx context.Co return o } +func (o RandomStringMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomString] { + return pulumix.Output[map[string]*RandomString]{ + OutputState: o.OutputState, + } +} + func (o RandomStringMapOutput) MapIndex(k pulumi.StringInput) RandomStringOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *RandomString { return vs[0].(map[string]*RandomString)[vs[1].(string)] 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 58566960..455d18c0 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 @@ -7,7 +7,9 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-random/sdk/v4/go/random/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The resource `RandomUuid` generates random uuid string that is intended to be used as unique identifiers for other resources. @@ -70,6 +72,7 @@ func NewRandomUuid(ctx *pulumi.Context, args = &RandomUuidArgs{} } + opts = internal.PkgResourceDefaultOpts(opts) var resource RandomUuid err := ctx.RegisterResource("random:index/randomUuid:RandomUuid", name, args, &resource, opts...) if err != nil { @@ -143,6 +146,12 @@ func (i *RandomUuid) ToRandomUuidOutputWithContext(ctx context.Context) RandomUu return pulumi.ToOutputWithContext(ctx, i).(RandomUuidOutput) } +func (i *RandomUuid) ToOutput(ctx context.Context) pulumix.Output[*RandomUuid] { + return pulumix.Output[*RandomUuid]{ + OutputState: i.ToRandomUuidOutputWithContext(ctx).OutputState, + } +} + // RandomUuidArrayInput is an input type that accepts RandomUuidArray and RandomUuidArrayOutput values. // You can construct a concrete instance of `RandomUuidArrayInput` via: // @@ -168,6 +177,12 @@ func (i RandomUuidArray) ToRandomUuidArrayOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(RandomUuidArrayOutput) } +func (i RandomUuidArray) ToOutput(ctx context.Context) pulumix.Output[[]*RandomUuid] { + return pulumix.Output[[]*RandomUuid]{ + OutputState: i.ToRandomUuidArrayOutputWithContext(ctx).OutputState, + } +} + // RandomUuidMapInput is an input type that accepts RandomUuidMap and RandomUuidMapOutput values. // You can construct a concrete instance of `RandomUuidMapInput` via: // @@ -193,6 +208,12 @@ func (i RandomUuidMap) ToRandomUuidMapOutputWithContext(ctx context.Context) Ran return pulumi.ToOutputWithContext(ctx, i).(RandomUuidMapOutput) } +func (i RandomUuidMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomUuid] { + return pulumix.Output[map[string]*RandomUuid]{ + OutputState: i.ToRandomUuidMapOutputWithContext(ctx).OutputState, + } +} + type RandomUuidOutput struct{ *pulumi.OutputState } func (RandomUuidOutput) ElementType() reflect.Type { @@ -207,6 +228,12 @@ func (o RandomUuidOutput) ToRandomUuidOutputWithContext(ctx context.Context) Ran return o } +func (o RandomUuidOutput) ToOutput(ctx context.Context) pulumix.Output[*RandomUuid] { + return pulumix.Output[*RandomUuid]{ + OutputState: o.OutputState, + } +} + // Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for more information. func (o RandomUuidOutput) Keepers() pulumi.StringMapOutput { return o.ApplyT(func(v *RandomUuid) pulumi.StringMapOutput { return v.Keepers }).(pulumi.StringMapOutput) @@ -231,6 +258,12 @@ func (o RandomUuidArrayOutput) ToRandomUuidArrayOutputWithContext(ctx context.Co return o } +func (o RandomUuidArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*RandomUuid] { + return pulumix.Output[[]*RandomUuid]{ + OutputState: o.OutputState, + } +} + func (o RandomUuidArrayOutput) Index(i pulumi.IntInput) RandomUuidOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *RandomUuid { return vs[0].([]*RandomUuid)[vs[1].(int)] @@ -251,6 +284,12 @@ func (o RandomUuidMapOutput) ToRandomUuidMapOutputWithContext(ctx context.Contex return o } +func (o RandomUuidMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*RandomUuid] { + return pulumix.Output[map[string]*RandomUuid]{ + OutputState: o.OutputState, + } +} + func (o RandomUuidMapOutput) MapIndex(k pulumi.StringInput) RandomUuidOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *RandomUuid { return vs[0].(map[string]*RandomUuid)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/certRequest.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/certRequest.go index e58e6dd8..01ca082f 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/certRequest.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/certRequest.go @@ -7,8 +7,10 @@ import ( "context" "reflect" - "github.com/pkg/errors" + "errors" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // ## Example Usage @@ -18,7 +20,7 @@ import ( // // import ( // -// "io/ioutil" +// "os" // // "github.com/pulumi/pulumi-tls/sdk/v4/go/tls" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" @@ -26,7 +28,7 @@ import ( // ) // // func readFileOrPanic(path string) pulumi.StringPtrInput { -// data, err := ioutil.ReadFile(path) +// data, err := os.ReadFile(path) // if err != nil { // panic(err.Error()) // } @@ -53,11 +55,7 @@ import ( type CertRequest struct { pulumi.CustomResourceState - // The certificate request data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // The certificate request data in PEM (RFC 1421). CertRequestPem pulumi.StringOutput `pulumi:"certRequestPem"` // List of DNS names for which a certificate is being requested (i.e. certificate subjects). DnsNames pulumi.StringArrayOutput `pulumi:"dnsNames"` @@ -94,6 +92,7 @@ func NewCertRequest(ctx *pulumi.Context, "privateKeyPem", }) opts = append(opts, secrets) + opts = internal.PkgResourceDefaultOpts(opts) var resource CertRequest err := ctx.RegisterResource("tls:index/certRequest:CertRequest", name, args, &resource, opts...) if err != nil { @@ -116,11 +115,7 @@ func GetCertRequest(ctx *pulumi.Context, // Input properties used for looking up and filtering CertRequest resources. type certRequestState struct { - // The certificate request data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // The certificate request data in PEM (RFC 1421). CertRequestPem *string `pulumi:"certRequestPem"` // List of DNS names for which a certificate is being requested (i.e. certificate subjects). DnsNames []string `pulumi:"dnsNames"` @@ -141,11 +136,7 @@ type certRequestState struct { } type CertRequestState struct { - // The certificate request data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // The certificate request data in PEM (RFC 1421). CertRequestPem pulumi.StringPtrInput // List of DNS names for which a certificate is being requested (i.e. certificate subjects). DnsNames pulumi.StringArrayInput @@ -231,6 +222,12 @@ func (i *CertRequest) ToCertRequestOutputWithContext(ctx context.Context) CertRe return pulumi.ToOutputWithContext(ctx, i).(CertRequestOutput) } +func (i *CertRequest) ToOutput(ctx context.Context) pulumix.Output[*CertRequest] { + return pulumix.Output[*CertRequest]{ + OutputState: i.ToCertRequestOutputWithContext(ctx).OutputState, + } +} + // CertRequestArrayInput is an input type that accepts CertRequestArray and CertRequestArrayOutput values. // You can construct a concrete instance of `CertRequestArrayInput` via: // @@ -256,6 +253,12 @@ func (i CertRequestArray) ToCertRequestArrayOutputWithContext(ctx context.Contex return pulumi.ToOutputWithContext(ctx, i).(CertRequestArrayOutput) } +func (i CertRequestArray) ToOutput(ctx context.Context) pulumix.Output[[]*CertRequest] { + return pulumix.Output[[]*CertRequest]{ + OutputState: i.ToCertRequestArrayOutputWithContext(ctx).OutputState, + } +} + // CertRequestMapInput is an input type that accepts CertRequestMap and CertRequestMapOutput values. // You can construct a concrete instance of `CertRequestMapInput` via: // @@ -281,6 +284,12 @@ func (i CertRequestMap) ToCertRequestMapOutputWithContext(ctx context.Context) C return pulumi.ToOutputWithContext(ctx, i).(CertRequestMapOutput) } +func (i CertRequestMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*CertRequest] { + return pulumix.Output[map[string]*CertRequest]{ + OutputState: i.ToCertRequestMapOutputWithContext(ctx).OutputState, + } +} + type CertRequestOutput struct{ *pulumi.OutputState } func (CertRequestOutput) ElementType() reflect.Type { @@ -295,11 +304,13 @@ func (o CertRequestOutput) ToCertRequestOutputWithContext(ctx context.Context) C return o } -// The certificate request data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the -// [underlying](https://pkg.go.dev/encoding/pem#Encode) -// [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at -// the end of the PEM. In case this disrupts your use case, we recommend using -// [`trimspace()`](https://www.terraform.io/language/functions/trimspace). +func (o CertRequestOutput) ToOutput(ctx context.Context) pulumix.Output[*CertRequest] { + return pulumix.Output[*CertRequest]{ + OutputState: o.OutputState, + } +} + +// The certificate request data in PEM (RFC 1421). func (o CertRequestOutput) CertRequestPem() pulumi.StringOutput { return o.ApplyT(func(v *CertRequest) pulumi.StringOutput { return v.CertRequestPem }).(pulumi.StringOutput) } @@ -352,6 +363,12 @@ func (o CertRequestArrayOutput) ToCertRequestArrayOutputWithContext(ctx context. return o } +func (o CertRequestArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*CertRequest] { + return pulumix.Output[[]*CertRequest]{ + OutputState: o.OutputState, + } +} + func (o CertRequestArrayOutput) Index(i pulumi.IntInput) CertRequestOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *CertRequest { return vs[0].([]*CertRequest)[vs[1].(int)] @@ -372,6 +389,12 @@ func (o CertRequestMapOutput) ToCertRequestMapOutputWithContext(ctx context.Cont return o } +func (o CertRequestMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*CertRequest] { + return pulumix.Output[map[string]*CertRequest]{ + OutputState: o.OutputState, + } +} + func (o CertRequestMapOutput) MapIndex(k pulumi.StringInput) CertRequestOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *CertRequest { return vs[0].(map[string]*CertRequest)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getCertificate.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getCertificate.go index ca22d38e..5b1e4943 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getCertificate.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getCertificate.go @@ -7,10 +7,13 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) func GetCertificate(ctx *pulumi.Context, args *GetCertificateArgs, opts ...pulumi.InvokeOption) (*GetCertificateResult, error) { + opts = internal.PkgInvokeDefaultOpts(opts) var rv GetCertificateResult err := ctx.Invoke("tls:index/getCertificate:getCertificate", args, &rv, opts...) if err != nil { @@ -85,6 +88,12 @@ func (o GetCertificateResultOutput) ToGetCertificateResultOutputWithContext(ctx return o } +func (o GetCertificateResultOutput) ToOutput(ctx context.Context) pulumix.Output[GetCertificateResult] { + return pulumix.Output[GetCertificateResult]{ + OutputState: o.OutputState, + } +} + // The certificates protecting the site, with the root of the chain first. func (o GetCertificateResultOutput) Certificates() GetCertificateCertificateArrayOutput { return o.ApplyT(func(v GetCertificateResult) []GetCertificateCertificate { return v.Certificates }).(GetCertificateCertificateArrayOutput) diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getPublicKey.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getPublicKey.go index b208e0c2..d77dd40e 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getPublicKey.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/getPublicKey.go @@ -7,7 +7,9 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // Get a public key from a PEM-encoded private key. @@ -21,7 +23,7 @@ import ( // // import ( // -// "io/ioutil" +// "os" // // "github.com/pulumi/pulumi-tls/sdk/v4/go/tls" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" @@ -29,7 +31,7 @@ import ( // ) // // func readFileOrPanic(path string) pulumi.StringPtrInput { -// data, err := ioutil.ReadFile(path) +// data, err := os.ReadFile(path) // if err != nil { // panic(err.Error()) // } @@ -59,6 +61,7 @@ import ( // // ``` func GetPublicKey(ctx *pulumi.Context, args *GetPublicKeyArgs, opts ...pulumi.InvokeOption) (*GetPublicKeyResult, error) { + opts = internal.PkgInvokeDefaultOpts(opts) var rv GetPublicKeyResult err := ctx.Invoke("tls:index/getPublicKey:getPublicKey", args, &rv, opts...) if err != nil { @@ -89,8 +92,10 @@ type GetPublicKeyResult struct { PublicKeyFingerprintMd5 string `pulumi:"publicKeyFingerprintMd5"` // The fingerprint of the public key data in OpenSSH SHA256 hash format, e.g. `SHA256:...`. Only available if the selected private key format is compatible, as per the rules for `publicKeyOpenssh` and ECDSA P224 limitations. PublicKeyFingerprintSha256 string `pulumi:"publicKeyFingerprintSha256"` - PublicKeyOpenssh string `pulumi:"publicKeyOpenssh"` - PublicKeyPem string `pulumi:"publicKeyPem"` + // The public key, in OpenSSH PEM (RFC 4716). + PublicKeyOpenssh string `pulumi:"publicKeyOpenssh"` + // The public key, in PEM (RFC 1421). + PublicKeyPem string `pulumi:"publicKeyPem"` } func GetPublicKeyOutput(ctx *pulumi.Context, args GetPublicKeyOutputArgs, opts ...pulumi.InvokeOption) GetPublicKeyResultOutput { @@ -133,6 +138,12 @@ func (o GetPublicKeyResultOutput) ToGetPublicKeyResultOutputWithContext(ctx cont return o } +func (o GetPublicKeyResultOutput) ToOutput(ctx context.Context) pulumix.Output[GetPublicKeyResult] { + return pulumix.Output[GetPublicKeyResult]{ + OutputState: o.OutputState, + } +} + // The name of the algorithm used by the given private key. Possible values are: `RSA`, `ECDSA` and `ED25519`. func (o GetPublicKeyResultOutput) Algorithm() pulumi.StringOutput { return o.ApplyT(func(v GetPublicKeyResult) string { return v.Algorithm }).(pulumi.StringOutput) @@ -163,10 +174,12 @@ func (o GetPublicKeyResultOutput) PublicKeyFingerprintSha256() pulumi.StringOutp return o.ApplyT(func(v GetPublicKeyResult) string { return v.PublicKeyFingerprintSha256 }).(pulumi.StringOutput) } +// The public key, in OpenSSH PEM (RFC 4716). func (o GetPublicKeyResultOutput) PublicKeyOpenssh() pulumi.StringOutput { return o.ApplyT(func(v GetPublicKeyResult) string { return v.PublicKeyOpenssh }).(pulumi.StringOutput) } +// The public key, in PEM (RFC 1421). func (o GetPublicKeyResultOutput) PublicKeyPem() pulumi.StringOutput { return o.ApplyT(func(v GetPublicKeyResult) string { return v.PublicKeyPem }).(pulumi.StringOutput) } diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/init.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/init.go index 8b2ed3b5..2626405d 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/init.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/init.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/blang/semver" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -55,7 +56,10 @@ func (p *pkg) ConstructProvider(ctx *pulumi.Context, name, typ, urn string) (pul } func init() { - version, _ := PkgVersion() + version, err := internal.PkgVersion() + if err != nil { + version = semver.Version{Major: 1} + } pulumi.RegisterResourceModule( "tls", "index/certRequest", diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/pulumiUtilities.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal/pulumiUtilities.go similarity index 58% rename from vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/pulumiUtilities.go rename to vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal/pulumiUtilities.go index 79167549..67c410a1 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/pulumiUtilities.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal/pulumiUtilities.go @@ -1,7 +1,7 @@ // Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. // *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** -package tls +package internal import ( "fmt" @@ -17,7 +17,7 @@ import ( type envParser func(v string) interface{} -func parseEnvBool(v string) interface{} { +func ParseEnvBool(v string) interface{} { b, err := strconv.ParseBool(v) if err != nil { return nil @@ -25,7 +25,7 @@ func parseEnvBool(v string) interface{} { return b } -func parseEnvInt(v string) interface{} { +func ParseEnvInt(v string) interface{} { i, err := strconv.ParseInt(v, 0, 0) if err != nil { return nil @@ -33,7 +33,7 @@ func parseEnvInt(v string) interface{} { return int(i) } -func parseEnvFloat(v string) interface{} { +func ParseEnvFloat(v string) interface{} { f, err := strconv.ParseFloat(v, 64) if err != nil { return nil @@ -41,7 +41,7 @@ func parseEnvFloat(v string) interface{} { return f } -func parseEnvStringArray(v string) interface{} { +func ParseEnvStringArray(v string) interface{} { var result pulumi.StringArray for _, item := range strings.Split(v, ";") { result = append(result, pulumi.String(item)) @@ -49,9 +49,9 @@ func parseEnvStringArray(v string) interface{} { return result } -func getEnvOrDefault(def interface{}, parser envParser, vars ...string) interface{} { +func GetEnvOrDefault(def interface{}, parser envParser, vars ...string) interface{} { for _, v := range vars { - if value := os.Getenv(v); value != "" { + if value, ok := os.LookupEnv(v); ok { if parser != nil { return parser(value) } @@ -65,6 +65,10 @@ func getEnvOrDefault(def interface{}, parser envParser, vars ...string) interfac // If a version cannot be determined, v1 will be assumed. The second return // value is always nil. func PkgVersion() (semver.Version, error) { + // emptyVersion defaults to v0.0.0 + if !SdkVersion.Equals(semver.Version{}) { + return SdkVersion, nil + } type sentinal struct{} pkgPath := reflect.TypeOf(sentinal{}).PkgPath() re := regexp.MustCompile("^.*/pulumi-tls/sdk(/v\\d+)?") @@ -79,9 +83,31 @@ func PkgVersion() (semver.Version, error) { } // isZero is a null safe check for if a value is it's types zero value. -func isZero(v interface{}) bool { +func IsZero(v interface{}) bool { if v == nil { return true } return reflect.ValueOf(v).IsZero() } + +// PkgResourceDefaultOpts provides package level defaults to pulumi.OptionResource. +func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { + defaults := []pulumi.ResourceOption{} + + version := SdkVersion + if !version.Equals(semver.Version{}) { + defaults = append(defaults, pulumi.Version(version.String())) + } + return append(defaults, opts...) +} + +// PkgInvokeDefaultOpts provides package level defaults to pulumi.OptionInvoke. +func PkgInvokeDefaultOpts(opts []pulumi.InvokeOption) []pulumi.InvokeOption { + defaults := []pulumi.InvokeOption{} + + version := SdkVersion + if !version.Equals(semver.Version{}) { + defaults = append(defaults, pulumi.Version(version.String())) + } + return append(defaults, opts...) +} diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal/pulumiVersion.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal/pulumiVersion.go new file mode 100644 index 00000000..d5916876 --- /dev/null +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal/pulumiVersion.go @@ -0,0 +1,11 @@ +// Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. +// *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** + +package internal + +import ( + "github.com/blang/semver" +) + +var SdkVersion semver.Version = semver.Version{} +var pluginDownloadURL string = "" diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/locallySignedCert.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/locallySignedCert.go index a92d5e23..df080509 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/locallySignedCert.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/locallySignedCert.go @@ -7,8 +7,10 @@ import ( "context" "reflect" - "github.com/pkg/errors" + "errors" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) type LocallySignedCert struct { @@ -24,11 +26,7 @@ type LocallySignedCert struct { CaKeyAlgorithm pulumi.StringOutput `pulumi:"caKeyAlgorithm"` // Private key of the Certificate Authority (CA) used to sign the certificate, in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. CaPrivateKeyPem pulumi.StringOutput `pulumi:"caPrivateKeyPem"` - // Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Certificate data in PEM (RFC 1421). CertPem pulumi.StringOutput `pulumi:"certPem"` // Certificate request data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. CertRequestPem pulumi.StringOutput `pulumi:"certRequestPem"` @@ -81,6 +79,7 @@ func NewLocallySignedCert(ctx *pulumi.Context, "caPrivateKeyPem", }) opts = append(opts, secrets) + opts = internal.PkgResourceDefaultOpts(opts) var resource LocallySignedCert err := ctx.RegisterResource("tls:index/locallySignedCert:LocallySignedCert", name, args, &resource, opts...) if err != nil { @@ -113,11 +112,7 @@ type locallySignedCertState struct { CaKeyAlgorithm *string `pulumi:"caKeyAlgorithm"` // Private key of the Certificate Authority (CA) used to sign the certificate, in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. CaPrivateKeyPem *string `pulumi:"caPrivateKeyPem"` - // Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Certificate data in PEM (RFC 1421). CertPem *string `pulumi:"certPem"` // Certificate request data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. CertRequestPem *string `pulumi:"certRequestPem"` @@ -152,11 +147,7 @@ type LocallySignedCertState struct { CaKeyAlgorithm pulumi.StringPtrInput // Private key of the Certificate Authority (CA) used to sign the certificate, in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. CaPrivateKeyPem pulumi.StringPtrInput - // Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Certificate data in PEM (RFC 1421). CertPem pulumi.StringPtrInput // Certificate request data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. CertRequestPem pulumi.StringPtrInput @@ -262,6 +253,12 @@ func (i *LocallySignedCert) ToLocallySignedCertOutputWithContext(ctx context.Con return pulumi.ToOutputWithContext(ctx, i).(LocallySignedCertOutput) } +func (i *LocallySignedCert) ToOutput(ctx context.Context) pulumix.Output[*LocallySignedCert] { + return pulumix.Output[*LocallySignedCert]{ + OutputState: i.ToLocallySignedCertOutputWithContext(ctx).OutputState, + } +} + // LocallySignedCertArrayInput is an input type that accepts LocallySignedCertArray and LocallySignedCertArrayOutput values. // You can construct a concrete instance of `LocallySignedCertArrayInput` via: // @@ -287,6 +284,12 @@ func (i LocallySignedCertArray) ToLocallySignedCertArrayOutputWithContext(ctx co return pulumi.ToOutputWithContext(ctx, i).(LocallySignedCertArrayOutput) } +func (i LocallySignedCertArray) ToOutput(ctx context.Context) pulumix.Output[[]*LocallySignedCert] { + return pulumix.Output[[]*LocallySignedCert]{ + OutputState: i.ToLocallySignedCertArrayOutputWithContext(ctx).OutputState, + } +} + // LocallySignedCertMapInput is an input type that accepts LocallySignedCertMap and LocallySignedCertMapOutput values. // You can construct a concrete instance of `LocallySignedCertMapInput` via: // @@ -312,6 +315,12 @@ func (i LocallySignedCertMap) ToLocallySignedCertMapOutputWithContext(ctx contex return pulumi.ToOutputWithContext(ctx, i).(LocallySignedCertMapOutput) } +func (i LocallySignedCertMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*LocallySignedCert] { + return pulumix.Output[map[string]*LocallySignedCert]{ + OutputState: i.ToLocallySignedCertMapOutputWithContext(ctx).OutputState, + } +} + type LocallySignedCertOutput struct{ *pulumi.OutputState } func (LocallySignedCertOutput) ElementType() reflect.Type { @@ -326,6 +335,12 @@ func (o LocallySignedCertOutput) ToLocallySignedCertOutputWithContext(ctx contex return o } +func (o LocallySignedCertOutput) ToOutput(ctx context.Context) pulumix.Output[*LocallySignedCert] { + return pulumix.Output[*LocallySignedCert]{ + OutputState: o.OutputState, + } +} + // List of key usages allowed for the issued certificate. Values are defined in [RFC 5280](https://datatracker.ietf.org/doc/html/rfc5280) and combine flags defined by both [Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3) and [Extended Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.12). Accepted values: `anyExtended`, `certSigning`, `clientAuth`, `codeSigning`, `contentCommitment`, `crlSigning`, `dataEncipherment`, `decipherOnly`, `digitalSignature`, `emailProtection`, `encipherOnly`, `ipsecEndSystem`, `ipsecTunnel`, `ipsecUser`, `keyAgreement`, `keyEncipherment`, `microsoftCommercialCodeSigning`, `microsoftKernelCodeSigning`, `microsoftServerGatedCrypto`, `netscapeServerGatedCrypto`, `ocspSigning`, `serverAuth`, `timestamping`. func (o LocallySignedCertOutput) AllowedUses() pulumi.StringArrayOutput { return o.ApplyT(func(v *LocallySignedCert) pulumi.StringArrayOutput { return v.AllowedUses }).(pulumi.StringArrayOutput) @@ -348,11 +363,7 @@ func (o LocallySignedCertOutput) CaPrivateKeyPem() pulumi.StringOutput { return o.ApplyT(func(v *LocallySignedCert) pulumi.StringOutput { return v.CaPrivateKeyPem }).(pulumi.StringOutput) } -// Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the -// [underlying](https://pkg.go.dev/encoding/pem#Encode) -// [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at -// the end of the PEM. In case this disrupts your use case, we recommend using -// [`trimspace()`](https://www.terraform.io/language/functions/trimspace). +// Certificate data in PEM (RFC 1421). func (o LocallySignedCertOutput) CertPem() pulumi.StringOutput { return o.ApplyT(func(v *LocallySignedCert) pulumi.StringOutput { return v.CertPem }).(pulumi.StringOutput) } @@ -415,6 +426,12 @@ func (o LocallySignedCertArrayOutput) ToLocallySignedCertArrayOutputWithContext( return o } +func (o LocallySignedCertArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*LocallySignedCert] { + return pulumix.Output[[]*LocallySignedCert]{ + OutputState: o.OutputState, + } +} + func (o LocallySignedCertArrayOutput) Index(i pulumi.IntInput) LocallySignedCertOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *LocallySignedCert { return vs[0].([]*LocallySignedCert)[vs[1].(int)] @@ -435,6 +452,12 @@ func (o LocallySignedCertMapOutput) ToLocallySignedCertMapOutputWithContext(ctx return o } +func (o LocallySignedCertMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*LocallySignedCert] { + return pulumix.Output[map[string]*LocallySignedCert]{ + OutputState: o.OutputState, + } +} + func (o LocallySignedCertMapOutput) MapIndex(k pulumi.StringInput) LocallySignedCertOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *LocallySignedCert { return vs[0].(map[string]*LocallySignedCert)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/privateKey.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/privateKey.go index 7522afc5..b6d47234 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/privateKey.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/privateKey.go @@ -7,8 +7,10 @@ import ( "context" "reflect" - "github.com/pkg/errors" + "errors" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) type PrivateKey struct { @@ -26,20 +28,9 @@ type PrivateKey struct { PublicKeyFingerprintMd5 pulumi.StringOutput `pulumi:"publicKeyFingerprintMd5"` // The fingerprint of the public key data in OpenSSH SHA256 hash format, e.g. `SHA256:...`. Only available if the selected private key format is compatible, similarly to `publicKeyOpenssh` and the ECDSA P224 limitations. PublicKeyFingerprintSha256 pulumi.StringOutput `pulumi:"publicKeyFingerprintSha256"` - // The public key data in ["Authorized - // Keys"](https://www.ssh.com/academy/ssh/authorized_keys/openssh#format-of-the-authorized-keys-file) format. This is - // populated only if the configured private key is supported: this includes all `RSA` and `ED25519` keys, as well as - // `ECDSA` keys with curves `P256`, `P384` and `P521`. `ECDSA` with curve `P224` [is not - // supported](../../docs#limitations). **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // The public key data in "Authorized Keys". PublicKeyOpenssh pulumi.StringOutput `pulumi:"publicKeyOpenssh"` - // Public key data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Public key data in PEM (RFC 1421). PublicKeyPem pulumi.StringOutput `pulumi:"publicKeyPem"` // When `algorithm` is `RSA`, the size of the generated RSA key, in bits (default: `2048`). RsaBits pulumi.IntPtrOutput `pulumi:"rsaBits"` @@ -60,6 +51,7 @@ func NewPrivateKey(ctx *pulumi.Context, "privateKeyPem", }) opts = append(opts, secrets) + opts = internal.PkgResourceDefaultOpts(opts) var resource PrivateKey err := ctx.RegisterResource("tls:index/privateKey:PrivateKey", name, args, &resource, opts...) if err != nil { @@ -94,20 +86,9 @@ type privateKeyState struct { PublicKeyFingerprintMd5 *string `pulumi:"publicKeyFingerprintMd5"` // The fingerprint of the public key data in OpenSSH SHA256 hash format, e.g. `SHA256:...`. Only available if the selected private key format is compatible, similarly to `publicKeyOpenssh` and the ECDSA P224 limitations. PublicKeyFingerprintSha256 *string `pulumi:"publicKeyFingerprintSha256"` - // The public key data in ["Authorized - // Keys"](https://www.ssh.com/academy/ssh/authorized_keys/openssh#format-of-the-authorized-keys-file) format. This is - // populated only if the configured private key is supported: this includes all `RSA` and `ED25519` keys, as well as - // `ECDSA` keys with curves `P256`, `P384` and `P521`. `ECDSA` with curve `P224` [is not - // supported](../../docs#limitations). **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // The public key data in "Authorized Keys". PublicKeyOpenssh *string `pulumi:"publicKeyOpenssh"` - // Public key data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Public key data in PEM (RFC 1421). PublicKeyPem *string `pulumi:"publicKeyPem"` // When `algorithm` is `RSA`, the size of the generated RSA key, in bits (default: `2048`). RsaBits *int `pulumi:"rsaBits"` @@ -126,20 +107,9 @@ type PrivateKeyState struct { PublicKeyFingerprintMd5 pulumi.StringPtrInput // The fingerprint of the public key data in OpenSSH SHA256 hash format, e.g. `SHA256:...`. Only available if the selected private key format is compatible, similarly to `publicKeyOpenssh` and the ECDSA P224 limitations. PublicKeyFingerprintSha256 pulumi.StringPtrInput - // The public key data in ["Authorized - // Keys"](https://www.ssh.com/academy/ssh/authorized_keys/openssh#format-of-the-authorized-keys-file) format. This is - // populated only if the configured private key is supported: this includes all `RSA` and `ED25519` keys, as well as - // `ECDSA` keys with curves `P256`, `P384` and `P521`. `ECDSA` with curve `P224` [is not - // supported](../../docs#limitations). **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // The public key data in "Authorized Keys". PublicKeyOpenssh pulumi.StringPtrInput - // Public key data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Public key data in PEM (RFC 1421). PublicKeyPem pulumi.StringPtrInput // When `algorithm` is `RSA`, the size of the generated RSA key, in bits (default: `2048`). RsaBits pulumi.IntPtrInput @@ -191,6 +161,12 @@ func (i *PrivateKey) ToPrivateKeyOutputWithContext(ctx context.Context) PrivateK return pulumi.ToOutputWithContext(ctx, i).(PrivateKeyOutput) } +func (i *PrivateKey) ToOutput(ctx context.Context) pulumix.Output[*PrivateKey] { + return pulumix.Output[*PrivateKey]{ + OutputState: i.ToPrivateKeyOutputWithContext(ctx).OutputState, + } +} + // PrivateKeyArrayInput is an input type that accepts PrivateKeyArray and PrivateKeyArrayOutput values. // You can construct a concrete instance of `PrivateKeyArrayInput` via: // @@ -216,6 +192,12 @@ func (i PrivateKeyArray) ToPrivateKeyArrayOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(PrivateKeyArrayOutput) } +func (i PrivateKeyArray) ToOutput(ctx context.Context) pulumix.Output[[]*PrivateKey] { + return pulumix.Output[[]*PrivateKey]{ + OutputState: i.ToPrivateKeyArrayOutputWithContext(ctx).OutputState, + } +} + // PrivateKeyMapInput is an input type that accepts PrivateKeyMap and PrivateKeyMapOutput values. // You can construct a concrete instance of `PrivateKeyMapInput` via: // @@ -241,6 +223,12 @@ func (i PrivateKeyMap) ToPrivateKeyMapOutputWithContext(ctx context.Context) Pri return pulumi.ToOutputWithContext(ctx, i).(PrivateKeyMapOutput) } +func (i PrivateKeyMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*PrivateKey] { + return pulumix.Output[map[string]*PrivateKey]{ + OutputState: i.ToPrivateKeyMapOutputWithContext(ctx).OutputState, + } +} + type PrivateKeyOutput struct{ *pulumi.OutputState } func (PrivateKeyOutput) ElementType() reflect.Type { @@ -255,6 +243,12 @@ func (o PrivateKeyOutput) ToPrivateKeyOutputWithContext(ctx context.Context) Pri return o } +func (o PrivateKeyOutput) ToOutput(ctx context.Context) pulumix.Output[*PrivateKey] { + return pulumix.Output[*PrivateKey]{ + OutputState: o.OutputState, + } +} + // Name of the algorithm to use when generating the private key. Currently-supported values are `RSA`, `ECDSA` and `ED25519`. func (o PrivateKeyOutput) Algorithm() pulumi.StringOutput { return o.ApplyT(func(v *PrivateKey) pulumi.StringOutput { return v.Algorithm }).(pulumi.StringOutput) @@ -285,23 +279,12 @@ func (o PrivateKeyOutput) PublicKeyFingerprintSha256() pulumi.StringOutput { return o.ApplyT(func(v *PrivateKey) pulumi.StringOutput { return v.PublicKeyFingerprintSha256 }).(pulumi.StringOutput) } -// The public key data in ["Authorized -// Keys"](https://www.ssh.com/academy/ssh/authorized_keys/openssh#format-of-the-authorized-keys-file) format. This is -// populated only if the configured private key is supported: this includes all `RSA` and `ED25519` keys, as well as -// `ECDSA` keys with curves `P256`, `P384` and `P521`. `ECDSA` with curve `P224` [is not -// supported](../../docs#limitations). **NOTE**: the [underlying](https://pkg.go.dev/encoding/pem#Encode) -// [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at -// the end of the PEM. In case this disrupts your use case, we recommend using -// [`trimspace()`](https://www.terraform.io/language/functions/trimspace). +// The public key data in "Authorized Keys". func (o PrivateKeyOutput) PublicKeyOpenssh() pulumi.StringOutput { return o.ApplyT(func(v *PrivateKey) pulumi.StringOutput { return v.PublicKeyOpenssh }).(pulumi.StringOutput) } -// Public key data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the -// [underlying](https://pkg.go.dev/encoding/pem#Encode) -// [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at -// the end of the PEM. In case this disrupts your use case, we recommend using -// [`trimspace()`](https://www.terraform.io/language/functions/trimspace). +// Public key data in PEM (RFC 1421). func (o PrivateKeyOutput) PublicKeyPem() pulumi.StringOutput { return o.ApplyT(func(v *PrivateKey) pulumi.StringOutput { return v.PublicKeyPem }).(pulumi.StringOutput) } @@ -325,6 +308,12 @@ func (o PrivateKeyArrayOutput) ToPrivateKeyArrayOutputWithContext(ctx context.Co return o } +func (o PrivateKeyArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*PrivateKey] { + return pulumix.Output[[]*PrivateKey]{ + OutputState: o.OutputState, + } +} + func (o PrivateKeyArrayOutput) Index(i pulumi.IntInput) PrivateKeyOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *PrivateKey { return vs[0].([]*PrivateKey)[vs[1].(int)] @@ -345,6 +334,12 @@ func (o PrivateKeyMapOutput) ToPrivateKeyMapOutputWithContext(ctx context.Contex return o } +func (o PrivateKeyMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*PrivateKey] { + return pulumix.Output[map[string]*PrivateKey]{ + OutputState: o.OutputState, + } +} + func (o PrivateKeyMapOutput) MapIndex(k pulumi.StringInput) PrivateKeyOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *PrivateKey { return vs[0].(map[string]*PrivateKey)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/provider.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/provider.go index 304fe123..534291b8 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/provider.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/provider.go @@ -7,7 +7,9 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) // The provider type for the tls package. By default, resources use package-wide configuration @@ -25,6 +27,7 @@ func NewProvider(ctx *pulumi.Context, args = &ProviderArgs{} } + opts = internal.PkgResourceDefaultOpts(opts) var resource Provider err := ctx.RegisterResource("pulumi:providers:tls", name, args, &resource, opts...) if err != nil { @@ -67,6 +70,12 @@ func (i *Provider) ToProviderOutputWithContext(ctx context.Context) ProviderOutp return pulumi.ToOutputWithContext(ctx, i).(ProviderOutput) } +func (i *Provider) ToOutput(ctx context.Context) pulumix.Output[*Provider] { + return pulumix.Output[*Provider]{ + OutputState: i.ToProviderOutputWithContext(ctx).OutputState, + } +} + type ProviderOutput struct{ *pulumi.OutputState } func (ProviderOutput) ElementType() reflect.Type { @@ -81,6 +90,12 @@ func (o ProviderOutput) ToProviderOutputWithContext(ctx context.Context) Provide return o } +func (o ProviderOutput) ToOutput(ctx context.Context) pulumix.Output[*Provider] { + return pulumix.Output[*Provider]{ + OutputState: o.OutputState, + } +} + func init() { pulumi.RegisterInputType(reflect.TypeOf((*ProviderInput)(nil)).Elem(), &Provider{}) pulumi.RegisterOutputType(ProviderOutput{}) diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/pulumiTypes.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/pulumiTypes.go index 31f86724..e5b81bcf 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/pulumiTypes.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/pulumiTypes.go @@ -7,9 +7,13 @@ import ( "context" "reflect" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) +var _ = internal.GetEnvOrDefault + type CertRequestSubject struct { // Distinguished name: `CN` CommonName *string `pulumi:"commonName"` @@ -75,6 +79,12 @@ func (i CertRequestSubjectArgs) ToCertRequestSubjectOutputWithContext(ctx contex return pulumi.ToOutputWithContext(ctx, i).(CertRequestSubjectOutput) } +func (i CertRequestSubjectArgs) ToOutput(ctx context.Context) pulumix.Output[CertRequestSubject] { + return pulumix.Output[CertRequestSubject]{ + OutputState: i.ToCertRequestSubjectOutputWithContext(ctx).OutputState, + } +} + func (i CertRequestSubjectArgs) ToCertRequestSubjectPtrOutput() CertRequestSubjectPtrOutput { return i.ToCertRequestSubjectPtrOutputWithContext(context.Background()) } @@ -116,6 +126,12 @@ func (i *certRequestSubjectPtrType) ToCertRequestSubjectPtrOutputWithContext(ctx return pulumi.ToOutputWithContext(ctx, i).(CertRequestSubjectPtrOutput) } +func (i *certRequestSubjectPtrType) ToOutput(ctx context.Context) pulumix.Output[*CertRequestSubject] { + return pulumix.Output[*CertRequestSubject]{ + OutputState: i.ToCertRequestSubjectPtrOutputWithContext(ctx).OutputState, + } +} + type CertRequestSubjectOutput struct{ *pulumi.OutputState } func (CertRequestSubjectOutput) ElementType() reflect.Type { @@ -140,6 +156,12 @@ func (o CertRequestSubjectOutput) ToCertRequestSubjectPtrOutputWithContext(ctx c }).(CertRequestSubjectPtrOutput) } +func (o CertRequestSubjectOutput) ToOutput(ctx context.Context) pulumix.Output[CertRequestSubject] { + return pulumix.Output[CertRequestSubject]{ + OutputState: o.OutputState, + } +} + // Distinguished name: `CN` func (o CertRequestSubjectOutput) CommonName() pulumi.StringPtrOutput { return o.ApplyT(func(v CertRequestSubject) *string { return v.CommonName }).(pulumi.StringPtrOutput) @@ -199,6 +221,12 @@ func (o CertRequestSubjectPtrOutput) ToCertRequestSubjectPtrOutputWithContext(ct return o } +func (o CertRequestSubjectPtrOutput) ToOutput(ctx context.Context) pulumix.Output[*CertRequestSubject] { + return pulumix.Output[*CertRequestSubject]{ + OutputState: o.OutputState, + } +} + func (o CertRequestSubjectPtrOutput) Elem() CertRequestSubjectOutput { return o.ApplyT(func(v *CertRequestSubject) CertRequestSubject { if v != nil { @@ -336,6 +364,12 @@ func (i ProviderProxyArgs) ToProviderProxyOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(ProviderProxyOutput) } +func (i ProviderProxyArgs) ToOutput(ctx context.Context) pulumix.Output[ProviderProxy] { + return pulumix.Output[ProviderProxy]{ + OutputState: i.ToProviderProxyOutputWithContext(ctx).OutputState, + } +} + func (i ProviderProxyArgs) ToProviderProxyPtrOutput() ProviderProxyPtrOutput { return i.ToProviderProxyPtrOutputWithContext(context.Background()) } @@ -377,6 +411,12 @@ func (i *providerProxyPtrType) ToProviderProxyPtrOutputWithContext(ctx context.C return pulumi.ToOutputWithContext(ctx, i).(ProviderProxyPtrOutput) } +func (i *providerProxyPtrType) ToOutput(ctx context.Context) pulumix.Output[*ProviderProxy] { + return pulumix.Output[*ProviderProxy]{ + OutputState: i.ToProviderProxyPtrOutputWithContext(ctx).OutputState, + } +} + type ProviderProxyOutput struct{ *pulumi.OutputState } func (ProviderProxyOutput) ElementType() reflect.Type { @@ -401,6 +441,12 @@ func (o ProviderProxyOutput) ToProviderProxyPtrOutputWithContext(ctx context.Con }).(ProviderProxyPtrOutput) } +func (o ProviderProxyOutput) ToOutput(ctx context.Context) pulumix.Output[ProviderProxy] { + return pulumix.Output[ProviderProxy]{ + OutputState: o.OutputState, + } +} + func (o ProviderProxyOutput) FromEnv() pulumi.BoolPtrOutput { return o.ApplyT(func(v ProviderProxy) *bool { return v.FromEnv }).(pulumi.BoolPtrOutput) } @@ -431,6 +477,12 @@ func (o ProviderProxyPtrOutput) ToProviderProxyPtrOutputWithContext(ctx context. return o } +func (o ProviderProxyPtrOutput) ToOutput(ctx context.Context) pulumix.Output[*ProviderProxy] { + return pulumix.Output[*ProviderProxy]{ + OutputState: o.OutputState, + } +} + func (o ProviderProxyPtrOutput) Elem() ProviderProxyOutput { return o.ApplyT(func(v *ProviderProxy) ProviderProxy { if v != nil { @@ -542,6 +594,12 @@ func (i SelfSignedCertSubjectArgs) ToSelfSignedCertSubjectOutputWithContext(ctx return pulumi.ToOutputWithContext(ctx, i).(SelfSignedCertSubjectOutput) } +func (i SelfSignedCertSubjectArgs) ToOutput(ctx context.Context) pulumix.Output[SelfSignedCertSubject] { + return pulumix.Output[SelfSignedCertSubject]{ + OutputState: i.ToSelfSignedCertSubjectOutputWithContext(ctx).OutputState, + } +} + func (i SelfSignedCertSubjectArgs) ToSelfSignedCertSubjectPtrOutput() SelfSignedCertSubjectPtrOutput { return i.ToSelfSignedCertSubjectPtrOutputWithContext(context.Background()) } @@ -583,6 +641,12 @@ func (i *selfSignedCertSubjectPtrType) ToSelfSignedCertSubjectPtrOutputWithConte return pulumi.ToOutputWithContext(ctx, i).(SelfSignedCertSubjectPtrOutput) } +func (i *selfSignedCertSubjectPtrType) ToOutput(ctx context.Context) pulumix.Output[*SelfSignedCertSubject] { + return pulumix.Output[*SelfSignedCertSubject]{ + OutputState: i.ToSelfSignedCertSubjectPtrOutputWithContext(ctx).OutputState, + } +} + type SelfSignedCertSubjectOutput struct{ *pulumi.OutputState } func (SelfSignedCertSubjectOutput) ElementType() reflect.Type { @@ -607,6 +671,12 @@ func (o SelfSignedCertSubjectOutput) ToSelfSignedCertSubjectPtrOutputWithContext }).(SelfSignedCertSubjectPtrOutput) } +func (o SelfSignedCertSubjectOutput) ToOutput(ctx context.Context) pulumix.Output[SelfSignedCertSubject] { + return pulumix.Output[SelfSignedCertSubject]{ + OutputState: o.OutputState, + } +} + // Distinguished name: `CN` func (o SelfSignedCertSubjectOutput) CommonName() pulumi.StringPtrOutput { return o.ApplyT(func(v SelfSignedCertSubject) *string { return v.CommonName }).(pulumi.StringPtrOutput) @@ -666,6 +736,12 @@ func (o SelfSignedCertSubjectPtrOutput) ToSelfSignedCertSubjectPtrOutputWithCont return o } +func (o SelfSignedCertSubjectPtrOutput) ToOutput(ctx context.Context) pulumix.Output[*SelfSignedCertSubject] { + return pulumix.Output[*SelfSignedCertSubject]{ + OutputState: o.OutputState, + } +} + func (o SelfSignedCertSubjectPtrOutput) Elem() SelfSignedCertSubjectOutput { return o.ApplyT(func(v *SelfSignedCertSubject) SelfSignedCertSubject { if v != nil { @@ -767,6 +843,7 @@ func (o SelfSignedCertSubjectPtrOutput) StreetAddresses() pulumi.StringArrayOutp } type GetCertificateCertificate struct { + // Certificate data in PEM (RFC 1421). CertPem string `pulumi:"certPem"` // `true` if the certificate is of a CA (Certificate Authority). IsCa bool `pulumi:"isCa"` @@ -803,6 +880,7 @@ type GetCertificateCertificateInput interface { } type GetCertificateCertificateArgs struct { + // Certificate data in PEM (RFC 1421). CertPem pulumi.StringInput `pulumi:"certPem"` // `true` if the certificate is of a CA (Certificate Authority). IsCa pulumi.BoolInput `pulumi:"isCa"` @@ -839,6 +917,12 @@ func (i GetCertificateCertificateArgs) ToGetCertificateCertificateOutputWithCont return pulumi.ToOutputWithContext(ctx, i).(GetCertificateCertificateOutput) } +func (i GetCertificateCertificateArgs) ToOutput(ctx context.Context) pulumix.Output[GetCertificateCertificate] { + return pulumix.Output[GetCertificateCertificate]{ + OutputState: i.ToGetCertificateCertificateOutputWithContext(ctx).OutputState, + } +} + // GetCertificateCertificateArrayInput is an input type that accepts GetCertificateCertificateArray and GetCertificateCertificateArrayOutput values. // You can construct a concrete instance of `GetCertificateCertificateArrayInput` via: // @@ -864,6 +948,12 @@ func (i GetCertificateCertificateArray) ToGetCertificateCertificateArrayOutputWi return pulumi.ToOutputWithContext(ctx, i).(GetCertificateCertificateArrayOutput) } +func (i GetCertificateCertificateArray) ToOutput(ctx context.Context) pulumix.Output[[]GetCertificateCertificate] { + return pulumix.Output[[]GetCertificateCertificate]{ + OutputState: i.ToGetCertificateCertificateArrayOutputWithContext(ctx).OutputState, + } +} + type GetCertificateCertificateOutput struct{ *pulumi.OutputState } func (GetCertificateCertificateOutput) ElementType() reflect.Type { @@ -878,6 +968,13 @@ func (o GetCertificateCertificateOutput) ToGetCertificateCertificateOutputWithCo return o } +func (o GetCertificateCertificateOutput) ToOutput(ctx context.Context) pulumix.Output[GetCertificateCertificate] { + return pulumix.Output[GetCertificateCertificate]{ + OutputState: o.OutputState, + } +} + +// Certificate data in PEM (RFC 1421). func (o GetCertificateCertificateOutput) CertPem() pulumi.StringOutput { return o.ApplyT(func(v GetCertificateCertificate) string { return v.CertPem }).(pulumi.StringOutput) } @@ -947,6 +1044,12 @@ func (o GetCertificateCertificateArrayOutput) ToGetCertificateCertificateArrayOu return o } +func (o GetCertificateCertificateArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]GetCertificateCertificate] { + return pulumix.Output[[]GetCertificateCertificate]{ + OutputState: o.OutputState, + } +} + func (o GetCertificateCertificateArrayOutput) Index(i pulumi.IntInput) GetCertificateCertificateOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) GetCertificateCertificate { return vs[0].([]GetCertificateCertificate)[vs[1].(int)] diff --git a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/selfSignedCert.go b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/selfSignedCert.go index 9d77a7f1..29f42337 100644 --- a/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/selfSignedCert.go +++ b/vendor/github.com/pulumi/pulumi-tls/sdk/v4/go/tls/selfSignedCert.go @@ -7,8 +7,10 @@ import ( "context" "reflect" - "github.com/pkg/errors" + "errors" + "github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" + "github.com/pulumi/pulumi/sdk/v3/go/pulumix" ) type SelfSignedCert struct { @@ -16,11 +18,7 @@ type SelfSignedCert struct { // List of key usages allowed for the issued certificate. Values are defined in [RFC 5280](https://datatracker.ietf.org/doc/html/rfc5280) and combine flags defined by both [Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3) and [Extended Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.12). Accepted values: `anyExtended`, `certSigning`, `clientAuth`, `codeSigning`, `contentCommitment`, `crlSigning`, `dataEncipherment`, `decipherOnly`, `digitalSignature`, `emailProtection`, `encipherOnly`, `ipsecEndSystem`, `ipsecTunnel`, `ipsecUser`, `keyAgreement`, `keyEncipherment`, `microsoftCommercialCodeSigning`, `microsoftKernelCodeSigning`, `microsoftServerGatedCrypto`, `netscapeServerGatedCrypto`, `ocspSigning`, `serverAuth`, `timestamping`. AllowedUses pulumi.StringArrayOutput `pulumi:"allowedUses"` - // Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Certificate data in PEM (RFC 1421). CertPem pulumi.StringOutput `pulumi:"certPem"` // List of DNS names for which a certificate is being requested (i.e. certificate subjects). DnsNames pulumi.StringArrayOutput `pulumi:"dnsNames"` @@ -83,6 +81,7 @@ func NewSelfSignedCert(ctx *pulumi.Context, "privateKeyPem", }) opts = append(opts, secrets) + opts = internal.PkgResourceDefaultOpts(opts) var resource SelfSignedCert err := ctx.RegisterResource("tls:index/selfSignedCert:SelfSignedCert", name, args, &resource, opts...) if err != nil { @@ -107,11 +106,7 @@ func GetSelfSignedCert(ctx *pulumi.Context, type selfSignedCertState struct { // List of key usages allowed for the issued certificate. Values are defined in [RFC 5280](https://datatracker.ietf.org/doc/html/rfc5280) and combine flags defined by both [Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3) and [Extended Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.12). Accepted values: `anyExtended`, `certSigning`, `clientAuth`, `codeSigning`, `contentCommitment`, `crlSigning`, `dataEncipherment`, `decipherOnly`, `digitalSignature`, `emailProtection`, `encipherOnly`, `ipsecEndSystem`, `ipsecTunnel`, `ipsecUser`, `keyAgreement`, `keyEncipherment`, `microsoftCommercialCodeSigning`, `microsoftKernelCodeSigning`, `microsoftServerGatedCrypto`, `netscapeServerGatedCrypto`, `ocspSigning`, `serverAuth`, `timestamping`. AllowedUses []string `pulumi:"allowedUses"` - // Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Certificate data in PEM (RFC 1421). CertPem *string `pulumi:"certPem"` // List of DNS names for which a certificate is being requested (i.e. certificate subjects). DnsNames []string `pulumi:"dnsNames"` @@ -154,11 +149,7 @@ type selfSignedCertState struct { type SelfSignedCertState struct { // List of key usages allowed for the issued certificate. Values are defined in [RFC 5280](https://datatracker.ietf.org/doc/html/rfc5280) and combine flags defined by both [Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3) and [Extended Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.12). Accepted values: `anyExtended`, `certSigning`, `clientAuth`, `codeSigning`, `contentCommitment`, `crlSigning`, `dataEncipherment`, `decipherOnly`, `digitalSignature`, `emailProtection`, `encipherOnly`, `ipsecEndSystem`, `ipsecTunnel`, `ipsecUser`, `keyAgreement`, `keyEncipherment`, `microsoftCommercialCodeSigning`, `microsoftKernelCodeSigning`, `microsoftServerGatedCrypto`, `netscapeServerGatedCrypto`, `ocspSigning`, `serverAuth`, `timestamping`. AllowedUses pulumi.StringArrayInput - // Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the - // [underlying](https://pkg.go.dev/encoding/pem#Encode) - // [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at - // the end of the PEM. In case this disrupts your use case, we recommend using - // [`trimspace()`](https://www.terraform.io/language/functions/trimspace). + // Certificate data in PEM (RFC 1421). CertPem pulumi.StringPtrInput // List of DNS names for which a certificate is being requested (i.e. certificate subjects). DnsNames pulumi.StringArrayInput @@ -296,6 +287,12 @@ func (i *SelfSignedCert) ToSelfSignedCertOutputWithContext(ctx context.Context) return pulumi.ToOutputWithContext(ctx, i).(SelfSignedCertOutput) } +func (i *SelfSignedCert) ToOutput(ctx context.Context) pulumix.Output[*SelfSignedCert] { + return pulumix.Output[*SelfSignedCert]{ + OutputState: i.ToSelfSignedCertOutputWithContext(ctx).OutputState, + } +} + // SelfSignedCertArrayInput is an input type that accepts SelfSignedCertArray and SelfSignedCertArrayOutput values. // You can construct a concrete instance of `SelfSignedCertArrayInput` via: // @@ -321,6 +318,12 @@ func (i SelfSignedCertArray) ToSelfSignedCertArrayOutputWithContext(ctx context. return pulumi.ToOutputWithContext(ctx, i).(SelfSignedCertArrayOutput) } +func (i SelfSignedCertArray) ToOutput(ctx context.Context) pulumix.Output[[]*SelfSignedCert] { + return pulumix.Output[[]*SelfSignedCert]{ + OutputState: i.ToSelfSignedCertArrayOutputWithContext(ctx).OutputState, + } +} + // SelfSignedCertMapInput is an input type that accepts SelfSignedCertMap and SelfSignedCertMapOutput values. // You can construct a concrete instance of `SelfSignedCertMapInput` via: // @@ -346,6 +349,12 @@ func (i SelfSignedCertMap) ToSelfSignedCertMapOutputWithContext(ctx context.Cont return pulumi.ToOutputWithContext(ctx, i).(SelfSignedCertMapOutput) } +func (i SelfSignedCertMap) ToOutput(ctx context.Context) pulumix.Output[map[string]*SelfSignedCert] { + return pulumix.Output[map[string]*SelfSignedCert]{ + OutputState: i.ToSelfSignedCertMapOutputWithContext(ctx).OutputState, + } +} + type SelfSignedCertOutput struct{ *pulumi.OutputState } func (SelfSignedCertOutput) ElementType() reflect.Type { @@ -360,16 +369,18 @@ func (o SelfSignedCertOutput) ToSelfSignedCertOutputWithContext(ctx context.Cont return o } +func (o SelfSignedCertOutput) ToOutput(ctx context.Context) pulumix.Output[*SelfSignedCert] { + return pulumix.Output[*SelfSignedCert]{ + OutputState: o.OutputState, + } +} + // List of key usages allowed for the issued certificate. Values are defined in [RFC 5280](https://datatracker.ietf.org/doc/html/rfc5280) and combine flags defined by both [Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3) and [Extended Key Usages](https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.12). Accepted values: `anyExtended`, `certSigning`, `clientAuth`, `codeSigning`, `contentCommitment`, `crlSigning`, `dataEncipherment`, `decipherOnly`, `digitalSignature`, `emailProtection`, `encipherOnly`, `ipsecEndSystem`, `ipsecTunnel`, `ipsecUser`, `keyAgreement`, `keyEncipherment`, `microsoftCommercialCodeSigning`, `microsoftKernelCodeSigning`, `microsoftServerGatedCrypto`, `netscapeServerGatedCrypto`, `ocspSigning`, `serverAuth`, `timestamping`. func (o SelfSignedCertOutput) AllowedUses() pulumi.StringArrayOutput { return o.ApplyT(func(v *SelfSignedCert) pulumi.StringArrayOutput { return v.AllowedUses }).(pulumi.StringArrayOutput) } -// Certificate data in [PEM (RFC 1421)](https://datatracker.ietf.org/doc/html/rfc1421) format. **NOTE**: the -// [underlying](https://pkg.go.dev/encoding/pem#Encode) -// [libraries](https://pkg.go.dev/golang.org/x/crypto/ssh#MarshalAuthorizedKey) that generate this value append a `\n` at -// the end of the PEM. In case this disrupts your use case, we recommend using -// [`trimspace()`](https://www.terraform.io/language/functions/trimspace). +// Certificate data in PEM (RFC 1421). func (o SelfSignedCertOutput) CertPem() pulumi.StringOutput { return o.ApplyT(func(v *SelfSignedCert) pulumi.StringOutput { return v.CertPem }).(pulumi.StringOutput) } @@ -466,6 +477,12 @@ func (o SelfSignedCertArrayOutput) ToSelfSignedCertArrayOutputWithContext(ctx co return o } +func (o SelfSignedCertArrayOutput) ToOutput(ctx context.Context) pulumix.Output[[]*SelfSignedCert] { + return pulumix.Output[[]*SelfSignedCert]{ + OutputState: o.OutputState, + } +} + func (o SelfSignedCertArrayOutput) Index(i pulumi.IntInput) SelfSignedCertOutput { return pulumi.All(o, i).ApplyT(func(vs []interface{}) *SelfSignedCert { return vs[0].([]*SelfSignedCert)[vs[1].(int)] @@ -486,6 +503,12 @@ func (o SelfSignedCertMapOutput) ToSelfSignedCertMapOutputWithContext(ctx contex return o } +func (o SelfSignedCertMapOutput) ToOutput(ctx context.Context) pulumix.Output[map[string]*SelfSignedCert] { + return pulumix.Output[map[string]*SelfSignedCert]{ + OutputState: o.OutputState, + } +} + func (o SelfSignedCertMapOutput) MapIndex(k pulumi.StringInput) SelfSignedCertOutput { return pulumi.All(o, k).ApplyT(func(vs []interface{}) *SelfSignedCert { return vs[0].(map[string]*SelfSignedCert)[vs[1].(string)] diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/asset.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/asset.go index 28ffd581..3b35d4c4 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/asset.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/asset.go @@ -471,6 +471,11 @@ const ( ) func NewAssetArchive(assets map[string]interface{}) (*Archive, error) { + if assets == nil { + // when provided assets are nil, create an empty archive + assets = make(map[string]interface{}) + } + // Ensure all elements are either assets or archives. for _, asset := range assets { switch t := asset.(type) { @@ -486,12 +491,18 @@ func NewAssetArchive(assets map[string]interface{}) (*Archive, error) { } func NewPathArchive(path string) (*Archive, error) { + if path == "" { + return nil, errors.New("path cannot be empty when constructing a path archive") + } a := &Archive{Sig: ArchiveSig, Path: path} err := a.EnsureHash() return a, err } func NewURIArchive(uri string) (*Archive, error) { + if uri == "" { + return nil, errors.New("uri cannot be empty when constructing a URI archive") + } a := &Archive{Sig: ArchiveSig, URI: uri} err := a.EnsureHash() return a, err @@ -603,60 +614,71 @@ func DeserializeArchive(obj map[string]interface{}) (*Archive, bool, error) { hash = h } - var assets map[string]interface{} - if v, has := obj[ArchiveAssetsProperty]; has { - assets = make(map[string]interface{}) - if v != nil { - m, ok := v.(map[string]interface{}) - if !ok { - return &Archive{}, false, fmt.Errorf("unexpected archive contents of type %T", v) - } + if path, has := obj[ArchivePathProperty]; has { + pathValue, ok := path.(string) + if !ok { + return &Archive{}, false, fmt.Errorf("unexpected archive path of type %T", path) + } - for k, elem := range m { - switch t := elem.(type) { - case *Asset: - assets[k] = t - case *Archive: - assets[k] = t - case map[string]interface{}: - a, isa, err := DeserializeAsset(t) - if err != nil { - return &Archive{}, false, err - } else if isa { - assets[k] = a - } else { - arch, isarch, err := DeserializeArchive(t) - if err != nil { - return &Archive{}, false, err - } else if !isarch { - return &Archive{}, false, fmt.Errorf("archive member '%v' is not an asset or archive", k) - } - assets[k] = arch - } - default: - return &Archive{}, false, fmt.Errorf("archive member '%v' is not an asset or archive", k) - } - } + if pathValue != "" { + pathArchive := &Archive{Sig: ArchiveSig, Path: pathValue, Hash: hash} + return pathArchive, true, nil } } - var path string - if v, has := obj[ArchivePathProperty]; has { - p, ok := v.(string) + + if uri, has := obj[ArchiveURIProperty]; has { + uriValue, ok := uri.(string) if !ok { - return &Archive{}, false, fmt.Errorf("unexpected archive path of type %T", v) + return &Archive{}, false, fmt.Errorf("unexpected archive URI of type %T", uri) + } + + if uriValue != "" { + uriArchive := &Archive{Sig: ArchiveSig, URI: uriValue, Hash: hash} + return uriArchive, true, nil } - path = p } - var uri string - if v, has := obj[ArchiveURIProperty]; has { - u, ok := v.(string) + + if assetsMap, has := obj[ArchiveAssetsProperty]; has { + m, ok := assetsMap.(map[string]interface{}) if !ok { - return &Archive{}, false, fmt.Errorf("unexpected archive URI of type %T", v) + return &Archive{}, false, fmt.Errorf("unexpected archive contents of type %T", assetsMap) } - uri = u + + assets := make(map[string]interface{}) + for k, elem := range m { + switch t := elem.(type) { + case *Asset: + assets[k] = t + case *Archive: + assets[k] = t + case map[string]interface{}: + a, isa, err := DeserializeAsset(t) + if err != nil { + return &Archive{}, false, err + } else if isa { + assets[k] = a + } else { + arch, isarch, err := DeserializeArchive(t) + if err != nil { + return &Archive{}, false, err + } else if !isarch { + return &Archive{}, false, fmt.Errorf("archive member '%v' is not an asset or archive", k) + } + assets[k] = arch + } + default: + return &Archive{}, false, fmt.Errorf("archive member '%v' is not an asset or archive", k) + } + } + + assetArchive := &Archive{Sig: ArchiveSig, Assets: assets, Hash: hash} + return assetArchive, true, nil } - return &Archive{Hash: hash, Assets: assets, Path: path, URI: uri}, true, nil + // if we reached here, it means the archive is empty, + // we didn't find a non-zero path, non-zero uri nor non-nil assets + // we will consider this to be an empty assets archive then with zero assets + return &Archive{Sig: ArchiveSig, Assets: make(map[string]interface{}), Hash: hash}, true, nil } // HasContents indicates whether or not an archive's contents can be read. diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter.go index ccd3ee3f..3e42e77a 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter.go @@ -44,6 +44,7 @@ type ConvertProgramRequest struct { TargetDirectory string MapperTarget string LoaderTarget string + Args []string } type ConvertProgramResponse struct { diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_plugin.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_plugin.go index 936d0b2b..0488d61c 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_plugin.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_plugin.go @@ -142,6 +142,7 @@ func (c *converter) ConvertProgram(ctx context.Context, req *ConvertProgramReque TargetDirectory: req.TargetDirectory, MapperTarget: req.MapperTarget, LoaderTarget: req.LoaderTarget, + Args: req.Args, }) if err != nil { rpcError := rpcerror.Convert(err) diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_server.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_server.go index 7317cb21..be850dc2 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_server.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/converter_server.go @@ -68,6 +68,7 @@ func (c *converterServer) ConvertProgram(ctx context.Context, TargetDirectory: req.TargetDirectory, MapperTarget: req.MapperTarget, LoaderTarget: req.LoaderTarget, + Args: req.Args, }) if err != nil { return nil, err diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider.go index e9bbb047..3c7c6913 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider.go @@ -104,7 +104,12 @@ type Provider interface { // GetMapping returns the mapping (if any) for the provider. A provider should return an empty response // (not an error) if it doesn't have a mapping for the given key. - GetMapping(key string) ([]byte, string, error) + GetMapping(key string, provider string) ([]byte, string, error) + + // GetMappings returns the mappings (if any) for the providers. A provider should return an empty list (not an + // error) if it doesn't have any mappings for the given key. + // If a provider implements this method GetMapping will be called using the results from this method. + GetMappings(key string) ([]string, error) } type GrpcProvider interface { diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_plugin.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_plugin.go index b1f9d0e4..b5c2db2c 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_plugin.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_plugin.go @@ -1853,12 +1853,13 @@ func decorateProviderSpans(span opentracing.Span, method string, req, resp inter } // GetMapping fetches the conversion mapping (if any) for this resource provider. -func (p *provider) GetMapping(key string) ([]byte, string, error) { +func (p *provider) GetMapping(key, provider string) ([]byte, string, error) { label := fmt.Sprintf("%s.GetMapping", p.label()) - logging.V(7).Infof("%s executing: key=%s", label, key) + logging.V(7).Infof("%s executing: key=%s, provider=%s", label, key, provider) resp, err := p.clientRaw.GetMapping(p.requestContext(), &pulumirpc.GetMappingRequest{ - Key: key, + Key: key, + Provider: provider, }) if err != nil { rpcError := rpcerror.Convert(err) @@ -1876,3 +1877,30 @@ func (p *provider) GetMapping(key string) ([]byte, string, error) { logging.V(7).Infof("%s success: data=#%d provider=%s", label, len(resp.Data), resp.Provider) return resp.Data, resp.Provider, nil } + +func (p *provider) GetMappings(key string) ([]string, error) { + label := fmt.Sprintf("%s.GetMappings", p.label()) + logging.V(7).Infof("%s executing: key=%s", label, key) + + resp, err := p.clientRaw.GetMappings(p.requestContext(), &pulumirpc.GetMappingsRequest{ + Key: key, + }) + if err != nil { + rpcError := rpcerror.Convert(err) + code := rpcError.Code() + if code == codes.Unimplemented { + // For backwards compatibility just return nil to indicate unimplemented. + logging.V(7).Infof("%s unimplemented", label) + return nil, nil + } + logging.V(7).Infof("%s failed: %v", label, rpcError) + return nil, err + } + + logging.V(7).Infof("%s success: providers=%v", label, resp.Providers) + // Ensure we don't return nil here because we use it as an "unimplemented" flag elsewhere in the system + if resp.Providers == nil { + resp.Providers = []string{} + } + return resp.Providers, nil +} diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_server.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_server.go index 72f2fe63..f10b4b98 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_server.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_server.go @@ -643,9 +643,19 @@ func (p *providerServer) Call(ctx context.Context, req *pulumirpc.CallRequest) ( func (p *providerServer) GetMapping(ctx context.Context, req *pulumirpc.GetMappingRequest, ) (*pulumirpc.GetMappingResponse, error) { - data, provider, err := p.provider.GetMapping(req.Key) + data, provider, err := p.provider.GetMapping(req.Key, req.Provider) if err != nil { return nil, err } return &pulumirpc.GetMappingResponse{Data: data, Provider: provider}, nil } + +func (p *providerServer) GetMappings(ctx context.Context, + req *pulumirpc.GetMappingsRequest, +) (*pulumirpc.GetMappingsResponse, error) { + providers, err := p.provider.GetMappings(req.Key) + if err != nil { + return nil, err + } + return &pulumirpc.GetMappingsResponse{Providers: providers}, nil +} diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_unimplemented.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_unimplemented.go index ab0cf797..dc0fcc17 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_unimplemented.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin/provider_unimplemented.go @@ -98,6 +98,10 @@ func (p *UnimplementedProvider) GetPluginInfo() (workspace.PluginInfo, error) { return workspace.PluginInfo{}, status.Error(codes.Unimplemented, "GetPluginInfo is not yet implemented") } -func (p *UnimplementedProvider) GetMapping(key string) ([]byte, string, error) { +func (p *UnimplementedProvider) GetMapping(key, provider string) ([]byte, string, error) { return nil, "", status.Error(codes.Unimplemented, "GetMapping is not yet implemented") } + +func (p *UnimplementedProvider) GetMappings(key string) ([]string, error) { + return nil, status.Error(codes.Unimplemented, "GetMappings is not yet implemented") +} diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/templates.go b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/templates.go index 85411077..b578d300 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/templates.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/go/common/workspace/templates.go @@ -28,15 +28,12 @@ import ( "github.com/texttheater/golang-levenshtein/levenshtein" "gopkg.in/yaml.v3" - "github.com/pulumi/pulumi/sdk/v3/go/common/tokens" "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract" "github.com/pulumi/pulumi/sdk/v3/go/common/util/gitutil" "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging" ) const ( - defaultProjectName = "project" - // This file will be ignored when copying from the template cache to // a project directory. legacyPulumiTemplateManifestFile = ".pulumi.template.yaml" @@ -621,93 +618,6 @@ func GetTemplateDir(templateKind TemplateKind) (string, error) { return GetPulumiPath(TemplateDir) } -// ValidateProjectName ensures a project name is valid, if it is not it returns an error with a message suitable -// for display to an end user. -func ValidateProjectName(s string) error { - if err := tokens.ValidateProjectName(s); err != nil { - return err - } - - // This is needed to stop cyclic imports in DotNet projects - if strings.ToLower(s) == "pulumi" || strings.HasPrefix(strings.ToLower(s), "pulumi.") { - return errors.New("project name must not be `Pulumi` and must not start with the prefix `Pulumi.` " + - "to avoid collision with standard libraries") - } - - return nil -} - -// ValidateProjectDescription ensures a project description name is valid, if it is not it returns an error with a -// message suitable for display to an end user. -func ValidateProjectDescription(s string) error { - const maxTagValueLength = 256 - - if len(s) > maxTagValueLength { - return errors.New("A project description must be 256 characters or less") - } - - return nil -} - -// ValueOrSanitizedDefaultProjectName returns the value or a sanitized valid project name -// based on defaultNameToSanitize. -func ValueOrSanitizedDefaultProjectName(name string, projectName string, defaultNameToSanitize string) string { - // If we have a name, use it. - if name != "" { - return name - } - - // If the project already has a name that isn't a replacement string, use it. - if projectName != "${PROJECT}" { - return projectName - } - - // Otherwise, get a sanitized version of `defaultNameToSanitize`. - return getValidProjectName(defaultNameToSanitize) -} - -// ValueOrDefaultProjectDescription returns the value or defaultDescription. -func ValueOrDefaultProjectDescription( - description string, projectDescription string, defaultDescription string, -) string { - // If we have a description, use it. - if description != "" { - return description - } - - // If the project already has a description that isn't a replacement string, use it. - if projectDescription != "${DESCRIPTION}" { - return projectDescription - } - - // Otherwise, use the default, which may be an empty string. - return defaultDescription -} - -// getValidProjectName returns a valid project name based on the passed-in name. -func getValidProjectName(name string) string { - // If the name is valid, return it. - if ValidateProjectName(name) == nil { - return name - } - - // Otherwise, try building-up the name, removing any invalid chars. - var result string - for i := 0; i < len(name); i++ { - temp := result + string(name[i]) - if ValidateProjectName(temp) == nil { - result = temp - } - } - - // If we couldn't come up with a valid project name, fallback to a default. - if result == "" { - result = defaultProjectName - } - - return result -} - // walkFiles is a helper that walks the directories/files in a source directory // and performs an action for each item. func walkFiles(sourceDir string, destDir string, projectName string, diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/converter.pb.go b/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/converter.pb.go index 1167f542..2212a7d7 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/converter.pb.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/converter.pb.go @@ -241,6 +241,8 @@ type ConvertProgramRequest struct { MapperTarget string `protobuf:"bytes,3,opt,name=mapper_target,json=mapperTarget,proto3" json:"mapper_target,omitempty"` // The target of a codegen.LoaderServer to use for loading schemas. LoaderTarget string `protobuf:"bytes,4,opt,name=loader_target,json=loaderTarget,proto3" json:"loader_target,omitempty"` + // the args passed to `pulumi convert` for this conversion. Normally used to specifiy a root file, or conversion options. + Args []string `protobuf:"bytes,5,rep,name=args,proto3" json:"args,omitempty"` } func (x *ConvertProgramRequest) Reset() { @@ -303,6 +305,13 @@ func (x *ConvertProgramRequest) GetLoaderTarget() string { return "" } +func (x *ConvertProgramRequest) GetArgs() []string { + if x != nil { + return x.Args + } + return nil +} + type ConvertProgramResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -382,7 +391,7 @@ var file_pulumi_converter_proto_rawDesc = []byte{ 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x73, 0x22, 0xb7, 0x01, 0x0a, 0x15, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, + 0x73, 0x22, 0xcb, 0x01, 0x0a, 0x15, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x69, 0x72, @@ -393,28 +402,30 @@ var file_pulumi_converter_proto_rawDesc = []byte{ 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6d, 0x61, 0x70, 0x70, 0x65, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6c, - 0x6f, 0x61, 0x64, 0x65, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x59, 0x0a, 0x16, 0x43, - 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x0b, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, - 0x74, 0x69, 0x63, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x70, 0x75, 0x6c, - 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x44, - 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x0b, 0x64, 0x69, 0x61, 0x67, 0x6e, - 0x6f, 0x73, 0x74, 0x69, 0x63, 0x73, 0x32, 0xb7, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x76, 0x65, - 0x72, 0x74, 0x65, 0x72, 0x12, 0x51, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, - 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, - 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x76, 0x65, - 0x72, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x20, 0x2e, 0x70, 0x75, 0x6c, 0x75, - 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, - 0x67, 0x72, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x75, - 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x50, - 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, - 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x2f, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x2f, 0x73, 0x64, 0x6b, - 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x3b, 0x70, 0x75, 0x6c, - 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x61, 0x64, 0x65, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x61, + 0x72, 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x67, 0x73, 0x22, + 0x59, 0x0a, 0x16, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x61, + 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x0b, 0x64, 0x69, 0x61, + 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, + 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x67, + 0x65, 0x6e, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x0b, 0x64, + 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x73, 0x32, 0xb7, 0x01, 0x0a, 0x09, 0x43, + 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x65, 0x72, 0x12, 0x51, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x76, + 0x65, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, + 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, + 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0e, 0x43, + 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x20, 0x2e, + 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, + 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x21, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x76, + 0x65, 0x72, 0x74, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x2f, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, + 0x2f, 0x73, 0x64, 0x6b, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x3b, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider.pb.go b/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider.pb.go index 8276bf32..0062baa3 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider.pb.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider.pb.go @@ -2084,6 +2084,10 @@ type GetMappingRequest struct { // the conversion key for the mapping being requested. Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + // the optional provider key for the mapping being requested, if this is empty the provider should assume this + // request is from an old engine from before GetMappings and should return it's "primary" mapping. If this is set + // then the `provider` field in GetMappingResponse should be the same. + Provider string `protobuf:"bytes,2,opt,name=provider,proto3" json:"provider,omitempty"` } func (x *GetMappingRequest) Reset() { @@ -2125,6 +2129,13 @@ func (x *GetMappingRequest) GetKey() string { return "" } +func (x *GetMappingRequest) GetProvider() string { + if x != nil { + return x.Provider + } + return "" +} + // GetMappingResponse returns convert plugin specific data for this provider. This will normally be human // readable JSON, but the engine doesn't mandate any form. type GetMappingResponse struct { @@ -2184,6 +2195,106 @@ func (x *GetMappingResponse) GetData() []byte { return nil } +// GetMappingsRequest allows providers to return ecosystem specific information without having to send back large data +// blobs for provider mappings that the engine doesn't then need. +type GetMappingsRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // the conversion key for the mapping being requested. + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` +} + +func (x *GetMappingsRequest) Reset() { + *x = GetMappingsRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_pulumi_provider_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetMappingsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetMappingsRequest) ProtoMessage() {} + +func (x *GetMappingsRequest) ProtoReflect() protoreflect.Message { + mi := &file_pulumi_provider_proto_msgTypes[27] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetMappingsRequest.ProtoReflect.Descriptor instead. +func (*GetMappingsRequest) Descriptor() ([]byte, []int) { + return file_pulumi_provider_proto_rawDescGZIP(), []int{27} +} + +func (x *GetMappingsRequest) GetKey() string { + if x != nil { + return x.Key + } + return "" +} + +// GetMappingsRequest returns a list of providers that this provider can provide mapping information for. +type GetMappingsResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // the provider keys this provider can supply mappings for. For example the Pulumi provider "terraform-template" + // would return ["template"] for this. + Providers []string `protobuf:"bytes,1,rep,name=providers,proto3" json:"providers,omitempty"` +} + +func (x *GetMappingsResponse) Reset() { + *x = GetMappingsResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_pulumi_provider_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetMappingsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetMappingsResponse) ProtoMessage() {} + +func (x *GetMappingsResponse) ProtoReflect() protoreflect.Message { + mi := &file_pulumi_provider_proto_msgTypes[28] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetMappingsResponse.ProtoReflect.Descriptor instead. +func (*GetMappingsResponse) Descriptor() ([]byte, []int) { + return file_pulumi_provider_proto_rawDescGZIP(), []int{28} +} + +func (x *GetMappingsResponse) GetProviders() []string { + if x != nil { + return x.Providers + } + return nil +} + type ConfigureErrorMissingKeys_MissingKey struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2196,7 +2307,7 @@ type ConfigureErrorMissingKeys_MissingKey struct { func (x *ConfigureErrorMissingKeys_MissingKey) Reset() { *x = ConfigureErrorMissingKeys_MissingKey{} if protoimpl.UnsafeEnabled { - mi := &file_pulumi_provider_proto_msgTypes[28] + mi := &file_pulumi_provider_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2209,7 +2320,7 @@ func (x *ConfigureErrorMissingKeys_MissingKey) String() string { func (*ConfigureErrorMissingKeys_MissingKey) ProtoMessage() {} func (x *ConfigureErrorMissingKeys_MissingKey) ProtoReflect() protoreflect.Message { - mi := &file_pulumi_provider_proto_msgTypes[28] + mi := &file_pulumi_provider_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2251,7 +2362,7 @@ type CallRequest_ArgumentDependencies struct { func (x *CallRequest_ArgumentDependencies) Reset() { *x = CallRequest_ArgumentDependencies{} if protoimpl.UnsafeEnabled { - mi := &file_pulumi_provider_proto_msgTypes[29] + mi := &file_pulumi_provider_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2264,7 +2375,7 @@ func (x *CallRequest_ArgumentDependencies) String() string { func (*CallRequest_ArgumentDependencies) ProtoMessage() {} func (x *CallRequest_ArgumentDependencies) ProtoReflect() protoreflect.Message { - mi := &file_pulumi_provider_proto_msgTypes[29] + mi := &file_pulumi_provider_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2299,7 +2410,7 @@ type CallResponse_ReturnDependencies struct { func (x *CallResponse_ReturnDependencies) Reset() { *x = CallResponse_ReturnDependencies{} if protoimpl.UnsafeEnabled { - mi := &file_pulumi_provider_proto_msgTypes[33] + mi := &file_pulumi_provider_proto_msgTypes[35] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2312,7 +2423,7 @@ func (x *CallResponse_ReturnDependencies) String() string { func (*CallResponse_ReturnDependencies) ProtoMessage() {} func (x *CallResponse_ReturnDependencies) ProtoReflect() protoreflect.Message { - mi := &file_pulumi_provider_proto_msgTypes[33] + mi := &file_pulumi_provider_proto_msgTypes[35] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2347,7 +2458,7 @@ type ConstructRequest_PropertyDependencies struct { func (x *ConstructRequest_PropertyDependencies) Reset() { *x = ConstructRequest_PropertyDependencies{} if protoimpl.UnsafeEnabled { - mi := &file_pulumi_provider_proto_msgTypes[36] + mi := &file_pulumi_provider_proto_msgTypes[38] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2360,7 +2471,7 @@ func (x *ConstructRequest_PropertyDependencies) String() string { func (*ConstructRequest_PropertyDependencies) ProtoMessage() {} func (x *ConstructRequest_PropertyDependencies) ProtoReflect() protoreflect.Message { - mi := &file_pulumi_provider_proto_msgTypes[36] + mi := &file_pulumi_provider_proto_msgTypes[38] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2413,7 +2524,7 @@ type ConstructRequest_CustomTimeouts struct { func (x *ConstructRequest_CustomTimeouts) Reset() { *x = ConstructRequest_CustomTimeouts{} if protoimpl.UnsafeEnabled { - mi := &file_pulumi_provider_proto_msgTypes[37] + mi := &file_pulumi_provider_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2426,7 +2537,7 @@ func (x *ConstructRequest_CustomTimeouts) String() string { func (*ConstructRequest_CustomTimeouts) ProtoMessage() {} func (x *ConstructRequest_CustomTimeouts) ProtoReflect() protoreflect.Message { - mi := &file_pulumi_provider_proto_msgTypes[37] + mi := &file_pulumi_provider_proto_msgTypes[39] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2475,7 +2586,7 @@ type ConstructResponse_PropertyDependencies struct { func (x *ConstructResponse_PropertyDependencies) Reset() { *x = ConstructResponse_PropertyDependencies{} if protoimpl.UnsafeEnabled { - mi := &file_pulumi_provider_proto_msgTypes[41] + mi := &file_pulumi_provider_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2488,7 +2599,7 @@ func (x *ConstructResponse_PropertyDependencies) String() string { func (*ConstructResponse_PropertyDependencies) ProtoMessage() {} func (x *ConstructResponse_PropertyDependencies) ProtoReflect() protoreflect.Message { - mi := &file_pulumi_provider_proto_msgTypes[41] + mi := &file_pulumi_provider_proto_msgTypes[43] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2937,93 +3048,105 @@ var file_pulumi_provider_proto_rawDesc = []byte{ 0x12, 0x2f, 0x0a, 0x06, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x69, 0x6e, 0x70, 0x75, 0x74, - 0x73, 0x22, 0x25, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, + 0x73, 0x22, 0x41, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x44, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, - 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xb6, - 0x09, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, - 0x64, 0x65, 0x72, 0x12, 0x48, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x12, 0x1b, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, - 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, - 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, - 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x42, 0x0a, - 0x0b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x2e, 0x70, - 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, - 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x3f, 0x0a, 0x0a, 0x44, 0x69, 0x66, 0x66, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, - 0x16, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, 0x66, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, - 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x48, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, - 0x1b, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, - 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, - 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3f, 0x0a, 0x06, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, + 0x69, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, + 0x69, 0x64, 0x65, 0x72, 0x22, 0x44, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, + 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, + 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x12, 0x47, 0x65, + 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x22, 0x33, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, + 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, + 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x32, 0x86, 0x0a, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x48, 0x0a, 0x09, + 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x1b, 0x2e, 0x70, 0x75, 0x6c, 0x75, + 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, + 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x0b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, + 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, + 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3f, 0x0a, 0x0a, 0x44, 0x69, + 0x66, 0x66, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, + 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, + 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x09, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x1b, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, + 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, + 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3f, 0x0a, 0x06, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x12, + 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76, 0x6f, + 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x70, 0x75, 0x6c, 0x75, + 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x47, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x12, 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76, - 0x6f, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x47, 0x0a, - 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x12, 0x18, 0x2e, - 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, + 0x6f, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, + 0x39, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, + 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3c, 0x0a, 0x05, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x12, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, + 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x70, + 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x04, 0x44, 0x69, 0x66, 0x66, + 0x12, 0x16, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, + 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, + 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x3f, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x18, 0x2e, + 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, - 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x39, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x16, - 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, - 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x3c, 0x0a, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x17, 0x2e, 0x70, 0x75, 0x6c, - 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, - 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x39, 0x0a, 0x04, 0x44, 0x69, 0x66, 0x66, 0x12, 0x16, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, - 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x66, 0x66, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3f, 0x0a, 0x06, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x12, 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, - 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, - 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x04, 0x52, - 0x65, 0x61, 0x64, 0x12, 0x16, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, - 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x70, 0x75, - 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3f, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x12, 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x70, 0x75, 0x6c, - 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3c, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x12, 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, - 0x63, 0x74, 0x12, 0x1b, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, - 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x1c, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x73, - 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x3a, 0x0a, 0x06, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x04, 0x52, 0x65, 0x61, 0x64, 0x12, 0x16, 0x2e, 0x70, + 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, + 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x3f, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x18, 0x2e, 0x70, 0x75, 0x6c, 0x75, + 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x3c, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x18, 0x2e, 0x70, 0x75, 0x6c, + 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x48, + 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12, 0x1b, 0x2e, 0x70, 0x75, + 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, + 0x69, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3a, 0x0a, 0x06, 0x43, 0x61, 0x6e, 0x63, + 0x65, 0x6c, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, + 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, + 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, + 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x00, 0x12, 0x3b, 0x0a, 0x06, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x12, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6c, 0x75, + 0x67, 0x69, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0d, 0x47, - 0x65, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, - 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, - 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x00, 0x12, 0x3b, 0x0a, - 0x06, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x12, 0x17, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, - 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0a, 0x47, 0x65, - 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x1c, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, - 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, - 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x2f, 0x70, 0x75, 0x6c, - 0x75, 0x6d, 0x69, 0x2f, 0x73, 0x64, 0x6b, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2f, 0x67, 0x6f, 0x3b, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x79, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, + 0x67, 0x12, 0x1c, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, + 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1d, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x4d, + 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x4e, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x73, 0x12, + 0x1d, 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x4d, + 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, + 0x2e, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x61, + 0x70, 0x70, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, + 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x2f, 0x70, 0x75, 0x6c, 0x75, 0x6d, 0x69, 0x2f, 0x73, 0x64, 0x6b, + 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x3b, 0x70, 0x75, 0x6c, + 0x75, 0x6d, 0x69, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -3039,7 +3162,7 @@ func file_pulumi_provider_proto_rawDescGZIP() []byte { } var file_pulumi_provider_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_pulumi_provider_proto_msgTypes = make([]protoimpl.MessageInfo, 43) +var file_pulumi_provider_proto_msgTypes = make([]protoimpl.MessageInfo, 45) var file_pulumi_provider_proto_goTypes = []interface{}{ (PropertyDiff_Kind)(0), // 0: pulumirpc.PropertyDiff.Kind (DiffResponse_DiffChanges)(0), // 1: pulumirpc.DiffResponse.DiffChanges @@ -3070,78 +3193,80 @@ var file_pulumi_provider_proto_goTypes = []interface{}{ (*ErrorResourceInitFailed)(nil), // 26: pulumirpc.ErrorResourceInitFailed (*GetMappingRequest)(nil), // 27: pulumirpc.GetMappingRequest (*GetMappingResponse)(nil), // 28: pulumirpc.GetMappingResponse - nil, // 29: pulumirpc.ConfigureRequest.VariablesEntry - (*ConfigureErrorMissingKeys_MissingKey)(nil), // 30: pulumirpc.ConfigureErrorMissingKeys.MissingKey - (*CallRequest_ArgumentDependencies)(nil), // 31: pulumirpc.CallRequest.ArgumentDependencies - nil, // 32: pulumirpc.CallRequest.ArgDependenciesEntry - nil, // 33: pulumirpc.CallRequest.PluginChecksumsEntry - nil, // 34: pulumirpc.CallRequest.ConfigEntry - (*CallResponse_ReturnDependencies)(nil), // 35: pulumirpc.CallResponse.ReturnDependencies - nil, // 36: pulumirpc.CallResponse.ReturnDependenciesEntry - nil, // 37: pulumirpc.DiffResponse.DetailedDiffEntry - (*ConstructRequest_PropertyDependencies)(nil), // 38: pulumirpc.ConstructRequest.PropertyDependencies - (*ConstructRequest_CustomTimeouts)(nil), // 39: pulumirpc.ConstructRequest.CustomTimeouts - nil, // 40: pulumirpc.ConstructRequest.ConfigEntry - nil, // 41: pulumirpc.ConstructRequest.InputDependenciesEntry - nil, // 42: pulumirpc.ConstructRequest.ProvidersEntry - (*ConstructResponse_PropertyDependencies)(nil), // 43: pulumirpc.ConstructResponse.PropertyDependencies - nil, // 44: pulumirpc.ConstructResponse.StateDependenciesEntry - (*structpb.Struct)(nil), // 45: google.protobuf.Struct - (*SourcePosition)(nil), // 46: pulumirpc.SourcePosition - (*emptypb.Empty)(nil), // 47: google.protobuf.Empty - (*PluginAttach)(nil), // 48: pulumirpc.PluginAttach - (*PluginInfo)(nil), // 49: pulumirpc.PluginInfo + (*GetMappingsRequest)(nil), // 29: pulumirpc.GetMappingsRequest + (*GetMappingsResponse)(nil), // 30: pulumirpc.GetMappingsResponse + nil, // 31: pulumirpc.ConfigureRequest.VariablesEntry + (*ConfigureErrorMissingKeys_MissingKey)(nil), // 32: pulumirpc.ConfigureErrorMissingKeys.MissingKey + (*CallRequest_ArgumentDependencies)(nil), // 33: pulumirpc.CallRequest.ArgumentDependencies + nil, // 34: pulumirpc.CallRequest.ArgDependenciesEntry + nil, // 35: pulumirpc.CallRequest.PluginChecksumsEntry + nil, // 36: pulumirpc.CallRequest.ConfigEntry + (*CallResponse_ReturnDependencies)(nil), // 37: pulumirpc.CallResponse.ReturnDependencies + nil, // 38: pulumirpc.CallResponse.ReturnDependenciesEntry + nil, // 39: pulumirpc.DiffResponse.DetailedDiffEntry + (*ConstructRequest_PropertyDependencies)(nil), // 40: pulumirpc.ConstructRequest.PropertyDependencies + (*ConstructRequest_CustomTimeouts)(nil), // 41: pulumirpc.ConstructRequest.CustomTimeouts + nil, // 42: pulumirpc.ConstructRequest.ConfigEntry + nil, // 43: pulumirpc.ConstructRequest.InputDependenciesEntry + nil, // 44: pulumirpc.ConstructRequest.ProvidersEntry + (*ConstructResponse_PropertyDependencies)(nil), // 45: pulumirpc.ConstructResponse.PropertyDependencies + nil, // 46: pulumirpc.ConstructResponse.StateDependenciesEntry + (*structpb.Struct)(nil), // 47: google.protobuf.Struct + (*SourcePosition)(nil), // 48: pulumirpc.SourcePosition + (*emptypb.Empty)(nil), // 49: google.protobuf.Empty + (*PluginAttach)(nil), // 50: pulumirpc.PluginAttach + (*PluginInfo)(nil), // 51: pulumirpc.PluginInfo } var file_pulumi_provider_proto_depIdxs = []int32{ - 29, // 0: pulumirpc.ConfigureRequest.variables:type_name -> pulumirpc.ConfigureRequest.VariablesEntry - 45, // 1: pulumirpc.ConfigureRequest.args:type_name -> google.protobuf.Struct - 30, // 2: pulumirpc.ConfigureErrorMissingKeys.missingKeys:type_name -> pulumirpc.ConfigureErrorMissingKeys.MissingKey - 45, // 3: pulumirpc.InvokeRequest.args:type_name -> google.protobuf.Struct - 45, // 4: pulumirpc.InvokeResponse.return:type_name -> google.protobuf.Struct + 31, // 0: pulumirpc.ConfigureRequest.variables:type_name -> pulumirpc.ConfigureRequest.VariablesEntry + 47, // 1: pulumirpc.ConfigureRequest.args:type_name -> google.protobuf.Struct + 32, // 2: pulumirpc.ConfigureErrorMissingKeys.missingKeys:type_name -> pulumirpc.ConfigureErrorMissingKeys.MissingKey + 47, // 3: pulumirpc.InvokeRequest.args:type_name -> google.protobuf.Struct + 47, // 4: pulumirpc.InvokeResponse.return:type_name -> google.protobuf.Struct 13, // 5: pulumirpc.InvokeResponse.failures:type_name -> pulumirpc.CheckFailure - 45, // 6: pulumirpc.CallRequest.args:type_name -> google.protobuf.Struct - 32, // 7: pulumirpc.CallRequest.argDependencies:type_name -> pulumirpc.CallRequest.ArgDependenciesEntry - 33, // 8: pulumirpc.CallRequest.pluginChecksums:type_name -> pulumirpc.CallRequest.PluginChecksumsEntry - 34, // 9: pulumirpc.CallRequest.config:type_name -> pulumirpc.CallRequest.ConfigEntry - 46, // 10: pulumirpc.CallRequest.sourcePosition:type_name -> pulumirpc.SourcePosition - 45, // 11: pulumirpc.CallResponse.return:type_name -> google.protobuf.Struct - 36, // 12: pulumirpc.CallResponse.returnDependencies:type_name -> pulumirpc.CallResponse.ReturnDependenciesEntry + 47, // 6: pulumirpc.CallRequest.args:type_name -> google.protobuf.Struct + 34, // 7: pulumirpc.CallRequest.argDependencies:type_name -> pulumirpc.CallRequest.ArgDependenciesEntry + 35, // 8: pulumirpc.CallRequest.pluginChecksums:type_name -> pulumirpc.CallRequest.PluginChecksumsEntry + 36, // 9: pulumirpc.CallRequest.config:type_name -> pulumirpc.CallRequest.ConfigEntry + 48, // 10: pulumirpc.CallRequest.sourcePosition:type_name -> pulumirpc.SourcePosition + 47, // 11: pulumirpc.CallResponse.return:type_name -> google.protobuf.Struct + 38, // 12: pulumirpc.CallResponse.returnDependencies:type_name -> pulumirpc.CallResponse.ReturnDependenciesEntry 13, // 13: pulumirpc.CallResponse.failures:type_name -> pulumirpc.CheckFailure - 45, // 14: pulumirpc.CheckRequest.olds:type_name -> google.protobuf.Struct - 45, // 15: pulumirpc.CheckRequest.news:type_name -> google.protobuf.Struct - 45, // 16: pulumirpc.CheckResponse.inputs:type_name -> google.protobuf.Struct + 47, // 14: pulumirpc.CheckRequest.olds:type_name -> google.protobuf.Struct + 47, // 15: pulumirpc.CheckRequest.news:type_name -> google.protobuf.Struct + 47, // 16: pulumirpc.CheckResponse.inputs:type_name -> google.protobuf.Struct 13, // 17: pulumirpc.CheckResponse.failures:type_name -> pulumirpc.CheckFailure - 45, // 18: pulumirpc.DiffRequest.olds:type_name -> google.protobuf.Struct - 45, // 19: pulumirpc.DiffRequest.news:type_name -> google.protobuf.Struct - 45, // 20: pulumirpc.DiffRequest.old_inputs:type_name -> google.protobuf.Struct + 47, // 18: pulumirpc.DiffRequest.olds:type_name -> google.protobuf.Struct + 47, // 19: pulumirpc.DiffRequest.news:type_name -> google.protobuf.Struct + 47, // 20: pulumirpc.DiffRequest.old_inputs:type_name -> google.protobuf.Struct 0, // 21: pulumirpc.PropertyDiff.kind:type_name -> pulumirpc.PropertyDiff.Kind 1, // 22: pulumirpc.DiffResponse.changes:type_name -> pulumirpc.DiffResponse.DiffChanges - 37, // 23: pulumirpc.DiffResponse.detailedDiff:type_name -> pulumirpc.DiffResponse.DetailedDiffEntry - 45, // 24: pulumirpc.CreateRequest.properties:type_name -> google.protobuf.Struct - 45, // 25: pulumirpc.CreateResponse.properties:type_name -> google.protobuf.Struct - 45, // 26: pulumirpc.ReadRequest.properties:type_name -> google.protobuf.Struct - 45, // 27: pulumirpc.ReadRequest.inputs:type_name -> google.protobuf.Struct - 45, // 28: pulumirpc.ReadResponse.properties:type_name -> google.protobuf.Struct - 45, // 29: pulumirpc.ReadResponse.inputs:type_name -> google.protobuf.Struct - 45, // 30: pulumirpc.UpdateRequest.olds:type_name -> google.protobuf.Struct - 45, // 31: pulumirpc.UpdateRequest.news:type_name -> google.protobuf.Struct - 45, // 32: pulumirpc.UpdateRequest.old_inputs:type_name -> google.protobuf.Struct - 45, // 33: pulumirpc.UpdateResponse.properties:type_name -> google.protobuf.Struct - 45, // 34: pulumirpc.DeleteRequest.properties:type_name -> google.protobuf.Struct - 40, // 35: pulumirpc.ConstructRequest.config:type_name -> pulumirpc.ConstructRequest.ConfigEntry - 45, // 36: pulumirpc.ConstructRequest.inputs:type_name -> google.protobuf.Struct - 41, // 37: pulumirpc.ConstructRequest.inputDependencies:type_name -> pulumirpc.ConstructRequest.InputDependenciesEntry - 42, // 38: pulumirpc.ConstructRequest.providers:type_name -> pulumirpc.ConstructRequest.ProvidersEntry - 39, // 39: pulumirpc.ConstructRequest.customTimeouts:type_name -> pulumirpc.ConstructRequest.CustomTimeouts - 45, // 40: pulumirpc.ConstructResponse.state:type_name -> google.protobuf.Struct - 44, // 41: pulumirpc.ConstructResponse.stateDependencies:type_name -> pulumirpc.ConstructResponse.StateDependenciesEntry - 45, // 42: pulumirpc.ErrorResourceInitFailed.properties:type_name -> google.protobuf.Struct - 45, // 43: pulumirpc.ErrorResourceInitFailed.inputs:type_name -> google.protobuf.Struct - 31, // 44: pulumirpc.CallRequest.ArgDependenciesEntry.value:type_name -> pulumirpc.CallRequest.ArgumentDependencies - 35, // 45: pulumirpc.CallResponse.ReturnDependenciesEntry.value:type_name -> pulumirpc.CallResponse.ReturnDependencies + 39, // 23: pulumirpc.DiffResponse.detailedDiff:type_name -> pulumirpc.DiffResponse.DetailedDiffEntry + 47, // 24: pulumirpc.CreateRequest.properties:type_name -> google.protobuf.Struct + 47, // 25: pulumirpc.CreateResponse.properties:type_name -> google.protobuf.Struct + 47, // 26: pulumirpc.ReadRequest.properties:type_name -> google.protobuf.Struct + 47, // 27: pulumirpc.ReadRequest.inputs:type_name -> google.protobuf.Struct + 47, // 28: pulumirpc.ReadResponse.properties:type_name -> google.protobuf.Struct + 47, // 29: pulumirpc.ReadResponse.inputs:type_name -> google.protobuf.Struct + 47, // 30: pulumirpc.UpdateRequest.olds:type_name -> google.protobuf.Struct + 47, // 31: pulumirpc.UpdateRequest.news:type_name -> google.protobuf.Struct + 47, // 32: pulumirpc.UpdateRequest.old_inputs:type_name -> google.protobuf.Struct + 47, // 33: pulumirpc.UpdateResponse.properties:type_name -> google.protobuf.Struct + 47, // 34: pulumirpc.DeleteRequest.properties:type_name -> google.protobuf.Struct + 42, // 35: pulumirpc.ConstructRequest.config:type_name -> pulumirpc.ConstructRequest.ConfigEntry + 47, // 36: pulumirpc.ConstructRequest.inputs:type_name -> google.protobuf.Struct + 43, // 37: pulumirpc.ConstructRequest.inputDependencies:type_name -> pulumirpc.ConstructRequest.InputDependenciesEntry + 44, // 38: pulumirpc.ConstructRequest.providers:type_name -> pulumirpc.ConstructRequest.ProvidersEntry + 41, // 39: pulumirpc.ConstructRequest.customTimeouts:type_name -> pulumirpc.ConstructRequest.CustomTimeouts + 47, // 40: pulumirpc.ConstructResponse.state:type_name -> google.protobuf.Struct + 46, // 41: pulumirpc.ConstructResponse.stateDependencies:type_name -> pulumirpc.ConstructResponse.StateDependenciesEntry + 47, // 42: pulumirpc.ErrorResourceInitFailed.properties:type_name -> google.protobuf.Struct + 47, // 43: pulumirpc.ErrorResourceInitFailed.inputs:type_name -> google.protobuf.Struct + 33, // 44: pulumirpc.CallRequest.ArgDependenciesEntry.value:type_name -> pulumirpc.CallRequest.ArgumentDependencies + 37, // 45: pulumirpc.CallResponse.ReturnDependenciesEntry.value:type_name -> pulumirpc.CallResponse.ReturnDependencies 15, // 46: pulumirpc.DiffResponse.DetailedDiffEntry.value:type_name -> pulumirpc.PropertyDiff - 38, // 47: pulumirpc.ConstructRequest.InputDependenciesEntry.value:type_name -> pulumirpc.ConstructRequest.PropertyDependencies - 43, // 48: pulumirpc.ConstructResponse.StateDependenciesEntry.value:type_name -> pulumirpc.ConstructResponse.PropertyDependencies + 40, // 47: pulumirpc.ConstructRequest.InputDependenciesEntry.value:type_name -> pulumirpc.ConstructRequest.PropertyDependencies + 45, // 48: pulumirpc.ConstructResponse.StateDependenciesEntry.value:type_name -> pulumirpc.ConstructResponse.PropertyDependencies 2, // 49: pulumirpc.ResourceProvider.GetSchema:input_type -> pulumirpc.GetSchemaRequest 11, // 50: pulumirpc.ResourceProvider.CheckConfig:input_type -> pulumirpc.CheckRequest 14, // 51: pulumirpc.ResourceProvider.DiffConfig:input_type -> pulumirpc.DiffRequest @@ -3156,30 +3281,32 @@ var file_pulumi_provider_proto_depIdxs = []int32{ 21, // 60: pulumirpc.ResourceProvider.Update:input_type -> pulumirpc.UpdateRequest 23, // 61: pulumirpc.ResourceProvider.Delete:input_type -> pulumirpc.DeleteRequest 24, // 62: pulumirpc.ResourceProvider.Construct:input_type -> pulumirpc.ConstructRequest - 47, // 63: pulumirpc.ResourceProvider.Cancel:input_type -> google.protobuf.Empty - 47, // 64: pulumirpc.ResourceProvider.GetPluginInfo:input_type -> google.protobuf.Empty - 48, // 65: pulumirpc.ResourceProvider.Attach:input_type -> pulumirpc.PluginAttach + 49, // 63: pulumirpc.ResourceProvider.Cancel:input_type -> google.protobuf.Empty + 49, // 64: pulumirpc.ResourceProvider.GetPluginInfo:input_type -> google.protobuf.Empty + 50, // 65: pulumirpc.ResourceProvider.Attach:input_type -> pulumirpc.PluginAttach 27, // 66: pulumirpc.ResourceProvider.GetMapping:input_type -> pulumirpc.GetMappingRequest - 3, // 67: pulumirpc.ResourceProvider.GetSchema:output_type -> pulumirpc.GetSchemaResponse - 12, // 68: pulumirpc.ResourceProvider.CheckConfig:output_type -> pulumirpc.CheckResponse - 16, // 69: pulumirpc.ResourceProvider.DiffConfig:output_type -> pulumirpc.DiffResponse - 5, // 70: pulumirpc.ResourceProvider.Configure:output_type -> pulumirpc.ConfigureResponse - 8, // 71: pulumirpc.ResourceProvider.Invoke:output_type -> pulumirpc.InvokeResponse - 8, // 72: pulumirpc.ResourceProvider.StreamInvoke:output_type -> pulumirpc.InvokeResponse - 10, // 73: pulumirpc.ResourceProvider.Call:output_type -> pulumirpc.CallResponse - 12, // 74: pulumirpc.ResourceProvider.Check:output_type -> pulumirpc.CheckResponse - 16, // 75: pulumirpc.ResourceProvider.Diff:output_type -> pulumirpc.DiffResponse - 18, // 76: pulumirpc.ResourceProvider.Create:output_type -> pulumirpc.CreateResponse - 20, // 77: pulumirpc.ResourceProvider.Read:output_type -> pulumirpc.ReadResponse - 22, // 78: pulumirpc.ResourceProvider.Update:output_type -> pulumirpc.UpdateResponse - 47, // 79: pulumirpc.ResourceProvider.Delete:output_type -> google.protobuf.Empty - 25, // 80: pulumirpc.ResourceProvider.Construct:output_type -> pulumirpc.ConstructResponse - 47, // 81: pulumirpc.ResourceProvider.Cancel:output_type -> google.protobuf.Empty - 49, // 82: pulumirpc.ResourceProvider.GetPluginInfo:output_type -> pulumirpc.PluginInfo - 47, // 83: pulumirpc.ResourceProvider.Attach:output_type -> google.protobuf.Empty - 28, // 84: pulumirpc.ResourceProvider.GetMapping:output_type -> pulumirpc.GetMappingResponse - 67, // [67:85] is the sub-list for method output_type - 49, // [49:67] is the sub-list for method input_type + 29, // 67: pulumirpc.ResourceProvider.GetMappings:input_type -> pulumirpc.GetMappingsRequest + 3, // 68: pulumirpc.ResourceProvider.GetSchema:output_type -> pulumirpc.GetSchemaResponse + 12, // 69: pulumirpc.ResourceProvider.CheckConfig:output_type -> pulumirpc.CheckResponse + 16, // 70: pulumirpc.ResourceProvider.DiffConfig:output_type -> pulumirpc.DiffResponse + 5, // 71: pulumirpc.ResourceProvider.Configure:output_type -> pulumirpc.ConfigureResponse + 8, // 72: pulumirpc.ResourceProvider.Invoke:output_type -> pulumirpc.InvokeResponse + 8, // 73: pulumirpc.ResourceProvider.StreamInvoke:output_type -> pulumirpc.InvokeResponse + 10, // 74: pulumirpc.ResourceProvider.Call:output_type -> pulumirpc.CallResponse + 12, // 75: pulumirpc.ResourceProvider.Check:output_type -> pulumirpc.CheckResponse + 16, // 76: pulumirpc.ResourceProvider.Diff:output_type -> pulumirpc.DiffResponse + 18, // 77: pulumirpc.ResourceProvider.Create:output_type -> pulumirpc.CreateResponse + 20, // 78: pulumirpc.ResourceProvider.Read:output_type -> pulumirpc.ReadResponse + 22, // 79: pulumirpc.ResourceProvider.Update:output_type -> pulumirpc.UpdateResponse + 49, // 80: pulumirpc.ResourceProvider.Delete:output_type -> google.protobuf.Empty + 25, // 81: pulumirpc.ResourceProvider.Construct:output_type -> pulumirpc.ConstructResponse + 49, // 82: pulumirpc.ResourceProvider.Cancel:output_type -> google.protobuf.Empty + 51, // 83: pulumirpc.ResourceProvider.GetPluginInfo:output_type -> pulumirpc.PluginInfo + 49, // 84: pulumirpc.ResourceProvider.Attach:output_type -> google.protobuf.Empty + 28, // 85: pulumirpc.ResourceProvider.GetMapping:output_type -> pulumirpc.GetMappingResponse + 30, // 86: pulumirpc.ResourceProvider.GetMappings:output_type -> pulumirpc.GetMappingsResponse + 68, // [68:87] is the sub-list for method output_type + 49, // [49:68] is the sub-list for method input_type 49, // [49:49] is the sub-list for extension type_name 49, // [49:49] is the sub-list for extension extendee 0, // [0:49] is the sub-list for field type_name @@ -3517,7 +3644,31 @@ func file_pulumi_provider_proto_init() { return nil } } + file_pulumi_provider_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetMappingsRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } file_pulumi_provider_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetMappingsResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pulumi_provider_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ConfigureErrorMissingKeys_MissingKey); i { case 0: return &v.state @@ -3529,7 +3680,7 @@ func file_pulumi_provider_proto_init() { return nil } } - file_pulumi_provider_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_pulumi_provider_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CallRequest_ArgumentDependencies); i { case 0: return &v.state @@ -3541,7 +3692,7 @@ func file_pulumi_provider_proto_init() { return nil } } - file_pulumi_provider_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { + file_pulumi_provider_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CallResponse_ReturnDependencies); i { case 0: return &v.state @@ -3553,7 +3704,7 @@ func file_pulumi_provider_proto_init() { return nil } } - file_pulumi_provider_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + file_pulumi_provider_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ConstructRequest_PropertyDependencies); i { case 0: return &v.state @@ -3565,7 +3716,7 @@ func file_pulumi_provider_proto_init() { return nil } } - file_pulumi_provider_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { + file_pulumi_provider_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ConstructRequest_CustomTimeouts); i { case 0: return &v.state @@ -3577,7 +3728,7 @@ func file_pulumi_provider_proto_init() { return nil } } - file_pulumi_provider_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { + file_pulumi_provider_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ConstructResponse_PropertyDependencies); i { case 0: return &v.state @@ -3596,7 +3747,7 @@ func file_pulumi_provider_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pulumi_provider_proto_rawDesc, NumEnums: 2, - NumMessages: 43, + NumMessages: 45, NumExtensions: 0, NumServices: 1, }, diff --git a/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider_grpc.pb.go b/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider_grpc.pb.go index 606f93d3..228e23a6 100644 --- a/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider_grpc.pb.go +++ b/vendor/github.com/pulumi/pulumi/sdk/v3/proto/go/provider_grpc.pb.go @@ -71,6 +71,10 @@ type ResourceProviderClient interface { // GetMapping fetches the mapping for this resource provider, if any. A provider should return an empty // response (not an error) if it doesn't have a mapping for the given key. GetMapping(ctx context.Context, in *GetMappingRequest, opts ...grpc.CallOption) (*GetMappingResponse, error) + // GetMappings is an optional method that returns what mappings (if any) a provider supports. If a provider does not + // implement this method the engine falls back to the old behaviour of just calling GetMapping without a name. + // If this method is implemented than the engine will then call GetMapping only with the names returned from this method. + GetMappings(ctx context.Context, in *GetMappingsRequest, opts ...grpc.CallOption) (*GetMappingsResponse, error) } type resourceProviderClient struct { @@ -266,6 +270,15 @@ func (c *resourceProviderClient) GetMapping(ctx context.Context, in *GetMappingR return out, nil } +func (c *resourceProviderClient) GetMappings(ctx context.Context, in *GetMappingsRequest, opts ...grpc.CallOption) (*GetMappingsResponse, error) { + out := new(GetMappingsResponse) + err := c.cc.Invoke(ctx, "/pulumirpc.ResourceProvider/GetMappings", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ResourceProviderServer is the server API for ResourceProvider service. // All implementations must embed UnimplementedResourceProviderServer // for forward compatibility @@ -318,6 +331,10 @@ type ResourceProviderServer interface { // GetMapping fetches the mapping for this resource provider, if any. A provider should return an empty // response (not an error) if it doesn't have a mapping for the given key. GetMapping(context.Context, *GetMappingRequest) (*GetMappingResponse, error) + // GetMappings is an optional method that returns what mappings (if any) a provider supports. If a provider does not + // implement this method the engine falls back to the old behaviour of just calling GetMapping without a name. + // If this method is implemented than the engine will then call GetMapping only with the names returned from this method. + GetMappings(context.Context, *GetMappingsRequest) (*GetMappingsResponse, error) mustEmbedUnimplementedResourceProviderServer() } @@ -379,6 +396,9 @@ func (UnimplementedResourceProviderServer) Attach(context.Context, *PluginAttach func (UnimplementedResourceProviderServer) GetMapping(context.Context, *GetMappingRequest) (*GetMappingResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetMapping not implemented") } +func (UnimplementedResourceProviderServer) GetMappings(context.Context, *GetMappingsRequest) (*GetMappingsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetMappings not implemented") +} func (UnimplementedResourceProviderServer) mustEmbedUnimplementedResourceProviderServer() {} // UnsafeResourceProviderServer may be embedded to opt out of forward compatibility for this service. @@ -719,6 +739,24 @@ func _ResourceProvider_GetMapping_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +func _ResourceProvider_GetMappings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetMappingsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ResourceProviderServer).GetMappings(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/pulumirpc.ResourceProvider/GetMappings", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ResourceProviderServer).GetMappings(ctx, req.(*GetMappingsRequest)) + } + return interceptor(ctx, in, info, handler) +} + // ResourceProvider_ServiceDesc is the grpc.ServiceDesc for ResourceProvider service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -794,6 +832,10 @@ var ResourceProvider_ServiceDesc = grpc.ServiceDesc{ MethodName: "GetMapping", Handler: _ResourceProvider_GetMapping_Handler, }, + { + MethodName: "GetMappings", + Handler: _ResourceProvider_GetMappings_Handler, + }, }, Streams: []grpc.StreamDesc{ { diff --git a/vendor/github.com/skeema/knownhosts/knownhosts.go b/vendor/github.com/skeema/knownhosts/knownhosts.go index c460031b..c2fb5160 100644 --- a/vendor/github.com/skeema/knownhosts/knownhosts.go +++ b/vendor/github.com/skeema/knownhosts/knownhosts.go @@ -5,6 +5,7 @@ package knownhosts import ( "encoding/base64" "errors" + "fmt" "io" "net" "sort" @@ -68,8 +69,19 @@ func (hkcb HostKeyCallback) HostKeys(hostWithPort string) (keys []ssh.PublicKey) // known_hosts entries (for different key types), the result will be sorted by // known_hosts filename and line number. func (hkcb HostKeyCallback) HostKeyAlgorithms(hostWithPort string) (algos []string) { - for _, key := range hkcb.HostKeys(hostWithPort) { - algos = append(algos, key.Type()) + // We ensure that algos never contains duplicates. This is done for robustness + // even though currently golang.org/x/crypto/ssh/knownhosts never exposes + // multiple keys of the same type. This way our behavior here is unaffected + // even if https://github.com/golang/go/issues/28870 is implemented, for + // example by https://github.com/golang/crypto/pull/254. + hostKeys := hkcb.HostKeys(hostWithPort) + seen := make(map[string]struct{}, len(hostKeys)) + for _, key := range hostKeys { + typ := key.Type() + if _, already := seen[typ]; !already { + algos = append(algos, typ) + seen[typ] = struct{}{} + } } return algos } @@ -140,11 +152,15 @@ func Line(addresses []string, key ssh.PublicKey) string { func WriteKnownHost(w io.Writer, hostname string, remote net.Addr, key ssh.PublicKey) error { // Always include hostname; only also include remote if it isn't a zero value // and doesn't normalize to the same string as hostname. - addresses := []string{hostname} - remoteStr := remote.String() - remoteStrNormalized := Normalize(remoteStr) - if remoteStrNormalized != "[0.0.0.0]:0" && remoteStrNormalized != Normalize(hostname) { - addresses = append(addresses, remoteStr) + hostnameNormalized := Normalize(hostname) + if strings.ContainsAny(hostnameNormalized, "\t ") { + return fmt.Errorf("knownhosts: hostname '%s' contains spaces", hostnameNormalized) + } + addresses := []string{hostnameNormalized} + remoteStrNormalized := Normalize(remote.String()) + if remoteStrNormalized != "[0.0.0.0]:0" && remoteStrNormalized != hostnameNormalized && + !strings.ContainsAny(remoteStrNormalized, "\t ") { + addresses = append(addresses, remoteStrNormalized) } line := Line(addresses, key) + "\n" _, err := w.Write([]byte(line)) diff --git a/vendor/github.com/spf13/afero/const_bsds.go b/vendor/github.com/spf13/afero/const_bsds.go index eed0f225..30855de5 100644 --- a/vendor/github.com/spf13/afero/const_bsds.go +++ b/vendor/github.com/spf13/afero/const_bsds.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build aix || darwin || openbsd || freebsd || netbsd || dragonfly -// +build aix darwin openbsd freebsd netbsd dragonfly +//go:build aix || darwin || openbsd || freebsd || netbsd || dragonfly || zos +// +build aix darwin openbsd freebsd netbsd dragonfly zos package afero diff --git a/vendor/github.com/spf13/afero/const_win_unix.go b/vendor/github.com/spf13/afero/const_win_unix.go index 004d57e2..12792d21 100644 --- a/vendor/github.com/spf13/afero/const_win_unix.go +++ b/vendor/github.com/spf13/afero/const_win_unix.go @@ -10,8 +10,8 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -//go:build !darwin && !openbsd && !freebsd && !dragonfly && !netbsd && !aix -// +build !darwin,!openbsd,!freebsd,!dragonfly,!netbsd,!aix +//go:build !darwin && !openbsd && !freebsd && !dragonfly && !netbsd && !aix && !zos +// +build !darwin,!openbsd,!freebsd,!dragonfly,!netbsd,!aix,!zos package afero diff --git a/vendor/github.com/spf13/afero/memmap.go b/vendor/github.com/spf13/afero/memmap.go index e6b7d70b..d6c744e8 100644 --- a/vendor/github.com/spf13/afero/memmap.go +++ b/vendor/github.com/spf13/afero/memmap.go @@ -16,9 +16,12 @@ package afero import ( "fmt" "io" + "log" "os" "path/filepath" + + "sort" "strings" "sync" "time" @@ -88,6 +91,24 @@ func (m *MemMapFs) findParent(f *mem.FileData) *mem.FileData { return pfile } +func (m *MemMapFs) findDescendants(name string) []*mem.FileData { + fData := m.getData() + descendants := make([]*mem.FileData, 0, len(fData)) + for p, dFile := range fData { + if strings.HasPrefix(p, name+FilePathSeparator) { + descendants = append(descendants, dFile) + } + } + + sort.Slice(descendants, func(i, j int) bool { + cur := len(strings.Split(descendants[i].Name(), FilePathSeparator)) + next := len(strings.Split(descendants[j].Name(), FilePathSeparator)) + return cur < next + }) + + return descendants +} + func (m *MemMapFs) registerWithParent(f *mem.FileData, perm os.FileMode) { if f == nil { return @@ -309,29 +330,51 @@ func (m *MemMapFs) Rename(oldname, newname string) error { if _, ok := m.getData()[oldname]; ok { m.mu.RUnlock() m.mu.Lock() - m.unRegisterWithParent(oldname) + err := m.unRegisterWithParent(oldname) + if err != nil { + return err + } + fileData := m.getData()[oldname] - delete(m.getData(), oldname) mem.ChangeFileName(fileData, newname) m.getData()[newname] = fileData + + err = m.renameDescendants(oldname, newname) + if err != nil { + return err + } + + delete(m.getData(), oldname) + m.registerWithParent(fileData, 0) m.mu.Unlock() m.mu.RLock() } else { return &os.PathError{Op: "rename", Path: oldname, Err: ErrFileNotFound} } + return nil +} - for p, fileData := range m.getData() { - if strings.HasPrefix(p, oldname+FilePathSeparator) { - m.mu.RUnlock() - m.mu.Lock() - delete(m.getData(), p) - p := strings.Replace(p, oldname, newname, 1) - m.getData()[p] = fileData - m.mu.Unlock() - m.mu.RLock() +func (m *MemMapFs) renameDescendants(oldname, newname string) error { + descendants := m.findDescendants(oldname) + removes := make([]string, 0, len(descendants)) + for _, desc := range descendants { + descNewName := strings.Replace(desc.Name(), oldname, newname, 1) + err := m.unRegisterWithParent(desc.Name()) + if err != nil { + return err } + + removes = append(removes, desc.Name()) + mem.ChangeFileName(desc, descNewName) + m.getData()[descNewName] = desc + + m.registerWithParent(desc, 0) + } + for _, r := range removes { + delete(m.getData(), r) } + return nil } diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go index 2a910c3c..d3f5bcbf 100644 --- a/vendor/google.golang.org/grpc/version.go +++ b/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.58.1" +const Version = "1.58.2" diff --git a/vendor/modules.txt b/vendor/modules.txt index e0bd7444..41dd5914 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8,7 +8,7 @@ github.com/Microsoft/go-winio/internal/fs github.com/Microsoft/go-winio/internal/socket github.com/Microsoft/go-winio/internal/stringbuffer github.com/Microsoft/go-winio/pkg/guid -# github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 +# github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c ## explicit; go 1.13 github.com/ProtonMail/go-crypto/bitcurves github.com/ProtonMail/go-crypto/brainpool @@ -288,7 +288,7 @@ github.com/pkg/errors # github.com/pkg/term v1.1.0 ## explicit; go 1.14 github.com/pkg/term/termios -# github.com/pulumi/pulumi-aws/sdk/v6 v6.1.0 +# github.com/pulumi/pulumi-aws/sdk/v6 v6.2.1 ## explicit; go 1.21 github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ebs github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ec2 @@ -304,18 +304,20 @@ github.com/pulumi/pulumi-azure-native-sdk/storage/v2 # github.com/pulumi/pulumi-azure-native-sdk/v2 v2.8.0 ## explicit; go 1.17 github.com/pulumi/pulumi-azure-native-sdk/v2/utilities -# github.com/pulumi/pulumi-command/sdk v0.8.2 +# github.com/pulumi/pulumi-command/sdk v0.9.1 ## explicit; go 1.19 github.com/pulumi/pulumi-command/sdk/go/command/internal github.com/pulumi/pulumi-command/sdk/go/command/local github.com/pulumi/pulumi-command/sdk/go/command/remote -# github.com/pulumi/pulumi-random/sdk/v4 v4.13.4 -## explicit; go 1.19 +# github.com/pulumi/pulumi-random/sdk/v4 v4.14.0 +## explicit; go 1.21 github.com/pulumi/pulumi-random/sdk/v4/go/random -# github.com/pulumi/pulumi-tls/sdk/v4 v4.10.0 -## explicit; go 1.17 +github.com/pulumi/pulumi-random/sdk/v4/go/random/internal +# github.com/pulumi/pulumi-tls/sdk/v4 v4.11.0 +## explicit; go 1.21 github.com/pulumi/pulumi-tls/sdk/v4/go/tls -# github.com/pulumi/pulumi/sdk/v3 v3.83.0 +github.com/pulumi/pulumi-tls/sdk/v4/go/tls/internal +# github.com/pulumi/pulumi/sdk/v3 v3.85.0 ## explicit; go 1.18 github.com/pulumi/pulumi/sdk/v3/go/auto github.com/pulumi/pulumi/sdk/v3/go/auto/debug @@ -383,10 +385,10 @@ github.com/santhosh-tekuri/jsonschema/v5 # github.com/sergi/go-diff v1.3.1 ## explicit; go 1.12 github.com/sergi/go-diff/diffmatchpatch -# github.com/skeema/knownhosts v1.2.0 +# github.com/skeema/knownhosts v1.2.1 ## explicit; go 1.17 github.com/skeema/knownhosts -# github.com/spf13/afero v1.9.5 +# github.com/spf13/afero v1.10.0 ## explicit; go 1.16 github.com/spf13/afero github.com/spf13/afero/internal/common @@ -536,10 +538,10 @@ golang.org/x/tools/internal/pkgbits golang.org/x/tools/internal/tokeninternal golang.org/x/tools/internal/typeparams golang.org/x/tools/internal/typesinternal -# google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb +# google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 ## explicit; go 1.19 google.golang.org/genproto/googleapis/rpc/status -# google.golang.org/grpc v1.58.1 +# google.golang.org/grpc v1.58.2 ## explicit; go 1.19 google.golang.org/grpc google.golang.org/grpc/attributes