test: add functional test for agent introspection endpoint #1485
Conversation
| "image": "amazon/amazon-ecs-agent-introspection-validator:make", | ||
| "name": "agent-introspection-validator", | ||
| "memory": 50, | ||
| "healthCheck": { |
There was a problem hiding this comment.
does this test need to have a healthcheck?
There was a problem hiding this comment.
No, this is unnecessary, I will remove it.
| "startPeriod": 1 | ||
| }, | ||
| "logConfiguration": { | ||
| "logDriver": "awslogs", |
There was a problem hiding this comment.
why are we configuring this task to use awslogs?
There was a problem hiding this comment.
Because the logs in misc/agent-introspection-validator/agent-introspection-validator.go needs be to be uploaded to Cloud Watch.
|
|
||
| // ContainerResponse is the schema for the container response JSON object | ||
| type ContainerResponse struct { | ||
| DockerID string |
There was a problem hiding this comment.
just making a note since i asked you offline, this should be DockerId to match the original API.
There was a problem hiding this comment.
Thanks! I was planning to update it when the fix PR is rebased, will add a TODO in the PR description.
haikuoliu
force-pushed
the
branch_func_tests_agent_introspection
branch
2 times, most recently
from
dda680a to
1097ea3
Compare
| return nil, err | ||
| } | ||
|
|
||
| fmt.Printf("Received tasks metadata: %s \n", string(body)) |
There was a problem hiding this comment.
should these fmt.Printfs be logging statements?
| seelog.Infof("Received tasks metadata: %s \n", string(body)) | ||
|
|
||
| var tasksMetadata TasksResponse | ||
| err = json.Unmarshal(body, &tasksMetadata) |
There was a problem hiding this comment.
Unmarshal could also work with case insensitive, this won't capture the bug, example: https://play.golang.org/p/iH8nsK-UJ_L
haikuoliu
force-pushed
the
branch_func_tests_agent_introspection
branch
2 times, most recently
from
4465113 to
fbd2072
Compare
|
@richardpen I have refactored accordingly. |
| func TestAgentIntrospectionValidator(t *testing.T) { | ||
| // The Docker version was 17.03.1-ce when we added changes to agent | ||
| // introspection endpoint feature for the last time. | ||
| RequireDockerVersion(t, ">=17.03.1-ce") |
There was a problem hiding this comment.
Why was this required? The introspection API shouldn't have dependency on the docker version.
| require.NoError(t, err, "Error waiting for task to transition to STOPPED") | ||
| exitCode, _ := task.ContainerExitcode("agent-introspection-validator") | ||
|
|
||
| assert.Equal(t, 42, exitCode, fmt.Sprintf("Expected exit code of 42; got %d", exitCode)) |
There was a problem hiding this comment.
Minor: you can just use assert.Equalf to get rid of the fmt.Sprintf.
| containerName, actualContainerName) | ||
| } | ||
|
|
||
| if containerMetadataMap["DockerID"] == nil { |
haikuoliu
force-pushed
the
branch_func_tests_agent_introspection
branch
2 times, most recently
from
faa8ed8 to
a15382f
Compare
haikuoliu
force-pushed
the
branch_func_tests_agent_introspection
branch
from
a15382f to
8fb0a25
Compare
Summary
Add functional test for agent introspection endpoint.
Implementation details
The
AgentIntrospectionValidatorbasically mimicsTaskMetadataValidator:hostmode, so it's similar to the case when you ssh into the container instance and query the introspection endpoint.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) passDescription 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.