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

Independent S3 Bucket Replication Configuration Resource #20777

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
b7356a7
init setup for replication configuration resource
dkujawski Jul 30, 2021
d8acd7a
adding new resource for replication configurations
dkujawski Jul 30, 2021
583894f
cleanup and remove unneeded logic
dkujawski Jul 30, 2021
457754a
WIP setup update processes
dkujawski Aug 17, 2021
22360e8
WIP pull in tests from s3 bucket resource
dkujawski Aug 17, 2021
9bf21ab
Merge branch 'hashicorp:main' into dk-FCC-332-bi-directional-s3-repli…
dkujawski Aug 17, 2021
68b88bc
WIP ensure create/read/update logic is operational
dkujawski Aug 19, 2021
25457f0
Merge branch 'hashicorp:main' into dk-FCC-332-bi-directional-s3-repli…
dkujawski Aug 19, 2021
2d0f9ce
basic tests passing
dkujawski Aug 19, 2021
64a623a
Merge branch 'dk-FCC-332-bi-directional-s3-replication-support' of gi…
dkujawski Aug 19, 2021
c08a294
Update expected resource names
dkujawski Aug 23, 2021
61573bd
Guard against missing bucket or import id
dkujawski Aug 23, 2021
eef6a43
Cleanout and relocate testing logic
dkujawski Aug 24, 2021
ff9ec94
Merge branch 'hashicorp:main' into dk-FCC-332-bi-directional-s3-repli…
dkujawski Aug 25, 2021
0c4ad21
Support Existing Object Replication
dkujawski Aug 30, 2021
796c1cb
Testing for ExistingObjectReplication
dkujawski Aug 30, 2021
cec4a4e
Merge branch 'hashicorp:main' into dk-FCC-332-bi-directional-s3-repli…
dkujawski Aug 30, 2021
a6c8b02
Adding support for Replication Time Control
dkujawski Sep 1, 2021
1a46b8b
Merge branch 'hashicorp:main' into dk-FCC-332-bi-directional-s3-repli…
dkujawski Sep 1, 2021
cd5556b
Adding Metrics support
dkujawski Sep 1, 2021
b398f35
Adding Replica Modifications support, with tests
dkujawski Sep 1, 2021
6ac9ac5
Merge branch 'hashicorp:main' into dk-FCC-332-bi-directional-s3-repli…
dkujawski Sep 2, 2021
48bdc44
terrafmt
dkujawski Sep 2, 2021
22ee15a
terrafmt
dkujawski Sep 2, 2021
ffe2e6c
Initial documentation for new resource
dkujawski Sep 3, 2021
644dc23
adding new feature documentation
dkujawski Sep 9, 2021
bd4302c
Documentation updates for existing object replication
dkujawski Sep 10, 2021
17a88f4
Documentation updates for existing object replication
dkujawski Sep 10, 2021
8bf7bc6
adding headers and source examples to documentation
dkujawski Sep 13, 2021
6bae9ee
adding internal documentation links, cleanup
dkujawski Sep 14, 2021
8d0562d
Align delete_marker_replication with other objects
dkujawski Sep 15, 2021
eb4cc6b
Update delete_marker replication docs to reflect changes
dkujawski Sep 16, 2021
b95262e
Merge branch 'hashicorp:main' into dk-FCC-332-bi-directional-s3-repli…
dkujawski Sep 16, 2021
27e6348
Documentation adjustments
dkujawski Sep 16, 2021
7735848
linting
dkujawski Sep 16, 2021
2411b0e
linting/fmt
dkujawski Sep 16, 2021
64400e1
adding missing attribute reference to documentation
dkujawski Sep 16, 2021
6e74845
address linter-related errors
anGie44 Sep 23, 2021
71d8119
Update CHANGELOG for #20777
anGie44 Sep 23, 2021
eceb584
forgo syntax highlighting in short snippet code blocks in documentation
anGie44 Sep 23, 2021
f683904
use untyped code blocks until new resource is merged to validate
dkujawski Sep 23, 2021
26a9cd8
Merge branch 'dk-FCC-332-bi-directional-s3-replication-support' of gi…
dkujawski Sep 23, 2021
c2e0724
Revert key renamed in error
dkujawski Sep 24, 2021
d4b7249
Clean up stray merge conflict
dkujawski Sep 26, 2021
a87d031
Add logic for explicit delete
dkujawski Sep 26, 2021
84904b0
init setup for replication configuration resource
dkujawski Jul 30, 2021
da4da50
adding new resource for replication configurations
dkujawski Jul 30, 2021
3bd0c6b
cleanup and remove unneeded logic
dkujawski Jul 30, 2021
e467649
WIP setup update processes
dkujawski Aug 17, 2021
a445cff
WIP pull in tests from s3 bucket resource
dkujawski Aug 17, 2021
e46cbd5
WIP ensure create/read/update logic is operational
dkujawski Aug 19, 2021
9b24010
basic tests passing
dkujawski Aug 19, 2021
94cc619
Update expected resource names
dkujawski Aug 23, 2021
cabf7d2
Guard against missing bucket or import id
dkujawski Aug 23, 2021
0118c80
Cleanout and relocate testing logic
dkujawski Aug 24, 2021
71fd24d
Support Existing Object Replication
dkujawski Aug 30, 2021
60d2124
Testing for ExistingObjectReplication
dkujawski Aug 30, 2021
73055fa
Adding support for Replication Time Control
dkujawski Sep 1, 2021
6d2fdcd
Adding Metrics support
dkujawski Sep 1, 2021
8d2fa83
Adding Replica Modifications support, with tests
dkujawski Sep 1, 2021
7d246e5
terrafmt
dkujawski Sep 2, 2021
c991dff
terrafmt
dkujawski Sep 2, 2021
f76cefd
Initial documentation for new resource
dkujawski Sep 3, 2021
ed53680
adding new feature documentation
dkujawski Sep 9, 2021
e4b87af
Documentation updates for existing object replication
dkujawski Sep 10, 2021
8a024bd
Documentation updates for existing object replication
dkujawski Sep 10, 2021
64d2ae8
adding headers and source examples to documentation
dkujawski Sep 13, 2021
54585b3
adding internal documentation links, cleanup
dkujawski Sep 14, 2021
80b6e26
Align delete_marker_replication with other objects
dkujawski Sep 15, 2021
d198d93
Update delete_marker replication docs to reflect changes
dkujawski Sep 16, 2021
e5d3d06
Documentation adjustments
dkujawski Sep 16, 2021
6c15db5
linting
dkujawski Sep 16, 2021
1a887de
linting/fmt
dkujawski Sep 16, 2021
01bd0b2
adding missing attribute reference to documentation
dkujawski Sep 16, 2021
0d92fba
use untyped code blocks until new resource is merged to validate
dkujawski Sep 23, 2021
e477832
address linter-related errors
anGie44 Sep 23, 2021
3622ba5
Update CHANGELOG for #20777
anGie44 Sep 23, 2021
a241e95
forgo syntax highlighting in short snippet code blocks in documentation
anGie44 Sep 23, 2021
b8be20a
Revert key renamed in error
dkujawski Sep 24, 2021
9614e74
Add logic for explicit delete
dkujawski Sep 26, 2021
96c9c84
Merge branch 'dk-FCC-332-bi-directional-s3-replication-support' of gi…
dkujawski Nov 2, 2021
821a2b4
move source into service/s3 dir tracking upstream changes
dkujawski Nov 2, 2021
a367de4
tracking up stream changes
dkujawski Nov 2, 2021
37352d0
tracking upstream changes
dkujawski Nov 3, 2021
45b1577
Merge remote-tracking branch 'upstream/main' into dk-FCC-332-bi-direc…
dkujawski Nov 3, 2021
a740404
tracking changes from upstream
dkujawski Nov 3, 2021
0ba4166
update tests to track V2 changes
dkujawski Nov 6, 2021
f7d3965
run terrafmt on test file
anGie44 Nov 12, 2021
523357f
Merge remote-tracking branch 'origin/main' into dk-FCC-332-bi-directi…
anGie44 Nov 12, 2021
37f2e23
CR updates; align with service packages structure; flex and enum
anGie44 Nov 18, 2021
875cd9d
CR updates: docs
anGie44 Nov 18, 2021
557ff34
retain Set hashing
anGie44 Nov 18, 2021
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/20777.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_s3_bucket_replication_configuration
```
1 change: 1 addition & 0 deletions internal/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -1476,6 +1476,7 @@ func Provider() *schema.Provider {
"aws_s3_bucket_ownership_controls": s3.ResourceBucketOwnershipControls(),
"aws_s3_bucket_policy": s3.ResourceBucketPolicy(),
"aws_s3_bucket_public_access_block": s3.ResourceBucketPublicAccessBlock(),
"aws_s3_bucket_replication_configuration": s3.ResourceBucketReplicationConfiguration(),
"aws_s3_object_copy": s3.ResourceObjectCopy(),

"aws_s3_access_point": s3control.ResourceAccessPoint(),
Expand Down
4 changes: 2 additions & 2 deletions internal/service/s3/bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ func resourceBucketUpdate(d *schema.ResourceData, meta interface{}) error {
}

if d.HasChange("replication_configuration") {
if err := resourceBucketReplicationConfigurationUpdate(conn, d); err != nil {
if err := resourceBucketInternalReplicationConfigurationUpdate(conn, d); err != nil {
return err
}
}
Expand Down Expand Up @@ -2033,7 +2033,7 @@ func resourceBucketObjectLockConfigurationUpdate(conn *s3.S3, d *schema.Resource
return nil
}

func resourceBucketReplicationConfigurationUpdate(conn *s3.S3, d *schema.ResourceData) error {
func resourceBucketInternalReplicationConfigurationUpdate(conn *s3.S3, d *schema.ResourceData) error {
bucket := d.Get("bucket").(string)
replicationConfiguration := d.Get("replication_configuration").([]interface{})

Expand Down
Loading