Skip to content

Commit a261b8d

Browse files
authored
Merge branch 'master' into master
2 parents 01fef49 + 428d56a commit a261b8d

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.77.3
3+
rev: v1.86.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_wrapper_module_for_each
@@ -24,7 +24,7 @@ repos:
2424
- '--args=--only=terraform_standard_module_structure'
2525
- '--args=--only=terraform_workspace_remote'
2626
- repo: https://github.com/pre-commit/pre-commit-hooks
27-
rev: v4.4.0
27+
rev: v4.5.0
2828
hooks:
2929
- id: check-merge-conflict
3030
- id: end-of-file-fixer

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
### [3.15.2](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/compare/v3.15.1...v3.15.2) (2024-01-12)
6+
7+
8+
### Bug Fixes
9+
10+
* Add China regions to elb_service_accounts ([#264](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/issues/264)) ([c6870d5](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/commit/c6870d5187eaa83d089ebeb7d1e750217da4ec89))
11+
512
### [3.15.1](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/compare/v3.15.0...v3.15.1) (2023-08-26)
613

714

main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,8 @@ locals {
594594
sa-east-1 = "507241528517"
595595
us-gov-west-1 = "048591011584"
596596
us-gov-east-1 = "190560391635"
597+
cn-north-1 = "638102146993"
598+
cn-northwest-1 = "037604701340"
597599
}
598600
}
599601

0 commit comments

Comments
 (0)