api/types/container: nice enum values for status

stevvooe · stevvooe · commit 178b4275cac0 · 2017-05-18T17:48:20.000-07:00
Signed-off-by: Stephen J Day &lt;stephen.day@docker.com&gt;
diff --git a/api/types/container/container.pb.go b/api/types/container/container.pb.go
diff --git a/api/types/container/container.proto b/api/types/container/container.proto
@@ -7,11 +7,14 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
 enum Status {
-	UNKNOWN = 0;
-	CREATED = 1;
-	RUNNING = 2;
-	STOPPED = 3;
-	PAUSED = 4;
+	option (gogoproto.goproto_enum_prefix) = false;
+	option (gogoproto.enum_customname) = "Status";
+
+	UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "StatusUnknown"];
+	CREATED = 1 [(gogoproto.enumvalue_customname) = "StatusCreated"];
+	RUNNING = 2 [(gogoproto.enumvalue_customname) = "StatusRunning"];
+	STOPPED = 3 [(gogoproto.enumvalue_customname) = "StatusStopped"];
+	PAUSED = 4 [(gogoproto.enumvalue_customname) = "StatusPaused"];
 }
 
 message Container {
diff --git a/linux/container.go b/linux/container.go
@@ -57,13 +57,13 @@ func (c *Container) State(ctx context.Context) (plugin.State, error) {
 	}
 	var status plugin.Status
 	switch response.Status {
-	case container.Status_CREATED:
+	case container.StatusCreated:
 		status = plugin.CreatedStatus
-	case container.Status_RUNNING:
+	case container.StatusRunning:
 		status = plugin.RunningStatus
-	case container.Status_STOPPED:
+	case container.StatusStopped:
 		status = plugin.StoppedStatus
-	case container.Status_PAUSED:
+	case container.StatusPaused:
 		status = plugin.PausedStatus
 		// TODO: containerd.DeletedStatus
 	}
diff --git a/linux/shim/service.go b/linux/shim/service.go
@@ -160,16 +160,16 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
 	if err != nil {
 		return nil, err
 	}
-	status := container.Status_UNKNOWN
+	status := container.StatusUnknown
 	switch st {
 	case "created":
-		status = container.Status_CREATED
+		status = container.StatusCreated
 	case "running":
-		status = container.Status_RUNNING
+		status = container.StatusRunning
 	case "stopped":
-		status = container.Status_STOPPED
+		status = container.StatusStopped
 	case "paused":
-		status = container.Status_PAUSED
+		status = container.StatusPaused
 	}
 	o := &shimapi.StateResponse{
 		ID:        s.id,
@@ -181,12 +181,12 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	for _, p := range s.processes {
-		status := container.Status_RUNNING
+		status := container.StatusRunning
 		if err := unix.Kill(p.Pid(), 0); err != nil {
 			if err != syscall.ESRCH {
 				return nil, err
 			}
-			status = container.Status_STOPPED
+			status = container.StatusStopped
 		}
 		o.Processes = append(o.Processes, &container.Process{
 			Pid:    uint32(p.Pid()),
diff --git a/services/execution/service.go b/services/execution/service.go
@@ -150,13 +150,13 @@ func containerFromContainerd(ctx context.Context, c plugin.Container) (*containe
 	var status container.Status
 	switch state.Status() {
 	case plugin.CreatedStatus:
-		status = container.Status_CREATED
+		status = container.StatusCreated
 	case plugin.RunningStatus:
-		status = container.Status_RUNNING
+		status = container.StatusRunning
 	case plugin.StoppedStatus:
-		status = container.Status_STOPPED
+		status = container.StatusStopped
 	case plugin.PausedStatus:
-		status = container.Status_PAUSED
+		status = container.StatusPaused
 	default:
 		log.G(ctx).WithField("status", state.Status()).Warn("unknown status")
 	}
