Merge pull request #191 from DevopsArtFactory/refactor/107-ecs-submodel

refactor: extract ECS TUI submodel

Author: nathanhuh

internal/app/app.go

@@ -137,26 +137,6 @@ type Model struct {
 	sgAddInput             string            // current field text input
 	sgAddSelectIdx         int               // index for select-type fields (direction, protocol)
 
-	// ECS browser state
-	ecsClusters         []awsservice.ECSCluster
-	filteredECSClusters []awsservice.ECSCluster
-	ecsClusterIdx       int
-	selectedECSCluster  *awsservice.ECSCluster
-
-	ecsServices         []awsservice.ECSService
-	filteredECSServices []awsservice.ECSService
-	ecsServiceIdx       int
-	selectedECSService  *awsservice.ECSService
-	selectedECSDetail   *awsservice.ECSServiceDetail
-	ecsDetailScroll     int
-
-	ecsTasks        []awsservice.ECSTask
-	ecsTaskIdx      int
-	selectedECSTask *awsservice.ECSTask
-
-	ecsContainers   []awsservice.ECSContainer
-	ecsContainerIdx int
-
 	// EKS browser state
 	eksClusters         []awsservice.EKSCluster
 	filteredEKSClusters []awsservice.EKSCluster
@@ -171,6 +151,7 @@ type Model struct {
 
 	// Feature submodels
 	ec2Browser   ec2InstanceBrowserModel
+	ecs          ecsModel
 	vpc          vpcModel
 	reachability reachabilityModel
 	cwMetrics    cloudWatchMetricsModel
@@ -281,6 +262,7 @@ func New(cfg *config.Config, configPath string, version string, checklistPath ..
 		contextTable:           newContextTable(),
 	}
 	model.ec2Browser = newEC2InstanceBrowserModel()
+	model.ecs = newECSModel()
 	model.vpc = newVPCModel()
 	model.reachability = newReachabilityModel()
 	model.cwMetrics = newCloudWatchMetricsModel()
@@ -389,7 +371,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	for _, h := range []func(tea.Msg) (tea.Model, tea.Cmd, bool){
 		m.handleEC2VPCMsg,
 		m.handleSecurityGroupMsg,
-		m.handleECSMsg,
 		m.handleEKSMsg,
 		m.handleInspectorMsg,
 		m.handleContextMsg,
@@ -480,16 +461,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m.updateSecurityGroupAddRule(msg)
 		case screenSecurityGroupDeleteConfirm:
 			return m.updateSecurityGroupDeleteConfirm(msg)
-		case screenECSClusterList:
-			return m.updateECSClusterList(msg)
-		case screenECSServiceList:
-			return m.updateECSServiceList(msg)
-		case screenECSServiceDetail:
-			return m.updateECSServiceDetail(msg)
-		case screenECSTaskList:
-			return m.updateECSTaskList(msg)
-		case screenECSContainerList:
-			return m.updateECSContainerList(msg)
 		case screenEKSClusterList:
 			return m.updateEKSClusterList(msg)
 		case screenEKSNodeGroupList:
@@ -599,7 +570,7 @@ func (m Model) updateFeatureList(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			case domain.FeatureRotateAccessKey:
 				return m.iam.StartKeys(&m, true)
 			case domain.FeatureECSExec:
-				return m.startLoading(m.loadECSClusters())
+				return m.ecs.Start(&m)
 			case domain.FeatureEKSBrowser:
 				return m.startLoading(m.loadEKSClusters())
 			case domain.FeatureLambdaBrowser:
@@ -670,16 +641,6 @@ func (m Model) View() string {
 		v = m.viewSecurityGroupAddRule()
 	case screenSecurityGroupDeleteConfirm:
 		v = m.viewSecurityGroupDeleteConfirm()
-	case screenECSClusterList:
-		v = m.viewECSClusterList()
-	case screenECSServiceList:
-		v = m.viewECSServiceList()
-	case screenECSServiceDetail:
-		v = m.viewECSServiceDetail()
-	case screenECSTaskList:
-		v = m.viewECSTaskList()
-	case screenECSContainerList:
-		v = m.viewECSContainerList()
 	case screenEKSClusterList:
 		v = m.viewEKSClusterList()
 	case screenEKSNodeGroupList:

internal/app/feature_submodel.go

@@ -10,5 +10,5 @@ type featureSubmodel interface {
 }
 
 func (m *Model) featureSubmodels() []featureSubmodel {
-	return []featureSubmodel{&m.ec2Browser, &m.vpc, &m.reachability, &m.cwMetrics, &m.cwLogs, &m.rds, &m.route53, &m.iam, &m.bedrock, &m.secrets, &m.s3, &m.lambda}
+	return []featureSubmodel{&m.ec2Browser, &m.ecs, &m.vpc, &m.reachability, &m.cwMetrics, &m.cwLogs, &m.rds, &m.route53, &m.iam, &m.bedrock, &m.secrets, &m.s3, &m.lambda}
 }

internal/app/filter.go

@@ -168,12 +168,6 @@ func (m *Model) applyFilterTarget(target filterTarget) {
 	case filterSecurityGroups:
 		m.filteredSecurityGroups = applyFilter(m.securityGroups, m.filterValue(target))
 		m.sgIdx = 0
-	case filterECSClusters:
-		m.filteredECSClusters = applyFilter(m.ecsClusters, m.filterValue(target))
-		m.ecsClusterIdx = 0
-	case filterECSServices:
-		m.filteredECSServices = applyFilter(m.ecsServices, m.filterValue(target))
-		m.ecsServiceIdx = 0
 	case filterEKSClusters:
 		m.filteredEKSClusters = applyFilter(m.eksClusters, m.filterValue(target))
 		m.eksClusterIdx = 0