Upstream v5.70.0 (#4604)

- **Move upstream to v5.70.0** - **./scripts/tidy-all.sh** - **./scripts/patch_computed_only.sh** - **Set up computed IDs** - **Regen schema** - **Regen SDK** The detected breaking change in `getStandardsControlAssociations` is expected and benign. The output `standardsControlAssociations` snuck its way into the inputs in upstream, but it wasn't usable. This PR fixed it upstream: hashicorp/terraform-provider-aws@f2a5704 Additionally this corrects the `ComputedID` of `aws_iam_role_policies_exclusive`. closes #4602
pulumi · Oct 4, 2024 · 77f656d · 77f656d
1 parent baee26c
commit 77f656d
Show file tree

Hide file tree

Showing 294 changed files with 20,854 additions and 3,400 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/0032-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch b/patches/0032-Run-scripts-patch_computed_only.sh-to-patch-eks-pod_.patch
@@ -32,10 +32,10 @@ index ce583fa5c4..9fdeea49d8 100644
  	}
  }
 diff --git a/internal/service/s3control/access_grant.go b/internal/service/s3control/access_grant.go
-index ce4d1a042d..f91e56ba64 100644
+index 6bd3274a3f..55ec1a948a 100644
 --- a/internal/service/s3control/access_grant.go
 +++ b/internal/service/s3control/access_grant.go
-@@ -103,7 +103,7 @@ func (r *accessGrantResource) Schema(ctx context.Context, request resource.Schem
+@@ -102,7 +102,7 @@ func (r *accessGrantResource) Schema(ctx context.Context, request resource.Schem
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),
@@ -58,10 +58,10 @@ index 5f13ed2859..5a0e3e931b 100644
  	}
  }
 diff --git a/internal/service/s3control/access_grants_location.go b/internal/service/s3control/access_grants_location.go
-index ca060273a1..1189fbc20c 100644
+index 9443dfb091..2f064132c3 100644
 --- a/internal/service/s3control/access_grants_location.go
 +++ b/internal/service/s3control/access_grants_location.go
-@@ -84,7 +84,7 @@ func (r *accessGrantsLocationResource) Schema(ctx context.Context, request resou
+@@ -83,7 +83,7 @@ func (r *accessGrantsLocationResource) Schema(ctx context.Context, request resou
  			},
  			names.AttrID:      framework.IDAttribute(),
  			names.AttrTags:    tftags.TagsAttribute(),

diff --git a/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch
@@ -83,7 +83,7 @@ index cc5317b08a..b8739c1bcb 100644
  		Blocks: map[string]schema.Block{
  			names.AttrActions: schema.SetNestedBlock{
 diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go
-index 3965c8aff9..e08db8c492 100644
+index 2a36dacdc9..56e99b5bc8 100644
 --- a/internal/service/securitylake/data_lake.go
 +++ b/internal/service/securitylake/data_lake.go
 @@ -75,7 +75,7 @@ func (r *dataLakeResource) Schema(ctx context.Context, request resource.SchemaRe

diff --git a/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch b/patches/0035-Disable-retry-for-KMS-access-denied-in-lambda.patch
@@ -52,7 +52,7 @@ index 0000000000..ffd7fa9728
 +	), nil
 +}
 diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go
-index a93ee3f2f9..1a96148501 100644
+index c70ed5f1f4..5b33cca471 100644
 --- a/internal/service/lambda/service_package_gen.go
 +++ b/internal/service/lambda/service_package_gen.go
 @@ -5,8 +5,6 @@ package lambda
@@ -64,7 +64,7 @@ index a93ee3f2f9..1a96148501 100644
  	"github.com/hashicorp/terraform-provider-aws/internal/conns"
  	"github.com/hashicorp/terraform-provider-aws/internal/types"
  	"github.com/hashicorp/terraform-provider-aws/names"
-@@ -138,16 +136,6 @@ func (p *servicePackage) ServicePackageName() string {
+@@ -144,16 +142,6 @@ func (p *servicePackage) ServicePackageName() string {
  	return names.Lambda
  }
 

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,7 +18,7 @@ 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 5b7dccb5a7..1bc9df029d 100644
+index fd25ee5bd0..f57bccf80e 100644
 --- a/internal/service/bedrockagent/agent.go
 +++ b/internal/service/bedrockagent/agent.go
 @@ -165,7 +165,7 @@ func (r *agentResource) Schema(ctx context.Context, request resource.SchemaReque
@@ -31,7 +31,7 @@ index 5b7dccb5a7..1bc9df029d 100644
  		Blocks: map[string]schema.Block{
  			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
 diff --git a/internal/service/bedrockagent/agent_alias.go b/internal/service/bedrockagent/agent_alias.go
-index 9c9bb20111..b0f767d142 100644
+index 2572b9419c..185d0ca643 100644
 --- a/internal/service/bedrockagent/agent_alias.go
 +++ b/internal/service/bedrockagent/agent_alias.go
 @@ -97,7 +97,7 @@ func (r *agentAliasResource) Schema(ctx context.Context, request resource.Schema
@@ -44,10 +44,10 @@ index 9c9bb20111..b0f767d142 100644
  		Blocks: map[string]schema.Block{
  			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
 diff --git a/internal/service/bedrockagent/knowledge_base.go b/internal/service/bedrockagent/knowledge_base.go
-index d3d128d356..b34efeb8db 100644
+index b243a08bca..3fa7be7051 100644
 --- a/internal/service/bedrockagent/knowledge_base.go
 +++ b/internal/service/bedrockagent/knowledge_base.go
-@@ -88,7 +88,7 @@ func (r *knowledgeBaseResource) Schema(ctx context.Context, request resource.Sch
+@@ -89,7 +89,7 @@ func (r *knowledgeBaseResource) Schema(ctx context.Context, request resource.Sch
  				},
  			},
  			names.AttrTags:    tftags.TagsAttribute(),

diff --git a/patches/0057-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0057-Fix-tags_all-Computed-for-PF-resources.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix tags_all Computed for PF resources
 
 
 diff --git a/internal/service/appfabric/app_authorization.go b/internal/service/appfabric/app_authorization.go
-index 6e6ba29267..1f0e418e56 100644
+index 4a13fe036e..716e2c75a6 100644
 --- a/internal/service/appfabric/app_authorization.go
 +++ b/internal/service/appfabric/app_authorization.go
 @@ -109,7 +109,7 @@ func (r *appAuthorizationResource) Schema(ctx context.Context, request resource.
@@ -18,7 +18,7 @@ index 6e6ba29267..1f0e418e56 100644
  				CustomType: timetypes.RFC3339Type{},
  				Computed:   true,
 diff --git a/internal/service/appfabric/app_bundle.go b/internal/service/appfabric/app_bundle.go
-index 0c9af1db2d..e25fca4e4e 100644
+index 3bca6523df..aae9b30c5f 100644
 --- a/internal/service/appfabric/app_bundle.go
 +++ b/internal/service/appfabric/app_bundle.go
 @@ -61,7 +61,7 @@ func (r *appBundleResource) Schema(ctx context.Context, request resource.SchemaR

diff --git a/patches/0059-Patch-tags-ComputedOnly-for-appfabric-networkmonitor.patch b/patches/0059-Patch-tags-ComputedOnly-for-appfabric-networkmonitor.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Patch tags ComputedOnly for appfabric, networkmonitor,
 
 
 diff --git a/internal/service/appfabric/ingestion.go b/internal/service/appfabric/ingestion.go
-index 5cffa7aa34..11d6d580e5 100644
+index a8c231c98b..5ab0190384 100644
 --- a/internal/service/appfabric/ingestion.go
 +++ b/internal/service/appfabric/ingestion.go
 @@ -81,7 +81,7 @@ func (r *ingestionResource) Schema(ctx context.Context, request resource.SchemaR
@@ -19,7 +19,7 @@ index 5cffa7aa34..11d6d580e5 100644
  				Required: true,
  				Validators: []validator.String{
 diff --git a/internal/service/appfabric/ingestion_destination.go b/internal/service/appfabric/ingestion_destination.go
-index d2bed80052..4633226a66 100644
+index 0bd92bba6b..6bdbed0689 100644
 --- a/internal/service/appfabric/ingestion_destination.go
 +++ b/internal/service/appfabric/ingestion_destination.go
 @@ -85,7 +85,7 @@ func (r *ingestionDestinationResource) Schema(ctx context.Context, request resou
@@ -58,7 +58,7 @@ index 83bf8577da..fba50e09bc 100644
  	}
  }
 diff --git a/internal/service/networkmonitor/probe.go b/internal/service/networkmonitor/probe.go
-index e07e500122..1cabc845d8 100644
+index 8fefba9ca3..598cca0f80 100644
 --- a/internal/service/networkmonitor/probe.go
 +++ b/internal/service/networkmonitor/probe.go
 @@ -109,7 +109,7 @@ func (r *probeResource) Schema(ctx context.Context, request resource.SchemaReque

diff --git a/patches/0065-Patch-Tags-for-bedrock-and-pinpoint.patch b/patches/0065-Patch-Tags-for-bedrock-and-pinpoint.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Patch Tags for bedrock and pinpoint
 
 
 diff --git a/internal/service/bedrock/guardrail.go b/internal/service/bedrock/guardrail.go
-index bf206322b9..d200b80002 100644
+index 04e3c61c21..e8630c6850 100644
 --- a/internal/service/bedrock/guardrail.go
 +++ b/internal/service/bedrock/guardrail.go
 @@ -119,7 +119,7 @@ func (r *resourceGuardrail) Schema(ctx context.Context, req resource.SchemaReque

diff --git a/patches/0068-Fix-tags_all-Computed-for-aws_backup_logically_air_g.patch b/patches/0068-Fix-tags_all-Computed-for-aws_backup_logically_air_g.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Florian Stadler <[email protected]>
+Date: Fri, 4 Oct 2024 09:08:32 +0200
+Subject: [PATCH] Fix tags_all Computed for
+ aws_backup_logically_air_gapped_vault
+
+
+diff --git a/internal/service/backup/logically_air_gapped_vault.go b/internal/service/backup/logically_air_gapped_vault.go
+index 56ceaef5c9..3734264073 100644
+--- a/internal/service/backup/logically_air_gapped_vault.go
++++ b/internal/service/backup/logically_air_gapped_vault.go
+@@ -87,7 +87,7 @@ func (r *logicallyAirGappedVaultResource) Schema(ctx context.Context, request re
+ 				},
+ 			},
+ 			names.AttrTags:    tftags.TagsAttribute(),
+-			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
++			names.AttrTagsAll: tftags.TagsAttribute(),
+ 		},
+ 		Blocks: map[string]schema.Block{
+ 			names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
diff --git a/provider/cmd/pulumi-resource-aws/bridge-metadata.json b/provider/cmd/pulumi-resource-aws/bridge-metadata.json
@@ -3712,6 +3712,10 @@
                 "current": "aws:backup/globalSettings:GlobalSettings",
                 "majorVersion": 6
             },
+            "aws_backup_logically_air_gapped_vault": {
+                "current": "aws:backup/logicallyAirGappedVault:LogicallyAirGappedVault",
+                "majorVersion": 6
+            },
             "aws_backup_plan": {
                 "current": "aws:backup/plan:Plan",
                 "majorVersion": 6,
@@ -4129,6 +4133,10 @@
                     }
                 }
             },
+            "aws_bedrock_guardrail_version": {
+                "current": "aws:bedrock/guardrailVersion:GuardrailVersion",
+                "majorVersion": 6
+            },
             "aws_bedrock_model_invocation_logging_configuration": {
                 "current": "aws:bedrockmodel/invocationLoggingConfiguration:InvocationLoggingConfiguration",
                 "majorVersion": 6
@@ -4277,6 +4285,40 @@
                                         }
                                     }
                                 },
+                                "custom_transformation_configuration": {
+                                    "maxItemsOne": true,
+                                    "elem": {
+                                        "fields": {
+                                            "intermediate_storage": {
+                                                "maxItemsOne": true,
+                                                "elem": {
+                                                    "fields": {
+                                                        "s3_location": {
+                                                            "maxItemsOne": true
+                                                        }
+                                                    }
+                                                }
+                                            },
+                                            "transformation": {
+                                                "maxItemsOne": true,
+                                                "elem": {
+                                                    "fields": {
+                                                        "transformation_function": {
+                                                            "maxItemsOne": true,
+                                                            "elem": {
+                                                                "fields": {
+                                                                    "transformation_lambda_configuration": {
+                                                                        "maxItemsOne": true
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
                                 "parsing_configuration": {
                                     "maxItemsOne": true,
                                     "elem": {
@@ -10570,6 +10612,14 @@
                     }
                 }
             },
+            "aws_ec2_transit_gateway_default_route_table_association": {
+                "current": "aws:ec2transitgateway/defaultRouteTableAssociation:DefaultRouteTableAssociation",
+                "majorVersion": 6
+            },
+            "aws_ec2_transit_gateway_default_route_table_propagation": {
+                "current": "aws:ec2transitgateway/defaultRouteTablePropagation:DefaultRouteTablePropagation",
+                "majorVersion": 6
+            },
             "aws_ec2_transit_gateway_multicast_domain": {
                 "current": "aws:ec2transitgateway/multicastDomain:MulticastDomain",
                 "majorVersion": 6
@@ -13827,6 +13877,15 @@
                     }
                 }
             },
+            "aws_iam_group_policies_exclusive": {
+                "current": "aws:iam/groupPoliciesExclusive:GroupPoliciesExclusive",
+                "majorVersion": 6,
+                "fields": {
+                    "policy_names": {
+                        "maxItemsOne": false
+                    }
+                }
+            },
             "aws_iam_group_policy": {
                 "current": "aws:iam/groupPolicy:GroupPolicy",
                 "majorVersion": 6
@@ -13940,6 +13999,15 @@
                 "current": "aws:iam/userLoginProfile:UserLoginProfile",
                 "majorVersion": 6
             },
+            "aws_iam_user_policies_exclusive": {
+                "current": "aws:iam/userPoliciesExclusive:UserPoliciesExclusive",
+                "majorVersion": 6,
+                "fields": {
+                    "policy_names": {
+                        "maxItemsOne": false
+                    }
+                }
+            },
             "aws_iam_user_policy": {
                 "current": "aws:iam/userPolicy:UserPolicy",
                 "majorVersion": 6
@@ -158687,6 +158755,10 @@
                     }
                 }
             },
+            "aws_securityhub_standards_control_association": {
+                "current": "aws:securityhub/standardsControlAssociation:StandardsControlAssociation",
+                "majorVersion": 6
+            },
             "aws_securityhub_standards_subscription": {
                 "current": "aws:securityhub/standardsSubscription:StandardsSubscription",
                 "majorVersion": 6
@@ -275196,6 +275268,7 @@
             "aws:autoscalingplans/scalingPlan:ScalingPlan": 0,
             "aws:backup/framework:Framework": 0,
             "aws:backup/globalSettings:GlobalSettings": 0,
+            "aws:backup/logicallyAirGappedVault:LogicallyAirGappedVault": 1,
             "aws:backup/plan:Plan": 0,
             "aws:backup/regionSettings:RegionSettings": 0,
             "aws:backup/reportPlan:ReportPlan": 0,
@@ -275217,6 +275290,7 @@
             "aws:bedrock/agentKnowledgeBase:AgentKnowledgeBase": 1,
             "aws:bedrock/customModel:CustomModel": 1,
             "aws:bedrock/guardrail:Guardrail": 1,
+            "aws:bedrock/guardrailVersion:GuardrailVersion": 1,
             "aws:bedrock/provisionedModelThroughput:ProvisionedModelThroughput": 1,
             "aws:bedrockmodel/invocationLoggingConfiguration:InvocationLoggingConfiguration": 1,
             "aws:budgets/budget:Budget": 0,
@@ -275586,6 +275660,8 @@
             "aws:ec2clientvpn/route:Route": 0,
             "aws:ec2transitgateway/connect:Connect": 0,
             "aws:ec2transitgateway/connectPeer:ConnectPeer": 0,
+            "aws:ec2transitgateway/defaultRouteTableAssociation:DefaultRouteTableAssociation": 1,
+            "aws:ec2transitgateway/defaultRouteTablePropagation:DefaultRouteTablePropagation": 1,
             "aws:ec2transitgateway/instanceConnectEndpoint:InstanceConnectEndpoint": 1,
             "aws:ec2transitgateway/instanceState:InstanceState": 0,
             "aws:ec2transitgateway/multicastDomain:MulticastDomain": 0,
@@ -275762,6 +275838,7 @@
             "aws:iam/accountPasswordPolicy:AccountPasswordPolicy": 0,
             "aws:iam/group:Group": 0,
             "aws:iam/groupMembership:GroupMembership": 0,
+            "aws:iam/groupPoliciesExclusive:GroupPoliciesExclusive": 1,
             "aws:iam/groupPolicy:GroupPolicy": 0,
             "aws:iam/groupPolicyAttachment:GroupPolicyAttachment": 0,
             "aws:iam/instanceProfile:InstanceProfile": 0,
@@ -275782,6 +275859,7 @@
             "aws:iam/user:User": 0,
             "aws:iam/userGroupMembership:UserGroupMembership": 0,
             "aws:iam/userLoginProfile:UserLoginProfile": 0,
+            "aws:iam/userPoliciesExclusive:UserPoliciesExclusive": 1,
             "aws:iam/userPolicy:UserPolicy": 0,
             "aws:iam/userPolicyAttachment:UserPolicyAttachment": 0,
             "aws:iam/virtualMfaDevice:VirtualMfaDevice": 0,
@@ -276276,6 +276354,7 @@
             "aws:securityhub/organizationConfiguration:OrganizationConfiguration": 0,
             "aws:securityhub/productSubscription:ProductSubscription": 0,
             "aws:securityhub/standardsControl:StandardsControl": 0,
+            "aws:securityhub/standardsControlAssociation:StandardsControlAssociation": 1,
             "aws:securityhub/standardsSubscription:StandardsSubscription": 0,
             "aws:securitylake/awsLogSource:AwsLogSource": 1,
             "aws:securitylake/customLogSource:CustomLogSource": 1,

diff --git a/provider/cmd/pulumi-resource-aws/runtime-bridge-metadata.json b/provider/cmd/pulumi-resource-aws/runtime-bridge-metadata.json