Upgrade upstream to v5.69.0 (#4571)

Upstream is updated to [v5.69.0](https://github.com/hashicorp/terraform-provider-aws/releases/tag/v5.69.0) There are no new resources or functions but the update is expected to propagate bug fixes. Notably this update also propagates updating to `Go 1.23.1` for the provider builds. Fixes #4563 Fixes #4465 Fixes #4362 Taking this opportunity to remove modifications from upstream/go.mod so that the Pulumi provider uses a consistent Go tool-chain and dependency set with upstream.
pulumi · Sep 27, 2024 · b62cf93 · b62cf93
1 parent ca81399
commit b62cf93
Show file tree

Hide file tree

Showing 233 changed files with 6,241 additions and 5,135 deletions.
diff --git a/examples/go.mod b/examples/go.mod
diff --git a/examples/go.sum b/examples/go.sum
diff --git a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch
@@ -44,7 +44,7 @@ index 837e79c057..8fc8280900 100644
  			},
  			"etag": {
 diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go
-index d530b2a85c..c14f298606 100644
+index 910dec1a1b..c67bc4cfde 100644
 --- a/internal/service/docdb/cluster_parameter_group.go
 +++ b/internal/service/docdb/cluster_parameter_group.go
 @@ -50,7 +50,7 @@ func ResourceClusterParameterGroup() *schema.Resource {
@@ -161,7 +161,7 @@ index c4c6f7c64b..df3d2d3544 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go
-index aa63ef7b8a..0aa99d67b0 100644
+index b31cd660ef..8ec5d31fae 100644
 --- a/internal/service/neptune/cluster_parameter_group.go
 +++ b/internal/service/neptune/cluster_parameter_group.go
 @@ -49,7 +49,7 @@ func resourceClusterParameterGroup() *schema.Resource {
@@ -174,7 +174,7 @@ index aa63ef7b8a..0aa99d67b0 100644
  			names.AttrFamily: {
  				Type:     schema.TypeString,
 diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go
-index 0c8e05589a..16d3c419ce 100644
+index df81d7c11b..518b7c2f11 100644
 --- a/internal/service/neptune/parameter_group.go
 +++ b/internal/service/neptune/parameter_group.go
 @@ -55,7 +55,7 @@ func resourceParameterGroup() *schema.Resource {
@@ -200,7 +200,7 @@ index 1d97895eea..45e74ae9ce 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go
-index ccfdc6bfcd..609718eef3 100644
+index 28a4a0c6ae..26112e8db5 100644
 --- a/internal/service/rds/cluster_parameter_group.go
 +++ b/internal/service/rds/cluster_parameter_group.go
 @@ -51,7 +51,7 @@ func resourceClusterParameterGroup() *schema.Resource {
@@ -309,7 +309,7 @@ index aeef59b958..abac8702c5 100644
  		HostedZoneId: aws.String(zoneID),
  	}
 diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go
-index 15edc9f2af..db519dc744 100644
+index 940e3bf78d..626ad3f819 100644
 --- a/internal/service/route53/zone.go
 +++ b/internal/service/route53/zone.go
 @@ -53,7 +53,7 @@ func resourceZone() *schema.Resource {

diff --git a/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch b/patches/0021-Fix-elbv2-target-group-read-to-workaround-2517.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix elbv2 target group read to workaround #2517
 
 
 diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go
-index 319e089d11..7f15483ead 100644
+index ed86abb195..2ba79e829f 100644
 --- a/internal/service/elbv2/target_group.go
 +++ b/internal/service/elbv2/target_group.go
 @@ -635,19 +635,19 @@ func resourceTargetGroupRead(ctx context.Context, d *schema.ResourceData, meta i
@@ -32,7 +32,7 @@ index 319e089d11..7f15483ead 100644
  		return sdkdiag.AppendErrorf(diags, "setting target_health_state: %s", err)
  	}
 
-@@ -1500,3 +1500,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic
+@@ -1519,3 +1519,13 @@ func targetGroupRuntimeValidation(d *schema.ResourceData, diags *diag.Diagnostic
  		}
  	}
  }

diff --git a/patches/0027-Do-not-compute-tags_all-at-TF-level.patch b/patches/0027-Do-not-compute-tags_all-at-TF-level.patch
@@ -153,10 +153,10 @@ index eb9c6f256f..912546358c 100644
  				ElementType: types.StringType,
  				Optional:    true,
 diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go
-index 53e6636756..e9cd945e10 100644
+index e2dfcda3c8..e524fcad2d 100644
 --- a/internal/service/opensearchserverless/collection.go
 +++ b/internal/service/opensearchserverless/collection.go
-@@ -123,7 +123,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ
+@@ -124,7 +124,7 @@ func (r *resourceCollection) Schema(ctx context.Context, req resource.SchemaRequ
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),

diff --git a/patches/0037-Restore-legacy-bucket.patch b/patches/0037-Restore-legacy-bucket.patch
diff --git a/patches/0041-fix-legacy-bucket-context.patch b/patches/0041-fix-legacy-bucket-context.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] fix legacy bucket context
 
 
 diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
-index 5f64a814be..d5c03b22fb 100644
+index 40fd0b7be2..e6470bb576 100644
 --- a/internal/service/s3legacy/bucket_legacy.go
 +++ b/internal/service/s3legacy/bucket_legacy.go
-@@ -904,7 +904,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
+@@ -903,7 +903,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
  		d.Set("bucket", d.Id())
  	}
 
@@ -17,7 +17,7 @@ index 5f64a814be..d5c03b22fb 100644
 
  	// Read the policy
  	if _, ok := d.GetOk("policy"); ok {
-@@ -1803,7 +1803,7 @@ func websiteLegacyDomainUrl(client *conns.AWSClient, region string) string {
+@@ -1802,7 +1802,7 @@ func websiteLegacyDomainUrl(client *conns.AWSClient, region string) string {
  	if isOldRegionLegacy(region) {
  		return fmt.Sprintf("s3-website-%s.amazonaws.com", region) //lintignore:AWSR001
  	}

diff --git a/patches/0044-restore-ECRConn.patch b/patches/0044-restore-ECRConn.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] restore ECRConn
 
 
 diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
-index 5234acf441..a49d9eef68 100644
+index 39875b62dd..a3ff9982dc 100644
 --- a/internal/conns/awsclient_gen.go
 +++ b/internal/conns/awsclient_gen.go
-@@ -244,6 +244,7 @@ import (
+@@ -245,6 +245,7 @@ import (
  	workspaces_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspaces"
  	workspacesweb_sdkv2 "github.com/aws/aws-sdk-go-v2/service/workspacesweb"
  	xray_sdkv2 "github.com/aws/aws-sdk-go-v2/service/xray"
 +	ecr_sdkv1 "github.com/aws/aws-sdk-go/service/ecr"
  	imagebuilder_sdkv1 "github.com/aws/aws-sdk-go/service/imagebuilder"
  	simpledb_sdkv1 "github.com/aws/aws-sdk-go/service/simpledb"
  	"github.com/hashicorp/terraform-provider-aws/internal/errs"
-@@ -582,6 +583,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
+@@ -587,6 +588,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
  	return errs.Must(client[*ec2_sdkv2.Client](ctx, c, names.EC2, make(map[string]any)))
  }
 

diff --git a/patches/0047-update-apn-info.patch b/patches/0047-update-apn-info.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] update apn info
 
 
 diff --git a/internal/conns/config.go b/internal/conns/config.go
-index 3c2228bfa5..783b775def 100644
+index a2f971928e..3b7174c1cc 100644
 --- a/internal/conns/config.go
 +++ b/internal/conns/config.go
 @@ -23,7 +23,6 @@ import (

diff --git a/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch b/patches/0052-Patch-tags-ComputedOnly-on-bedrockagent-and-other-mo.patch
@@ -18,10 +18,10 @@ index 18133c7439..ea9f2d088f 100644
  		Blocks: map[string]schema.Block{
  			"export": schema.ListNestedBlock{
 diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go
-index a4cf7bf381..2a7f9dd2bf 100644
+index 5b7dccb5a7..1bc9df029d 100644
 --- a/internal/service/bedrockagent/agent.go
 +++ b/internal/service/bedrockagent/agent.go
-@@ -152,7 +152,7 @@ func (r *agentResource) Schema(ctx context.Context, request resource.SchemaReque
+@@ -165,7 +165,7 @@ func (r *agentResource) Schema(ctx context.Context, request resource.SchemaReque
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),

diff --git a/patches/0064-Adapt-gamelift-matchmaking-resources.patch b/patches/0064-Adapt-gamelift-matchmaking-resources.patch
@@ -614,10 +614,10 @@ index 4295987ae6..377b46816e 100644
  		return nil
  	}
 diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl
-index 966398b368..396ff180be 100644
+index e7e59f53e7..e24138d8b1 100644
 --- a/names/data/names_data.hcl
 +++ b/names/data/names_data.hcl
-@@ -3856,7 +3856,8 @@ service "fsx" {
+@@ -3884,7 +3884,8 @@ service "fsx" {
 
  service "gamelift" {
    sdk {

diff --git a/patches/0066-Legacy-bucket-Read-now-sets-acl-and-force_destroy-de.patch b/patches/0066-Legacy-bucket-Read-now-sets-acl-and-force_destroy-de.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Legacy bucket Read now sets acl and force_destroy defaults
 
 
 diff --git a/internal/service/s3legacy/bucket_legacy.go b/internal/service/s3legacy/bucket_legacy.go
-index d5c03b22fb..8c26fee574 100644
+index e6470bb576..e4f72d2bd2 100644
 --- a/internal/service/s3legacy/bucket_legacy.go
 +++ b/internal/service/s3legacy/bucket_legacy.go
-@@ -35,6 +35,10 @@ import (
+@@ -34,6 +34,10 @@ import (
  	"github.com/hashicorp/terraform-provider-aws/internal/verify"
  )
 
@@ -19,7 +19,7 @@ index d5c03b22fb..8c26fee574 100644
  func ResourceBucketLegacy() *schema.Resource {
  	return &schema.Resource{
  		CreateWithoutTimeout: resourceBucketLegacyCreate,
-@@ -80,7 +84,7 @@ func ResourceBucketLegacy() *schema.Resource {
+@@ -79,7 +83,7 @@ func ResourceBucketLegacy() *schema.Resource {
 
  			"acl": {
  				Type:          schema.TypeString,
@@ -28,7 +28,7 @@ index d5c03b22fb..8c26fee574 100644
  				Optional:      true,
  				ConflictsWith: []string{"grant"},
  				ValidateFunc:  validation.StringInSlice(BucketCannedACL_Values(), false),
-@@ -943,7 +947,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
+@@ -942,7 +946,7 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
  	}
 
  	//Read the Grant ACL. Reset if `acl` (canned ACL) is set.
@@ -37,7 +37,7 @@ index d5c03b22fb..8c26fee574 100644
  		if err := d.Set("grant", nil); err != nil {
  			return diag.Errorf("error resetting grant %s", err)
  		}
-@@ -1403,6 +1407,18 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
+@@ -1402,6 +1406,18 @@ func resourceBucketLegacyRead(ctx context.Context, d *schema.ResourceData, meta
  	}.String()
  	d.Set("arn", arn)
 

diff --git a/provider/cmd/pulumi-resource-aws/bridge-metadata.json b/provider/cmd/pulumi-resource-aws/bridge-metadata.json
@@ -4141,6 +4141,9 @@
                 "current": "aws:bedrock/agentAgent:AgentAgent",
                 "majorVersion": 6,
                 "fields": {
+                    "guardrail_configuration": {
+                        "maxItemsOne": false
+                    },
                     "prompt_override_configuration": {
                         "maxItemsOne": false,
                         "elem": {
@@ -10904,7 +10907,14 @@
                         "elem": {
                             "fields": {
                                 "managed_ebs_volume": {
-                                    "maxItemsOne": true
+                                    "maxItemsOne": true,
+                                    "elem": {
+                                        "fields": {
+                                            "tag_specifications": {
+                                                "maxItemsOne": false
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }