From e4328eb0385fe01682974acada0cbb97aaf7a347 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Wed, 22 Nov 2023 08:29:11 -0800 Subject: [PATCH] Upgrade pulumi-terraform-bridge to v3.66.0 (#3038) This PR was generated via `$ upgrade-provider pulumi/pulumi-aws --kind=bridge --pr-reviewers=t0yv0`. --- - Upgrading pulumi-terraform-bridge from v3.65.1-0.20231116043842-89a4965045a1 to v3.66.0. - Upgrading pulumi-terraform-bridge/pf from v0.19.1-0.20231116043842-89a4965045a1 to v0.20.0. --- examples/go.mod | 10 ++++---- examples/go.sum | 22 +++++++++-------- provider/cmd/pulumi-resource-aws/schema.json | 2 +- provider/go.mod | 12 ++++----- provider/go.sum | 26 +++++++++++--------- sdk/go.mod | 2 +- sdk/go.sum | 4 +-- 7 files changed, 41 insertions(+), 37 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index efe1280b162..c415815d96d 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -5,9 +5,9 @@ go 1.21.0 require ( github.com/aws/aws-sdk-go v1.47.12 github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000 - github.com/pulumi/pulumi-terraform-bridge/pf v0.19.1-0.20231116043842-89a4965045a1 + github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0 github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3 - github.com/pulumi/pulumi/pkg/v3 v3.93.0 + github.com/pulumi/pulumi/pkg/v3 v3.94.2 github.com/stretchr/testify v1.8.4 ) @@ -267,10 +267,10 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/pulumi/esc v0.5.7-0.20231030195049-f71961c0d5fa // indirect - github.com/pulumi/pulumi-terraform-bridge/v3 v3.65.1-0.20231116043842-89a4965045a1 // indirect + github.com/pulumi/esc v0.6.0 // indirect + github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0 // indirect github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 // indirect - github.com/pulumi/pulumi/sdk/v3 v3.93.0 // indirect + github.com/pulumi/pulumi/sdk/v3 v3.94.2 // indirect github.com/pulumi/terraform-diff-reader v0.0.2 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index db745122413..7763efe4ecc 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -2354,22 +2354,22 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/prometheus v0.35.0/go.mod h1:7HaLx5kEPKJ0GDgbODG0fZgXbQ8K/XjZNJXQmbmgQlY= github.com/prometheus/prometheus v0.37.0/go.mod h1:egARUgz+K93zwqsVIAneFlLZefyGOON44WyAp4Xqbbk= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pulumi/esc v0.5.7-0.20231030195049-f71961c0d5fa h1:5y6/zZsPQW8xNgfyWVMTnuSl8gH2wrYkvTOAqPwhM9Q= -github.com/pulumi/esc v0.5.7-0.20231030195049-f71961c0d5fa/go.mod h1:Y6W21yUukvxS2NnS5ae1beMSPhMvj0xNAYcDqDHVj/g= +github.com/pulumi/esc v0.6.0 h1:m8jWgBektlj26RvrN3/sM0r1lYiwTMmqVPvLxCxahGE= +github.com/pulumi/esc v0.6.0/go.mod h1:Y6W21yUukvxS2NnS5ae1beMSPhMvj0xNAYcDqDHVj/g= github.com/pulumi/providertest v0.0.3 h1:DLcAvVGgeP4mHEi1Ftk5zTX9QHjcrO6u5w5GCZrF99s= github.com/pulumi/providertest v0.0.3/go.mod h1:kZYBA14iemv3X4G4xsBKaa72zVbn//IyL5HTYKpLuy0= -github.com/pulumi/pulumi-terraform-bridge/pf v0.19.1-0.20231116043842-89a4965045a1 h1:fok1TKY+RQC0ekVx39gBhcKvgRRtBj0rGvS2H7sdD+U= -github.com/pulumi/pulumi-terraform-bridge/pf v0.19.1-0.20231116043842-89a4965045a1/go.mod h1:A68h9Hs13U56M4C4J148/RWIZEZ5vB8/Ayz62jvM2pQ= +github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0 h1:SdZn+lpoW5MvQp5Ogj2KRZvib9M1xjOoRpEEXD4DWrA= +github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0/go.mod h1:ogKh6ynS1wuGGY6ebopoglwHIwRZNGAyWKuz1A3yGs4= github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3 h1:bBWWeAtSPPYpKYlPZr2h0BiYgWQpHRIk0HO/MQmB+jc= github.com/pulumi/pulumi-terraform-bridge/testing v0.0.2-0.20230927165309-e3fd9503f2d3/go.mod h1:vAQ7DeddebQ7FHdRaSG6ijuS28FS9PC4j8Y9wUuue0c= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.65.1-0.20231116043842-89a4965045a1 h1:ufPR8SXnfTMwXKASiwMhl+YA12I3Xh+Sfv5ag4o+uNw= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.65.1-0.20231116043842-89a4965045a1/go.mod h1:GO5Zhb6+hryafZ+kvcmnaEE1Y9fnVQa6xQDZ7C+EQww= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0 h1:1U5n9Xzh+BPf4/5x7EvaopwtsTvpP/RZ8FVUTE5IN5I= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0/go.mod h1:1ZnUBM2KMg/JHgFn5tN/OrwRmgdJIGQ1uWs758CmdGY= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 h1:1nzT9XuyTHdcWJboYNMPPdW0B0mQdXYg8Az5tF96MXY= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096/go.mod h1:1pLAP9kryYta3Xrw99oh7BmxY6PYb+z2m7ENNCJMIRQ= -github.com/pulumi/pulumi/pkg/v3 v3.93.0 h1:ryb8a691MffcAv8KAgAIRvpZOjVW1xCpSDH10x9ZYUg= -github.com/pulumi/pulumi/pkg/v3 v3.93.0/go.mod h1:cGnwvoPZ8fjR0cUvOt1skqLl8E4fIN708lFITPhY/K8= -github.com/pulumi/pulumi/sdk/v3 v3.93.0 h1:5InTUxulGuPMXQbnrruIbOEJylRkRWfoDyQIj6dtsYA= -github.com/pulumi/pulumi/sdk/v3 v3.93.0/go.mod h1:zeqyIODqbb6GrEyhFV6aJET/xBSXSnF7Bw/EjbYZUnU= +github.com/pulumi/pulumi/pkg/v3 v3.94.2 h1:b+gQ+EJZMYfSIu/sb/+p36VmfZ2ZJWbEWMsptt2f6Kk= +github.com/pulumi/pulumi/pkg/v3 v3.94.2/go.mod h1:aCeDMlncyDwX3RG6+vYUjWsy6bOEtoHUY0twCcn5qqE= +github.com/pulumi/pulumi/sdk/v3 v3.94.2 h1:B8W3CCzA2fX/0730o/7KQXdmqrY5KdgGtiAA6rDMVlk= +github.com/pulumi/pulumi/sdk/v3 v3.94.2/go.mod h1:zeqyIODqbb6GrEyhFV6aJET/xBSXSnF7Bw/EjbYZUnU= github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI= github.com/pulumi/terraform-diff-reader v0.0.2/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ= github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e h1:blSirnXqvm8JXLxwxelsBroUNRhOHakDO7cgJUYTdpQ= @@ -3665,8 +3665,10 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/provider/cmd/pulumi-resource-aws/schema.json b/provider/cmd/pulumi-resource-aws/schema.json index f6e4f1dd580..2209339a0c5 100644 --- a/provider/cmd/pulumi-resource-aws/schema.json +++ b/provider/cmd/pulumi-resource-aws/schema.json @@ -129367,7 +129367,7 @@ } }, "aws:acm/certificateValidation:CertificateValidation": { - "description": "{{% examples %}}\nThis resource represents a successful validation of an ACM certificate in concert\nwith other resources.\n\nMost commonly, this resource is used together with `aws.route53.Record` and\n`aws.acm.Certificate` to request a DNS validated certificate,\ndeploy the required validation records and wait for validation to complete.\n\n\u003e **WARNING:** This resource implements a part of the validation workflow. It does not represent a real-world entity in AWS, therefore changing or deleting this resource on its own has no immediate effect.\n\n## Example Usage\n\n{{% example %}}\n### DNS Validation with Route 53\n\n```typescript\nimport * as aws from \"@pulumi/aws\";\n\nconst exampleCertificate = new aws.acm.Certificate(\"exampleCertificate\", {\n domainName: \"example.com\",\n validationMethod: \"DNS\",\n});\nconst exampleZone = aws.route53.getZone({\n name: \"example.com\",\n privateZone: false,\n});\n\nconst certValidation = new aws.route53.Record(\"certValidation\", {\n name: exampleCertificate.domainValidationOptions[0].resourceRecordName,\n records: [exampleCertificate.domainValidationOptions[0].resourceRecordValue],\n ttl: 60,\n type: exampleCertificate.domainValidationOptions[0].resourceRecordType,\n zoneId: exampleZone.then(x =\u003e x.zoneId),\n});\n\nconst certCertificateValidation = new aws.acm.CertificateValidation(\"cert\", {\n certificateArn: exampleCertificate.arn,\n validationRecordFqdns: [certValidation.fqdn],\n});\n\nexport const certificateArn = certCertificateValidation.certificateArn;\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/acm\"\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/route53\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n exampleCertificate, err := acm.NewCertificate(ctx, \"exampleCertificate\", \u0026acm.CertificateArgs{\n DomainName: pulumi.String(\"example.com\"),\n ValidationMethod: pulumi.String(\"DNS\"),\n })\n if err != nil {\n return err\n }\n \n exampleZone, err := route53.LookupZone(ctx, \u0026route53.LookupZoneArgs{\n Name: pulumi.StringRef(\"example.com\"),\n PrivateZone: pulumi.BoolRef(false),\n }, nil)\n if err != nil {\n return err\n }\n \n domainValidationOption := exampleCertificate.DomainValidationOptions.ApplyT(func(options []acm.CertificateDomainValidationOption) interface{} {\n return options[0]\n })\n \n certValidation, err := route53.NewRecord(ctx, \"certValidation\", \u0026route53.RecordArgs{\n Name: domainValidationOption.ApplyT(func(option interface{}) string {\n return *option.(acm.CertificateDomainValidationOption).ResourceRecordName\n }).(pulumi.StringOutput),\n Type: domainValidationOption.ApplyT(func(option interface{}) string {\n return *option.(acm.CertificateDomainValidationOption).ResourceRecordType\n }).(pulumi.StringOutput),\n Records: pulumi.StringArray{\n domainValidationOption.ApplyT(func(option interface{}) string {\n return *option.(acm.CertificateDomainValidationOption).ResourceRecordValue\n }).(pulumi.StringOutput),\n },\n Ttl: pulumi.Int(10 * 60),\n ZoneId: pulumi.String(exampleZone.ZoneId),\n })\n if err != nil {\n return err\n }\n \n certCertificateValidation, err := acm.NewCertificateValidation(ctx, \"cert\", \u0026acm.CertificateValidationArgs{\n CertificateArn: exampleCertificate.Arn,\n ValidationRecordFqdns: pulumi.StringArray{\n certValidation.Fqdn,\n },\n })\n if err != nil {\n return err\n }\n \n ctx.Export(\"certificateArn\", certCertificateValidation.CertificateArn)\n \n return nil\n })\n}\n```\n```python\nimport pulumi_aws as aws\n\nexample_certificate = aws.acm.Certificate(\"exampleCertificate\",\n domain_name=\"example.com\",\n validation_method=\"DNS\")\n\nexample_zone = aws.route53.getZone(name=\"example.com\",\n private_zone=False)\n\ncert_validation = aws.route53.Record(\"certValidation\",\n name=example_certificate.domain_validation_options[0].resource_record_name,\n records=[example_certificate.domain_validation_options[0].resource_record_value],\n ttl=60,\n type=example_certificate.domain_validation_options[0].resource_record_type,\n zone_id=example_zone.zone_id)\n\ncert_certificate_validation = aws.acm.CertificateValidation(\"cert\",\n certificate_arn=example_certificate.arn,\n validation_record_fqdns=[cert_validation.fqdn])\n\npulumi.export(\"certificate_arn\", cert_certificate_validation.certificate_arn)\n```\n```csharp\nusing Pulumi;\nusing Pulumi.Aws.Acm;\nusing Pulumi.Aws.Route53;\nusing System.Collections.Generic;\n\nreturn await Deployment.RunAsync(() =\u003e\n{\n var exampleCertificate = new Certificate(\"exampleCertificate\", new CertificateArgs\n {\n DomainName = \"example.com\",\n ValidationMethod = \"DNS\"\n });\n\n var exampleZone = GetZone.Invoke(new GetZoneInvokeArgs\n {\n Name = \"example.com\",\n PrivateZone = false,\n });\n\n var certValidation = new Record(\"certValidation\", new RecordArgs\n {\n Name = exampleCertificate.DomainValidationOptions.Apply(options =\u003e options[0].ResourceRecordName!),\n Records =\n {\n exampleCertificate.DomainValidationOptions.Apply(options =\u003e options[0].ResourceRecordValue!),\n },\n Ttl = 60,\n Type = exampleCertificate.DomainValidationOptions.Apply(options =\u003e options[0].ResourceRecordType!),\n ZoneId = exampleZone.Apply(zone =\u003e zone.Id),\n });\n\n var certCertificateValidation = new CertificateValidation(\"cert\", new CertificateValidationArgs\n {\n CertificateArn = exampleCertificate.Arn,\n ValidationRecordFqdns =\n {\n certValidation.Fqdn,\n },\n });\n \n return new Dictionary\u003cstring, object?\u003e\n {\n [\"certificateArn\"] = certCertificateValidation.CertificateArn,\n };\n});\n```\n```yaml\nvariables:\n zoneId:\n Fn::Invoke:\n Function: aws.route53.getZone\n Arguments:\n name: \"example.com\"\n privateZone: false\n Return: id\nresources:\n exampleCertificate:\n type: aws.acm.Certificate\n properties:\n domainName: \"example.com\"\n validationMethod: \"DNS\"\n certValidation:\n type: aws.route53.Record\n properties:\n name: ${exampleCertificate.domainValidationOptions[0].resourceRecordName}\n records: [${exampleCertificate.domainValidationOptions[0].resourceRecordValue}]\n ttl: 60\n type: ${exampleCertificate.domainValidationOptions[0].resourceRecordType}\n zoneId: ${zoneId}\n certCertificateValidation:\n type: aws.acm.CertificateValidation\n properties:\n certificateArn: ${exampleCertificate.arn}\n validationRecordFqdns: [${certValidation.fqdn}]\noutputs:\n certificateArn: ${certCertificateValidation.certificateArn}\n```\n{{% /example %}}\n{{% example %}}\n### Email Validation\n\n```typescript\nimport * as aws from \"@pulumi/aws\";\n\nconst exampleCertificate = new aws.acm.Certificate(\"exampleCertificate\", {\n domainName: \"example.com\",\n validationMethod: \"EMAIL\",\n});\n\nconst exampleCertificateValidation = new aws.acm.CertificateValidation(\"exampleCertificateValidation\", {\n certificateArn: exampleCertificate.arn,\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/acm\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n exampleCertificate, err := acm.NewCertificate(ctx, \"exampleCertificate\", \u0026acm.CertificateArgs{\n DomainName: pulumi.String(\"example.com\"),\n ValidationMethod: pulumi.String(\"EMAIL\"),\n })\n if err != nil {\n return err\n }\n \n _, err = acm.NewCertificateValidation(ctx, \"exampleCertificateValidation\", \u0026acm.CertificateValidationArgs{\n CertificateArn: exampleCertificate.Arn,\n })\n if err != nil {\n return err\n }\n\t\treturn nil\n\t})\n}\n```\n```python\nimport pulumi_aws as aws\n\nexample_certificate = aws.acm.Certificate(\"exampleCertificate\",\n domain_name=\"example.com\",\n validation_method=\"EMAIL\")\n\nexample_certificate_validation = aws.acm.CertificateValidation(\"exampleCertificateValidation\",\n certificate_arn=example_certificate.arn)\n```\n```csharp\nusing Pulumi;\nusing Pulumi.Aws.Acm;\n\nreturn await Deployment.RunAsync(() =\u003e\n{\n var exampleCertificate = new Certificate(\"exampleCertificate\", new CertificateArgs\n {\n DomainName = \"example.com\",\n ValidationMethod = \"EMAIL\"\n });\n\n var certCertificateValidation = new CertificateValidation(\"cert\", new CertificateValidationArgs\n {\n CertificateArn = exampleCertificate.Arn,\n });\n});\n\n```\n```yaml\nresources:\n exampleCertificate:\n type: aws.acm.Certificate\n properties:\n domainName: \"example.com\"\n validationMethod: \"EMAIL\"\n certCertificateValidation:\n type: aws.acm.CertificateValidation\n properties:\n certificateArn: ${exampleCertificate.arn}\n```\n{{% /example %}}\n\n{{% /examples %}}", + "description": "This resource represents a successful validation of an ACM certificate in concert\nwith other resources.\n\nMost commonly, this resource is used together with `aws.route53.Record` and\n`aws.acm.Certificate` to request a DNS validated certificate,\ndeploy the required validation records and wait for validation to complete.\n\n\u003e **WARNING:** This resource implements a part of the validation workflow. It does not represent a real-world entity in AWS, therefore changing or deleting this resource on its own has no immediate effect.\n\n{{% examples %}}\n## Example Usage\n\n{{% example %}}\n### DNS Validation with Route 53\n\n```typescript\nimport * as aws from \"@pulumi/aws\";\n\nconst exampleCertificate = new aws.acm.Certificate(\"exampleCertificate\", {\n domainName: \"example.com\",\n validationMethod: \"DNS\",\n});\nconst exampleZone = aws.route53.getZone({\n name: \"example.com\",\n privateZone: false,\n});\n\nconst certValidation = new aws.route53.Record(\"certValidation\", {\n name: exampleCertificate.domainValidationOptions[0].resourceRecordName,\n records: [exampleCertificate.domainValidationOptions[0].resourceRecordValue],\n ttl: 60,\n type: exampleCertificate.domainValidationOptions[0].resourceRecordType,\n zoneId: exampleZone.then(x =\u003e x.zoneId),\n});\n\nconst certCertificateValidation = new aws.acm.CertificateValidation(\"cert\", {\n certificateArn: exampleCertificate.arn,\n validationRecordFqdns: [certValidation.fqdn],\n});\n\nexport const certificateArn = certCertificateValidation.certificateArn;\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/acm\"\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/route53\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n exampleCertificate, err := acm.NewCertificate(ctx, \"exampleCertificate\", \u0026acm.CertificateArgs{\n DomainName: pulumi.String(\"example.com\"),\n ValidationMethod: pulumi.String(\"DNS\"),\n })\n if err != nil {\n return err\n }\n \n exampleZone, err := route53.LookupZone(ctx, \u0026route53.LookupZoneArgs{\n Name: pulumi.StringRef(\"example.com\"),\n PrivateZone: pulumi.BoolRef(false),\n }, nil)\n if err != nil {\n return err\n }\n \n domainValidationOption := exampleCertificate.DomainValidationOptions.ApplyT(func(options []acm.CertificateDomainValidationOption) interface{} {\n return options[0]\n })\n \n certValidation, err := route53.NewRecord(ctx, \"certValidation\", \u0026route53.RecordArgs{\n Name: domainValidationOption.ApplyT(func(option interface{}) string {\n return *option.(acm.CertificateDomainValidationOption).ResourceRecordName\n }).(pulumi.StringOutput),\n Type: domainValidationOption.ApplyT(func(option interface{}) string {\n return *option.(acm.CertificateDomainValidationOption).ResourceRecordType\n }).(pulumi.StringOutput),\n Records: pulumi.StringArray{\n domainValidationOption.ApplyT(func(option interface{}) string {\n return *option.(acm.CertificateDomainValidationOption).ResourceRecordValue\n }).(pulumi.StringOutput),\n },\n Ttl: pulumi.Int(10 * 60),\n ZoneId: pulumi.String(exampleZone.ZoneId),\n })\n if err != nil {\n return err\n }\n \n certCertificateValidation, err := acm.NewCertificateValidation(ctx, \"cert\", \u0026acm.CertificateValidationArgs{\n CertificateArn: exampleCertificate.Arn,\n ValidationRecordFqdns: pulumi.StringArray{\n certValidation.Fqdn,\n },\n })\n if err != nil {\n return err\n }\n \n ctx.Export(\"certificateArn\", certCertificateValidation.CertificateArn)\n \n return nil\n })\n}\n```\n```python\nimport pulumi_aws as aws\n\nexample_certificate = aws.acm.Certificate(\"exampleCertificate\",\n domain_name=\"example.com\",\n validation_method=\"DNS\")\n\nexample_zone = aws.route53.getZone(name=\"example.com\",\n private_zone=False)\n\ncert_validation = aws.route53.Record(\"certValidation\",\n name=example_certificate.domain_validation_options[0].resource_record_name,\n records=[example_certificate.domain_validation_options[0].resource_record_value],\n ttl=60,\n type=example_certificate.domain_validation_options[0].resource_record_type,\n zone_id=example_zone.zone_id)\n\ncert_certificate_validation = aws.acm.CertificateValidation(\"cert\",\n certificate_arn=example_certificate.arn,\n validation_record_fqdns=[cert_validation.fqdn])\n\npulumi.export(\"certificate_arn\", cert_certificate_validation.certificate_arn)\n```\n```csharp\nusing Pulumi;\nusing Pulumi.Aws.Acm;\nusing Pulumi.Aws.Route53;\nusing System.Collections.Generic;\n\nreturn await Deployment.RunAsync(() =\u003e\n{\n var exampleCertificate = new Certificate(\"exampleCertificate\", new CertificateArgs\n {\n DomainName = \"example.com\",\n ValidationMethod = \"DNS\"\n });\n\n var exampleZone = GetZone.Invoke(new GetZoneInvokeArgs\n {\n Name = \"example.com\",\n PrivateZone = false,\n });\n\n var certValidation = new Record(\"certValidation\", new RecordArgs\n {\n Name = exampleCertificate.DomainValidationOptions.Apply(options =\u003e options[0].ResourceRecordName!),\n Records =\n {\n exampleCertificate.DomainValidationOptions.Apply(options =\u003e options[0].ResourceRecordValue!),\n },\n Ttl = 60,\n Type = exampleCertificate.DomainValidationOptions.Apply(options =\u003e options[0].ResourceRecordType!),\n ZoneId = exampleZone.Apply(zone =\u003e zone.Id),\n });\n\n var certCertificateValidation = new CertificateValidation(\"cert\", new CertificateValidationArgs\n {\n CertificateArn = exampleCertificate.Arn,\n ValidationRecordFqdns =\n {\n certValidation.Fqdn,\n },\n });\n \n return new Dictionary\u003cstring, object?\u003e\n {\n [\"certificateArn\"] = certCertificateValidation.CertificateArn,\n };\n});\n```\n```yaml\nvariables:\n zoneId:\n Fn::Invoke:\n Function: aws.route53.getZone\n Arguments:\n name: \"example.com\"\n privateZone: false\n Return: id\nresources:\n exampleCertificate:\n type: aws.acm.Certificate\n properties:\n domainName: \"example.com\"\n validationMethod: \"DNS\"\n certValidation:\n type: aws.route53.Record\n properties:\n name: ${exampleCertificate.domainValidationOptions[0].resourceRecordName}\n records: [${exampleCertificate.domainValidationOptions[0].resourceRecordValue}]\n ttl: 60\n type: ${exampleCertificate.domainValidationOptions[0].resourceRecordType}\n zoneId: ${zoneId}\n certCertificateValidation:\n type: aws.acm.CertificateValidation\n properties:\n certificateArn: ${exampleCertificate.arn}\n validationRecordFqdns: [${certValidation.fqdn}]\noutputs:\n certificateArn: ${certCertificateValidation.certificateArn}\n```\n{{% /example %}}\n{{% example %}}\n### Email Validation\n\n```typescript\nimport * as aws from \"@pulumi/aws\";\n\nconst exampleCertificate = new aws.acm.Certificate(\"exampleCertificate\", {\n domainName: \"example.com\",\n validationMethod: \"EMAIL\",\n});\n\nconst exampleCertificateValidation = new aws.acm.CertificateValidation(\"exampleCertificateValidation\", {\n certificateArn: exampleCertificate.arn,\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-aws/sdk/v5/go/aws/acm\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n exampleCertificate, err := acm.NewCertificate(ctx, \"exampleCertificate\", \u0026acm.CertificateArgs{\n DomainName: pulumi.String(\"example.com\"),\n ValidationMethod: pulumi.String(\"EMAIL\"),\n })\n if err != nil {\n return err\n }\n \n _, err = acm.NewCertificateValidation(ctx, \"exampleCertificateValidation\", \u0026acm.CertificateValidationArgs{\n CertificateArn: exampleCertificate.Arn,\n })\n if err != nil {\n return err\n }\n\t\treturn nil\n\t})\n}\n```\n```python\nimport pulumi_aws as aws\n\nexample_certificate = aws.acm.Certificate(\"exampleCertificate\",\n domain_name=\"example.com\",\n validation_method=\"EMAIL\")\n\nexample_certificate_validation = aws.acm.CertificateValidation(\"exampleCertificateValidation\",\n certificate_arn=example_certificate.arn)\n```\n```csharp\nusing Pulumi;\nusing Pulumi.Aws.Acm;\n\nreturn await Deployment.RunAsync(() =\u003e\n{\n var exampleCertificate = new Certificate(\"exampleCertificate\", new CertificateArgs\n {\n DomainName = \"example.com\",\n ValidationMethod = \"EMAIL\"\n });\n\n var certCertificateValidation = new CertificateValidation(\"cert\", new CertificateValidationArgs\n {\n CertificateArn = exampleCertificate.Arn,\n });\n});\n\n```\n```yaml\nresources:\n exampleCertificate:\n type: aws.acm.Certificate\n properties:\n domainName: \"example.com\"\n validationMethod: \"EMAIL\"\n certCertificateValidation:\n type: aws.acm.CertificateValidation\n properties:\n certificateArn: ${exampleCertificate.arn}\n```\n{{% /example %}}\n\n{{% /examples %}}", "properties": { "certificateArn": { "type": "string", diff --git a/provider/go.mod b/provider/go.mod index fd988e6a224..b984f63fd8a 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -9,10 +9,10 @@ require ( github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220923175450-ca71523cdc36 github.com/mitchellh/go-homedir v1.1.0 github.com/pulumi/providertest v0.0.3 - github.com/pulumi/pulumi-terraform-bridge/pf v0.19.1-0.20231116043842-89a4965045a1 - github.com/pulumi/pulumi-terraform-bridge/v3 v3.65.1-0.20231116043842-89a4965045a1 - github.com/pulumi/pulumi/pkg/v3 v3.93.0 - github.com/pulumi/pulumi/sdk/v3 v3.93.0 + github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0 + github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0 + github.com/pulumi/pulumi/pkg/v3 v3.94.2 + github.com/pulumi/pulumi/sdk/v3 v3.94.2 github.com/stretchr/testify v1.8.4 pgregory.net/rapid v0.6.1 ) @@ -294,10 +294,10 @@ require ( github.com/pkg/term v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/posener/complete v1.2.3 // indirect - github.com/pulumi/esc v0.5.7-0.20231030195049-f71961c0d5fa // indirect + github.com/pulumi/esc v0.6.0 // indirect github.com/pulumi/pulumi-java/pkg v0.9.8 // indirect github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 // indirect - github.com/pulumi/pulumi-yaml v1.4.0 // indirect + github.com/pulumi/pulumi-yaml v1.4.2 // indirect github.com/pulumi/schema-tools v0.1.2 // indirect github.com/pulumi/terraform-diff-reader v0.0.2 // indirect github.com/rivo/uniseg v0.4.4 // indirect diff --git a/provider/go.sum b/provider/go.sum index 1de2998de96..43a31442c66 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -2374,26 +2374,26 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/prometheus v0.35.0/go.mod h1:7HaLx5kEPKJ0GDgbODG0fZgXbQ8K/XjZNJXQmbmgQlY= github.com/prometheus/prometheus v0.37.0/go.mod h1:egARUgz+K93zwqsVIAneFlLZefyGOON44WyAp4Xqbbk= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pulumi/esc v0.5.7-0.20231030195049-f71961c0d5fa h1:5y6/zZsPQW8xNgfyWVMTnuSl8gH2wrYkvTOAqPwhM9Q= -github.com/pulumi/esc v0.5.7-0.20231030195049-f71961c0d5fa/go.mod h1:Y6W21yUukvxS2NnS5ae1beMSPhMvj0xNAYcDqDHVj/g= +github.com/pulumi/esc v0.6.0 h1:m8jWgBektlj26RvrN3/sM0r1lYiwTMmqVPvLxCxahGE= +github.com/pulumi/esc v0.6.0/go.mod h1:Y6W21yUukvxS2NnS5ae1beMSPhMvj0xNAYcDqDHVj/g= github.com/pulumi/providertest v0.0.3 h1:DLcAvVGgeP4mHEi1Ftk5zTX9QHjcrO6u5w5GCZrF99s= github.com/pulumi/providertest v0.0.3/go.mod h1:kZYBA14iemv3X4G4xsBKaa72zVbn//IyL5HTYKpLuy0= github.com/pulumi/pulumi-java/pkg v0.9.8 h1:c8mYsalnRXA2Ibgvv6scefOn6mW1Vb0UT0mcDqjsivQ= github.com/pulumi/pulumi-java/pkg v0.9.8/go.mod h1:c6rSw/+q4O0IImgJ9axxoC6QesbPYWBaG5gimbHouUQ= -github.com/pulumi/pulumi-terraform-bridge/pf v0.19.1-0.20231116043842-89a4965045a1 h1:fok1TKY+RQC0ekVx39gBhcKvgRRtBj0rGvS2H7sdD+U= -github.com/pulumi/pulumi-terraform-bridge/pf v0.19.1-0.20231116043842-89a4965045a1/go.mod h1:A68h9Hs13U56M4C4J148/RWIZEZ5vB8/Ayz62jvM2pQ= +github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0 h1:SdZn+lpoW5MvQp5Ogj2KRZvib9M1xjOoRpEEXD4DWrA= +github.com/pulumi/pulumi-terraform-bridge/pf v0.20.0/go.mod h1:ogKh6ynS1wuGGY6ebopoglwHIwRZNGAyWKuz1A3yGs4= github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc= github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1/go.mod h1:7OeUPH8rpt5ipyj9EFcnXpuzQ8SHL0dyqdfa8nOacdk= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.65.1-0.20231116043842-89a4965045a1 h1:ufPR8SXnfTMwXKASiwMhl+YA12I3Xh+Sfv5ag4o+uNw= -github.com/pulumi/pulumi-terraform-bridge/v3 v3.65.1-0.20231116043842-89a4965045a1/go.mod h1:GO5Zhb6+hryafZ+kvcmnaEE1Y9fnVQa6xQDZ7C+EQww= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0 h1:1U5n9Xzh+BPf4/5x7EvaopwtsTvpP/RZ8FVUTE5IN5I= +github.com/pulumi/pulumi-terraform-bridge/v3 v3.66.0/go.mod h1:1ZnUBM2KMg/JHgFn5tN/OrwRmgdJIGQ1uWs758CmdGY= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096 h1:1nzT9XuyTHdcWJboYNMPPdW0B0mQdXYg8Az5tF96MXY= github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.7-0.20230801203955-5d215c892096/go.mod h1:1pLAP9kryYta3Xrw99oh7BmxY6PYb+z2m7ENNCJMIRQ= -github.com/pulumi/pulumi-yaml v1.4.0 h1:vIm+F18aPXqHcgCZcD+PCEtA96Fbs96wHoW8RPVxJfk= -github.com/pulumi/pulumi-yaml v1.4.0/go.mod h1:1hwsXFnT7hm2ZeftY5fzjkngjs2eT/rv9MsPE48Leb4= -github.com/pulumi/pulumi/pkg/v3 v3.93.0 h1:ryb8a691MffcAv8KAgAIRvpZOjVW1xCpSDH10x9ZYUg= -github.com/pulumi/pulumi/pkg/v3 v3.93.0/go.mod h1:cGnwvoPZ8fjR0cUvOt1skqLl8E4fIN708lFITPhY/K8= -github.com/pulumi/pulumi/sdk/v3 v3.93.0 h1:5InTUxulGuPMXQbnrruIbOEJylRkRWfoDyQIj6dtsYA= -github.com/pulumi/pulumi/sdk/v3 v3.93.0/go.mod h1:zeqyIODqbb6GrEyhFV6aJET/xBSXSnF7Bw/EjbYZUnU= +github.com/pulumi/pulumi-yaml v1.4.2 h1:LKptNH2lG6f5IjJmR7bvu7ouBE4sgkTRNd4I8ZHmjHw= +github.com/pulumi/pulumi-yaml v1.4.2/go.mod h1:1hwsXFnT7hm2ZeftY5fzjkngjs2eT/rv9MsPE48Leb4= +github.com/pulumi/pulumi/pkg/v3 v3.94.2 h1:b+gQ+EJZMYfSIu/sb/+p36VmfZ2ZJWbEWMsptt2f6Kk= +github.com/pulumi/pulumi/pkg/v3 v3.94.2/go.mod h1:aCeDMlncyDwX3RG6+vYUjWsy6bOEtoHUY0twCcn5qqE= +github.com/pulumi/pulumi/sdk/v3 v3.94.2 h1:B8W3CCzA2fX/0730o/7KQXdmqrY5KdgGtiAA6rDMVlk= +github.com/pulumi/pulumi/sdk/v3 v3.94.2/go.mod h1:zeqyIODqbb6GrEyhFV6aJET/xBSXSnF7Bw/EjbYZUnU= github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo= github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k= github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI= @@ -3699,8 +3699,10 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/sdk/go.mod b/sdk/go.mod index de4090417d0..0437604cda8 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/blang/semver v3.5.1+incompatible - github.com/pulumi/pulumi/sdk/v3 v3.93.0 + github.com/pulumi/pulumi/sdk/v3 v3.94.2 ) retract ( diff --git a/sdk/go.sum b/sdk/go.sum index a0eff6b9494..301c2c6d50c 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -147,8 +147,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pulumi/esc v0.5.6 h1:4WV3X7OEVcChIwbSG+JxhZDdmq/q7lFPaSjHRYlPwmI= github.com/pulumi/esc v0.5.6/go.mod h1:wpwNfVS5fV7Kd51j4dJ6FWYlKfxdqyppgp0gtkzqH04= -github.com/pulumi/pulumi/sdk/v3 v3.93.0 h1:5InTUxulGuPMXQbnrruIbOEJylRkRWfoDyQIj6dtsYA= -github.com/pulumi/pulumi/sdk/v3 v3.93.0/go.mod h1:zeqyIODqbb6GrEyhFV6aJET/xBSXSnF7Bw/EjbYZUnU= +github.com/pulumi/pulumi/sdk/v3 v3.94.2 h1:B8W3CCzA2fX/0730o/7KQXdmqrY5KdgGtiAA6rDMVlk= +github.com/pulumi/pulumi/sdk/v3 v3.94.2/go.mod h1:zeqyIODqbb6GrEyhFV6aJET/xBSXSnF7Bw/EjbYZUnU= 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=