States

Author: giulio93

cmd/gendoc/docs.go

@@ -69,7 +69,7 @@ func NewOpenApiGenerator(version string) *Generator {
 		openapi3.SchemaOrRef{
 			Schema: &openapi3.Schema{
 				UniqueItems: f.Ptr(true),
-				Enum:        f.Map(orchestrator.State("").AllowedStatuses(), func(v orchestrator.State) interface{} { return v }),
+				Enum:        f.Map(orchestrator.State("").AllowedStates(), func(v orchestrator.State) interface{} { return v }),
 				Type:        f.Ptr(openapi3.SchemaTypeString),
 				Description: f.Ptr("Application status"),
 				ReflectType: reflect.TypeOf(orchestrator.State("")),

internal/api/handlers/app_list.go

@@ -53,7 +53,7 @@ func HandleAppList(
 
 		var stateFilter orchestrator.State
 		if status := queryParams.Get("status"); status != "" {
-			status, err := orchestrator.ParseStatus(status)
+			status, err := orchestrator.ParseStates(status)
 			if err != nil {
 				render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: "invalid status filter"})
 				return

internal/orchestrator/status.go

@@ -48,7 +48,7 @@ func StatusFromDockerState(s container.ContainerState) State {
 	}
 }
 
-func ParseStatus(s string) (State, error) {
+func ParseStates(s string) (State, error) {
 	s1 := State(s)
 	return s1, s1.Validate()
 }
@@ -58,10 +58,10 @@ func (s State) Validate() error {
 	case StatusStarting, StatusRunning, StatusStopping, StatusStopped, StatusFailed:
 		return nil
 	default:
-		return fmt.Errorf("status should be one of %v", s.AllowedStatuses())
+		return fmt.Errorf("status should be one of %v", s.AllowedStates())
 	}
 }
 
-func (s State) AllowedStatuses() []State {
+func (s State) AllowedStates() []State {
 	return []State{StatusStarting, StatusRunning, StatusStopping, StatusStopped, StatusFailed}
 }