Merge pull request #876 from stevvooe/nice-enum-values
api/types/container: nice enum values for status
This commit is contained in:
Phil Estes
GitHub
commit
5ee77fc281
@ -47,11 +47,11 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
|
||||
type Status int32
|
||||
|
||||
const (
|
||||
Status_UNKNOWN Status = 0
|
||||
Status_CREATED Status = 1
|
||||
Status_RUNNING Status = 2
|
||||
Status_STOPPED Status = 3
|
||||
Status_PAUSED Status = 4
|
||||
StatusUnknown Status = 0
|
||||
StatusCreated Status = 1
|
||||
StatusRunning Status = 2
|
||||
StatusStopped Status = 3
|
||||
StatusPaused Status = 4
|
||||
)
|
||||
|
||||
var Status_name = map[int32]string{
|
||||
@ -1413,44 +1413,48 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptorContainer = []byte{
|
||||
// 612 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x6e, 0xd3, 0x4c,
|
||||
0x14, 0xcd, 0xd8, 0xce, 0x8f, 0x6f, 0xbe, 0xe6, 0xb3, 0x86, 0x0a, 0xb9, 0x41, 0x4a, 0xa2, 0x08,
|
||||
0x89, 0x08, 0x09, 0x47, 0xa4, 0x0b, 0xd8, 0xba, 0xb5, 0x55, 0x2a, 0x44, 0x12, 0x26, 0x8e, 0xe8,
|
||||
0x2e, 0x9a, 0xc6, 0xc6, 0x0c, 0x6a, 0xec, 0xc8, 0x1e, 0x17, 0xb2, 0xe3, 0x11, 0x78, 0x06, 0xf6,
|
||||
0xbc, 0x47, 0x97, 0x2c, 0x59, 0x15, 0x9a, 0x27, 0x41, 0x33, 0x4e, 0xea, 0xaa, 0x2d, 0x12, 0x1b,
|
||||
0xeb, 0xdc, 0xab, 0x73, 0xcf, 0xdc, 0x73, 0x8f, 0xc1, 0x09, 0x19, 0xff, 0x90, 0x9d, 0x5a, 0xf3,
|
||||
0x78, 0xd1, 0x9f, 0xc7, 0x11, 0xa7, 0x2c, 0x0a, 0x12, 0xff, 0x26, 0xa4, 0x4b, 0xd6, 0xe7, 0xab,
|
||||
0x65, 0x90, 0x16, 0xcd, 0x02, 0x59, 0xcb, 0x24, 0xe6, 0x31, 0x7e, 0x50, 0xf0, 0xad, 0xf3, 0xe7,
|
||||
0x96, 0xa4, 0x37, 0xf7, 0xc2, 0x38, 0x0e, 0xcf, 0x82, 0xbe, 0xa4, 0x9c, 0x66, 0xef, 0xfb, 0x34,
|
||||
0x5a, 0xe5, 0xfc, 0xe6, 0x6e, 0x18, 0x87, 0xb1, 0x84, 0x7d, 0x81, 0x36, 0xdd, 0xf6, 0xed, 0x01,
|
||||
0xce, 0x16, 0x41, 0xca, 0xe9, 0x62, 0x99, 0x13, 0xba, 0x1f, 0x41, 0x3f, 0xdc, 0x3e, 0x84, 0x1f,
|
||||
0x82, 0xc2, 0x7c, 0x13, 0x75, 0x50, 0x4f, 0x3f, 0xa8, 0xac, 0x2f, 0xdb, 0xca, 0xb1, 0x43, 0x14,
|
||||
0xe6, 0x63, 0x03, 0xd4, 0x25, 0xf3, 0x4d, 0xa5, 0x83, 0x7a, 0x3b, 0x44, 0x40, 0xbc, 0x0f, 0x95,
|
||||
0x94, 0x53, 0x9e, 0xa5, 0xa6, 0xda, 0x41, 0xbd, 0xc6, 0xe0, 0x91, 0x75, 0xcf, 0xba, 0xd6, 0x44,
|
||||
0x52, 0xc8, 0x86, 0xda, 0xfd, 0xae, 0x40, 0x75, 0x9c, 0xc4, 0xf3, 0x20, 0x4d, 0xb7, 0x92, 0xa8,
|
||||
0x90, 0xc4, 0xa0, 0xd1, 0x24, 0x4c, 0x4d, 0xa5, 0xa3, 0xf6, 0x74, 0x22, 0xb1, 0x60, 0x05, 0xd1,
|
||||
0xb9, 0xa9, 0xca, 0x96, 0x80, 0xf8, 0x19, 0x68, 0x59, 0x1a, 0x24, 0xa6, 0xd6, 0x41, 0xbd, 0xfa,
|
||||
0x60, 0xef, 0xde, 0x67, 0xa7, 0x69, 0x90, 0x10, 0x49, 0x13, 0x02, 0xf3, 0x4f, 0xbe, 0x59, 0x16,
|
||||
0x96, 0x88, 0x80, 0xb8, 0x09, 0x35, 0x1e, 0x24, 0x0b, 0x16, 0xd1, 0x33, 0xb3, 0xd2, 0x41, 0xbd,
|
||||
0x1a, 0xb9, 0xae, 0x71, 0x1b, 0xea, 0xc1, 0x67, 0xc6, 0x67, 0x1b, 0x6b, 0x55, 0xb9, 0x1c, 0x88,
|
||||
0x56, 0xee, 0xe4, 0x86, 0xed, 0xda, 0x3f, 0xdb, 0xc6, 0x2f, 0xe0, 0xbf, 0x24, 0x8b, 0xc4, 0xe1,
|
||||
0x67, 0x3e, 0xe5, 0xd4, 0xd4, 0xe5, 0xea, 0xbb, 0x56, 0x1e, 0x8d, 0xb5, 0x8d, 0xc6, 0xb2, 0xa3,
|
||||
0x15, 0xa9, 0x6f, 0x98, 0x0e, 0xe5, 0xb4, 0x3b, 0x01, 0x6d, 0xba, 0x31, 0x91, 0x15, 0xb7, 0xca,
|
||||
0xf2, 0x40, 0xc2, 0x22, 0x90, 0x90, 0xf9, 0xf8, 0x09, 0xfc, 0x4f, 0x7d, 0x9f, 0x71, 0x16, 0x47,
|
||||
0xf4, 0x6c, 0x16, 0x32, 0x3f, 0x95, 0x57, 0xdb, 0x21, 0x8d, 0xa2, 0x7d, 0xc4, 0xfc, 0xb4, 0xfb,
|
||||
0x4d, 0x81, 0xb2, 0x7b, 0x1e, 0x44, 0xfc, 0xaf, 0x69, 0xbf, 0x04, 0x4d, 0xf8, 0x90, 0xea, 0x8d,
|
||||
0xc1, 0xe3, 0x7b, 0x2d, 0x4a, 0x85, 0xfc, 0xeb, 0xad, 0x96, 0x01, 0x91, 0x13, 0xdb, 0x50, 0xd5,
|
||||
0x22, 0xd4, 0x5b, 0x17, 0xd5, 0xee, 0x5c, 0xd4, 0x06, 0x5d, 0x54, 0x81, 0x3f, 0xa3, 0x5c, 0xc6,
|
||||
0x54, 0x1f, 0x34, 0xef, 0x5c, 0xc6, 0xdb, 0xfe, 0xb4, 0x07, 0xb5, 0x8b, 0xcb, 0x76, 0xe9, 0xeb,
|
||||
0xaf, 0x36, 0x22, 0xb5, 0x7c, 0xcc, 0xe6, 0xdd, 0xb7, 0xa0, 0x5f, 0x2f, 0x82, 0x6b, 0xa0, 0xb9,
|
||||
0x27, 0xc7, 0x9e, 0x51, 0xc2, 0x55, 0x50, 0x47, 0xa3, 0x37, 0x06, 0xc2, 0x00, 0x95, 0x43, 0xe2,
|
||||
0xda, 0x9e, 0x6b, 0x28, 0x58, 0x87, 0xf2, 0xc4, 0xb3, 0x89, 0x67, 0xa8, 0xb8, 0x01, 0xe0, 0x9e,
|
||||
0xb8, 0x87, 0x33, 0xdb, 0x71, 0x5c, 0xc7, 0xd0, 0x04, 0x6d, 0x6c, 0x4f, 0x27, 0xae, 0x63, 0x94,
|
||||
0x9f, 0xbe, 0x82, 0xca, 0x66, 0xbf, 0x3a, 0x54, 0xa7, 0xc3, 0xd7, 0xc3, 0xd1, 0xbb, 0xa1, 0x51,
|
||||
0x12, 0x45, 0xae, 0xe4, 0x18, 0x48, 0x14, 0x64, 0x3a, 0x1c, 0x1e, 0x0f, 0x8f, 0x0c, 0x45, 0x14,
|
||||
0x13, 0x6f, 0x34, 0x1e, 0xbb, 0x8e, 0xa1, 0xde, 0x50, 0xd2, 0x0e, 0xcc, 0x8b, 0xab, 0x56, 0xe9,
|
||||
0xe7, 0x55, 0xab, 0xf4, 0x65, 0xdd, 0x42, 0x17, 0xeb, 0x16, 0xfa, 0xb1, 0x6e, 0xa1, 0xdf, 0xeb,
|
||||
0x16, 0x3a, 0xad, 0x48, 0x7b, 0xfb, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x9b, 0x55, 0x0d,
|
||||
0x2f, 0x04, 0x00, 0x00,
|
||||
// 680 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0x6f, 0xd3, 0x4a,
|
||||
0x14, 0x8d, 0x3f, 0xf2, 0x35, 0x69, 0xf3, 0xfc, 0xe6, 0x55, 0x4f, 0x6e, 0x40, 0x8e, 0x15, 0x21,
|
||||
0x11, 0x21, 0xe1, 0x88, 0x74, 0x01, 0xdb, 0x34, 0xb6, 0xaa, 0x0a, 0x91, 0x04, 0x27, 0x11, 0xdd,
|
||||
0x45, 0xd3, 0x78, 0x30, 0x03, 0xcd, 0xd8, 0xb2, 0xc7, 0x2d, 0xd9, 0xb1, 0x44, 0x5d, 0xf1, 0x07,
|
||||
0xba, 0x01, 0xb6, 0x6c, 0x59, 0xf0, 0x0b, 0xba, 0x64, 0xc9, 0xaa, 0xd0, 0xfc, 0x12, 0x34, 0xe3,
|
||||
0xa4, 0x8e, 0xda, 0x22, 0xb1, 0xb1, 0xce, 0xdc, 0x73, 0xe6, 0xce, 0x3d, 0xf7, 0x18, 0xd8, 0x3e,
|
||||
0x61, 0xaf, 0x92, 0x43, 0x6b, 0x1a, 0xcc, 0x5a, 0xd3, 0x80, 0x32, 0x44, 0x28, 0x8e, 0xbc, 0x75,
|
||||
0x88, 0x42, 0xd2, 0x62, 0xf3, 0x10, 0xc7, 0x59, 0x31, 0x43, 0x56, 0x18, 0x05, 0x2c, 0x80, 0xff,
|
||||
0x65, 0x7a, 0xeb, 0xf8, 0x91, 0x25, 0xe4, 0xb5, 0x6d, 0x3f, 0x08, 0xfc, 0x23, 0xdc, 0x12, 0x92,
|
||||
0xc3, 0xe4, 0x65, 0x0b, 0xd1, 0x79, 0xaa, 0xaf, 0x6d, 0xf9, 0x81, 0x1f, 0x08, 0xd8, 0xe2, 0x68,
|
||||
0x59, 0xad, 0x5f, 0xbf, 0xc0, 0xc8, 0x0c, 0xc7, 0x0c, 0xcd, 0xc2, 0x54, 0xd0, 0x78, 0x0d, 0xca,
|
||||
0xdd, 0xd5, 0x43, 0xf0, 0x7f, 0x20, 0x13, 0x4f, 0x97, 0x4c, 0xa9, 0x59, 0xde, 0x2d, 0x2c, 0x2e,
|
||||
0xea, 0xf2, 0xbe, 0xed, 0xca, 0xc4, 0x83, 0x1a, 0x50, 0x42, 0xe2, 0xe9, 0xb2, 0x29, 0x35, 0x37,
|
||||
0x5d, 0x0e, 0xe1, 0x0e, 0x28, 0xc4, 0x0c, 0xb1, 0x24, 0xd6, 0x15, 0x53, 0x6a, 0x56, 0xdb, 0x77,
|
||||
0xac, 0x5b, 0xc6, 0xb5, 0x86, 0x42, 0xe2, 0x2e, 0xa5, 0x8d, 0x2f, 0x32, 0x28, 0x0e, 0xa2, 0x60,
|
||||
0x8a, 0xe3, 0x78, 0xd5, 0x52, 0xca, 0x5a, 0x42, 0xa0, 0xa2, 0xc8, 0x8f, 0x75, 0xd9, 0x54, 0x9a,
|
||||
0x65, 0x57, 0x60, 0xae, 0xc2, 0xf4, 0x58, 0x57, 0x44, 0x89, 0x43, 0xf8, 0x10, 0xa8, 0x49, 0x8c,
|
||||
0x23, 0x5d, 0x35, 0xa5, 0x66, 0xa5, 0xbd, 0x7d, 0xeb, 0xb3, 0xe3, 0x18, 0x47, 0xae, 0x90, 0xf1,
|
||||
0x06, 0xd3, 0x13, 0x4f, 0xcf, 0x73, 0x4b, 0x2e, 0x87, 0xb0, 0x06, 0x4a, 0x0c, 0x47, 0x33, 0x42,
|
||||
0xd1, 0x91, 0x5e, 0x30, 0xa5, 0x66, 0xc9, 0xbd, 0x3a, 0xc3, 0x3a, 0xa8, 0xe0, 0xb7, 0x84, 0x4d,
|
||||
0x96, 0xd6, 0x8a, 0x62, 0x38, 0xc0, 0x4b, 0xa9, 0x93, 0x35, 0xdb, 0xa5, 0xbf, 0xb6, 0x0d, 0x1f,
|
||||
0x83, 0x8d, 0x28, 0xa1, 0x7c, 0xf1, 0x13, 0x0f, 0x31, 0xa4, 0x97, 0xc5, 0xe8, 0x5b, 0x56, 0x1a,
|
||||
0x8d, 0xb5, 0x8a, 0xc6, 0xea, 0xd0, 0xb9, 0x5b, 0x59, 0x2a, 0x6d, 0xc4, 0x50, 0x63, 0x08, 0xd4,
|
||||
0xf1, 0xd2, 0x44, 0x92, 0xed, 0x2a, 0x49, 0x03, 0xf1, 0xb3, 0x40, 0x7c, 0xe2, 0xc1, 0xfb, 0xe0,
|
||||
0x1f, 0xe4, 0x79, 0x84, 0x91, 0x80, 0xa2, 0xa3, 0x89, 0x4f, 0xbc, 0x58, 0x6c, 0x6d, 0xd3, 0xad,
|
||||
0x66, 0xe5, 0x3d, 0xe2, 0xc5, 0x8d, 0x8f, 0x32, 0xc8, 0x3b, 0xc7, 0x98, 0xb2, 0x3f, 0xa6, 0xfd,
|
||||
0x04, 0xa8, 0xdc, 0x87, 0xe8, 0x5e, 0x6d, 0xdf, 0xbb, 0xd5, 0xa2, 0xe8, 0x90, 0x7e, 0x47, 0xf3,
|
||||
0x10, 0xbb, 0xe2, 0xc6, 0x2a, 0x54, 0x25, 0x0b, 0xf5, 0xda, 0x46, 0xd5, 0x1b, 0x1b, 0xed, 0x80,
|
||||
0x32, 0x3f, 0x61, 0x6f, 0x82, 0x98, 0x88, 0xa9, 0xd2, 0xae, 0xdd, 0xd8, 0xcc, 0x68, 0xf5, 0xd3,
|
||||
0xee, 0x96, 0xce, 0x2f, 0xea, 0xb9, 0x0f, 0x3f, 0xeb, 0x92, 0x5b, 0x4a, 0xaf, 0x75, 0x58, 0xe3,
|
||||
0x39, 0x28, 0x5f, 0x0d, 0x02, 0x4b, 0x40, 0x75, 0x0e, 0xf6, 0x47, 0x5a, 0x0e, 0x16, 0x81, 0xd2,
|
||||
0xef, 0x3f, 0xd3, 0x24, 0x08, 0x40, 0xa1, 0xeb, 0x3a, 0x9d, 0x91, 0xa3, 0xc9, 0xb0, 0x0c, 0xf2,
|
||||
0xc3, 0x51, 0xc7, 0x1d, 0x69, 0x0a, 0xac, 0x02, 0xe0, 0x1c, 0x38, 0xdd, 0x49, 0xc7, 0xb6, 0x1d,
|
||||
0x5b, 0x53, 0xb9, 0x6c, 0xd0, 0x19, 0x0f, 0x1d, 0x5b, 0xcb, 0x3f, 0xf8, 0x2a, 0x81, 0xc2, 0x72,
|
||||
0x40, 0x03, 0x14, 0xc7, 0xbd, 0xa7, 0xbd, 0xfe, 0x8b, 0x9e, 0x96, 0xab, 0xfd, 0x7b, 0x7a, 0x66,
|
||||
0x6e, 0xa6, 0xc4, 0x98, 0xbe, 0xa1, 0xc1, 0x09, 0xe5, 0x7c, 0xda, 0xdd, 0xd6, 0xa4, 0x75, 0xbe,
|
||||
0x1b, 0x61, 0xc4, 0xb0, 0xc7, 0x79, 0x77, 0xdc, 0xeb, 0xed, 0xf7, 0xf6, 0x34, 0x79, 0x9d, 0x77,
|
||||
0x13, 0x4a, 0x09, 0xf5, 0x39, 0x3f, 0x1c, 0xf5, 0x07, 0x03, 0xc7, 0xd6, 0x94, 0x75, 0x7e, 0xc8,
|
||||
0x82, 0x30, 0xc4, 0x1e, 0xbc, 0x7b, 0x35, 0x96, 0x5a, 0xd3, 0x4e, 0xcf, 0xcc, 0x8d, 0x94, 0x1e,
|
||||
0xa0, 0x24, 0xc6, 0x5e, 0xad, 0xfa, 0xfe, 0x93, 0x91, 0xfb, 0xf6, 0xd9, 0x58, 0x4e, 0xbb, 0xab,
|
||||
0x9f, 0x5f, 0x1a, 0xb9, 0x1f, 0x97, 0x46, 0xee, 0xdd, 0xc2, 0x90, 0xce, 0x17, 0x86, 0xf4, 0x7d,
|
||||
0x61, 0x48, 0xbf, 0x16, 0x86, 0x74, 0x58, 0x10, 0xdb, 0xdc, 0xf9, 0x1d, 0x00, 0x00, 0xff, 0xff,
|
||||
0x0d, 0x06, 0xaf, 0x6b, 0x9e, 0x04, 0x00, 0x00,
|
||||
}
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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()),
|
||||
|
||||
@ -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")
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user