aws[s3]: Add versioning support #1085
Merged
Conversation
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
grahamc
reviewed
Jan 28, 2019
nix/s3-bucket.nix
Outdated
| @@ -40,6 +40,12 @@ with lib; | |||
| description = "The JSON lifecycle management string to apply to the bucket."; | |||
| }; | |||
|
|
|||
| versioning = mkOption { | |||
| default = "Suspended"; | |||
| type = types.str; | |||
There was a problem hiding this comment.
Instead of a string, should use an enum:
nixops/nix/cloudwatch-metric-alarm.nix
Line 86 in 28231a1
There was a problem hiding this comment.
Suggested change
| type = types.str; | |
| type = types.enum [ "Suspended" "Enabled" ]; |
should do it, I think (please test it).
There was a problem hiding this comment.
Thanks, Updated ( and tested)
PsyanticY
force-pushed
the
s3-versionning
branch
from
ba89fff
to
fd70e49
Compare
nixops/resources/s3_bucket.py
Outdated
| @@ -105,10 +107,21 @@ def create(self, defn, check, allow_reboot, allow_recreate): | |||
| except botocore.exceptions.ClientError as e: | |||
| if e.response['Error']['Code'] != "BucketAlreadyOwnedByYou": raise | |||
|
|
|||
| try: | |||
| current = s3client.get_bucket_versioning(Bucket=defn.bucket_name) | |||
There was a problem hiding this comment.
I guess this is more correct but we typically check against the api only with --check or within the _check() method. The assumption is that nixops is the only thing updating the bucket config, so we should check against self.versioning.
PsyanticY
force-pushed
the
s3-versionning
branch
from
fd70e49
to
8846d02
Compare
nixops/resources/s3_bucket.py
Outdated
| @@ -105,10 +107,21 @@ def create(self, defn, check, allow_reboot, allow_recreate): | |||
| except botocore.exceptions.ClientError as e: | |||
| if e.response['Error']['Code'] != "BucketAlreadyOwnedByYou": raise | |||
|
|
|||
| try: | |||
There was a problem hiding this comment.
Can you move this out of the if check or self.state != self.UP: block
PsyanticY
force-pushed
the
s3-versionning
branch
from
8846d02
to
75bd887
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.