@@ -19,7 +19,7 @@ import (
1919 "github.com/arduino/arduino-app-cli/internal/orchestrator/config"
2020)
2121
22- type AppStatus struct {
22+ type AppStatusInfo struct {
2323 AppPath * paths.Path
2424 Status Status
2525}
@@ -34,8 +34,8 @@ type AppStatus struct {
3434// failed: at least one failed
3535// stopping: at least one stopping
3636// starting: at least one starting
37- func parseAppStatus (containers []container.Summary ) []AppStatus {
38- apps := make ([]AppStatus , 0 , len (containers ))
37+ func parseAppStatus (containers []container.Summary ) []AppStatusInfo {
38+ apps := make ([]AppStatusInfo , 0 , len (containers ))
3939 appsStatusMap := make (map [string ][]Status )
4040 for _ , c := range containers {
4141 appPath , ok := c .Labels [DockerAppPathLabel ]
@@ -46,7 +46,7 @@ func parseAppStatus(containers []container.Summary) []AppStatus {
4646 }
4747
4848 appendResult := func (appPath * paths.Path , status Status ) {
49- apps = append (apps , AppStatus {
49+ apps = append (apps , AppStatusInfo {
5050 AppPath : appPath ,
5151 Status : status ,
5252 })
@@ -90,8 +90,8 @@ func parseAppStatus(containers []container.Summary) []AppStatus {
9090func getAppsStatus (
9191 ctx context.Context ,
9292 docker dockerClient.APIClient ,
93- ) ([]AppStatus , error ) {
94- getPythonApp := func () ([]AppStatus , error ) {
93+ ) ([]AppStatusInfo , error ) {
94+ getPythonApp := func () ([]AppStatusInfo , error ) {
9595 containers , err := docker .ContainerList (ctx , container.ListOptions {
9696 All : true ,
9797 Filters : filters .NewArgs (filters .Arg ("label" , DockerAppLabel + "=true" )),
@@ -105,12 +105,12 @@ func getAppsStatus(
105105 return parseAppStatus (containers ), nil
106106 }
107107
108- getSketchApp := func () ([]AppStatus , error ) {
108+ getSketchApp := func () ([]AppStatusInfo , error ) {
109109 // TODO: implement this function
110110 return nil , nil
111111 }
112112
113- for _ , get := range [](func () ([]AppStatus , error )){getPythonApp , getSketchApp } {
113+ for _ , get := range [](func () ([]AppStatusInfo , error )){getPythonApp , getSketchApp } {
114114 apps , err := get ()
115115 if err != nil {
116116 return nil , err
@@ -126,16 +126,16 @@ func getAppStatus(
126126 ctx context.Context ,
127127 docker command.Cli ,
128128 app app.ArduinoApp ,
129- ) (AppStatus , error ) {
129+ ) (AppStatusInfo , error ) {
130130 apps , err := getAppsStatus (ctx , docker .Client ())
131131 if err != nil {
132- return AppStatus {}, fmt .Errorf ("failed to get app status: %w" , err )
132+ return AppStatusInfo {}, fmt .Errorf ("failed to get app status: %w" , err )
133133 }
134- idx := slices .IndexFunc (apps , func (a AppStatus ) bool {
134+ idx := slices .IndexFunc (apps , func (a AppStatusInfo ) bool {
135135 return a .AppPath .String () == app .FullPath .String ()
136136 })
137137 if idx == - 1 {
138- return AppStatus {}, fmt .Errorf ("app %s not found" , app .FullPath )
138+ return AppStatusInfo {}, fmt .Errorf ("app %s not found" , app .FullPath )
139139 }
140140 return apps [idx ], nil
141141}
@@ -148,7 +148,7 @@ func getRunningApp(
148148 if err != nil {
149149 return nil , fmt .Errorf ("failed to get running apps: %w" , err )
150150 }
151- idx := slices .IndexFunc (apps , func (a AppStatus ) bool {
151+ idx := slices .IndexFunc (apps , func (a AppStatusInfo ) bool {
152152 return a .Status == StatusRunning || a .Status == StatusStarting
153153 })
154154 if idx == - 1 {
0 commit comments