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.

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

chore: Update from hashicorp/terraform-provider-aws (v5.78.0) #325

Merged
merged 151 commits into from
Nov 27, 2024
Merged
Changes from 12 commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
eb95c0a
Ensure required values are set when changing `storage_type`.
fatmcgav Jan 12, 2023
720451d
Fix RDS instance bug where switching to IO2 needs the allocated stora…
nhenjes May 3, 2024
4641aba
Add tests that switch from GP3 to IO2
nhenjes May 17, 2024
2ca05fd
Fix merge issues
nhenjes May 17, 2024
b76c2ad
initial commit
alexbacchin Nov 17, 2024
aaea0ba
fixed update, documentation and changelog
alexbacchin Nov 18, 2024
9458f63
fixed website terraform fmt
alexbacchin Nov 18, 2024
73669da
consmetic
alexbacchin Nov 18, 2024
03fa768
:bug: EKS and ECS Properties causes nil pointer
danquack Nov 18, 2024
e4f047f
:broom: linting
danquack Nov 18, 2024
bc5a3d8
:broom: remove unused functions
danquack Nov 18, 2024
d8b0e7c
added additional validation and tests
alexbacchin Nov 19, 2024
74e0c2a
:broom: remove single line
danquack Nov 19, 2024
e1e41ea
Add Valkey engine support for memorydb resources
sasidhar-aws Oct 30, 2024
4b2b619
added changelog
sasidhar-aws Oct 30, 2024
13f2aed
updated engine version as mandatory parameter
sasidhar-aws Oct 31, 2024
53ab794
updated memorydb_cluster documentation
sasidhar-aws Oct 31, 2024
6ade930
remove outdated test constants
atkretsch Nov 20, 2024
cd1011c
rename changelog entry to match new PR
atkretsch Nov 20, 2024
0b3eada
fix tests that were missing engine_version attribute
atkretsch Nov 21, 2024
c749eb2
Update CHANGELOG.md after v5.77.0
Nov 21, 2024
71da666
docs: add missing transformation block (#40218)
stefanfreitag Nov 21, 2024
0782551
Build with go1.23.3.
ewbankkit Nov 21, 2024
d319a6e
fix: update documentation for AWS ALB health check paths
RoseSecurity Nov 21, 2024
abe0d63
Merge pull request #40247 from hashicorp/td-go1.23.3
ewbankkit Nov 21, 2024
8426cdc
Ignore unknown order argument on import
YakDriver Nov 21, 2024
917e11e
r/chatbot: Fix SNS topic ARNs ordering in Slack channel configuration
max-ts0gt Nov 22, 2024
3e08f19
fix ignored skip_requesting_account_id argument
kilmajster Nov 22, 2024
2815774
dependabot: Remove '/tools/awssdkpatch'.
ewbankkit Nov 22, 2024
35deeb7
Bump the aws-sdk-go-v2 group across 1 directory with 20 updates
dependabot[bot] Nov 22, 2024
9243181
.github/workflows: fix formatting in `post_publish` shell script (#40…
jar-b Nov 22, 2024
516973e
Merge pull request #40262 from hashicorp/td-fix-dependabot-.ci/tools/…
ewbankkit Nov 22, 2024
26af539
Bump github.com/hashicorp/terraform-plugin-sdk/v2 in /.ci/providerlint
dependabot[bot] Nov 22, 2024
5492e42
Bump codelytv/pr-size-labeler from 1.10.1 to 1.10.2 (#40254)
dependabot[bot] Nov 22, 2024
d968d47
Merge pull request #40263 from hashicorp/dependabot/go_modules/aws-sd…
ewbankkit Nov 22, 2024
4dc9750
Merge pull request #40266 from hashicorp/dependabot/go_modules/dot-ci…
ewbankkit Nov 22, 2024
0594c2a
Merge pull request #40172 from danquack/38605/nil-bug
YakDriver Nov 22, 2024
fd24ef8
Merge branch 'main' into update-grpc-alb-health-endpoint-docs
jar-b Nov 22, 2024
90584cb
chore: revert cdktf documentation changes
jar-b Nov 22, 2024
56e2b26
Merge pull request #40248 from RoseSecurity/update-grpc-alb-health-en…
jar-b Nov 22, 2024
c576750
Merge remote-tracking branch 'origin/main' into b-aws_rds_instance-st…
YakDriver Nov 22, 2024
e2f9749
Update caps
YakDriver Nov 22, 2024
2d557a8
Merge pull request #37257 from nhenjes/b-aws_rds_instance-storage-cha…
YakDriver Nov 22, 2024
305ee69
r/aws_s3_bucket_lifecycle_configuration: S3 directory buckets are now…
jar-b Nov 22, 2024
6a4b5ba
Update CHANGELOG.md for #40268
Nov 22, 2024
d128c4e
aws_chatbot_slack_channel_configuration: use flex HasChanges()
johnsonaj Nov 22, 2024
cac3107
aws_chatbot_slack_channel_configuration: use flex custom types
johnsonaj Nov 22, 2024
205bb54
chore: cleanup unused functions
johnsonaj Nov 22, 2024
a2a768b
add CHANGELOG entry
johnsonaj Nov 22, 2024
8f7c8a3
Merge branch 'main' into b-chatbot-sns-sort-fix
johnsonaj Nov 22, 2024
aa87459
chore: semgrep fix
johnsonaj Nov 22, 2024
7a50b4d
Merge pull request #40253 from max-ts0gt/b-chatbot-sns-sort-fix
johnsonaj Nov 22, 2024
d7fbcb5
Merge branch 'main' into HEAD
ewbankkit Nov 22, 2024
8d4edab
Merge main
YakDriver Nov 22, 2024
a53860e
Add CHANGELOG entry.
ewbankkit Nov 22, 2024
597e802
Fixes after merge, sdkv2
YakDriver Nov 22, 2024
d9491e3
Update tests after merge, new ways
YakDriver Nov 22, 2024
d244ae5
Merge pull request #40264 from kilmajster/main
ewbankkit Nov 22, 2024
0aa73d9
Add changelog
YakDriver Nov 22, 2024
fd9e4bb
Add retroactive changelog
YakDriver Nov 22, 2024
6d466f5
Fix misplacing of logic during merge
YakDriver Nov 22, 2024
af22811
Clean up tests after merge
YakDriver Nov 22, 2024
b3fb095
Remove git merge artifact
YakDriver Nov 22, 2024
a223c87
Fix merge artifact
YakDriver Nov 22, 2024
c312e22
Remove unused
YakDriver Nov 22, 2024
6286921
Merge branch 'main' into HEAD
ewbankkit Nov 22, 2024
2d10619
Fix naming
YakDriver Nov 22, 2024
fd06d1b
Tweak CHANGELOG entries.
ewbankkit Nov 22, 2024
8b74b46
d/aws_memorydb_snapshot: Add `cluster_configuration.engine` attribute.
ewbankkit Nov 22, 2024
5548271
Corrections for MemoryDB.
ewbankkit Nov 22, 2024
32732aa
Run 'make gen'.
ewbankkit Nov 22, 2024
8348019
MySQL/Postgres don't support allocated storage was trying
YakDriver Nov 22, 2024
ae1e8c1
Correct error message.
ewbankkit Nov 22, 2024
044de05
Correct documentation subcategory for MemoryDB.
ewbankkit Nov 22, 2024
b41c78c
r/aws_memorydb_cluster: 'engine' is Optional+Computed.
ewbankkit Nov 22, 2024
924ed26
Add Lambda Node.js 22 CHANGELOG entries.
ewbankkit Nov 22, 2024
46d04b6
Add Lambda Python 3.13 CHANGELOG entries.
ewbankkit Nov 22, 2024
a1dd597
Correct PR number.
ewbankkit Nov 22, 2024
55d48f3
rds/instance: Test correct updating of cert
YakDriver Nov 22, 2024
5f260ec
Merge pull request #40277 from hashicorp/f-aws_lambda_function-new-ru…
ewbankkit Nov 22, 2024
998cfca
Update CHANGELOG.md for #40277
Nov 22, 2024
005ca9d
memorydb: Reduce visibility of enums.
ewbankkit Nov 22, 2024
95e2ed1
Update .changelog/28847.txt
YakDriver Nov 22, 2024
85a8e92
Update .changelog/37257.txt
YakDriver Nov 22, 2024
1e8dbbc
Remove hardcoded cert
YakDriver Nov 22, 2024
042a38f
Merge pull request #28847 from fatmcgav/fix_28589
YakDriver Nov 22, 2024
967d545
Merge pull request #40278 from hashicorp/f-certs-rds-oh-my
YakDriver Nov 22, 2024
c9febc4
Update CHANGELOG.md for #40278
Nov 22, 2024
2c1ab3a
Update dependencies
YakDriver Nov 22, 2024
63bd3f6
Update AWS
YakDriver Nov 22, 2024
6e59e35
Update tools
YakDriver Nov 22, 2024
686686a
Fix aws_rds_reserved_instance_offering data source
YakDriver Nov 22, 2024
d216cee
Add changelog
YakDriver Nov 22, 2024
6458461
Rework tests for existing instances, postgresql
YakDriver Nov 22, 2024
5027bf3
Whitespace
YakDriver Nov 22, 2024
9e2c746
Add code comment
YakDriver Nov 22, 2024
dfe6aaf
Merge pull request #40280 from hashicorp/go-update-deps
YakDriver Nov 24, 2024
9d4a0d2
Merge pull request #40281 from hashicorp/b-rds-reserved-instance-offe…
YakDriver Nov 24, 2024
44e7d85
Update CHANGELOG.md for #40281
Nov 24, 2024
d5ac874
r/aws_memorydb_acl: Standardize.
ewbankkit Nov 24, 2024
fd2dc10
d/aws_memorydb_acl: Transparent tagging.
ewbankkit Nov 24, 2024
b8722a1
r/aws_memorydb_cluster: Standardize.
ewbankkit Nov 24, 2024
ac56917
d/aws_memorydb_cluster: Transparent tagging.
ewbankkit Nov 24, 2024
96df325
r/aws_memorydb_parameter_group: Standardize.
ewbankkit Nov 24, 2024
252f9ac
d/aws_memorydb_parameter_group: Transparent tagging.
ewbankkit Nov 24, 2024
ee7aed2
r/aws_memorydb_snapshot: Standardize.
ewbankkit Nov 24, 2024
f232fff
d/aws_memorydb_snapshot: Transparent tagging.
ewbankkit Nov 24, 2024
9b73acb
cdktf: update index.html.markdown,r/xray_sampling_rule.html.markdown,…
team-tf-cdk Nov 25, 2024
8d562f7
Merge pull request #40287 from hashicorp/d-cdktf-docs-12000826733-124
ewbankkit Nov 25, 2024
fd1e477
r/aws_memorydb_subnet_group: Standardize.
ewbankkit Nov 25, 2024
eead82a
d/aws_memorydb_subnet_group: Transparent tagging.
ewbankkit Nov 25, 2024
70676c7
aws_chatbot_teams_channel_configuration: use autoflex HasChanges
johnsonaj Nov 25, 2024
bf8b07b
aws_chatbot_teams_channel_configuration: use autoflex custom types
johnsonaj Nov 25, 2024
e68690d
aws_chatbot_teams_channel_configuration: use setTagsOut
johnsonaj Nov 25, 2024
c0c11a0
aws_chatbot_slack_channel_configuration: use setTagsOut
johnsonaj Nov 25, 2024
b0c3624
add CHANGELOG entry
johnsonaj Nov 25, 2024
81f1e20
r/aws_memorydb_user: Standardize.
ewbankkit Nov 25, 2024
41e948a
d/aws_memorydb_user: Transparent tagging.
ewbankkit Nov 25, 2024
1a3875c
Fix golangci-lint 'unparam'.
ewbankkit Nov 25, 2024
d6b5fcc
Fix golangci-lint 'staticcheck'.
ewbankkit Nov 25, 2024
f719192
Fix tfproviderdocs errors.
ewbankkit Nov 25, 2024
58faeb7
Merge branch 'main' into HEAD
ewbankkit Nov 25, 2024
e771346
Merge commit 'f719192ee7' into HEAD
ewbankkit Nov 25, 2024
788e669
Merge pull request #40291 from hashicorp/f-chatbot_teams_configuration
johnsonaj Nov 25, 2024
0c9edd4
Update CHANGELOG.md for #40291
Nov 25, 2024
6354ec3
Fix 'TestParameterChanges'.
ewbankkit Nov 25, 2024
563bed5
Merge branch 'main' into HEAD
ewbankkit Nov 25, 2024
4242909
'aws_iam_organization_features' -> 'aws_iam_organizations_features'.
ewbankkit Nov 25, 2024
0958acf
'PreCheckOrganizationsTrustedServicePrincipalAccess' -> 'PreCheckOrga…
ewbankkit Nov 25, 2024
de609fb
r/aws_iam_organizations_features: Tidy up.
ewbankkit Nov 25, 2024
13d37a4
Fix typos.
ewbankkit Nov 25, 2024
39d10af
Converts `content_policy_config.filters_config` to Set
gdavison Nov 26, 2024
cb010e3
Bump github.com/golangci/golangci-lint in /.ci/tools
dependabot[bot] Nov 26, 2024
5b0aa50
Bump the aws-sdk-go-v2 group across 1 directory with 4 updates
dependabot[bot] Nov 26, 2024
45d53e2
Bump github.com/ProtonMail/go-crypto from 1.1.2 to 1.1.3
dependabot[bot] Nov 26, 2024
3633582
Fix 'TestAccMemoryDBCluster_Update_securityGroupIds'.
ewbankkit Nov 26, 2024
1d07a94
Remove 'testAccOrganizationsFeatures_disappears'.
ewbankkit Nov 26, 2024
6e736e5
Merge pull request #40306 from hashicorp/dependabot/go_modules/dot-ci…
ewbankkit Nov 26, 2024
4446c54
Merge pull request #40308 from hashicorp/dependabot/go_modules/github…
ewbankkit Nov 26, 2024
eb6f0cb
Fix golangci-lint 'func `manageOrganizationFeatures` is unused (unuse…
ewbankkit Nov 26, 2024
bb13c9c
Merge branch 'main' into HEAD
ewbankkit Nov 26, 2024
56807ca
Merge pull request #40307 from hashicorp/dependabot/go_modules/aws-sd…
ewbankkit Nov 26, 2024
38f33e4
r/aws_db_proxy: Skip 'InvalidAction: DescribeDBProxies is not availab…
ewbankkit Nov 26, 2024
bf676bb
Merge pull request #40164 from alexbacchin/r-aws_iam_organization_fea…
ewbankkit Nov 26, 2024
c93f7bc
Merge pull request #40224 from atkretsch/f-memorydb_valkey
ewbankkit Nov 26, 2024
85be6ab
Merge pull request #40312 from hashicorp/s-gov-cloud
ewbankkit Nov 26, 2024
523ac85
Update CHANGELOG.md for #40312
Nov 26, 2024
cb58eb0
Adds CHANGELOG entry
gdavison Nov 26, 2024
dff0abb
Merge pull request #40304 from hashicorp/td-bedrock-guardrail-policy-…
gdavison Nov 26, 2024
ed4d7f5
Update CHANGELOG.md for #40304
Nov 26, 2024
a497fd7
chore: checkout .github/ files from main branch
coveobot Nov 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/40291.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_chatbot_teams_channel_configuration: Fix inconsistent provider result when order of `sns_topic_arns`changes
```
6 changes: 3 additions & 3 deletions .ci/tools/go.mod
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ go 1.23.3
require (
github.com/YakDriver/tfproviderdocs v0.16.6
github.com/client9/misspell v0.3.4
github.com/golangci/golangci-lint v1.62.0
github.com/golangci/golangci-lint v1.62.2
github.com/hashicorp/copywrite v0.19.0
github.com/hashicorp/go-changelog v0.0.0-20241111140550-beb7aaabfbd1
github.com/katbyte/terrafmt v0.5.4
@@ -278,7 +278,7 @@ require (
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/stretchr/testify v1.10.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tdakkota/asciicheck v0.2.0 // indirect
github.com/terraform-linters/tflint-plugin-sdk v0.21.0 // indirect
@@ -294,7 +294,7 @@ require (
github.com/ultraware/funlen v0.1.0 // indirect
github.com/ultraware/whitespace v0.1.1 // indirect
github.com/uudashr/gocognit v1.1.3 // indirect
github.com/uudashr/iface v1.2.0 // indirect
github.com/uudashr/iface v1.2.1 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
12 changes: 6 additions & 6 deletions .ci/tools/go.sum
Original file line number Diff line number Diff line change
@@ -568,8 +568,8 @@ github.com/golangci/go-printf-func-name v0.1.0 h1:dVokQP+NMTO7jwO4bwsRwLWeudOVUP
github.com/golangci/go-printf-func-name v0.1.0/go.mod h1:wqhWFH5mUdJQhweRnldEywnR5021wTdZSNgwYceV14s=
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 h1:/1322Qns6BtQxUZDTAT4SdcoxknUki7IAoK4SAXr8ME=
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9/go.mod h1:Oesb/0uFAyWoaw1U1qS5zyjCg5NP9C9iwjnI4tIsXEE=
github.com/golangci/golangci-lint v1.62.0 h1:/G0g+bi1BhmGJqLdNQkKBWjcim8HjOPc4tsKuHDOhcI=
github.com/golangci/golangci-lint v1.62.0/go.mod h1:jtoOhQcKTz8B6dGNFyfQV3WZkQk+YvBDewDtNpiAJts=
github.com/golangci/golangci-lint v1.62.2 h1:b8K5K9PN+rZN1+mKLtsZHz2XXS9aYKzQ9i25x3Qnxxw=
github.com/golangci/golangci-lint v1.62.2/go.mod h1:ILWWyeFUrctpHVGMa1dg2xZPKoMUTc5OIMgW7HZr34g=
github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs=
github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo=
github.com/golangci/modinfo v0.3.4 h1:oU5huX3fbxqQXdfspamej74DFX0kyGLkw1ppvXoJ8GA=
@@ -1143,8 +1143,8 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM=
@@ -1184,8 +1184,8 @@ github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/
github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8=
github.com/uudashr/gocognit v1.1.3 h1:l+a111VcDbKfynh+airAy/DJQKaXh2m9vkoysMPSZyM=
github.com/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U=
github.com/uudashr/iface v1.2.0 h1:ECJjh5q/1Zmnv/2yFpWV6H3oMg5+Mo+vL0aqw9Gjazo=
github.com/uudashr/iface v1.2.0/go.mod h1:Ux/7d/rAF3owK4m53cTVXL4YoVHKNqnoOeQHn2xrlp0=
github.com/uudashr/iface v1.2.1 h1:vHHyzAUmWZ64Olq6NZT3vg/z1Ws56kyPdBOd5kTXDF8=
github.com/uudashr/iface v1.2.1/go.mod h1:4QvspiRd3JLPAEXBQ9AiZpLbJlrWWgRChOKDJEuQTdg=
github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ BUG FIXES:
* provider: Suppress `Warning: AWS account ID not found for provider` when `skip_requesting_account_id` is `true` ([#40264](https://github.com/hashicorp/terraform-provider-aws/issues/40264))
* resource/aws_batch_job_definition: Fix crash when specifying `eksProperties` or `ecsProperties` block ([#40172](https://github.com/hashicorp/terraform-provider-aws/issues/40172))
* resource/aws_chatbot_slack_channel_configuration: Fix inconsistent provider result when order of `sns_topic_arns`changes ([#40253](https://github.com/hashicorp/terraform-provider-aws/issues/40253))
* resource/aws_chatbot_teams_channel_configuration: Fix inconsistent provider result when order of `sns_topic_arns`changes ([#40291](https://github.com/hashicorp/terraform-provider-aws/issues/40291))
* resource/aws_db_instance: When changing `storage_type` from `io1` or `io2` to `gp3`, fix bug causing error `InvalidParameterCombination: You must specify both the storage size and iops when modifying the storage size or iops on a DB instance that has iops` ([#37257](https://github.com/hashicorp/terraform-provider-aws/issues/37257))
* resource/aws_db_instance: When changing a `gp3` volume's `allocated_storage` to a value larger than the [threshold value for `engine`](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#gp3-storage), fix bug causing error `InvalidParameterCombination: You must specify both the storage size and iops when modifying the storage size or iops on a DB instance that has iops` ([#28847](https://github.com/hashicorp/terraform-provider-aws/issues/28847))

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ go 1.23.3
godebug tlskyber=0

require (
github.com/ProtonMail/go-crypto v1.1.2
github.com/ProtonMail/go-crypto v1.1.3
github.com/YakDriver/go-version v0.1.0
github.com/YakDriver/regexache v0.24.0
github.com/aws/aws-sdk-go v1.55.5
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@ github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe
github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/ProtonMail/go-crypto v1.1.2 h1:A7JbD57ThNqh7XjmHE+PXpQ3Dqt3BrSAC0AL0Go3KS0=
github.com/ProtonMail/go-crypto v1.1.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
github.com/YakDriver/go-version v0.1.0 h1:/x+Xg2+l89Mjtxl0VRf2+ue8cnHkw6jfYv49j6f7gZw=
github.com/YakDriver/go-version v0.1.0/go.mod h1:LXwFAp1E3KBhS7FHO/FE8r3XCmvKizs/VXXXFWfoSYY=
github.com/YakDriver/regexache v0.24.0 h1:zUKaixelkswzdqsqPc2sveiV//Mi/msJn0teG8zBDiA=
2 changes: 2 additions & 0 deletions internal/service/chatbot/slack_channel_configuration.go
Original file line number Diff line number Diff line change
@@ -202,6 +202,8 @@ func (r *slackChannelConfigurationResource) Read(ctx context.Context, request re
return
}

setTagsOut(ctx, output.Tags)

response.Diagnostics.Append(response.State.Set(ctx, &data)...)
}

74 changes: 34 additions & 40 deletions internal/service/chatbot/teams_channel_configuration.go
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/types"
@@ -73,9 +74,9 @@ func (r *teamsChannelConfigurationResource) Schema(ctx context.Context, request
Required: true,
},
"guardrail_policy_arns": schema.ListAttribute{
Optional: true,
Computed: true,
ElementType: types.StringType,
CustomType: fwtypes.ListOfStringType,
Optional: true,
Computed: true,
PlanModifiers: []planmodifier.List{
listplanmodifier.UseStateForUnknown(),
},
@@ -92,12 +93,12 @@ func (r *teamsChannelConfigurationResource) Schema(ctx context.Context, request
stringplanmodifier.UseStateForUnknown(),
},
},
"sns_topic_arns": schema.ListAttribute{
Optional: true,
Computed: true,
ElementType: types.StringType,
PlanModifiers: []planmodifier.List{
listplanmodifier.UseStateForUnknown(),
"sns_topic_arns": schema.SetAttribute{
CustomType: fwtypes.SetOfStringType,
Optional: true,
Computed: true,
PlanModifiers: []planmodifier.Set{
setplanmodifier.UseStateForUnknown(),
},
},
names.AttrTags: tftags.TagsAttribute(),
@@ -204,6 +205,8 @@ func (r *teamsChannelConfigurationResource) Read(ctx context.Context, request re
return
}

setTagsOut(ctx, output.Tags)

response.Diagnostics.Append(response.State.Set(ctx, &data)...)
}

@@ -221,7 +224,13 @@ func (r *teamsChannelConfigurationResource) Update(ctx context.Context, request

conn := r.Meta().ChatbotClient(ctx)

if teamsChannelConfigurationHasChanges(ctx, new, old) {
diff, d := fwflex.Calculate(ctx, new, old)
response.Diagnostics.Append(d...)
if response.Diagnostics.HasError() {
return
}

if diff.HasChanges() {
input := &chatbot.UpdateMicrosoftTeamsChannelConfigurationInput{}
response.Diagnostics.Append(fwflex.Expand(ctx, new, input)...)
if response.Diagnostics.HasError() {
@@ -402,34 +411,19 @@ func waitTeamsChannelConfigurationDeleted(ctx context.Context, conn *chatbot.Cli
}

type teamsChannelConfigurationResourceModel struct {
ChannelID types.String `tfsdk:"channel_id"`
ChannelName types.String `tfsdk:"channel_name"`
ChatConfigurationARN types.String `tfsdk:"chat_configuration_arn"`
ConfigurationName types.String `tfsdk:"configuration_name"`
GuardrailPolicyARNs types.List `tfsdk:"guardrail_policy_arns"`
IAMRoleARN types.String `tfsdk:"iam_role_arn"`
LoggingLevel fwtypes.StringEnum[loggingLevel] `tfsdk:"logging_level"`
SNSTopicARNs types.List `tfsdk:"sns_topic_arns"`
Tags tftags.Map `tfsdk:"tags"`
TagsAll tftags.Map `tfsdk:"tags_all"`
TeamID types.String `tfsdk:"team_id"`
TeamName types.String `tfsdk:"team_name"`
TenantID types.String `tfsdk:"tenant_id"`
Timeouts timeouts.Value `tfsdk:"timeouts"`
UserAuthorizationRequired types.Bool `tfsdk:"user_authorization_required"`
}

func teamsChannelConfigurationHasChanges(_ context.Context, plan, state teamsChannelConfigurationResourceModel) bool {
return !plan.ChannelID.Equal(state.ChannelID) ||
!plan.ChannelName.Equal(state.ChannelName) ||
!plan.ChatConfigurationARN.Equal(state.ChatConfigurationARN) ||
!plan.ConfigurationName.Equal(state.ConfigurationName) ||
!plan.GuardrailPolicyARNs.Equal(state.GuardrailPolicyARNs) ||
!plan.IAMRoleARN.Equal(state.IAMRoleARN) ||
!plan.LoggingLevel.Equal(state.LoggingLevel) ||
!plan.SNSTopicARNs.Equal(state.SNSTopicARNs) ||
!plan.TeamID.Equal(state.TeamID) ||
!plan.TeamName.Equal(state.TeamName) ||
!plan.TenantID.Equal(state.TenantID) ||
!plan.UserAuthorizationRequired.Equal(state.UserAuthorizationRequired)
ChannelID types.String `tfsdk:"channel_id"`
ChannelName types.String `tfsdk:"channel_name"`
ChatConfigurationARN types.String `tfsdk:"chat_configuration_arn"`
ConfigurationName types.String `tfsdk:"configuration_name"`
GuardrailPolicyARNs fwtypes.ListValueOf[types.String] `tfsdk:"guardrail_policy_arns"`
IAMRoleARN types.String `tfsdk:"iam_role_arn"`
LoggingLevel fwtypes.StringEnum[loggingLevel] `tfsdk:"logging_level"`
SNSTopicARNs fwtypes.SetValueOf[types.String] `tfsdk:"sns_topic_arns"`
Tags tftags.Map `tfsdk:"tags"`
TagsAll tftags.Map `tfsdk:"tags_all"`
TeamID types.String `tfsdk:"team_id"`
TeamName types.String `tfsdk:"team_name"`
TenantID types.String `tfsdk:"tenant_id"`
Timeouts timeouts.Value `tfsdk:"timeouts"`
UserAuthorizationRequired types.Bool `tfsdk:"user_authorization_required"`
}