-
Notifications
You must be signed in to change notification settings - Fork 0
Support attachments in room requests updates + multiregion s3 for assets bucket #367
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
71bc0ed
Setup multiregion s3 for assets bucket
devksingh4 0af7c04
Deploy assets bucket
devksingh4 dee9d82
New
devksingh4 69f8681
Fix bucket name
devksingh4 ad951ed
Retain data for longer
devksingh4 d15139a
Clarify comment
devksingh4 70c92ef
Enable auto intelligent tiering
devksingh4 b5e39c0
Fix terraform deploy
devksingh4 2966bcf
Setup s3 presigned URL uploads
devksingh4 c83dc5b
Move to archive after 90d
devksingh4 4488971
Update ref
devksingh4 f1dea79
Setup S3 bucket CORS
devksingh4 1e9dfe2
Add room requests attachment functionality
devksingh4 fde201a
Remove spark-md5
devksingh4 888ad92
Add unit tests
devksingh4 c3f63b5
Setup IAM policies for S3
devksingh4 9d7ff31
Fix wiring
devksingh4 604a826
if request to get the file, and it doesn't exist, delete the file att…
devksingh4 0449677
fix
devksingh4 d2789d9
Fix
devksingh4 c32847f
fix
devksingh4 feaab0b
Update
devksingh4 6b64c35
Fix catch
devksingh4 8507369
Fix
devksingh4 6399b67
Cleanup
devksingh4 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| data "aws_caller_identity" "current" {} | ||
| data "aws_region" "current" {} | ||
|
|
||
| locals { | ||
| asset_bucket_prefix = "${data.aws_caller_identity.current.account_id}-${var.ProjectId}" | ||
| } | ||
|
|
||
| module "buckets" { | ||
| source = "git::https://github.com/acm-uiuc/terraform-modules.git//multiregion-s3?ref=99de4c350d1e35931f94499e0c06cbf29d0d5b8a" | ||
| Region1 = var.PrimaryRegion | ||
| Region2 = var.SecondaryRegion | ||
| BucketPrefix = local.asset_bucket_prefix | ||
| } | ||
|
|
||
| resource "aws_s3_bucket_lifecycle_configuration" "expire_noncurrent" { | ||
| for_each = module.buckets.buckets_info | ||
| bucket = each.value.id | ||
|
|
||
| rule { | ||
| id = "expire-noncurrent-versions" | ||
| status = "Enabled" | ||
|
|
||
| noncurrent_version_expiration { | ||
| noncurrent_days = 3 | ||
| } | ||
| } | ||
|
|
||
| rule { | ||
| id = "expire-delete-markers" | ||
| status = "Enabled" | ||
|
|
||
| expiration { | ||
| expired_object_delete_marker = true | ||
| } | ||
| } | ||
|
|
||
| rule { | ||
| id = "abort-incomplete-multipart" | ||
| status = "Enabled" | ||
|
|
||
| abort_incomplete_multipart_upload { | ||
| days_after_initiation = 3 | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| variable "PrimaryRegion" { | ||
| type = string | ||
| default = "us-east-2" | ||
| } | ||
|
|
||
| variable "SecondaryRegion" { | ||
| type = string | ||
| default = "us-west-2" | ||
| } | ||
|
|
||
| variable "ProjectId" { | ||
| type = string | ||
| description = "Prefix before each resource" | ||
| } | ||
devksingh4 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.