upstream v5.55.0 #4102
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,10 +6,10 @@ Subject: [PATCH] Disable retry for KMS access denied in lambda | |
|
|
||
| diff --git a/internal/service/lambda/service_package_extra.go b/internal/service/lambda/service_package_extra.go | ||
| new file mode 100644 | ||
| index 0000000000..ffd7fa9728 | ||
| --- /dev/null | ||
| +++ b/internal/service/lambda/service_package_extra.go | ||
| @@ -0,0 +1,41 @@ | ||
| +package lambda | ||
| + | ||
| +import ( | ||
|
|
@@ -19,7 +19,6 @@ index 0000000000..4625f9e31c | |
| + retry_sdkv2 "github.com/aws/aws-sdk-go-v2/aws/retry" | ||
| + lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda" | ||
| + tfawserr_sdkv2 "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" | ||
| + "github.com/hashicorp/terraform-provider-aws/internal/conns" | ||
| + "github.com/hashicorp/terraform-provider-aws/names" | ||
| +) | ||
|
|
@@ -43,71 +42,42 @@ index 0000000000..4625f9e31c | |
| + } | ||
| + return aws_sdkv2.UnknownTernary // Delegate | ||
| + }) | ||
| + | ||
| + return lambda_sdkv2.NewFromConfig(cfg, | ||
|
There was a problem hiding this comment. There's multiple similar changes to patches in this PR. |
||
| + lambda_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), | ||
| + withBaseEndpoint(config[names.AttrEndpoint].(string)), | ||
| + func(o *lambda_sdkv2.Options) { | ||
| + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws_sdkv2.RetryerV2), retry) | ||
| + }, | ||
| + ), nil | ||
| +} | ||
| diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go | ||
| index 95c6c04302..1ebeaf2126 100644 | ||
| --- a/internal/service/lambda/service_package_gen.go | ||
| +++ b/internal/service/lambda/service_package_gen.go | ||
| @@ -5,8 +5,6 @@ package lambda | ||
| import ( | ||
| "context" | ||
|
|
||
| - aws_sdkv2 "github.com/aws/aws-sdk-go-v2/aws" | ||
| - lambda_sdkv2 "github.com/aws/aws-sdk-go-v2/service/lambda" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/conns" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/types" | ||
| "github.com/hashicorp/terraform-provider-aws/names" | ||
| @@ -134,16 +132,6 @@ func (p *servicePackage) ServicePackageName() string { | ||
| return names.Lambda | ||
| } | ||
|
|
||
| -// NewClient returns a new AWS SDK for Go v2 client for this service package's AWS API. | ||
| -func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*lambda_sdkv2.Client, error) { | ||
| - cfg := *(config["aws_sdkv2_config"].(*aws_sdkv2.Config)) | ||
| - | ||
| - return lambda_sdkv2.NewFromConfig(cfg, | ||
| - lambda_sdkv2.WithEndpointResolverV2(newEndpointResolverSDKv2()), | ||
| - withBaseEndpoint(config[names.AttrEndpoint].(string)), | ||
| - ), nil | ||
| -} | ||
| - | ||
| func ServicePackage(ctx context.Context) conns.ServicePackage { | ||
| return &servicePackage{} | ||
| } | ||
|
There was a problem hiding this comment. Wish GitHub knew how to display CSV diffs properly.. This is terrible. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Florian Stadler <[email protected]> | ||
| Date: Mon, 24 Jun 2024 12:21:45 +0200 | ||
| Subject: [PATCH] Fix tags_all Computed for PF resources | ||
|
|
||
|
|
||
| diff --git a/internal/service/drs/replication_configuration_template.go b/internal/service/drs/replication_configuration_template.go | ||
| index 500e1a1947..3691471e73 100644 | ||
| --- a/internal/service/drs/replication_configuration_template.go | ||
| +++ b/internal/service/drs/replication_configuration_template.go | ||
| @@ -100,7 +100,7 @@ func (r *replicationConfigurationTemplateResource) Schema(ctx context.Context, r | ||
|
|
||
| "staging_area_tags": tftags.TagsAttribute(), | ||
| names.AttrTags: tftags.TagsAttribute(), | ||
| - names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), | ||
| + names.AttrTagsAll: tftags.TagsAttribute(), | ||
|
|
||
| "use_dedicated_replication_server": schema.BoolAttribute{ | ||
| Required: true, |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A bit tedious but we could move this from a patch some Go code running on provider init. Fewer patches, less busywork.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have a ticket for this already?