Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream v5.71.0 #4638

Merged
merged 8 commits into from
Oct 15, 2024
Merged

Upstream v5.71.0 #4638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ce8ef3
Update patches for v5.71.0
t0yv0 Oct 14, 2024
337c16c
Move upstream to v5.71.0
t0yv0 Oct 14, 2024
290ef57
./scripts/tidy-all.sh
t0yv0 Oct 14, 2024
c89e3e0
Rebuild schema.json
t0yv0 Oct 14, 2024
e933a66
Specify ComputeID for new PF resources
t0yv0 Oct 14, 2024
f14cfc9
make tfgen
t0yv0 Oct 14, 2024
ff2d5ad
make build_sdks
t0yv0 Oct 14, 2024
f058f20
PR review
t0yv0 Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
528 changes: 264 additions & 264 deletions examples/go.mod
View file
Open in desktop

Large diffs are not rendered by default.

1,052 changes: 526 additions & 526 deletions examples/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions patches/0001-Add-TagsSchemaTrulyComputed-definition.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Subject: [PATCH] Add TagsSchemaTrulyComputed definition


diff --git a/internal/tags/tags.go b/internal/tags/tags.go
index 12d3b9013e..bc9e14fc19 100644
index 40c06bb057..247a01bba3 100644
--- a/internal/tags/tags.go
+++ b/internal/tags/tags.go
@@ -33,3 +33,11 @@ func TagsSchemaForceNew() *schema.Schema {
@@ -37,3 +37,11 @@ var TagsSchemaForceNew = sync.OnceValue(func() *schema.Schema {
Elem: &schema.Schema{Type: schema.TypeString},
}
}
})
+
+func TagsSchemaTrulyComputed() *schema.Schema {
+ return &schema.Schema{
Expand Down
6 changes: 3 additions & 3 deletions patches/0002-Add-S3-legacy-bucket-to-resources.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ scheme for registration: see
https://github.com/hashicorp/terraform-provider-aws/pull/29717.

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 3c84cda7e1..abb89bb34d 100644
index 8a5fa03dd4..99e1155a67 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -13,6 +13,8 @@ import (
@@ -14,6 +14,8 @@ import (

"github.com/YakDriver/regexache"
"github.com/aws/aws-sdk-go-v2/aws"
Expand All @@ -26,7 +26,7 @@ index 3c84cda7e1..abb89bb34d 100644
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
awsbase "github.com/hashicorp/aws-sdk-go-base/v2"
"github.com/hashicorp/go-cty/cty"
@@ -258,7 +260,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -261,7 +263,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
// should use the @SDKDataSource and @SDKResource function-level annotations
// rather than adding directly to these maps.
DataSourcesMap: make(map[string]*schema.Resource),
Expand Down
6 changes: 3 additions & 3 deletions patches/0009-Add-ECR-credentials_data_source.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Add ECR credentials_data_source


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index abb89bb34d..7e0afbe60d 100644
index 99e1155a67..c540155d05 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -13,6 +13,8 @@ import (
@@ -14,6 +14,8 @@ import (

"github.com/YakDriver/regexache"
"github.com/aws/aws-sdk-go-v2/aws"
Expand All @@ -17,7 +17,7 @@ index abb89bb34d..7e0afbe60d 100644
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"

"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -259,7 +261,10 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -262,7 +264,10 @@ func New(ctx context.Context) (*schema.Provider, error) {
// Data sources and resources implemented using Terraform Plugin SDK
// should use the @SDKDataSource and @SDKResource function-level annotations
// rather than adding directly to these maps.
Expand Down
4 changes: 2 additions & 2 deletions patches/0012-Revert-WAF-schema-changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Revert WAF schema changes
- This causes far too many types to be generated downstream.

diff --git a/internal/service/wafv2/schemas.go b/internal/service/wafv2/schemas.go
index ccff60eff7..b1385a1646 100644
index 8ac8b8d534..65f810be49 100644
--- a/internal/service/wafv2/schemas.go
+++ b/internal/service/wafv2/schemas.go
@@ -54,14 +54,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {
@@ -56,14 +56,14 @@ func ruleGroupRootStatementSchema(level int) *schema.Schema {
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down
6 changes: 3 additions & 3 deletions patches/0014-add-matchmaking-configuration-72.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ Subject: [PATCH] add matchmaking configuration (#72)
* add resource docs

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 7e0afbe60d..46be10bc97 100644
index c540155d05..44ff399e2b 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -15,6 +15,7 @@ import (
@@ -16,6 +16,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws"

"github.com/hashicorp/terraform-provider-aws/internal/service/ecr"
+ "github.com/hashicorp/terraform-provider-aws/internal/service/gamelift"
"github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"

"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
@@ -267,6 +268,9 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -270,6 +271,9 @@ func New(ctx context.Context) (*schema.Provider, error) {

ResourcesMap: map[string]*schema.Resource{
"aws_s3_bucket_legacy": s3legacy.ResourceBucketLegacy(),
Expand Down
4 changes: 2 additions & 2 deletions patches/0016-Revert-Update-endpointHashIPAddress.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ This commit causes never-converging diffs due to incorrect use of
a computed property in hashing.

diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go
index 8bbcf1a699..a36639de0a 100644
index f9ecbc7cc8..842ebac62c 100644
--- a/internal/service/route53resolver/endpoint.go
+++ b/internal/service/route53resolver/endpoint.go
@@ -433,7 +433,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Client, id s
@@ -439,7 +439,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Client, id s
func endpointHashIPAddress(v interface{}) int {
var buf bytes.Buffer
m := v.(map[string]interface{})
Expand Down
6 changes: 3 additions & 3 deletions patches/0030-Optimize-startup-performance.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Optimize startup performance


diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index 46be10bc97..e49e7ea69d 100644
index 44ff399e2b..4221a35f24 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -314,7 +314,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -317,7 +317,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
interceptors := interceptorItems{}

if v.Tags != nil {
Expand All @@ -17,7 +17,7 @@ index 46be10bc97..e49e7ea69d 100644

// The data source has opted in to transparent tagging.
// Ensure that the schema look OK.
@@ -390,7 +390,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -393,7 +393,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
interceptors := interceptorItems{}

if v.Tags != nil {
Expand Down
20 changes: 10 additions & 10 deletions patches/0034-Fix-tags_all-Computed-for-PF-resources.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ index b6d8c71ef7..f78c4502b0 100644
Blocks: map[string]schema.Block{
names.AttrDestination: schema.ListNestedBlock{
diff --git a/internal/service/bedrock/custom_model.go b/internal/service/bedrock/custom_model.go
index e0606306fd..61981ae7fb 100644
index daba31c85d..8ce47d7720 100644
--- a/internal/service/bedrock/custom_model.go
+++ b/internal/service/bedrock/custom_model.go
@@ -137,7 +137,7 @@ func (r *customModelResource) Schema(ctx context.Context, request resource.Schem
@@ -136,7 +136,7 @@ func (r *customModelResource) Schema(ctx context.Context, request resource.Schem
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
"training_metrics": schema.ListAttribute{
CustomType: fwtypes.NewListNestedObjectTypeOf[customModelTrainingMetricsModel](ctx),
Computed: true,
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Patch conflict here. I think simply the surrounding code changed upstream, so all this does is makes sure the patch still cleanly applies, while the real edits are removing ComputedOnly.

"training_metrics": framework.ResourceComputedListOfObjectAttribute[trainingMetricsModel](ctx),
"validation_metrics": framework.ResourceComputedListOfObjectAttribute[validatorMetricModel](ctx),
},
diff --git a/internal/service/codeguruprofiler/profiling_group.go b/internal/service/codeguruprofiler/profiling_group.go
index 6e8d8de302..af48127242 100644
--- a/internal/service/codeguruprofiler/profiling_group.go
Expand Down Expand Up @@ -70,10 +70,10 @@ index a9bb3bb327..9f68386f3a 100644
}

diff --git a/internal/service/securityhub/automation_rule.go b/internal/service/securityhub/automation_rule.go
index cc5317b08a..b8739c1bcb 100644
index 979de8b5bd..4c1f5dc706 100644
--- a/internal/service/securityhub/automation_rule.go
+++ b/internal/service/securityhub/automation_rule.go
@@ -75,7 +75,7 @@ func (r *automationRuleResource) Schema(ctx context.Context, request resource.Sc
@@ -78,7 +78,7 @@ func (r *automationRuleResource) Schema(ctx context.Context, request resource.Sc
},
},
names.AttrTags: tftags.TagsAttribute(),
Expand Down
8 changes: 4 additions & 4 deletions patches/0037-Restore-legacy-bucket.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ index c98bc7fc2f..b9d46d6765 100644
config := client.S3Conn(ctx).Config
config.DisableRestProtocolURICleaning = aws_sdkv2.Bool(true)
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index e49e7ea69d..33d7ccbc3c 100644
index 4221a35f24..af988348da 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -16,7 +16,6 @@ import (
@@ -17,7 +17,6 @@ import (

"github.com/hashicorp/terraform-provider-aws/internal/service/ecr"
"github.com/hashicorp/terraform-provider-aws/internal/service/gamelift"
- "github.com/hashicorp/terraform-provider-aws/internal/service/s3legacy"

"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
awsbase "github.com/hashicorp/aws-sdk-go-base/v2"
@@ -267,8 +266,6 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -270,8 +269,6 @@ func New(ctx context.Context) (*schema.Provider, error) {
},

ResourcesMap: map[string]*schema.Resource{
Expand All @@ -40,7 +40,7 @@ index e49e7ea69d..33d7ccbc3c 100644
"aws_gamelift_matchmaking_configuration": gamelift.ResourceMatchMakingConfiguration(),
"aws_gamelift_matchmaking_rule_set": gamelift.ResourceMatchmakingRuleSet(),
},
@@ -281,7 +278,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
@@ -284,7 +281,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
var errs []error
servicePackageMap := make(map[string]conns.ServicePackage)

Expand Down
6 changes: 3 additions & 3 deletions patches/0044-restore-ECRConn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ Subject: [PATCH] restore ECRConn


diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
index 39875b62dd..a3ff9982dc 100644
index cfbc51180e..2a8249e7d4 100644
--- a/internal/conns/awsclient_gen.go
+++ b/internal/conns/awsclient_gen.go
@@ -245,6 +245,7 @@ import (
@@ -246,6 +246,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"
@@ -587,6 +588,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
@@ -588,6 +589,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)))
}

Expand Down
2 changes: 1 addition & 1 deletion patches/0064-Adapt-gamelift-matchmaking-resources.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ index 4295987ae6..377b46816e 100644
return nil
}
diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl
index e7e59f53e7..e24138d8b1 100644
index e4ba54d340..d89f5e9878 100644
--- a/names/data/names_data.hcl
+++ b/names/data/names_data.hcl
@@ -3884,7 +3884,8 @@ service "fsx" {
Expand Down
2 changes: 1 addition & 1 deletion patches/0068-Fix-tags_all-Computed-for-aws_backup_logically_air_g.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Fix tags_all Computed for


diff --git a/internal/service/backup/logically_air_gapped_vault.go b/internal/service/backup/logically_air_gapped_vault.go
index 56ceaef5c9..3734264073 100644
index dc37ee2449..ba1e94c6d6 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
Expand Down
58 changes: 58 additions & 0 deletions patches/0069-Patch-ComputedOnly-for-route53profiles-and-more.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anton Tayanovskyy <[email protected]>
Date: Mon, 14 Oct 2024 15:15:47 -0400
Subject: [PATCH] Patch ComputedOnly for route53profiles and more


diff --git a/internal/service/backup/restore_testing_plan.go b/internal/service/backup/restore_testing_plan.go
index b324c80f36..b5e2bf8337 100644
--- a/internal/service/backup/restore_testing_plan.go
+++ b/internal/service/backup/restore_testing_plan.go
@@ -88,7 +88,7 @@ func (r *restoreTestingPlanResource) Schema(ctx context.Context, request resourc
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
Blocks: map[string]schema.Block{
"recovery_point_selection": schema.ListNestedBlock{
diff --git a/internal/service/pinpointsmsvoicev2/configuration_set.go b/internal/service/pinpointsmsvoicev2/configuration_set.go
index b4bd9f9d39..61334ec528 100644
--- a/internal/service/pinpointsmsvoicev2/configuration_set.go
+++ b/internal/service/pinpointsmsvoicev2/configuration_set.go
@@ -75,7 +75,7 @@ func (r *configurationSetResource) Schema(ctx context.Context, request resource.
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
}
}
diff --git a/internal/service/route53profiles/association.go b/internal/service/route53profiles/association.go
index bb460f3268..9dc39c6e3f 100644
--- a/internal/service/route53profiles/association.go
+++ b/internal/service/route53profiles/association.go
@@ -102,7 +102,7 @@ func (r *resourceAssociation) Schema(ctx context.Context, req resource.SchemaReq
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More edits.

+ names.AttrTagsAll: tftags.TagsAttribute(),
},
Blocks: map[string]schema.Block{
names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
diff --git a/internal/service/route53profiles/profile.go b/internal/service/route53profiles/profile.go
index b65485fd1b..529f1589f8 100644
--- a/internal/service/route53profiles/profile.go
+++ b/internal/service/route53profiles/profile.go
@@ -94,7 +94,7 @@ func (r *resourceProfile) Schema(ctx context.Context, req resource.SchemaRequest
},
},
names.AttrTags: tftags.TagsAttribute(),
- names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
+ names.AttrTagsAll: tftags.TagsAttribute(),
},
Blocks: map[string]schema.Block{
names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{
Loading
Loading