config: refactor config.go #1353
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
samuelkarp
approved these changes
Apr 19, 2018
8 tasks
richardpen
approved these changes
Apr 19, 2018
agent/config/config.go
Outdated
| if len(errs) != 0 { | ||
| err = apierrors.NewMultiError(errs...) | ||
| } else { | ||
| err = nil |
There was a problem hiding this comment.
I thought the err is nil by default.
There was a problem hiding this comment.
Just noticed the named return here. urgh. i'll modify this to get rid of that.
aaithal
force-pushed
the
refactorConfigPackage
branch
2 times, most recently
from
a5f4ed1 to
7be6465
Compare
sharanyad
reviewed
Apr 19, 2018
agent/config/config.go
Outdated
| // considered fatal. | ||
| func NewConfig(ec2client ec2.EC2MetadataClient) (*Config, error) { | ||
| var errs []error | ||
| var errTmp error |
There was a problem hiding this comment.
nit: this can be removed
There was a problem hiding this comment.
and probably just call it err?
agent/config/config.go
Outdated
|
|
||
| var err error | ||
| if len(errs) > 0 { | ||
| err = apierrors.NewMultiError(errs...) | ||
| } else { | ||
| err = nil |
There was a problem hiding this comment.
nit: this can be removed
The environtConfig() method, spanning few 150 odd lines has now been broken down so that it's easier to read and debug. Parsing individual config fields has been refactored into multiple parse* methods in the parse.go file
aaithal
force-pushed
the
refactorConfigPackage
branch
from
7be6465 to
71ab5ea
Compare
sharanyad
approved these changes
Apr 19, 2018
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.
Summary
config: refactor config.go
Implementation details
The
environtConfig()method, spanning few 150 odd lines has now beenbroken down so that it's easier to read and debug. Parsing individual
config fields has been refactored into multiple
parse*methods inthe
parse.gofileTesting
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes:
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.