expose availabilityZone to ECS metadata file #1675
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
|
I didn't see where you actually add az to metadata manager, I think this PR can be completed after your another PR is merged. You can add a |
cyastella
changed the title
cyastella
changed the title
fenxiong
reviewed
Nov 10, 2018
| } | ||
|
|
||
| // setAvailabilityZone indicates an expected call of setAvailabilityZone | ||
| func (mr *MockDockerMetadataClientMockRecorder) setAvailabilityZone(arg0 interface{}) *gomock.Call { |
There was a problem hiding this comment.
is this added by mistake?
There was a problem hiding this comment.
these two functions are auto generated when I ran go generate.
agent/app/agent_test.go
Outdated
| @@ -65,7 +66,8 @@ func setup(t *testing.T) (*gomock.Controller, | |||
| *mock_api.MockECSClient, | |||
| *mock_dockerapi.MockDockerClient, | |||
| *mock_factory.MockStateManager, | |||
| *mock_factory.MockSaveableOption) { | |||
| *mock_factory.MockSaveableOption, | |||
| *mock_containermetadata.MockManager) { | |||
There was a problem hiding this comment.
why do you need to mock container metadata manager?
There was a problem hiding this comment.
remove it and add a separate test to test set availabilityZone.
haikuoliu
approved these changes
Nov 12, 2018
fenxiong
approved these changes
Nov 13, 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
we also want to expose availabilityZone to the ECS metadata file.
Implementation details
set availabilityZone to the containermetadata manager and pass it to the ECS metadata file after agent start.
Testing
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.