Skip to content

Commit e7bbf96

Browse files
committed
Update vendor for ecs agent with TMDs changes.
1 parent 1078cf6 commit e7bbf96

File tree

8 files changed

+166
-12
lines changed

8 files changed

+166
-12
lines changed

agent/handlers/v4/tmdsstate.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,18 @@ func (s *TMDSAgentState) GetTaskStats(v3EndpointID string) (map[string]*tmdsv4.S
249249
return taskStatsResponse, nil
250250
}
251251

252+
func (s *TMDSAgentState) GetTasksMetadata() ([]tmdsv4.TaskResponse, error) {
253+
return nil, tmdsv4.NewErrorMetadataFetchFailure("tasks metadata endpoint not supported")
254+
}
255+
256+
func (s *TMDSAgentState) GetTasksMetadataWithTags() ([]tmdsv4.TaskResponse, error) {
257+
return nil, tmdsv4.NewErrorMetadataFetchFailure("tasks metadata with tags endpoint not supported")
258+
}
259+
260+
func (s *TMDSAgentState) GetTasksStats(v3EndpointID string) ([]map[string]*tmdsv4.StatsResponse, error) {
261+
return nil, tmdsv4.NewErrorStatsFetchFailure("tasks stats endpoint not supported", nil)
262+
}
263+
252264
// sortContainersCNIPauseFirst sorts containers so that CNI_PAUSE containers appear first.
253265
// Other containers maintain their relative order.
254266
func sortContainersCNIPauseFirst(containers []tmdsv4.ContainerResponse) {

agent/handlers/v4/tmdsstate_test.go

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package v4
1818

1919
import (
20+
"errors"
2021
"testing"
2122

2223
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
@@ -179,3 +180,30 @@ func TestGetTaskMetadataWithTags(t *testing.T) {
179180
})
180181
}
181182
}
183+
184+
func TestGetTasksMetadata_NotSupported(t *testing.T) {
185+
state := &TMDSAgentState{}
186+
_, err := state.GetTasksMetadata()
187+
188+
var metadataErr *tmdsv4.ErrorMetadataFetchFailure
189+
assert.True(t, errors.As(err, &metadataErr))
190+
assert.Contains(t, err.Error(), "not supported")
191+
}
192+
193+
func TestGetTasksMetadataWithTags_NotSupported(t *testing.T) {
194+
state := &TMDSAgentState{}
195+
_, err := state.GetTasksMetadataWithTags()
196+
197+
var metadataErr *tmdsv4.ErrorMetadataFetchFailure
198+
assert.True(t, errors.As(err, &metadataErr))
199+
assert.Contains(t, err.Error(), "not supported")
200+
}
201+
202+
func TestGetTasksStats_NotSupported(t *testing.T) {
203+
state := &TMDSAgentState{}
204+
_, err := state.GetTasksStats("test")
205+
206+
var statsErr *tmdsv4.ErrorStatsFetchFailure
207+
assert.True(t, errors.As(err, &statsErr))
208+
assert.Contains(t, err.Error(), "not supported")
209+
}

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

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 93 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

amazon-vpc-cni-plugins

ecs-agent/tmds/handlers/v4/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func tasksMetadataHandler(
212212
} else {
213213
tasksMetadata, err = agentState.GetTasksMetadata()
214214
}
215-
215+
216216
if err != nil {
217217
logger.Error("Failed to get v4 tasks metadata", logger.Fields{
218218
field.Error: err,

ecs-agent/tmds/handlers/v4/handlers_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,9 @@ func TestTasksMetadata(t *testing.T) {
504504
expectedTaskResponse := taskResponse()
505505
expectedTaskResponse.CredentialsID = "" // credentials ID not expected
506506
expectedTaskResponse.TaskNetworkConfig = nil // TaskNetworkConfig is not expected and would be used internally.
507-
507+
508508
tasksMetadata := []state.TaskResponse{*expectedTaskResponse}
509-
509+
510510
handler, _, agentState, _ := setup(t)
511511
agentState.EXPECT().
512512
GetTasksMetadata().
@@ -583,9 +583,9 @@ func TestTasksMetadataWithTags(t *testing.T) {
583583
expectedTaskResponse := taskResponse()
584584
expectedTaskResponse.CredentialsID = "" // credentials ID not expected
585585
expectedTaskResponse.TaskNetworkConfig = nil // TaskNetworkConfig is not expected and would be used internally.
586-
586+
587587
tasksMetadata := []state.TaskResponse{*expectedTaskResponse}
588-
588+
589589
handler, _, agentState, _ := setup(t)
590590
agentState.EXPECT().
591591
GetTasksMetadataWithTags().
@@ -953,25 +953,25 @@ func TestTasksMetadataHandler_IncludeTags(t *testing.T) {
953953

954954
t.Run("calls GetTasksMetadata when includeTags is false", func(t *testing.T) {
955955
agentState.EXPECT().GetTasksMetadata().Return([]state.TaskResponse{}, nil)
956-
956+
957957
handler := tasksMetadataHandler(agentState, metricsFactory, false)
958958
req := httptest.NewRequest("GET", "/v4/test/tasks", nil)
959959
w := httptest.NewRecorder()
960-
960+
961961
handler(w, req)
962-
962+
963963
assert.Equal(t, http.StatusOK, w.Code)
964964
})
965965

966966
t.Run("calls GetTasksMetadataWithTags when includeTags is true", func(t *testing.T) {
967967
agentState.EXPECT().GetTasksMetadataWithTags().Return([]state.TaskResponse{}, nil)
968-
968+
969969
handler := tasksMetadataHandler(agentState, metricsFactory, true)
970970
req := httptest.NewRequest("GET", "/v4/test/tasks", nil)
971971
w := httptest.NewRecorder()
972-
972+
973973
handler(w, req)
974-
974+
975975
assert.Equal(t, http.StatusOK, w.Code)
976976
})
977977
}

0 commit comments

Comments
 (0)