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/handlers/v4/tmdsstate_test.go

@@ -183,7 +183,7 @@ func TestGetTaskMetadataWithTags(t *testing.T) {
 
 func TestGetTasksMetadata_NotSupported(t *testing.T) {
 	state := &TMDSAgentState{}
-	_, err := state.GetTasksMetadata()
+	_, err := state.GetTasksMetadata("test-container-id")
 
 	var metadataErr *tmdsv4.ErrorMetadataFetchFailure
 	assert.True(t, errors.As(err, &metadataErr))
@@ -192,7 +192,7 @@ func TestGetTasksMetadata_NotSupported(t *testing.T) {
 
 func TestGetTasksMetadataWithTags_NotSupported(t *testing.T) {
 	state := &TMDSAgentState{}
-	_, err := state.GetTasksMetadataWithTags()
+	_, err := state.GetTasksMetadataWithTags("test-container-id")
 
 	var metadataErr *tmdsv4.ErrorMetadataFetchFailure
 	assert.True(t, errors.As(err, &metadataErr))

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

@@ -509,7 +509,7 @@ func TestTasksMetadata(t *testing.T) {
 
 		handler, _, agentState, _ := setup(t)
 		agentState.EXPECT().
-			GetTasksMetadata().
+			GetTasksMetadata(gomock.Any()).
 			Return(tasksMetadata, nil)
 		testTMDSRequest(t, handler, TMDSTestCase[[]state.TaskResponse]{
 			path:                 path,
@@ -543,7 +543,7 @@ func TestTasksMetadata(t *testing.T) {
 		handler, ctrl, agentState, metricsFactory := setup(t)
 
 		agentState.EXPECT().
-			GetTasksMetadata().
+			GetTasksMetadata(gomock.Any()).
 			Return(nil, errors.New("fetch error"))
 
 		entry := mock_metrics.NewMockEntry(ctrl)
@@ -588,7 +588,7 @@ func TestTasksMetadataWithTags(t *testing.T) {
 
 		handler, _, agentState, _ := setup(t)
 		agentState.EXPECT().
-			GetTasksMetadataWithTags().
+			GetTasksMetadataWithTags(gomock.Any()).
 			Return(tasksMetadata, nil)
 		testTMDSRequest(t, handler, TMDSTestCase[[]state.TaskResponse]{
 			path:                 path,
@@ -622,7 +622,7 @@ func TestTasksMetadataWithTags(t *testing.T) {
 		handler, ctrl, agentState, metricsFactory := setup(t)
 
 		agentState.EXPECT().
-			GetTasksMetadataWithTags().
+			GetTasksMetadataWithTags(gomock.Any()).
 			Return(nil, errors.New("fetch error"))
 
 		entry := mock_metrics.NewMockEntry(ctrl)
@@ -872,7 +872,7 @@ func TestTasksStats(t *testing.T) {
 
 			// expect GetTasksStats to be called that should return an error
 			agentState.EXPECT().
-				GetTasksStats("").
+				GetTasksStats(gomock.Any()).
 				Return(nil, tc.err)
 
 			// expect InternalServerError metric to be published with the error.
@@ -894,7 +894,7 @@ func TestTasksStats(t *testing.T) {
 		agentState, _, _, handler := setup()
 		tasksStats := []map[string]*state.StatsResponse{taskStats}
 		agentState.EXPECT().
-			GetTasksStats("").
+			GetTasksStats(gomock.Any()).
 			Return(tasksStats, nil)
 		testTMDSRequest(t, handler, TMDSTestCase[[]map[string]*state.StatsResponse]{
 			path:                 path,
@@ -952,7 +952,7 @@ func TestTasksMetadataHandler_IncludeTags(t *testing.T) {
 	metricsFactory := mock_metrics.NewMockEntryFactory(ctrl)
 
 	t.Run("calls GetTasksMetadata when includeTags is false", func(t *testing.T) {
-		agentState.EXPECT().GetTasksMetadata().Return([]state.TaskResponse{}, nil)
+		agentState.EXPECT().GetTasksMetadata(gomock.Any()).Return([]state.TaskResponse{}, nil)
 
 		handler := tasksMetadataHandler(agentState, metricsFactory, false)
 		req := httptest.NewRequest("GET", "/v4/test/tasks", nil)
@@ -964,7 +964,7 @@ func TestTasksMetadataHandler_IncludeTags(t *testing.T) {
 	})
 
 	t.Run("calls GetTasksMetadataWithTags when includeTags is true", func(t *testing.T) {
-		agentState.EXPECT().GetTasksMetadataWithTags().Return([]state.TaskResponse{}, nil)
+		agentState.EXPECT().GetTasksMetadataWithTags(gomock.Any()).Return([]state.TaskResponse{}, nil)
 
 		handler := tasksMetadataHandler(agentState, metricsFactory, true)
 		req := httptest.NewRequest("GET", "/v4/test/tasks", nil)

ecs-agent/tmds/handlers/v4/handlers.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.