Refactor ACS attach instance ENI message handling

aws · Jun 29, 2023 · d8d984b · d8d984b
1 parent 18850dd
commit d8d984b
Show file tree

Hide file tree

Showing 7 changed files with 665 additions and 479 deletions.
diff --git a/agent/acs/handler/acs_handler.go b/agent/acs/handler/acs_handler.go
@@ -263,19 +263,6 @@ func (acsSession *session) startACSSession(client wsclient.ClientServer) error {
 		dataClient: acsSession.dataClient,
 	}
 
-	// Add handler to ack instance ENI attach message
-	instanceENIAttachHandler := newAttachInstanceENIHandler(
-		acsSession.ctx,
-		cfg.Cluster,
-		acsSession.containerInstanceARN,
-		client,
-		eniHandler,
-	)
-	instanceENIAttachHandler.start()
-	defer instanceENIAttachHandler.stop()
-
-	client.AddRequestHandler(instanceENIAttachHandler.handlerFunc())
-
 	manifestMessageIDAccessor := &manifestMessageIDAccessor{}
 
 	// Add TaskManifestHandler
@@ -314,6 +301,7 @@ func (acsSession *session) startACSSession(client wsclient.ClientServer) error {
 	}
 	responders := []wsclient.RequestResponder{
 		acssession.NewAttachTaskENIResponder(eniHandler, responseSender),
+		acssession.NewAttachInstanceENIResponder(eniHandler, responseSender),
 		acssession.NewHeartbeatResponder(acsSession.doctor, responseSender),
 	}
 	for _, r := range responders {

diff --git a/agent/acs/handler/attach_instance_eni_handler.go b/agent/acs/handler/attach_instance_eni_handler.go