handlers: add eni info to introspection endpoint

Author: adnxn

agent/handlers/types/v1/response.go

@@ -28,6 +28,7 @@ type TaskResponse struct {
 	Family        string
 	Version       string
 	Containers    []ContainerResponse
+	Networks      []NetworkResponse
 }
 
 // TasksResponse is the schema for the tasks response JSON object
@@ -41,3 +42,10 @@ type ContainerResponse struct {
 	DockerName string
 	Name       string
 }
+
+// NetworkResponse is the schema for the network response JSON object
+type NetworkResponse struct {
+	NetworkMode   string
+	IPV4Addresses []string
+	IPV6Addresses []string
+}

agent/handlers/v1_handlers.go

@@ -65,6 +65,7 @@ func metadataV1RequestHandlerMaker(containerInstanceArn *string, cfg *config.Con
 }
 
 func newTaskResponse(task *api.Task, containerMap map[string]*api.DockerContainer) *v1.TaskResponse {
+	resp := &v1.TaskResponse{}
 	containers := []v1.ContainerResponse{}
 	for containerName, container := range containerMap {
 		if container.Container.IsInternal() {
@@ -82,14 +83,24 @@ func newTaskResponse(task *api.Task, containerMap map[string]*api.DockerContaine
 		desiredStatus = ""
 	}
 
-	return &v1.TaskResponse{
-		Arn:           task.Arn,
-		DesiredStatus: desiredStatus,
-		KnownStatus:   knownBackendStatus,
-		Family:        task.Family,
-		Version:       task.Version,
-		Containers:    containers,
+	if eni := task.GetTaskENI(); eni != nil {
+		resp.Networks = []v1.NetworkResponse{
+			{
+				NetworkMode:   "awsvpc",
+				IPV4Addresses: eni.GetIPV4Addresses(),
+				IPV6Addresses: eni.GetIPV6Addresses(),
+			},
+		}
 	}
+
+	resp.Arn = task.Arn
+	resp.DesiredStatus = desiredStatus
+	resp.KnownStatus = knownBackendStatus
+	resp.Family = task.Family
+	resp.Version = task.Version
+	resp.Containers = containers
+
+	return resp
 }
 
 func newTasksResponse(state dockerstate.TaskEngineState) *v1.TasksResponse {
@@ -135,7 +146,7 @@ func tasksV1RequestHandlerMaker(taskEngine DockerStateResolver) func(http.Respon
 			return
 		}
 		if dockerIdExists {
-			// Create TaskResponse for the docker id in the query.
+
 			var task *api.Task
 			var found bool
 			if len(dockerId) > dockerShortIdLen {

agent/handlers/v1_handlers_test.go

@@ -36,6 +36,7 @@ import (
 
 const testContainerInstanceArn = "test_container_instance_arn"
 const testClusterArn = "test_cluster_arn"
+const eniIPV4Address = "10.0.0.2"
 
 func TestMetadataHandler(t *testing.T) {
 	metadataHandler := metadataV1RequestHandlerMaker(utils.Strptr(testContainerInstanceArn), &config.Config{Cluster: testClusterArn})
@@ -125,6 +126,21 @@ func TestGetTaskByTaskArn(t *testing.T) {
 	taskDiffHelper(t, []*api.Task{testTasks[0]}, v1.TasksResponse{Tasks: []*v1.TaskResponse{&taskResponse}})
 }
 
+func TestGetAWSVPCTaskByTaskArn(t *testing.T) {
+	recorder := performMockRequest(t, "/v1/tasks?taskarn=awsvpcTask")
+
+	var taskResponse v1.TaskResponse
+	err := json.Unmarshal(recorder.Body.Bytes(), &taskResponse)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	resp := v1.TasksResponse{Tasks: []*v1.TaskResponse{&taskResponse}}
+
+	assert.Equal(t, eniIPV4Address, resp.Tasks[0].Networks[0].IPV4Addresses[0])
+	taskDiffHelper(t, []*api.Task{testTasks[3]}, resp)
+}
+
 func TestGetTaskByTaskArnNotFound(t *testing.T) {
 	recorder := performMockRequest(t, "/v1/tasks?taskarn=doesnotexist")
 
@@ -303,6 +319,25 @@ var testTasks = []*api.Task{
 			},
 		},
 	},
+	{
+		Arn:                 "awsvpcTask",
+		DesiredStatusUnsafe: api.TaskRunning,
+		KnownStatusUnsafe:   api.TaskRunning,
+		Family:              "test",
+		Version:             "1",
+		Containers: []*api.Container{
+			{
+				Name: "awsvpc",
+			},
+		},
+		ENI: &api.ENI{
+			IPV4Addresses: []*api.ENIIPV4Address{
+				{
+					Address: eniIPV4Address,
+				},
+			},
+		},
+	},
 }
 
 func stateSetupHelper(state dockerstate.TaskEngineState, tasks []*api.Task) {