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
Add code to use RabbitMQ, Swift, and SMTP email #28
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
…uracloud project. Add Swift storage support in relevant mill modules.
…cer, and LoopingDupeTaskProducer.
Updated to use 6.2.0-SNAPSHOT.
Also updates organization from DuraSpace to LYRASIS and reference urls to https
There is no need to create an additional parameter that performs the same function.
…oint and aws.signertype parameters to swift.*
We no longer use a specific variable to determine what kind of S3 we want to use. Instead, the code will see if we have specified a Swift Endpoint, in which case, we use Swift. We now use separate variables for Swift credentials. Added relevant config to the PropertyDefinitionListBuilder of each module.
I performed a rebase on the develop branch to pick up the change that will let the Travis build run. |
bbranan
requested changes
Mar 5, 2020
...tlog-generator/src/main/java/org/duracloud/mill/audit/generator/AuditLogGeneratorDriver.java
Show resolved
Hide resolved
common-dup/src/main/java/org/duracloud/mill/dup/repo/SwiftDuplicationPolicyRepo.java
Show resolved
Hide resolved
common/src/main/java/org/duracloud/mill/config/ConfigurationManager.java
Outdated
Show resolved
Hide resolved
common/src/main/java/org/duracloud/mill/config/ConfigurationManager.java
Outdated
Show resolved
Hide resolved
common-dup/src/main/java/org/duracloud/mill/dup/repo/SwiftDuplicationPolicyRepo.java
Show resolved
Hide resolved
loopingduptaskproducer/src/main/java/org/duracloud/mill/ltp/dup/AppDriver.java
Outdated
Show resolved
Hide resolved
common/src/main/java/org/duracloud/mill/config/ConfigurationManager.java
Outdated
Show resolved
Hide resolved
common/src/main/java/org/duracloud/mill/config/ConfigurationManager.java
Outdated
Show resolved
Hide resolved
workman/src/main/java/org/duracloud/mill/workman/spring/AppDriver.java
Outdated
Show resolved
Hide resolved
This commit prevents any config change being necessary for existing installations, as we always assume AWS options if not explicitly specified. We also rename SwiftNotificationManager to SMTPNotificationManager to mirror the changes made in MC/Duracloud.
We now pull strings from a Constant whenever we do a string comparison.
This makes the code clearer.
Removed useless Javadocs. Added missing header. Corrected erroneous Javadoc.
This is no longer used.
We now use Enums in Duracloud to make it clearer what the valid values are for a particular "type". This commit makes the necessary changes to utilise those enums.
dbernstein
approved these changes
Mar 16, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good and works well. Nicely done!
bbranan
approved these changes
Mar 17, 2020
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.
What does this Pull Request do?
We have added the ability to:
How should this be tested?
Prerequisites for testing
If you have already gone through the prerequisite steps for testing the associated duradmin/durastore/MC PRs, you already have the necessary infrastructure to test Mill.
Steps
To test SMTP email, add this to the .properties file:
Then perform an operation that sends emails, such as starting a duplication run.
To test RabbitMQ, add this to the .properties file:
Start Workman. Create some audit log events. You should see Workman process the events in the same way it would for an SQS queue.
To test using a Swift container for audit logs and duplication policies, add this to the .properties file:
Create a duplication policy in the location specified by
duplication-policy.bucket-suffix
. Write files and watch the duplications 🍿Run
auditlog-generator
. Audit logs should get written to the configuredaudit-log-generator.audit-log-space-id
.Interested parties
@bbranan