Moved NetConfigClient struct into netconfig

mye956 · Sep 26, 2024 · e651ae8 · e651ae8
1 parent ef1a678
commit e651ae8
Show file tree

Hide file tree

Showing 24 changed files with 189 additions and 450 deletions.
diff --git a/agent/handlers/task_server_setup_linux_test.go b/agent/handlers/task_server_setup_linux_test.go
@@ -26,6 +26,7 @@ import (
 	mock_stats "github.com/aws/amazon-ecs-agent/agent/stats/mock"
 	mock_ecs "github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/mocks"
 	v4 "github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/tmds/utils/netconfig"
 	mock_netlinkwrapper "github.com/aws/amazon-ecs-agent/ecs-agent/utils/netlinkwrapper/mocks"
 
 	"github.com/golang/mock/gomock"
@@ -45,7 +46,7 @@ func TestV4GetTaskMetadataWithTaskNetworkConfig(t *testing.T) {
 			name: "happy case with awsvpc mode",
 			setStateExpectations: func(state *mock_dockerstate.MockTaskEngineState) {
 				task := standardTask()
-				task.FaultInjectionEnabled = true
+				task.EnableFaultInjection = true
 				task.NetworkNamespace = networkNamespace
 				task.DefaultIfname = defaultIfname
 				gomock.InOrder(
@@ -64,7 +65,7 @@ func TestV4GetTaskMetadataWithTaskNetworkConfig(t *testing.T) {
 			name: "happy case with host mode",
 			setStateExpectations: func(state *mock_dockerstate.MockTaskEngineState) {
 				hostTask := standardHostTask()
-				hostTask.FaultInjectionEnabled = true
+				hostTask.EnableFaultInjection = true
 				hostTask.NetworkNamespace = networkNamespace
 				hostTask.DefaultIfname = defaultIfname
 				gomock.InOrder(
@@ -127,7 +128,7 @@ func TestV4GetTaskMetadataWithTaskNetworkConfig(t *testing.T) {
 			}
 			tmdsAgentState := agentV4.NewTMDSAgentState(state, statsEngine, ecsClient, clusterName, availabilityzone, vpcID, containerInstanceArn)
 
-			netConfigClient := v4.NewNetworkConfigClient()
+			netConfigClient := netconfig.NewNetworkConfigClient()
 
 			if tc.setNetLinkExpectations != nil {
 				mock_netlinkwrapper := mock_netlinkwrapper.NewMockNetLink(ctrl)

diff --git a/agent/handlers/task_server_setup_other_test.go b/agent/handlers/task_server_setup_other_test.go
@@ -41,7 +41,7 @@ func TestV4GetTaskMetadataWithTaskNetworkConfig(t *testing.T) {
 			name: "happy case with awsvpc mode",
 			setStateExpectations: func(state *mock_dockerstate.MockTaskEngineState) {
 				task := standardTask()
-				task.FaultInjectionEnabled = true
+				task.EnableFaultInjection = true
 				task.NetworkNamespace = networkNamespace
 				task.DefaultIfname = defaultIfname
 				gomock.InOrder(
@@ -60,7 +60,7 @@ func TestV4GetTaskMetadataWithTaskNetworkConfig(t *testing.T) {
 			name: "happy case with host mode",
 			setStateExpectations: func(state *mock_dockerstate.MockTaskEngineState) {
 				hostTask := standardHostTask()
-				hostTask.FaultInjectionEnabled = true
+				hostTask.EnableFaultInjection = true
 				hostTask.NetworkNamespace = networkNamespace
 				hostTask.DefaultIfname = defaultIfname
 				gomock.InOrder(

diff --git a/agent/handlers/v4/tmdsstate_linux.go b/agent/handlers/v4/tmdsstate_linux.go
@@ -23,7 +23,9 @@ import (
 	"github.com/aws/amazon-ecs-agent/ecs-agent/tmds/utils/netconfig"
 )
 
-func (s *TMDSAgentState) GetTaskMetadataWithTaskNetworkConfig(v3EndpointID string, networkConfigClient *tmdsv4.NetworkConfigClient) (tmdsv4.TaskResponse, error) {
+// Returns task metadata including the task network configuration in v4 format for the
+// task identified by the provided endpointContainerID.
+func (s *TMDSAgentState) GetTaskMetadataWithTaskNetworkConfig(v3EndpointID string, networkConfigClient *netconfig.NetworkConfigClient) (tmdsv4.TaskResponse, error) {
 	taskResponse, err := s.getTaskMetadata(v3EndpointID, false, true)
 	if err == nil {
 		if taskResponse.TaskNetworkConfig != nil && taskResponse.TaskNetworkConfig.NetworkMode == "host" {

diff --git a/agent/handlers/v4/tmdsstate_other.go b/agent/handlers/v4/tmdsstate_other.go
@@ -18,8 +18,11 @@ package v4
 
 import (
 	tmdsv4 "github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/tmds/utils/netconfig"
 )
 
-func (s *TMDSAgentState) GetTaskMetadataWithTaskNetworkConfig(v3EndpointID string, networkConfigClient *tmdsv4.NetworkConfigClient) (tmdsv4.TaskResponse, error) {
+// Returns task metadata including the task network configuration in v4 format for the
+// task identified by the provided endpointContainerID.
+func (s *TMDSAgentState) GetTaskMetadataWithTaskNetworkConfig(v3EndpointID string, networkConfigClient *netconfig.NetworkConfigClient) (tmdsv4.TaskResponse, error) {
 	return s.getTaskMetadata(v3EndpointID, false, true)
 }
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/...om/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers_linux_tests.go b/...om/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers_linux_tests.go
diff --git a/...om/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers_other_tests.go b/...om/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/fault/v1/handlers/handlers_other_tests.go
diff --git a/...ndor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/mocks/state_mock.go b/...ndor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/mocks/state_mock.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/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/state_linux.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/state_linux.go
diff --git a/.../vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/utils/netconfig/netconfig_linux.go b/.../vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/utils/netconfig/netconfig_linux.go