adding new GetTaskMetadataWithTaskNetworkConfig functionality to redu…

…ce scoping
aws · Sep 24, 2024 · 1c09ac7 · 1c09ac7
1 parent 5585857
commit 1c09ac7
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 80 deletions.
diff --git a/agent/handlers/task_server_setup_test.go b/agent/handlers/task_server_setup_test.go
@@ -4153,7 +4153,7 @@ func TestV4GetTaskMetadataWithTaskNetworkConfig(t *testing.T) {
 				tc.setStateExpectations(state)
 			}
 			tmdsAgentState := agentV4.NewTMDSAgentState(state, statsEngine, ecsClient, clusterName, availabilityzone, vpcID, containerInstanceArn)
-			actualTaskResponse, err := tmdsAgentState.GetTaskMetadata(v3EndpointID)
+			actualTaskResponse, err := tmdsAgentState.GetTaskMetadataWithTaskNetworkConfig(v3EndpointID)
 
 			assert.NoError(t, err)
 			assert.Equal(t, tc.expectedTaskNetworkConfig, actualTaskResponse.TaskNetworkConfig)

diff --git a/agent/handlers/v4/tmdsstate.go b/agent/handlers/v4/tmdsstate.go
@@ -91,17 +91,21 @@ func (s *TMDSAgentState) GetContainerMetadata(v3EndpointID string) (tmdsv4.Conta
 
 // Returns task metadata in v4 format for the task identified by the provided endpointContainerID.
 func (s *TMDSAgentState) GetTaskMetadata(v3EndpointID string) (tmdsv4.TaskResponse, error) {
-	return s.getTaskMetadata(v3EndpointID, false)
+	return s.getTaskMetadata(v3EndpointID, false, false)
 }
 
 // Returns task metadata including task and container instance tags in v4 format for the
 // task identified by the provided endpointContainerID.
 func (s *TMDSAgentState) GetTaskMetadataWithTags(v3EndpointID string) (tmdsv4.TaskResponse, error) {
-	return s.getTaskMetadata(v3EndpointID, true)
+	return s.getTaskMetadata(v3EndpointID, true, false)
+}
+
+func (s *TMDSAgentState) GetTaskMetadataWithTaskNetworkConfig(v3EndpointID string) (tmdsv4.TaskResponse, error) {
+	return s.getTaskMetadata(v3EndpointID, false, true)
 }
 
 // Returns task metadata in v4 format for the task identified by the provided endpointContainerID.
-func (s *TMDSAgentState) getTaskMetadata(v3EndpointID string, includeTags bool) (tmdsv4.TaskResponse, error) {
+func (s *TMDSAgentState) getTaskMetadata(v3EndpointID string, includeTags, includeTaskNetworkConfig bool) (tmdsv4.TaskResponse, error) {
 	taskARN, ok := s.state.TaskARNByV3EndpointID(v3EndpointID)
 	if !ok {
 		return tmdsv4.TaskResponse{}, tmdsv4.NewErrorLookupFailure(fmt.Sprintf(
@@ -155,18 +159,20 @@ func (s *TMDSAgentState) getTaskMetadata(v3EndpointID string, includeTags bool)
 			NewPulledContainerResponse(dockerContainer, task.GetPrimaryENI()))
 	}
 
-	taskResponse.FaultInjectionEnabled = task.IsFaultInjectionEnabled()
-	var taskNetworkConfig *tmdsv4.TaskNetworkConfig
-	if task.IsNetworkModeHost() {
-		// For host most, we don't really need the network namespace in order to do anything within the host instance network namespace
-		// and so we will set this to an arbitrary value such as "host".
-		// TODO: Will need to find/obtain the interface name of the default network interface on the host instance
-		taskNetworkConfig = tmdsv4.NewTaskNetworkConfig(task.GetNetworkMode(), defaultHostNetworkNamespace, task.GetDefaultIfname())
-	} else {
-		taskNetworkConfig = tmdsv4.NewTaskNetworkConfig(task.GetNetworkMode(), task.GetNetworkNamespace(), task.GetDefaultIfname())
-	}
+	if includeTaskNetworkConfig {
+		taskResponse.FaultInjectionEnabled = task.IsFaultInjectionEnabled()
+		var taskNetworkConfig *tmdsv4.TaskNetworkConfig
+		if task.IsNetworkModeHost() {
+			// For host most, we don't really need the network namespace in order to do anything within the host instance network namespace
+			// and so we will set this to an arbitrary value such as "host".
+			// TODO: Will need to find/obtain the interface name of the default network interface on the host instance
+			taskNetworkConfig = tmdsv4.NewTaskNetworkConfig(task.GetNetworkMode(), defaultHostNetworkNamespace, task.GetDefaultIfname())
+		} else {
+			taskNetworkConfig = tmdsv4.NewTaskNetworkConfig(task.GetNetworkMode(), task.GetNetworkNamespace(), task.GetDefaultIfname())
+		}
 
-	taskResponse.TaskNetworkConfig = taskNetworkConfig
+		taskResponse.TaskNetworkConfig = taskNetworkConfig
+	}
 
 	return *taskResponse, nil
 }

diff --git a/...dor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers.go b/...dor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers.go
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/state.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/state.go
diff --git a/ecs-agent/tmds/handlers/fault/v1/handlers/handlers.go b/ecs-agent/tmds/handlers/fault/v1/handlers/handlers.go
@@ -737,7 +737,7 @@ func validateRequest(w http.ResponseWriter, request types.NetworkFaultRequest, r
 func validateTaskMetadata(w http.ResponseWriter, agentState state.AgentState, requestType string, r *http.Request) (*state.TaskResponse, error) {
 	var taskMetadata state.TaskResponse
 	endpointContainerID := mux.Vars(r)[v4.EndpointContainerIDMuxName]
-	taskMetadata, err := agentState.GetTaskMetadata(endpointContainerID)
+	taskMetadata, err := agentState.GetTaskMetadataWithTaskNetworkConfig(endpointContainerID)
 	if err != nil {
 		code, errResponse := getTaskMetadataErrorResponse(endpointContainerID, requestType, err)
 		responseBody := types.NewNetworkFaultInjectionErrorResponse(fmt.Sprintf("%v", errResponse))