fix(serverGroup): Fixing asg rules and handler #293
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
Contributor
jeyrschabu
commented
Nov 6, 2019
jeyrschabu
commented
- remove misleading classifiers for disabled. use fields instead
- fix test
- remove misleading classifiers for disabled. use fields instead - fix test
jeyrschabu
commented
Nov 6, 2019
| @@ -79,14 +79,6 @@ data class AmazonAutoScalingGroup( | |||
| return getAddToLoadBalancerProcess()?.suspensionReason | |||
| } | |||
|
|
|||
| fun isDisabled(): Boolean { | |||
There was a problem hiding this comment.
@aravindmd this creates a circular dependency.
There was a problem hiding this comment.
Can you explain this bit more ?
There was a problem hiding this comment.
IS_DISABLED is not a field on the amazon autoscaling group. It's something that the handler was responsible to set.
There was a problem hiding this comment.
Thanks , that makes sense now.
| return (details[IS_DISABLED] != null && details[IS_DISABLED] == true) | ||
| } | ||
|
|
||
| fun hasInstances(): Boolean { |
There was a problem hiding this comment.
See above comment
| @@ -152,20 +151,7 @@ class AmazonAutoScalingGroupHandler( | |||
| if (serverGroups == null || serverGroups.isEmpty()) { | |||
| return | |||
| } | |||
| val elapsedTimeMillis = measureTimeMillis { | |||
There was a problem hiding this comment.
No need to do this here since we have all references already present. Load balancer and instances
| @@ -72,7 +72,7 @@ class ZeroInstanceInDiscoveryDisabledServerGroupRule( | |||
| private val disabledDurationInDays: Long = 30 | |||
|
|
|||
| override fun apply(resource: AmazonAutoScalingGroup): Result { | |||
| if (!resource.isDisabled()) { | |||
| if (resource.isInLoadBalancer()) { | |||
| createdTime = clock.millis() | ||
|
|
||
| ).apply { | ||
| set(IS_DISABLED, false) |
There was a problem hiding this comment.
@aravindmd better to check actual fields on the server groups.
6 tasks
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.