-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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 support for EIPs associated with secondary ENIs #1513
Merged
+158
−6
Merged
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
da18301
Add support for EIPs associated with secondary ENIs
c0e280d
Added tests
ac96965
fix flaky tests
4e35eb0
fix more flaky test
c316bcd
explicit imports
470ff15
test something
0c7f8ef
no idea how these worked before
f4b1fa2
adjust clustersampledata
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
test something
There are no files selected for viewing
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
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.
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.
Why did the ClusterSampleData change?
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.
In the update to Mockito 3.4.0 the ArgumentMatcher for
anyString()
changed from accepting "any string or null" to "any string". In thetestStatusUpdate()
andtestDeleteStatusOverride()
tests in PeerReplicationResourceTest, the provided parameter forstatus
in the downstreaminstanceResource.statusUpdate()
call isnull
, which results in the Mock not matching and our response returning null.There are two solutions to this:
ReplicationInstance
(current change in this PR) to correctly capture the intent of thestatusUpdate()
anddeleteStatusUpdate()
calls.The current master branch calls
statusUpdate(String newStatus = null, String isReplication = "true", String lastDirtyTimestamp = "12345678")
anddeleteStatusUpdate(String isReplication = "true", String newStatus = null, String lastDirtyTimestamp = "12345678")
, which to me seems odd that we'd setnewStatus = null
in each rather than an actual status.statusUpdate()
anddeleteStatusUpdate()
toisNull()
for the parameters that returnnull
.I prefer the first option as I believe it's the more correct change, but I'm happy to go with 2) if we want to minimize the changes in this PR.