Support Marathon 1.5 Network API #283
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
janisz
suggested changes
Jan 31, 2018
apps/app.go
Outdated
| @@ -162,14 +167,22 @@ type indexedPortDefinition struct { | |||
| } | |||
|
|
|||
| func (app App) findConsulPortDefinitions() []indexedPortDefinition { | |||
| var appPortDefinitions []PortDefinition | |||
| if len(app.Container.PortMappings) > 0 { | |||
There was a problem hiding this comment.
Can you add a comment here with information about deprecation of PortDefinitons in favour of PortMappings and link to Marathon release notes?
There was a problem hiding this comment.
We can extract this part to a function with proper godoc. e.g.
func (app App) getPortDefinitions() []PortDefinition {
var appPortDefinitions []PortDefinition
if len(app.Container.PortMappings) > 0 {
appPortDefinitions = app.Container.PortMappings
} else {
appPortDefinitions = app.PortDefinitions
}
return appPortDefinitions
}There was a problem hiding this comment.
Can you add a test for this change?
There was a problem hiding this comment.
Sounds good. Added the changes and unittest
janisz
suggested changes
Jan 31, 2018
janisz
suggested changes
Feb 1, 2018
apps/app.go
Outdated
| // Deprecated: Allows for backward compatibility with Marathons' network API | ||
| // PortDefinitions are deprecated in favor of Marathons' new PortMappings | ||
| // see https://github.com/mesosphere/marathon/pull/5391 | ||
| func extractPortDefinitions(app *App) []PortDefinition { |
There was a problem hiding this comment.
Why not a struct receiver?
func (app App) extractPortDefinitions()
There was a problem hiding this comment.
Good suggestion. I'll update.
janisz
approved these changes
Feb 1, 2018
|
@zanes2016 Thanks a lot! |
|
@janisz No problem! Thanks for the quick feedback |
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.
I've manually tested this end-to-end with Marathon, Consul, and this new binary. This patch addresses issue #230
I'm able to manually compile this code using native
go run. But I'm not able to runmake build, etc. So maybe someone (@janisz) can test this?