Add endpointContainerID to tasks and tasksStats endpoint.

Author: avirak

agent/handlers/v4/tmdsstate.go

@@ -249,15 +249,15 @@ func (s *TMDSAgentState) GetTaskStats(v3EndpointID string) (map[string]*tmdsv4.S
 	return taskStatsResponse, nil
 }
 
-func (s *TMDSAgentState) GetTasksMetadata() ([]tmdsv4.TaskResponse, error) {
+func (s *TMDSAgentState) GetTasksMetadata(endpointContainerID string) ([]tmdsv4.TaskResponse, error) {
 	return nil, tmdsv4.NewErrorMetadataFetchFailure("tasks metadata endpoint not supported")
 }
 
-func (s *TMDSAgentState) GetTasksMetadataWithTags() ([]tmdsv4.TaskResponse, error) {
+func (s *TMDSAgentState) GetTasksMetadataWithTags(endpointContainerID string) ([]tmdsv4.TaskResponse, error) {
 	return nil, tmdsv4.NewErrorMetadataFetchFailure("tasks metadata with tags endpoint not supported")
 }
 
-func (s *TMDSAgentState) GetTasksStats(v3EndpointID string) ([]map[string]*tmdsv4.StatsResponse, error) {
+func (s *TMDSAgentState) GetTasksStats(endpointContainerID string) ([]map[string]*tmdsv4.StatsResponse, error) {
 	return nil, tmdsv4.NewErrorStatsFetchFailure("tasks stats endpoint not supported", nil)
 }
 

agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/handlers.go

@@ -204,13 +204,14 @@ func tasksMetadataHandler(
 	includeTags bool,
 ) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+		endpointContainerID := mux.Vars(r)[EndpointContainerIDMuxName]
 		var tasksMetadata []state.TaskResponse
 		var err error
 
 		if includeTags {
-			tasksMetadata, err = agentState.GetTasksMetadataWithTags()
+			tasksMetadata, err = agentState.GetTasksMetadataWithTags(endpointContainerID)
 		} else {
-			tasksMetadata, err = agentState.GetTasksMetadata()
+			tasksMetadata, err = agentState.GetTasksMetadata(endpointContainerID)
 		}
 
 		if err != nil {
@@ -274,8 +275,9 @@ func TasksStatsHandler(
 	metricsFactory metrics.EntryFactory,
 ) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+		endpointContainerID := mux.Vars(r)[EndpointContainerIDMuxName]
 		// Get stats for all tasks
-		stats, err := agentState.GetTasksStats("")
+		stats, err := agentState.GetTasksStats(endpointContainerID)
 		if err != nil {
 			logger.Error("Failed to get v4 tasks stats", logger.Fields{
 				field.Error: err,

agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/state.go

@@ -158,12 +158,12 @@ type AgentState interface {
 	// Returns metadata for all tasks on the container instance in v4 format.
 	// Returns ErrorTaskLookupFailed if task lookup fails.
 	// Returns ErrorMetadataFetchFailure if something else goes wrong.
-	GetTasksMetadata() ([]TaskResponse, error)
+	GetTasksMetadata(endpointContainerID string) ([]TaskResponse, error)
 
 	// Returns metadata for all tasks on the container instance including task and container instance tags (if applicable) in v4 format.
 	// Returns ErrorTaskLookupFailed if task lookup fails.
 	// Returns ErrorMetadataFetchFailure if something else goes wrong.
-	GetTasksMetadataWithTags() ([]TaskResponse, error)
+	GetTasksMetadataWithTags(endpointContainerID string) ([]TaskResponse, error)
 
 	// Returns task metadata including task and container instance tags (if applicable) in v4 format
 	// for the task identified by the provided endpointContainerID.