jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-19 17:59:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

encryption/keyprovider/aws_kms: Use APNInfo instead of UserAgent

Browse Source
This commit is contained in:
ian
2025-10-18 03:08:51 +08:00
committed by GitHub
parent 943c54079a
commit b7bcc13ea5
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -74,6 +74,7 @@ ENHANCEMENTS:
BUG FIXES:
* The `s3` state storage backend now correctly sends the `x-amz-server-side-encryption` header when working with S3 objects representing state locks. ([#2970](https://github.com/opentofu/opentofu/issues/2970))
* The `aws_kms` key provider for state and plan encryption no longer returns a confusing error when the `TF_APPEND_USER_AGENT` environment variable is set. ([#3390](https://github.com/opentofu/opentofu/pull/3390))
* The `issensitive` function now returns an unknown result when its argument is unknown, because a sensitive unknown value can potentially become non-sensitive once more information is available. ([#3008](https://github.com/opentofu/opentofu/pull/3008))
* Provider references like `null.some_alias[each.key]` in `.tf.json` files are now accepted in the same way as in native syntax files. ([#2915](https://github.com/opentofu/opentofu/issues/2915))
* Fixed "slice bounds out of range" crash when processing multiple deprecated values inside a complex object. ([#3105](https://github.com/opentofu/opentofu/pull/3105))

8
internal/encryption/keyprovider/aws_kms/config.go
View File

@@ -160,9 +160,11 @@ func (c Config) asAWSBase() (*awsbase.Config, error) {
Insecure: c.Insecure,
UseDualStackEndpoint: c.UseDualStackEndpoint,
UseFIPSEndpoint: c.UseFIPSEndpoint,
UserAgent: awsbase.UserAgentProducts{
{Name: "APN", Version: "1.0"},
{Name: httpclient.DefaultApplicationName, Version: version.String()},
APNInfo: &awsbase.APNInfo{
PartnerName: "OpenTofu-AWS-KMS",
Products: []awsbase.UserAgentProduct{
{Name: httpclient.DefaultApplicationName, Version: version.String()},
},
},
CustomCABundle: stringAttrEnvFallback(c.CustomCABundle, "AWS_CA_BUNDLE"),

17
internal/encryption/keyprovider/aws_kms/config_test.go
View File

@@ -40,9 +40,11 @@ func TestConfig_asAWSBase(t *testing.T) {
CallerDocumentationURL: "https://opentofu.org/docs/language/settings/backends/s3",
CallerName: "KMS Key Provider",
MaxRetries: 5,
UserAgent: awsbase.UserAgentProducts{
{Name: "APN", Version: "1.0"},
{Name: httpclient.DefaultApplicationName, Version: version.String()},
APNInfo: &awsbase.APNInfo{
PartnerName: "OpenTofu-AWS-KMS",
Products: []awsbase.UserAgentProduct{
{Name: httpclient.DefaultApplicationName, Version: version.String()},
},
},
},
},
@@ -105,11 +107,12 @@ func TestConfig_asAWSBase(t *testing.T) {
expected: awsbase.Config{
CallerDocumentationURL: "https://opentofu.org/docs/language/settings/backends/s3",
CallerName: "KMS Key Provider",
UserAgent: awsbase.UserAgentProducts{
{Name: "APN", Version: "1.0"},
{Name: httpclient.DefaultApplicationName, Version: version.String()},
APNInfo: &awsbase.APNInfo{
PartnerName: "OpenTofu-AWS-KMS",
Products: []awsbase.UserAgentProduct{
{Name: httpclient.DefaultApplicationName, Version: version.String()},
},
},
AccessKey: "my-access-key",
IamEndpoint: "https://endpoint-iam",
MaxRetries: 42,