diff --git a/models/actions.pb.go b/models/actions.pb.go index 9d98e76c..21ae6c5a 100644 --- a/models/actions.pb.go +++ b/models/actions.pb.go @@ -316,14 +316,15 @@ func (m *UploadAction) GetUser() string { } type RunAction struct { - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path"` - Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` - Dir string `protobuf:"bytes,3,opt,name=dir,proto3" json:"dir,omitempty"` - Env []*EnvironmentVariable `protobuf:"bytes,4,rep,name=env,proto3" json:"env,omitempty"` - ResourceLimits *ResourceLimits `protobuf:"bytes,5,opt,name=resource_limits,json=resourceLimits,proto3" json:"resource_limits,omitempty"` - User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user"` - LogSource string `protobuf:"bytes,7,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` - SuppressLogOutput bool `protobuf:"varint,8,opt,name=suppress_log_output,json=suppressLogOutput,proto3" json:"suppress_log_output"` + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path"` + Args []string `protobuf:"bytes,2,rep,name=args,proto3" json:"args,omitempty"` + Dir string `protobuf:"bytes,3,opt,name=dir,proto3" json:"dir,omitempty"` + Env []*EnvironmentVariable `protobuf:"bytes,4,rep,name=env,proto3" json:"env,omitempty"` + ResourceLimits *ResourceLimits `protobuf:"bytes,5,opt,name=resource_limits,json=resourceLimits,proto3" json:"resource_limits,omitempty"` + User string `protobuf:"bytes,6,opt,name=user,proto3" json:"user"` + LogSource string `protobuf:"bytes,7,opt,name=log_source,json=logSource,proto3" json:"log_source,omitempty"` + SuppressLogOutput bool `protobuf:"varint,8,opt,name=suppress_log_output,json=suppressLogOutput,proto3" json:"suppress_log_output"` + VolumeMountedFiles []*File `protobuf:"bytes,9,rep,name=volume_mounted_files,json=volumeMountedFiles,proto3" json:"volume_mounted_files"` } func (m *RunAction) Reset() { *m = RunAction{} } @@ -414,6 +415,13 @@ func (m *RunAction) GetSuppressLogOutput() bool { return false } +func (m *RunAction) GetVolumeMountedFiles() []*File { + if m != nil { + return m.VolumeMountedFiles + } + return nil +} + type TimeoutAction struct { Action *Action `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` DeprecatedTimeoutNs int64 `protobuf:"varint,2,opt,name=deprecated_timeout_ns,json=deprecatedTimeoutNs,proto3" json:"timeout,omitempty"` // Deprecated: Do not use. @@ -880,75 +888,77 @@ func init() { func init() { proto.RegisterFile("actions.proto", fileDescriptor_eeb49063df94c2b8) } var fileDescriptor_eeb49063df94c2b8 = []byte{ - // 1073 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0x5f, 0xef, 0x6e, 0x36, 0xf1, 0x6b, 0xd6, 0xc9, 0x4e, 0xfe, 0x74, 0xbb, 0x01, 0x3b, 0x5a, - 0x09, 0x14, 0x21, 0x92, 0x4a, 0x05, 0x71, 0x42, 0x42, 0xdd, 0x82, 0xa8, 0xd4, 0x96, 0x46, 0x93, - 0xd2, 0x0a, 0x09, 0xc9, 0x72, 0xbc, 0xb3, 0x8e, 0x15, 0xdb, 0x63, 0x8d, 0xc7, 0x81, 0xbd, 0x71, - 0xe7, 0xc2, 0x17, 0xe0, 0x80, 0xb8, 0xf0, 0x45, 0x90, 0x38, 0x46, 0x9c, 0x7a, 0xb2, 0xc8, 0xe6, - 0x82, 0x7c, 0xea, 0x47, 0x40, 0x1e, 0xcf, 0x6c, 0xec, 0x4d, 0xab, 0xf4, 0x50, 0x2e, 0xd6, 0xbc, - 0xf7, 0x7e, 0xef, 0xf7, 0x66, 0xde, 0x7b, 0xf3, 0xc6, 0xd0, 0x75, 0x5c, 0xee, 0xd3, 0x28, 0x39, - 0x88, 0x19, 0xe5, 0x14, 0x75, 0x42, 0x3a, 0x26, 0x41, 0x32, 0xd8, 0xf7, 0x7c, 0x7e, 0x92, 0x1e, - 0x1f, 0xb8, 0x34, 0xbc, 0xeb, 0x51, 0x8f, 0xde, 0x15, 0xe6, 0xe3, 0x74, 0x22, 0x24, 0x21, 0x88, - 0x55, 0xe9, 0x36, 0xd8, 0x21, 0xd1, 0x99, 0xcf, 0x68, 0x14, 0x92, 0x88, 0xdb, 0x67, 0x0e, 0xf3, - 0x9d, 0xe3, 0x80, 0x48, 0xce, 0xe1, 0xcf, 0x1d, 0xe8, 0xdc, 0x17, 0x51, 0xd0, 0x0b, 0x58, 0x1b, - 0xd3, 0x1f, 0xa2, 0x80, 0x3a, 0x63, 0xbb, 0x0c, 0xdc, 0xd7, 0x76, 0xb5, 0xbd, 0x5b, 0xf7, 0xb6, - 0x0f, 0xca, 0xc0, 0x07, 0x5f, 0x4a, 0x73, 0xe9, 0x30, 0xda, 0xce, 0x33, 0x0b, 0x29, 0x97, 0x8f, - 0x69, 0xe8, 0x73, 0x12, 0xc6, 0x7c, 0x8a, 0x8d, 0x71, 0x0d, 0x87, 0x9e, 0x42, 0x37, 0x8d, 0xab, - 0xb4, 0x4d, 0x41, 0xbb, 0xa9, 0x68, 0xbf, 0x8d, 0x2b, 0xa4, 0x9b, 0x79, 0x66, 0xad, 0x97, 0xf0, - 0x0a, 0xe5, 0x6a, 0x5a, 0xc1, 0xa0, 0x07, 0x00, 0x2c, 0x8d, 0x14, 0x5b, 0x4b, 0xb0, 0xf5, 0x14, - 0x1b, 0x4e, 0x23, 0x49, 0xd5, 0xcb, 0x33, 0xab, 0xcb, 0xd2, 0xa8, 0xc2, 0xa3, 0x33, 0x65, 0x45, - 0x47, 0x60, 0x70, 0x3f, 0x24, 0x34, 0xe5, 0x8a, 0xa8, 0x2d, 0x88, 0xb6, 0x14, 0xd1, 0xb3, 0xd2, - 0x2a, 0xc9, 0xb6, 0xf2, 0xcc, 0xea, 0x49, 0x87, 0x0a, 0x61, 0x97, 0x57, 0x51, 0xc8, 0x87, 0x4d, - 0x12, 0xfa, 0xdc, 0x8e, 0x19, 0xf5, 0x18, 0x49, 0x12, 0x45, 0xbd, 0x24, 0xa8, 0x07, 0x8a, 0xfa, - 0xab, 0xd0, 0xe7, 0x87, 0x12, 0x22, 0xf9, 0x77, 0xf2, 0xcc, 0xba, 0x5d, 0xf3, 0xad, 0x44, 0x41, - 0xe4, 0x9a, 0x43, 0x91, 0x04, 0xce, 0xa6, 0x2a, 0x40, 0xa7, 0x9e, 0x84, 0x67, 0x6c, 0x5a, 0x4d, - 0x02, 0x67, 0xd3, 0x6a, 0x12, 0xb8, 0xb2, 0x16, 0x35, 0x8f, 0x1d, 0xe6, 0x04, 0x01, 0x09, 0x14, - 0xd3, 0x72, 0xbd, 0xe6, 0x87, 0xd2, 0x5c, 0xad, 0xb9, 0x72, 0xa9, 0xd6, 0x3c, 0xae, 0xe1, 0x8a, - 0x9a, 0x27, 0x84, 0xf9, 0xce, 0x9c, 0x76, 0xa5, 0x5e, 0xf3, 0x23, 0x61, 0xac, 0xd6, 0xbc, 0x84, - 0x57, 0x6b, 0x9e, 0x54, 0x30, 0xc8, 0x05, 0xe4, 0xd2, 0x31, 0x89, 0x49, 0x34, 0x2e, 0xfa, 0x58, - 0xb2, 0xea, 0x82, 0xf5, 0x8e, 0x62, 0x7d, 0x70, 0x85, 0x90, 0xd4, 0x77, 0xf2, 0xcc, 0xda, 0xaa, - 0x38, 0x56, 0xf8, 0x7b, 0xee, 0x22, 0x7a, 0xf8, 0x5b, 0x13, 0x8c, 0x7a, 0x93, 0xa3, 0x01, 0xac, - 0x38, 0x8c, 0xfb, 0x13, 0xc7, 0xe5, 0xe2, 0x3a, 0xe8, 0x78, 0x2e, 0xa3, 0xf7, 0xa0, 0x3d, 0x61, - 0x34, 0x14, 0xfd, 0xac, 0x8f, 0x56, 0xf2, 0xcc, 0x12, 0x32, 0x16, 0x5f, 0xb4, 0x0d, 0x4d, 0x4e, - 0x45, 0x77, 0xea, 0xa3, 0x4e, 0x9e, 0x59, 0x4d, 0x4e, 0x71, 0x93, 0x53, 0xf4, 0x11, 0xe8, 0xae, - 0xe3, 0x9e, 0x10, 0xfb, 0x94, 0x4c, 0x45, 0xcf, 0xe9, 0xa3, 0x6e, 0x9e, 0x59, 0x57, 0x4a, 0xbc, - 0x22, 0x96, 0x8f, 0xc8, 0x14, 0xbd, 0x0f, 0x10, 0x50, 0xcf, 0x4e, 0x68, 0xca, 0x5c, 0x22, 0xba, - 0x48, 0xc7, 0x7a, 0x40, 0xbd, 0x23, 0xa1, 0x28, 0x36, 0x90, 0x26, 0x84, 0x89, 0xea, 0xcb, 0x0d, - 0x14, 0x32, 0x16, 0x5f, 0xb4, 0x0f, 0xc8, 0x3d, 0x21, 0xee, 0x69, 0x92, 0x86, 0xb6, 0x13, 0x78, - 0x94, 0xf9, 0xfc, 0x24, 0x14, 0xf5, 0xd5, 0x71, 0x4f, 0x59, 0xee, 0x2b, 0x03, 0xfa, 0x00, 0x8c, - 0x39, 0xfc, 0xcc, 0x09, 0x52, 0x22, 0x6a, 0xa6, 0xe3, 0xae, 0xd2, 0x3e, 0x2f, 0x94, 0xc3, 0x5f, - 0x35, 0x58, 0xad, 0xde, 0xd8, 0xff, 0x21, 0x43, 0xf5, 0x53, 0xb7, 0xdf, 0x74, 0xea, 0xa5, 0xd7, - 0x9d, 0x7a, 0xf8, 0x67, 0x13, 0xf4, 0xf9, 0x0c, 0x28, 0xb0, 0xb1, 0xc3, 0x4f, 0xca, 0x8d, 0x95, - 0xd8, 0x42, 0xc6, 0xe2, 0x8b, 0x10, 0xb4, 0x1d, 0xe6, 0x25, 0xfd, 0xe6, 0x6e, 0x6b, 0x4f, 0xc7, - 0x62, 0x8d, 0xd6, 0xa1, 0x35, 0xf6, 0x59, 0xb9, 0x2b, 0x5c, 0x2c, 0xd1, 0x3e, 0xb4, 0x48, 0x74, - 0xd6, 0x6f, 0xef, 0xb6, 0xf6, 0x6e, 0xdd, 0xdb, 0x99, 0xdf, 0xe1, 0xab, 0xa9, 0xfa, 0x5c, 0x0e, - 0x55, 0x5c, 0xe0, 0xd0, 0x17, 0xb0, 0xc6, 0x48, 0xb9, 0x77, 0x3b, 0xf0, 0x43, 0x9f, 0x27, 0xf2, - 0xfa, 0xcf, 0xef, 0x14, 0x96, 0xe6, 0xc7, 0xc2, 0x8a, 0x0d, 0x56, 0x93, 0x6f, 0xa8, 0x6a, 0x3d, - 0x39, 0xcb, 0x8b, 0xc9, 0xf9, 0x1a, 0x36, 0x92, 0x34, 0x8e, 0xc5, 0xf0, 0x29, 0x70, 0x34, 0xe5, - 0x71, 0xca, 0x45, 0x29, 0x57, 0x46, 0xb7, 0xf3, 0xcc, 0x7a, 0x9d, 0x19, 0xf7, 0x94, 0xf2, 0x31, - 0xf5, 0x9e, 0x0a, 0xd5, 0xf0, 0x6f, 0x0d, 0xba, 0xb5, 0x11, 0x88, 0x3e, 0x84, 0x4e, 0xed, 0x5d, - 0x30, 0xd4, 0x79, 0x4a, 0x3b, 0x96, 0x56, 0xf4, 0x08, 0xb6, 0xc6, 0x24, 0x66, 0xc4, 0x75, 0x38, - 0x19, 0xdb, 0x6a, 0xc8, 0x46, 0x89, 0xe8, 0x82, 0x96, 0xd8, 0xc4, 0xf5, 0x49, 0xda, 0xd7, 0xf0, - 0xc6, 0x95, 0x97, 0x0c, 0xfc, 0x4d, 0xb2, 0x70, 0xdc, 0xd6, 0xe2, 0x71, 0xf7, 0x01, 0x54, 0x80, - 0x30, 0x11, 0xad, 0xd2, 0x1a, 0x19, 0x79, 0x66, 0x55, 0xb4, 0x58, 0x97, 0xeb, 0x27, 0xc9, 0xf0, - 0xf7, 0x26, 0xa0, 0xeb, 0xc3, 0xf7, 0xad, 0x4f, 0xf6, 0x19, 0x74, 0x13, 0xee, 0x30, 0x6e, 0x87, - 0x24, 0x49, 0x1c, 0x8f, 0xc8, 0xbe, 0x16, 0x33, 0xb6, 0x66, 0xc0, 0xab, 0x42, 0x7c, 0x52, 0x4a, - 0xe8, 0x73, 0x58, 0x4b, 0x52, 0xd7, 0x2d, 0x92, 0xae, 0x3c, 0xcb, 0xae, 0xdf, 0xc8, 0x33, 0x6b, - 0xd1, 0x84, 0x0d, 0xa9, 0x50, 0xde, 0x87, 0xb0, 0x3d, 0x71, 0xfc, 0x20, 0x65, 0x44, 0x41, 0xec, - 0x98, 0x91, 0x89, 0xff, 0xa3, 0x9c, 0x1e, 0x83, 0x3c, 0xb3, 0xde, 0x80, 0xc0, 0x9b, 0x52, 0x2f, - 0xb9, 0x0e, 0x85, 0xf6, 0x86, 0xb1, 0x32, 0xc4, 0xa0, 0xcf, 0x1f, 0x90, 0xb7, 0xce, 0x4d, 0x9d, - 0xb3, 0xb9, 0xc8, 0xf9, 0x1d, 0x18, 0xf5, 0xa7, 0x04, 0xed, 0xc1, 0xb2, 0xfc, 0xbf, 0xe9, 0x6b, - 0xe2, 0x6a, 0x2d, 0x32, 0x2b, 0xf3, 0x4d, 0xd4, 0x2f, 0x60, 0xb5, 0xfa, 0x9c, 0xbc, 0x3b, 0xe2, - 0xef, 0xa1, 0x77, 0xed, 0x45, 0x79, 0x77, 0xec, 0xa7, 0x60, 0xd4, 0x07, 0x01, 0xea, 0x43, 0x27, - 0xa2, 0x13, 0x3f, 0x20, 0x22, 0xd5, 0xed, 0x87, 0x0d, 0x2c, 0x65, 0x34, 0x80, 0xa5, 0x28, 0x66, - 0xd4, 0x15, 0x2c, 0xed, 0x51, 0xb3, 0xaf, 0x3d, 0xd4, 0x70, 0xa9, 0x1a, 0xf5, 0x60, 0x8d, 0xc6, - 0x45, 0x44, 0x27, 0xb0, 0x4b, 0xf8, 0x68, 0x1d, 0x8c, 0x2b, 0x95, 0x00, 0x7d, 0x7a, 0x7e, 0x61, - 0x36, 0x5e, 0x5e, 0x98, 0x8d, 0x57, 0x17, 0xa6, 0xf6, 0xd3, 0xcc, 0xd4, 0xfe, 0x98, 0x99, 0xda, - 0x5f, 0x33, 0x53, 0x3b, 0x9f, 0x99, 0xda, 0x3f, 0x33, 0x53, 0xfb, 0x77, 0x66, 0x36, 0x5e, 0xcd, - 0x4c, 0xed, 0x97, 0x4b, 0xb3, 0x71, 0x7e, 0x69, 0x36, 0x5e, 0x5e, 0x9a, 0x8d, 0xe3, 0x8e, 0xf8, - 0x49, 0xfc, 0xe4, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x26, 0xe4, 0x44, 0x5a, 0x89, 0x0a, 0x00, - 0x00, + // 1119 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xdb, 0x36, + 0x14, 0xb7, 0x6c, 0xd7, 0x8d, 0x5e, 0x63, 0xa7, 0x66, 0xfe, 0xd4, 0x75, 0x36, 0x29, 0x30, 0xb0, + 0x21, 0x18, 0x96, 0x14, 0xe8, 0x86, 0x9d, 0x06, 0x0c, 0x75, 0xf7, 0xa7, 0x40, 0x9b, 0x35, 0x60, + 0xba, 0x76, 0x03, 0x06, 0x08, 0x8a, 0x4c, 0x3b, 0x42, 0x24, 0x51, 0x20, 0xa9, 0x6c, 0xbe, 0xed, + 0xbe, 0xcb, 0xbe, 0xc0, 0x30, 0x0c, 0xbb, 0xec, 0xa3, 0xec, 0x18, 0xec, 0xd4, 0x93, 0xb0, 0x38, + 0x97, 0x41, 0xa7, 0x7e, 0x84, 0x41, 0x14, 0xe9, 0x48, 0x4e, 0x8a, 0xf4, 0xd0, 0x5d, 0x04, 0xbe, + 0xf7, 0xfb, 0xbd, 0x1f, 0xc9, 0xf7, 0xc8, 0x47, 0x41, 0xdb, 0xf5, 0x84, 0x4f, 0x23, 0xbe, 0x1b, + 0x33, 0x2a, 0x28, 0x6a, 0x85, 0x74, 0x44, 0x02, 0xde, 0xdf, 0x99, 0xf8, 0xe2, 0x28, 0x39, 0xdc, + 0xf5, 0x68, 0x78, 0x6f, 0x42, 0x27, 0xf4, 0x9e, 0x84, 0x0f, 0x93, 0xb1, 0xb4, 0xa4, 0x21, 0x47, + 0x45, 0x58, 0x7f, 0x93, 0x44, 0x27, 0x3e, 0xa3, 0x51, 0x48, 0x22, 0xe1, 0x9c, 0xb8, 0xcc, 0x77, + 0x0f, 0x03, 0xa2, 0x34, 0xfb, 0x30, 0xf6, 0x03, 0x52, 0x8c, 0x07, 0x3f, 0xb7, 0xa0, 0xf5, 0x40, + 0xce, 0x88, 0x5e, 0xc0, 0xca, 0x88, 0xfe, 0x10, 0x05, 0xd4, 0x1d, 0x39, 0xc5, 0x22, 0x7a, 0xc6, + 0x96, 0xb1, 0x7d, 0xeb, 0xfe, 0xc6, 0x6e, 0xb1, 0x88, 0xdd, 0xcf, 0x15, 0x5c, 0x04, 0x0c, 0x37, + 0xb2, 0xd4, 0x46, 0x3a, 0xe4, 0x43, 0x1a, 0xfa, 0x82, 0x84, 0xb1, 0x98, 0xe2, 0xce, 0xa8, 0xc2, + 0x43, 0x4f, 0xa1, 0x9d, 0xc4, 0x65, 0xd9, 0xba, 0x94, 0x5d, 0xd3, 0xb2, 0xdf, 0xc4, 0x25, 0xd1, + 0xb5, 0x2c, 0xb5, 0x6f, 0x17, 0xf4, 0x92, 0xe4, 0x72, 0x52, 0xe2, 0xa0, 0x87, 0x00, 0x2c, 0x89, + 0xb4, 0x5a, 0x43, 0xaa, 0x75, 0xb5, 0x1a, 0x4e, 0x22, 0x25, 0xd5, 0xcd, 0x52, 0xbb, 0xcd, 0x92, + 0xa8, 0xa4, 0x63, 0x32, 0x8d, 0xa2, 0x03, 0xe8, 0x08, 0x3f, 0x24, 0x34, 0x11, 0x5a, 0xa8, 0x29, + 0x85, 0xd6, 0xb5, 0xd0, 0xb3, 0x02, 0x55, 0x62, 0xeb, 0x59, 0x6a, 0x77, 0x55, 0x40, 0x49, 0xb0, + 0x2d, 0xca, 0x2c, 0xe4, 0xc3, 0x1a, 0x09, 0x7d, 0xe1, 0xc4, 0x8c, 0x4e, 0x18, 0xe1, 0x5c, 0x4b, + 0xdf, 0x90, 0xd2, 0x7d, 0x2d, 0xfd, 0x45, 0xe8, 0x8b, 0x7d, 0x45, 0x51, 0xfa, 0x9b, 0x59, 0x6a, + 0xdf, 0xa9, 0xc4, 0x96, 0x66, 0x41, 0xe4, 0x52, 0x40, 0x9e, 0x04, 0xc1, 0xa6, 0x7a, 0x82, 0x56, + 0x35, 0x09, 0xcf, 0xd8, 0xb4, 0x9c, 0x04, 0xc1, 0xa6, 0xe5, 0x24, 0x08, 0x8d, 0xe6, 0x35, 0x8f, + 0x5d, 0xe6, 0x06, 0x01, 0x09, 0xb4, 0xd2, 0xcd, 0x6a, 0xcd, 0xf7, 0x15, 0x5c, 0xae, 0xb9, 0x0e, + 0x29, 0xd7, 0x3c, 0xae, 0xf0, 0xf2, 0x9a, 0x73, 0xc2, 0x7c, 0x77, 0x2e, 0xbb, 0x54, 0xad, 0xf9, + 0x81, 0x04, 0xcb, 0x35, 0x2f, 0xe8, 0xe5, 0x9a, 0xf3, 0x12, 0x07, 0x79, 0x80, 0x3c, 0x3a, 0x22, + 0x31, 0x89, 0x46, 0xf9, 0x99, 0x56, 0xaa, 0xa6, 0x54, 0xbd, 0xab, 0x55, 0x1f, 0x5e, 0x30, 0x94, + 0xf4, 0xdd, 0x2c, 0xb5, 0xd7, 0x4b, 0x81, 0x25, 0xfd, 0xae, 0xb7, 0xc8, 0x1e, 0xfc, 0x5e, 0x87, + 0x4e, 0xf5, 0x90, 0xa3, 0x3e, 0x2c, 0xb9, 0x4c, 0xf8, 0x63, 0xd7, 0x13, 0xf2, 0x3a, 0x98, 0x78, + 0x6e, 0xa3, 0x77, 0xa0, 0x39, 0x66, 0x34, 0x94, 0xe7, 0xd9, 0x1c, 0x2e, 0x65, 0xa9, 0x2d, 0x6d, + 0x2c, 0xbf, 0x68, 0x03, 0xea, 0x82, 0xca, 0xd3, 0x69, 0x0e, 0x5b, 0x59, 0x6a, 0xd7, 0x05, 0xc5, + 0x75, 0x41, 0xd1, 0x07, 0x60, 0x7a, 0xae, 0x77, 0x44, 0x9c, 0x63, 0x32, 0x95, 0x67, 0xce, 0x1c, + 0xb6, 0xb3, 0xd4, 0xbe, 0x70, 0xe2, 0x25, 0x39, 0x7c, 0x4c, 0xa6, 0xe8, 0x5d, 0x80, 0x80, 0x4e, + 0x1c, 0x4e, 0x13, 0xe6, 0x11, 0x79, 0x8a, 0x4c, 0x6c, 0x06, 0x74, 0x72, 0x20, 0x1d, 0xf9, 0x02, + 0x12, 0x4e, 0x98, 0xac, 0xbe, 0x5a, 0x40, 0x6e, 0x63, 0xf9, 0x45, 0x3b, 0x80, 0xbc, 0x23, 0xe2, + 0x1d, 0xf3, 0x24, 0x74, 0xdc, 0x60, 0x42, 0x99, 0x2f, 0x8e, 0x42, 0x59, 0x5f, 0x13, 0x77, 0x35, + 0xf2, 0x40, 0x03, 0xe8, 0x3d, 0xe8, 0xcc, 0xe9, 0x27, 0x6e, 0x90, 0x10, 0x59, 0x33, 0x13, 0xb7, + 0xb5, 0xf7, 0x79, 0xee, 0x1c, 0xfc, 0x6a, 0xc0, 0x72, 0xf9, 0xc6, 0xfe, 0x0f, 0x19, 0xaa, 0xee, + 0xba, 0xf9, 0xba, 0x5d, 0xdf, 0xb8, 0x6a, 0xd7, 0x83, 0xdf, 0x1a, 0x60, 0xce, 0x7b, 0x40, 0xce, + 0x8d, 0x5d, 0x71, 0x54, 0x2c, 0xac, 0xe0, 0xe6, 0x36, 0x96, 0x5f, 0x84, 0xa0, 0xe9, 0xb2, 0x09, + 0xef, 0xd5, 0xb7, 0x1a, 0xdb, 0x26, 0x96, 0x63, 0x74, 0x1b, 0x1a, 0x23, 0x9f, 0x15, 0xab, 0xc2, + 0xf9, 0x10, 0xed, 0x40, 0x83, 0x44, 0x27, 0xbd, 0xe6, 0x56, 0x63, 0xfb, 0xd6, 0xfd, 0xcd, 0xf9, + 0x1d, 0xbe, 0xe8, 0xb0, 0xcf, 0x55, 0x83, 0xc5, 0x39, 0x0f, 0x7d, 0x06, 0x2b, 0x8c, 0x14, 0x6b, + 0x77, 0x02, 0x3f, 0xf4, 0x05, 0x57, 0xd7, 0x7f, 0x7e, 0xa7, 0xb0, 0x82, 0x9f, 0x48, 0x14, 0x77, + 0x58, 0xc5, 0xbe, 0xa6, 0xaa, 0xd5, 0xe4, 0xdc, 0x5c, 0x4c, 0xce, 0x57, 0xb0, 0xca, 0x93, 0x38, + 0x96, 0xcd, 0x27, 0xe7, 0xd1, 0x44, 0xc4, 0x89, 0x90, 0xa5, 0x5c, 0x1a, 0xde, 0xc9, 0x52, 0xfb, + 0x2a, 0x18, 0x77, 0xb5, 0xf3, 0x09, 0x9d, 0x3c, 0x95, 0x2e, 0xf4, 0x2d, 0xac, 0x9d, 0xd0, 0x20, + 0x09, 0x89, 0x13, 0xd2, 0x24, 0x12, 0x64, 0xe4, 0xe4, 0xcf, 0x06, 0xef, 0x99, 0x32, 0x0d, 0xcb, + 0x7a, 0x2f, 0x5f, 0xfa, 0x01, 0x19, 0xf6, 0xb2, 0xd4, 0xbe, 0x92, 0x8d, 0x51, 0xe1, 0xdd, 0x2b, + 0x9c, 0x39, 0x99, 0x0f, 0xfe, 0x36, 0xa0, 0x5d, 0x69, 0xae, 0xe8, 0x7d, 0x68, 0x55, 0x5e, 0x9c, + 0x8e, 0x56, 0x2f, 0x70, 0xac, 0x50, 0xf4, 0x18, 0xd6, 0x47, 0x24, 0x66, 0xc4, 0x73, 0xf3, 0x19, + 0x74, 0xfb, 0x8e, 0xb8, 0x3c, 0x5f, 0x0d, 0xb9, 0xbd, 0xcb, 0x3d, 0xba, 0x67, 0xe0, 0xd5, 0x8b, + 0x28, 0x35, 0xf1, 0xd7, 0x7c, 0x21, 0x91, 0x8d, 0xc5, 0x44, 0xee, 0x00, 0xe8, 0x09, 0x42, 0x2e, + 0x0f, 0x61, 0x63, 0xd8, 0xc9, 0x52, 0xbb, 0xe4, 0xc5, 0xa6, 0x1a, 0xef, 0xf1, 0xc1, 0x1f, 0x75, + 0x40, 0x97, 0xdb, 0xfa, 0x1b, 0xef, 0xec, 0x13, 0x68, 0x73, 0xe1, 0x32, 0xe1, 0x84, 0x84, 0x73, + 0x77, 0x42, 0xd4, 0x8d, 0x91, 0xdd, 0xbb, 0x02, 0xe0, 0x65, 0x69, 0xee, 0x15, 0x16, 0xfa, 0x14, + 0x56, 0x78, 0xe2, 0x79, 0x79, 0x39, 0x75, 0x64, 0x71, 0x9f, 0x56, 0xb3, 0xd4, 0x5e, 0x84, 0x70, + 0x47, 0x39, 0x74, 0xf4, 0x3e, 0x6c, 0x8c, 0x5d, 0x3f, 0x48, 0x18, 0xd1, 0x14, 0x27, 0x66, 0x64, + 0xec, 0xff, 0xa8, 0xfa, 0x52, 0x3f, 0x4b, 0xed, 0xd7, 0x30, 0xf0, 0x9a, 0xf2, 0x2b, 0xad, 0x7d, + 0xe9, 0xbd, 0xa6, 0x61, 0x0d, 0x30, 0x98, 0xf3, 0xa7, 0xe9, 0x8d, 0x73, 0x53, 0xd5, 0xac, 0x2f, + 0x6a, 0x7e, 0x07, 0x9d, 0xea, 0x23, 0x85, 0xb6, 0xe1, 0xa6, 0xfa, 0x8b, 0xea, 0x19, 0xf2, 0xb4, + 0x2e, 0x2a, 0x6b, 0xf8, 0x3a, 0xe9, 0x17, 0xb0, 0x5c, 0x7e, 0xa8, 0xde, 0x9e, 0xf0, 0xf7, 0xd0, + 0xbd, 0xf4, 0x56, 0xbd, 0x3d, 0xf5, 0x63, 0xe8, 0x54, 0x5b, 0x0c, 0xea, 0x41, 0x2b, 0xa2, 0xf9, + 0x8d, 0x94, 0xa9, 0x6e, 0x3e, 0xaa, 0x61, 0x65, 0xa3, 0x3e, 0xdc, 0x88, 0x62, 0x46, 0x3d, 0xa9, + 0xd2, 0x1c, 0xd6, 0x7b, 0xc6, 0x23, 0x03, 0x17, 0xae, 0x61, 0x17, 0x56, 0x68, 0x9c, 0xcf, 0xe8, + 0x06, 0x4e, 0x41, 0x1f, 0xde, 0x86, 0xce, 0x85, 0x4b, 0x92, 0x3e, 0x3e, 0x3d, 0xb3, 0x6a, 0x2f, + 0xcf, 0xac, 0xda, 0xab, 0x33, 0xcb, 0xf8, 0x69, 0x66, 0x19, 0x7f, 0xce, 0x2c, 0xe3, 0xaf, 0x99, + 0x65, 0x9c, 0xce, 0x2c, 0xe3, 0x9f, 0x99, 0x65, 0xfc, 0x3b, 0xb3, 0x6a, 0xaf, 0x66, 0x96, 0xf1, + 0xcb, 0xb9, 0x55, 0x3b, 0x3d, 0xb7, 0x6a, 0x2f, 0xcf, 0xad, 0xda, 0x61, 0x4b, 0xfe, 0x7e, 0x7e, + 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x06, 0xa4, 0xbb, 0xef, 0x0a, 0x00, 0x00, } func (this *Action) Equal(that interface{}) bool { @@ -1133,6 +1143,14 @@ func (this *RunAction) Equal(that interface{}) bool { if this.SuppressLogOutput != that1.SuppressLogOutput { return false } + if len(this.VolumeMountedFiles) != len(that1.VolumeMountedFiles) { + return false + } + for i := range this.VolumeMountedFiles { + if !this.VolumeMountedFiles[i].Equal(that1.VolumeMountedFiles[i]) { + return false + } + } return true } func (this *TimeoutAction) Equal(that interface{}) bool { @@ -1485,7 +1503,7 @@ func (this *RunAction) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 12) + s := make([]string, 0, 13) s = append(s, "&models.RunAction{") s = append(s, "Path: "+fmt.Sprintf("%#v", this.Path)+",\n") s = append(s, "Args: "+fmt.Sprintf("%#v", this.Args)+",\n") @@ -1499,6 +1517,9 @@ func (this *RunAction) GoString() string { s = append(s, "User: "+fmt.Sprintf("%#v", this.User)+",\n") s = append(s, "LogSource: "+fmt.Sprintf("%#v", this.LogSource)+",\n") s = append(s, "SuppressLogOutput: "+fmt.Sprintf("%#v", this.SuppressLogOutput)+",\n") + if this.VolumeMountedFiles != nil { + s = append(s, "VolumeMountedFiles: "+fmt.Sprintf("%#v", this.VolumeMountedFiles)+",\n") + } s = append(s, "}") return strings.Join(s, "") } @@ -1912,6 +1933,20 @@ func (m *RunAction) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.VolumeMountedFiles) > 0 { + for iNdEx := len(m.VolumeMountedFiles) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VolumeMountedFiles[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintActions(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } + } if m.SuppressLogOutput { i-- if m.SuppressLogOutput { @@ -2509,6 +2544,12 @@ func (m *RunAction) Size() (n int) { if m.SuppressLogOutput { n += 2 } + if len(m.VolumeMountedFiles) > 0 { + for _, e := range m.VolumeMountedFiles { + l = e.Size() + n += 1 + l + sovActions(uint64(l)) + } + } return n } @@ -2736,6 +2777,11 @@ func (this *RunAction) String() string { repeatedStringForEnv += strings.Replace(fmt.Sprintf("%v", f), "EnvironmentVariable", "EnvironmentVariable", 1) + "," } repeatedStringForEnv += "}" + repeatedStringForVolumeMountedFiles := "[]*File{" + for _, f := range this.VolumeMountedFiles { + repeatedStringForVolumeMountedFiles += strings.Replace(fmt.Sprintf("%v", f), "File", "File", 1) + "," + } + repeatedStringForVolumeMountedFiles += "}" s := strings.Join([]string{`&RunAction{`, `Path:` + fmt.Sprintf("%v", this.Path) + `,`, `Args:` + fmt.Sprintf("%v", this.Args) + `,`, @@ -2745,6 +2791,7 @@ func (this *RunAction) String() string { `User:` + fmt.Sprintf("%v", this.User) + `,`, `LogSource:` + fmt.Sprintf("%v", this.LogSource) + `,`, `SuppressLogOutput:` + fmt.Sprintf("%v", this.SuppressLogOutput) + `,`, + `VolumeMountedFiles:` + repeatedStringForVolumeMountedFiles + `,`, `}`, }, "") return s @@ -4043,6 +4090,40 @@ func (m *RunAction) Unmarshal(dAtA []byte) error { } } m.SuppressLogOutput = bool(v != 0) + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VolumeMountedFiles", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowActions + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthActions + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthActions + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VolumeMountedFiles = append(m.VolumeMountedFiles, &File{}) + if err := m.VolumeMountedFiles[len(m.VolumeMountedFiles)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipActions(dAtA[iNdEx:]) diff --git a/models/actions.proto b/models/actions.proto index 7b29cc45..ab462358 100644 --- a/models/actions.proto +++ b/models/actions.proto @@ -4,6 +4,7 @@ package models; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; import "environment_variables.proto"; +import "file.proto"; message Action { // Note: we only expect one of the following set of fields to be @@ -55,6 +56,7 @@ message RunAction { string user = 6 [(gogoproto.jsontag) = "user"]; string log_source = 7; bool suppress_log_output = 8 [(gogoproto.jsontag) = "suppress_log_output"]; + repeated File volume_mounted_files = 9 [(gogoproto.jsontag) = "volume_mounted_files"]; } message TimeoutAction { diff --git a/models/actions_test.go b/models/actions_test.go index 6054bbd0..29768188 100644 --- a/models/actions_test.go +++ b/models/actions_test.go @@ -306,7 +306,10 @@ var _ = Describe("Actions", func() { {"name":"BAR", "value":"2"} ], "resource_limits":{"nofile": 10, "nproc": 20}, - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": [ + {"path": "/redis/username", "content": "username"} + ] }`, models.WrapAction(&models.RunAction{ User: "me", @@ -318,6 +321,9 @@ var _ = Describe("Actions", func() { {"BAR", "2"}, }, ResourceLimits: resourceLimits, + VolumeMountedFiles: []*models.File{ + {Path: "/redis/username", Content: "username"}, + }, }), ) @@ -370,7 +376,8 @@ var _ = Describe("Actions", func() { "resource_limits":{ "nofile": 10 }, - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } }, "timeout_ms": 10 @@ -452,7 +459,8 @@ var _ = Describe("Actions", func() { "path": "echo", "resource_limits":{}, "user": "me", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } } }`, @@ -521,7 +529,8 @@ var _ = Describe("Actions", func() { "resource_limits": {}, "path": "echo", "user": "me", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } } ] @@ -615,7 +624,8 @@ var _ = Describe("Actions", func() { "resource_limits": {}, "path": "echo", "user": "me", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } } ] @@ -694,7 +704,8 @@ var _ = Describe("Actions", func() { "path": "echo", "resource_limits":{}, "user": "me", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } } }`, @@ -764,7 +775,8 @@ var _ = Describe("Actions", func() { "resource_limits": {}, "path": "echo", "user": "me", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } } ] diff --git a/models/desired_lrp.go b/models/desired_lrp.go index 572a9a3a..7a920ce9 100644 --- a/models/desired_lrp.go +++ b/models/desired_lrp.go @@ -3,6 +3,7 @@ package models import ( bytes "bytes" "encoding/json" + "errors" "net/url" "regexp" "time" @@ -13,6 +14,8 @@ import ( const PreloadedRootFSScheme = "preloaded" const PreloadedOCIRootFSScheme = "preloaded+layer" +const volumeMountedFilesMaxAllowedSize = 1 * 1024 * 1024 // 1MB in bytes + var processGuidPattern = regexp.MustCompile(`^[a-zA-Z0-9_-]+$`) type DesiredLRPChange struct { @@ -38,6 +41,9 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo environmentVariables[i] = &runInfo.EnvironmentVariables[i] } + volumeMountedFiles := make([]*File, len(runInfo.VolumeMountedFiles)) + copy(volumeMountedFiles, runInfo.VolumeMountedFiles) + egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) for i := range runInfo.EgressRules { egressRules[i] = &runInfo.EgressRules[i] @@ -80,6 +86,7 @@ func NewDesiredLRP(schedInfo DesiredLRPSchedulingInfo, runInfo DesiredLRPRunInfo MetricTags: metricTags, Sidecars: runInfo.Sidecars, LogRateLimit: runInfo.LogRateLimit, + VolumeMountedFiles: volumeMountedFiles, } } @@ -89,6 +96,9 @@ func (desiredLRP *DesiredLRP) AddRunInfo(runInfo DesiredLRPRunInfo) { environmentVariables[i] = &runInfo.EnvironmentVariables[i] } + volumeMountedFiles := make([]*File, len(runInfo.VolumeMountedFiles)) + copy(volumeMountedFiles, runInfo.VolumeMountedFiles) + egressRules := make([]*SecurityGroupRule, len(runInfo.EgressRules)) for i := range runInfo.EgressRules { egressRules[i] = &runInfo.EgressRules[i] @@ -111,6 +121,7 @@ func (desiredLRP *DesiredLRP) AddRunInfo(runInfo DesiredLRPRunInfo) { desiredLRP.VolumeMounts = runInfo.VolumeMounts desiredLRP.Network = runInfo.Network desiredLRP.CheckDefinition = runInfo.CheckDefinition + desiredLRP.VolumeMountedFiles = volumeMountedFiles } func (*DesiredLRP) Version() format.Version { @@ -266,6 +277,9 @@ func (d *DesiredLRP) DesiredLRPRunInfo(createdAt time.Time) DesiredLRPRunInfo { environmentVariables[i] = *d.EnvironmentVariables[i] } + volumeMountedFiles := make([]*File, len(d.VolumeMountedFiles)) + copy(volumeMountedFiles, d.VolumeMountedFiles) + egressRules := make([]SecurityGroupRule, len(d.EgressRules)) for i := range d.EgressRules { egressRules[i] = *d.EgressRules[i] @@ -297,6 +311,7 @@ func (d *DesiredLRP) DesiredLRPRunInfo(createdAt time.Time) DesiredLRPRunInfo { d.ImageLayers, d.Sidecars, d.LogRateLimit, + volumeMountedFiles, ) } @@ -308,6 +323,13 @@ func (d *DesiredLRP) Copy() *DesiredLRP { func (desired DesiredLRP) Validate() error { var validationError ValidationError + if len(desired.VolumeMountedFiles) > 0 { + err := validateVolumeMountedFiles(desired.VolumeMountedFiles) + if err != nil { + validationError = validationError.Append(ErrInvalidField{"volumeMountedFiles"}) + } + } + if desired.GetDomain() == "" { validationError = validationError.Append(ErrInvalidField{"domain"}) } @@ -661,6 +683,7 @@ func NewDesiredLRPRunInfo( imageLayers []*ImageLayer, sidecars []*Sidecar, logRateLimit *LogRateLimit, + volumeMountedFiles []*File, ) DesiredLRPRunInfo { return DesiredLRPRunInfo{ DesiredLRPKey: key, @@ -688,6 +711,7 @@ func NewDesiredLRPRunInfo( ImageLayers: imageLayers, Sidecars: sidecars, LogRateLimit: logRateLimit, + VolumeMountedFiles: volumeMountedFiles, } } @@ -696,6 +720,13 @@ func (runInfo DesiredLRPRunInfo) Validate() error { validationError = validationError.Check(runInfo.DesiredLRPKey) + if len(runInfo.VolumeMountedFiles) > 0 { + err := validateVolumeMountedFiles(runInfo.VolumeMountedFiles) + if err != nil { + validationError = validationError.Append(ErrInvalidField{"volumeMountedFiles"}) + } + } + if runInfo.Setup != nil { if err := runInfo.Setup.Validate(); err != nil { validationError = validationError.Append(ErrInvalidField{"setup"}) @@ -780,3 +811,14 @@ func (*CertificateProperties) Version() format.Version { func (CertificateProperties) Validate() error { return nil } + +func validateVolumeMountedFiles(files []*File) error { + var totalSize int + for _, file := range files { + totalSize += len(file.Content) + if totalSize > volumeMountedFilesMaxAllowedSize { + return errors.New("total size of all file values exceeds 1MB") + } + } + return nil +} diff --git a/models/desired_lrp.pb.go b/models/desired_lrp.pb.go index 7f32eb90..123c9d8e 100644 --- a/models/desired_lrp.pb.go +++ b/models/desired_lrp.pb.go @@ -126,6 +126,7 @@ type DesiredLRPRunInfo struct { MetricTags map[string]*MetricTagValue `protobuf:"bytes,25,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. Sidecars []*Sidecar `protobuf:"bytes,26,rep,name=sidecars,proto3" json:"sidecars,omitempty"` LogRateLimit *LogRateLimit `protobuf:"bytes,27,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` + VolumeMountedFiles []*File `protobuf:"bytes,28,rep,name=volume_mounted_files,json=volumeMountedFiles,proto3" json:"volume_mounted_files"` } func (m *DesiredLRPRunInfo) Reset() { *m = DesiredLRPRunInfo{} } @@ -346,6 +347,13 @@ func (m *DesiredLRPRunInfo) GetLogRateLimit() *LogRateLimit { return nil } +func (m *DesiredLRPRunInfo) GetVolumeMountedFiles() []*File { + if m != nil { + return m.VolumeMountedFiles + } + return nil +} + // helper message for marshalling routes type ProtoRoutes struct { Routes map[string][]byte `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -664,6 +672,7 @@ type DesiredLRP struct { MetricTags map[string]*MetricTagValue `protobuf:"bytes,35,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Sidecars []*Sidecar `protobuf:"bytes,36,rep,name=sidecars,proto3" json:"sidecars,omitempty"` LogRateLimit *LogRateLimit `protobuf:"bytes,37,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` + VolumeMountedFiles []*File `protobuf:"bytes,38,rep,name=volume_mounted_files,json=volumeMountedFiles,proto3" json:"volume_mounted_files"` } func (m *DesiredLRP) Reset() { *m = DesiredLRP{} } @@ -953,6 +962,13 @@ func (m *DesiredLRP) GetLogRateLimit() *LogRateLimit { return nil } +func (m *DesiredLRP) GetVolumeMountedFiles() []*File { + if m != nil { + return m.VolumeMountedFiles + } + return nil +} + func init() { proto.RegisterType((*DesiredLRPSchedulingInfo)(nil), "models.DesiredLRPSchedulingInfo") proto.RegisterType((*DesiredLRPRunInfo)(nil), "models.DesiredLRPRunInfo") @@ -970,120 +986,123 @@ func init() { func init() { proto.RegisterFile("desired_lrp.proto", fileDescriptor_f592e9299b63d68c) } var fileDescriptor_f592e9299b63d68c = []byte{ - // 1797 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xe7, 0xea, 0x0f, 0x29, 0x0e, 0x49, 0x89, 0x1a, 0x51, 0xd2, 0x98, 0xb6, 0xb9, 0x2c, 0x63, - 0xb7, 0x4c, 0x93, 0x28, 0x80, 0x93, 0xa2, 0x69, 0x5a, 0x14, 0xc8, 0xda, 0xa9, 0x63, 0x58, 0x0a, - 0x84, 0x91, 0xed, 0xa2, 0x01, 0x8a, 0xc5, 0x6a, 0x77, 0xb4, 0x5a, 0x78, 0x77, 0x67, 0xb1, 0x33, - 0x2b, 0x87, 0xb7, 0xf6, 0xd8, 0x5b, 0xfb, 0x2d, 0xfa, 0x01, 0x0a, 0xf4, 0xd4, 0x7b, 0x8e, 0x3e, - 0x06, 0x3d, 0x10, 0xb1, 0x7c, 0x29, 0x78, 0xca, 0x47, 0x28, 0x66, 0xf6, 0x3f, 0x49, 0x53, 0x74, - 0x62, 0x23, 0x27, 0xce, 0xfc, 0xde, 0x9f, 0x7d, 0xf3, 0xe6, 0xed, 0x7b, 0xbf, 0x25, 0xd8, 0xb6, - 0x08, 0x73, 0x42, 0x62, 0xe9, 0x6e, 0x18, 0x1c, 0x04, 0x21, 0xe5, 0x14, 0x56, 0x3d, 0x6a, 0x11, - 0x97, 0x75, 0x3f, 0xb0, 0x1d, 0x7e, 0x1e, 0x9d, 0x1e, 0x98, 0xd4, 0xfb, 0xd0, 0xa6, 0x36, 0xfd, - 0x50, 0x8a, 0x4f, 0xa3, 0x33, 0xb9, 0x93, 0x1b, 0xb9, 0x8a, 0xcd, 0xba, 0x2d, 0xc3, 0xe4, 0x0e, - 0xf5, 0x59, 0xb2, 0xdd, 0x37, 0x0d, 0xf3, 0x9c, 0x58, 0xba, 0x45, 0x02, 0xe2, 0x5b, 0xc4, 0x37, - 0x47, 0x89, 0xe0, 0x86, 0x49, 0x42, 0xee, 0x9c, 0x39, 0xa6, 0xc1, 0x89, 0x1e, 0x84, 0x34, 0x10, - 0x5b, 0x92, 0x9a, 0x5d, 0x27, 0xfe, 0x85, 0x13, 0x52, 0xdf, 0x23, 0x3e, 0xd7, 0x2f, 0x8c, 0xd0, - 0x31, 0x4e, 0xdd, 0x4c, 0xb8, 0xe7, 0x51, 0x2b, 0xb6, 0x74, 0xa8, 0xaf, 0x73, 0xc3, 0x4e, 0x1f, - 0xed, 0x13, 0xfe, 0x8c, 0x86, 0x4f, 0x93, 0x6d, 0x87, 0x11, 0x33, 0x0a, 0x1d, 0x3e, 0xd2, 0xed, - 0x90, 0x46, 0xc9, 0xb1, 0xba, 0xf0, 0x82, 0xba, 0x91, 0x47, 0x74, 0x8f, 0x46, 0x3e, 0x4f, 0x1d, - 0x9a, 0xe7, 0xc4, 0x7c, 0xaa, 0x5b, 0xe4, 0xcc, 0xf1, 0x1d, 0xe1, 0x34, 0xc1, 0xb7, 0x1d, 0xcf, - 0xb0, 0x89, 0xee, 0x1a, 0x23, 0x12, 0xa6, 0x90, 0x47, 0x78, 0xe8, 0x98, 0xe2, 0xa9, 0x69, 0x38, - 0x2d, 0xe6, 0x58, 0xc4, 0x34, 0x52, 0x8d, 0x8e, 0x4b, 0x6d, 0x3d, 0x14, 0xa7, 0x72, 0x1d, 0xcf, - 0x49, 0x1e, 0x31, 0xf8, 0xf7, 0x1a, 0x40, 0xf7, 0xe2, 0x1c, 0x1f, 0xe2, 0xe3, 0x13, 0x91, 0x93, - 0xc8, 0x75, 0x7c, 0xfb, 0x81, 0x7f, 0x46, 0xe1, 0x43, 0xb0, 0x55, 0xc8, 0xbf, 0xfe, 0x94, 0x8c, - 0x90, 0xd2, 0x57, 0x86, 0x8d, 0x3b, 0xbb, 0x07, 0xf1, 0x25, 0x1c, 0xe4, 0xa6, 0x0f, 0xc9, 0x48, - 0x6b, 0x7e, 0x33, 0x56, 0x2b, 0xcf, 0xc7, 0xaa, 0x32, 0x19, 0xab, 0x15, 0xdc, 0x4a, 0x6c, 0x0f, - 0xc3, 0xe0, 0x21, 0x19, 0xc1, 0x03, 0x00, 0x0c, 0xdf, 0xa7, 0x5c, 0x66, 0x07, 0xad, 0xf4, 0x95, - 0x61, 0x5d, 0xdb, 0x9c, 0x8c, 0xd5, 0x02, 0x8a, 0x0b, 0x6b, 0xf8, 0x1e, 0xa8, 0x3b, 0x3e, 0xe3, - 0x86, 0x6f, 0x12, 0x86, 0x56, 0xfb, 0xca, 0x70, 0x5d, 0x6b, 0x4d, 0xc6, 0x6a, 0x0e, 0xe2, 0x7c, - 0x09, 0xbf, 0x02, 0x9d, 0x62, 0xa4, 0x21, 0x61, 0x34, 0x0a, 0x4d, 0x82, 0xd6, 0x64, 0xb8, 0xdd, - 0xd9, 0x70, 0x71, 0xa2, 0x31, 0x15, 0x33, 0xcc, 0x63, 0x4e, 0x35, 0xe0, 0x6f, 0x41, 0x35, 0xa4, - 0x11, 0x27, 0x0c, 0xad, 0x4b, 0x6f, 0x3b, 0xa9, 0xb7, 0x63, 0x91, 0x41, 0x2c, 0x45, 0xda, 0xa6, - 0x70, 0xf3, 0xdf, 0xb1, 0x5a, 0x8d, 0xf7, 0x38, 0x31, 0x81, 0xc7, 0xa0, 0x3d, 0x5d, 0x15, 0xa8, - 0x2a, 0xdd, 0xec, 0xa7, 0x6e, 0x8e, 0x0a, 0xf2, 0x47, 0x86, 0x3d, 0x15, 0xd1, 0x96, 0x57, 0x16, - 0x43, 0x0d, 0xb4, 0x93, 0x52, 0x09, 0x5c, 0xc3, 0x24, 0xa2, 0x12, 0x51, 0xad, 0xec, 0xf1, 0x89, - 0x94, 0x1f, 0xa7, 0x62, 0xbc, 0x75, 0x51, 0x06, 0xa0, 0x06, 0x5a, 0xd9, 0xe6, 0x91, 0x61, 0x33, - 0xb4, 0xd1, 0x5f, 0x1d, 0xd6, 0xb5, 0x1b, 0x93, 0xb1, 0x8a, 0x32, 0xaf, 0xb2, 0x96, 0xde, 0xa7, - 0x9e, 0xc3, 0x89, 0x17, 0xf0, 0x11, 0x2e, 0x9b, 0x0c, 0xfe, 0xd6, 0x02, 0xdb, 0x85, 0x7c, 0x46, - 0xfe, 0x9b, 0x2f, 0x99, 0x3f, 0x83, 0xdd, 0xb9, 0xef, 0x1b, 0x5a, 0xe9, 0xaf, 0x0e, 0x1b, 0x77, - 0xae, 0xa7, 0x2e, 0x3f, 0xcf, 0x95, 0x9e, 0x24, 0x3a, 0x5a, 0x43, 0x38, 0x9e, 0x8c, 0xd5, 0x55, - 0xe2, 0x5f, 0xe0, 0x0e, 0x99, 0xd5, 0x60, 0xf0, 0x16, 0x58, 0x67, 0x84, 0x47, 0x81, 0xac, 0xae, - 0xc6, 0x9d, 0xcd, 0xd4, 0xdd, 0x67, 0xb2, 0x53, 0xe0, 0x58, 0x08, 0x7f, 0x0e, 0xaa, 0x71, 0xeb, - 0x48, 0x8a, 0x69, 0x5a, 0x2d, 0x91, 0xc2, 0x21, 0xa8, 0x79, 0xd4, 0x77, 0x38, 0x0d, 0x93, 0x3a, - 0x99, 0x56, 0x4c, 0xc5, 0xf0, 0x2b, 0xd0, 0xb5, 0x48, 0x10, 0x12, 0xd1, 0x62, 0x2c, 0x9d, 0x71, - 0x23, 0xe4, 0x3a, 0x77, 0x3c, 0x42, 0x23, 0xae, 0x33, 0x59, 0x1d, 0x2d, 0xed, 0xe6, 0x64, 0xac, - 0xee, 0x97, 0x44, 0xf9, 0x4d, 0x20, 0x05, 0xef, 0xe7, 0x0e, 0x4e, 0x84, 0xd2, 0xa3, 0x58, 0xe7, - 0x44, 0xbc, 0x65, 0x41, 0xe8, 0x5c, 0x38, 0x2e, 0xb1, 0x89, 0x25, 0xeb, 0x62, 0x23, 0x7e, 0xcb, - 0x72, 0x14, 0x17, 0xd6, 0xf0, 0x03, 0x00, 0xcc, 0x20, 0xd2, 0x9f, 0x11, 0xc7, 0x3e, 0xe7, 0x68, - 0x43, 0x3e, 0x5b, 0xea, 0xe7, 0x28, 0xae, 0x9b, 0x41, 0xf4, 0x47, 0xb9, 0x84, 0x08, 0xac, 0x07, - 0x34, 0xe4, 0x0c, 0xd5, 0xfb, 0xab, 0xc3, 0x96, 0xb6, 0xd2, 0xae, 0xe0, 0x18, 0x80, 0x1a, 0x68, - 0x12, 0x3b, 0x24, 0x8c, 0xe9, 0x61, 0x24, 0xae, 0x08, 0xc8, 0x2b, 0xba, 0x96, 0xe6, 0xe0, 0x24, - 0xe9, 0x79, 0xf7, 0x45, 0xcb, 0xc3, 0x91, 0x4b, 0xb4, 0x35, 0x71, 0x41, 0xb8, 0x11, 0x1b, 0x09, - 0x84, 0x89, 0x60, 0x44, 0x93, 0x4a, 0xde, 0xdd, 0x46, 0xde, 0x22, 0x72, 0x14, 0xd7, 0x5d, 0x6a, - 0x9f, 0xc4, 0x2f, 0xe6, 0xaf, 0x40, 0x33, 0xee, 0x7a, 0x4c, 0xb7, 0x23, 0xc7, 0x42, 0x4d, 0x69, - 0x00, 0x27, 0x63, 0xb5, 0x8c, 0x2b, 0xb8, 0x91, 0xec, 0xef, 0x47, 0x4e, 0x7c, 0xe4, 0x90, 0xc8, - 0xdc, 0x1b, 0x1c, 0xb5, 0xfa, 0xca, 0x70, 0x35, 0x39, 0x72, 0x86, 0xe2, 0x7a, 0xb2, 0xfe, 0x8c, - 0xc3, 0x07, 0x60, 0x67, 0x7a, 0x56, 0x38, 0x84, 0xa1, 0x4d, 0x79, 0x3e, 0x94, 0x9e, 0xef, 0xae, - 0x54, 0xb9, 0x97, 0x4d, 0x13, 0x0c, 0xcd, 0x32, 0xe2, 0x10, 0x06, 0x3f, 0x06, 0x1d, 0x97, 0xd8, - 0x86, 0x39, 0xd2, 0x2d, 0xfa, 0xcc, 0x77, 0xa9, 0x61, 0xe9, 0x11, 0x23, 0x21, 0xda, 0x92, 0x81, - 0xaf, 0x20, 0x05, 0xc3, 0x58, 0x7e, 0x2f, 0x11, 0x3f, 0x66, 0x24, 0x84, 0xf7, 0x41, 0x9f, 0x87, - 0x11, 0x93, 0xb5, 0x32, 0x62, 0x9c, 0x78, 0x7a, 0x61, 0x44, 0x31, 0x3d, 0x30, 0xf8, 0x39, 0x6a, - 0x0b, 0x0f, 0xf8, 0x66, 0xa2, 0x77, 0x22, 0xd5, 0xee, 0x16, 0xb4, 0x8e, 0x0d, 0x7e, 0x0e, 0x3f, - 0x01, 0xad, 0xe2, 0x90, 0x61, 0x68, 0x5b, 0x9e, 0x61, 0xa7, 0xdc, 0x36, 0x8e, 0x84, 0x0c, 0x37, - 0x2f, 0xf2, 0x0d, 0x83, 0xef, 0x82, 0x5a, 0x32, 0xc3, 0x10, 0x94, 0xb5, 0xbd, 0x95, 0xda, 0x7c, - 0x19, 0xc3, 0x38, 0x95, 0xc3, 0xdf, 0x83, 0x76, 0xb9, 0xa2, 0x3d, 0x86, 0x76, 0x64, 0x8e, 0x3b, - 0x93, 0xb1, 0x3a, 0x23, 0xc3, 0x9b, 0xac, 0x50, 0xbf, 0x47, 0xa2, 0x93, 0xef, 0xcd, 0x9f, 0xc0, - 0xa8, 0x23, 0x9f, 0x7c, 0x33, 0xcb, 0x78, 0xae, 0x75, 0x9c, 0x29, 0xc9, 0xaa, 0x52, 0xf0, 0xae, - 0x39, 0x4f, 0x08, 0x6f, 0x83, 0xcd, 0x78, 0x72, 0x8a, 0xac, 0xfb, 0x86, 0x47, 0xd0, 0xae, 0xcc, - 0x5b, 0x4b, 0xa2, 0x8f, 0x13, 0x30, 0x57, 0x0b, 0x0c, 0xc6, 0x9e, 0xd1, 0xd0, 0x42, 0x7b, 0x05, - 0xb5, 0xe3, 0x04, 0x14, 0x8d, 0x78, 0x7a, 0x3e, 0xa3, 0xfd, 0x72, 0x23, 0xbe, 0x2b, 0xe4, 0xf7, - 0x32, 0x31, 0xde, 0x32, 0xcb, 0x80, 0x28, 0xe1, 0xc2, 0x2c, 0x67, 0x08, 0xc9, 0x1b, 0x81, 0xa9, - 0xfd, 0x03, 0x21, 0x3b, 0x14, 0x22, 0xdc, 0x70, 0xb2, 0x35, 0x83, 0x5f, 0x82, 0x46, 0x61, 0xde, - 0xa3, 0x6b, 0xd2, 0xea, 0xdd, 0x39, 0x53, 0x2e, 0xee, 0xca, 0x07, 0x47, 0x52, 0x59, 0xb4, 0xed, - 0xcf, 0x7d, 0x1e, 0x8e, 0x64, 0xa9, 0x01, 0x2f, 0x03, 0xe1, 0x7b, 0x60, 0x23, 0x21, 0x0b, 0x0c, - 0x75, 0xa5, 0xb3, 0xec, 0x82, 0x4f, 0x62, 0x1c, 0x67, 0x0a, 0xf0, 0x53, 0xb0, 0x59, 0xa6, 0x12, - 0xe8, 0xba, 0x3c, 0x75, 0x27, 0x35, 0x39, 0xa4, 0x36, 0x36, 0x38, 0x39, 0x14, 0x32, 0xdc, 0x74, - 0x0b, 0xbb, 0xee, 0x63, 0xb0, 0x35, 0x15, 0x0b, 0x6c, 0x83, 0xd5, 0x74, 0x4a, 0xd4, 0xb1, 0x58, - 0xc2, 0xf7, 0xc1, 0xfa, 0x85, 0xe1, 0x46, 0x44, 0x92, 0x84, 0xc6, 0x9d, 0xbd, 0x6c, 0x50, 0xa6, - 0x96, 0x4f, 0x84, 0x14, 0xc7, 0x4a, 0x9f, 0xae, 0x7c, 0xa2, 0x0c, 0xfe, 0xaa, 0x80, 0x46, 0x61, - 0x1a, 0xc3, 0x5f, 0x67, 0x23, 0x5b, 0x91, 0xa7, 0x51, 0xe7, 0x8c, 0xec, 0x83, 0xf8, 0x47, 0x06, - 0x91, 0x8e, 0xeb, 0xee, 0x6f, 0x40, 0xa3, 0x00, 0xcf, 0x89, 0xad, 0x53, 0x8c, 0xad, 0x59, 0x8c, - 0xe1, 0xbb, 0x15, 0xd0, 0xce, 0x33, 0xff, 0x38, 0xb0, 0x0c, 0x4e, 0x60, 0xaf, 0x48, 0x62, 0x84, - 0x9b, 0xf5, 0x2f, 0x2a, 0x45, 0xde, 0x92, 0x73, 0x8b, 0x95, 0xc5, 0xdc, 0x42, 0x99, 0xc3, 0x2d, - 0xfa, 0x25, 0x46, 0x25, 0x86, 0x58, 0xfd, 0x0b, 0xa5, 0xc4, 0xa1, 0x1e, 0x94, 0xeb, 0x64, 0x4d, - 0x26, 0x63, 0x38, 0x5b, 0x27, 0x71, 0xb4, 0xd3, 0x65, 0x52, 0x2c, 0x91, 0xb7, 0x74, 0x73, 0x5a, - 0x07, 0x40, 0x1a, 0x88, 0x58, 0x0d, 0x57, 0xcf, 0xd2, 0xa2, 0xed, 0x82, 0x9d, 0x0c, 0xcd, 0x8f, - 0x33, 0xf8, 0x87, 0x02, 0x5a, 0x25, 0xfa, 0x00, 0x3f, 0x02, 0xcd, 0x20, 0xa4, 0xa6, 0x18, 0x3b, - 0x71, 0xab, 0x97, 0x9d, 0xb4, 0x2d, 0x46, 0x40, 0x11, 0xc7, 0x8d, 0x64, 0x27, 0x07, 0xc0, 0x00, - 0x54, 0x2d, 0xea, 0x19, 0x4e, 0xca, 0x42, 0xc1, 0x64, 0xac, 0x26, 0x08, 0x4e, 0x7e, 0xe1, 0x2f, - 0xc0, 0x86, 0x28, 0x72, 0xe9, 0x54, 0x66, 0x56, 0x6b, 0x4e, 0xc6, 0x6a, 0x86, 0xe1, 0x9a, 0x4b, - 0x6d, 0xe1, 0x6c, 0xf0, 0x2f, 0x05, 0xc0, 0x59, 0x5a, 0x09, 0x7f, 0x09, 0xea, 0x1e, 0xf1, 0x68, - 0x38, 0xd2, 0xbd, 0xd3, 0xf8, 0xe2, 0x63, 0xf6, 0x9a, 0x81, 0x78, 0x23, 0x5e, 0x1e, 0x9d, 0xc2, - 0x5b, 0xa0, 0x66, 0x39, 0xec, 0xa9, 0xd0, 0x5c, 0x91, 0x9a, 0x8d, 0xc9, 0x58, 0x4d, 0x21, 0x5c, - 0x15, 0x8b, 0xa3, 0x53, 0xf8, 0x0e, 0xa8, 0x85, 0x94, 0x72, 0xfd, 0x8c, 0x25, 0x01, 0xc9, 0xb0, - 0x05, 0x74, 0x26, 0x4b, 0x82, 0xf2, 0x3f, 0x30, 0x11, 0xb6, 0x67, 0x7c, 0xad, 0x07, 0x8e, 0xc5, - 0x24, 0x5d, 0x59, 0x8f, 0xc3, 0x4e, 0x31, 0x5c, 0xf3, 0x8c, 0xaf, 0x8f, 0x1d, 0x8b, 0x0d, 0xfe, - 0xd3, 0x06, 0x20, 0x0f, 0xfb, 0xed, 0xe5, 0x71, 0xa9, 0xa8, 0x4b, 0x54, 0x7f, 0xed, 0x0a, 0xaa, - 0xff, 0xa7, 0x57, 0x91, 0xc2, 0xf5, 0xab, 0x49, 0x61, 0x6d, 0x49, 0x42, 0x58, 0x5d, 0x8e, 0x10, - 0xd6, 0x16, 0x12, 0xc2, 0x79, 0x93, 0xf0, 0xfa, 0x6b, 0x4c, 0xc2, 0xd3, 0x85, 0x34, 0x31, 0xa6, - 0x6a, 0xb7, 0x27, 0x63, 0x55, 0x2d, 0x68, 0xa5, 0x72, 0x9f, 0x2d, 0x47, 0x17, 0x0b, 0xa4, 0xb5, - 0xbe, 0x98, 0xb4, 0x16, 0x8a, 0x14, 0xbc, 0xba, 0x48, 0x4b, 0x65, 0xdf, 0x58, 0x5c, 0xf6, 0x65, - 0xea, 0xd9, 0xbc, 0x8a, 0x7a, 0x96, 0x99, 0x6d, 0xeb, 0x4a, 0x66, 0x9b, 0x51, 0xd5, 0xcd, 0x69, - 0xaa, 0x9a, 0x37, 0xdd, 0xad, 0xd7, 0x6f, 0xba, 0x65, 0x8e, 0xda, 0xbe, 0x8a, 0xa3, 0x16, 0xfb, - 0xc8, 0xf6, 0x82, 0x3e, 0x32, 0x43, 0x66, 0xe1, 0x72, 0x64, 0xb6, 0xfc, 0x55, 0xbd, 0x73, 0xe5, - 0x57, 0xf5, 0xef, 0xa6, 0x68, 0x7a, 0xe7, 0x0a, 0x9a, 0x5e, 0x26, 0xe8, 0xda, 0x9c, 0xaf, 0xd9, - 0xdd, 0x85, 0x5f, 0xb3, 0xb3, 0xdf, 0xaf, 0xaf, 0xe0, 0xd3, 0x7b, 0x6f, 0x90, 0x4f, 0xef, 0xff, - 0x68, 0x3e, 0x8d, 0x7e, 0x10, 0x9f, 0xbe, 0xf6, 0x03, 0xf8, 0x74, 0xf7, 0x0a, 0x3e, 0x3d, 0xf3, - 0xa9, 0x7e, 0xe3, 0xb5, 0x3f, 0xd5, 0x4b, 0x53, 0xe1, 0xe6, 0x82, 0xa9, 0xb0, 0x80, 0x7c, 0xf7, - 0xde, 0x02, 0xf9, 0x56, 0x97, 0x23, 0xdf, 0xfd, 0x65, 0xc9, 0xf7, 0xcf, 0x7e, 0x24, 0xf9, 0x1e, - 0x2c, 0x47, 0xbe, 0xef, 0x96, 0x49, 0xd5, 0x3b, 0xd2, 0x6a, 0x30, 0x4b, 0xaa, 0x16, 0xd1, 0xa9, - 0x12, 0xe3, 0xbe, 0xf5, 0xfa, 0x8c, 0xfb, 0xf6, 0x4f, 0xcc, 0xb8, 0xb5, 0x8f, 0x9f, 0xbf, 0xe8, - 0x55, 0xbe, 0x7d, 0xd1, 0xab, 0x7c, 0xff, 0xa2, 0xa7, 0xfc, 0xe5, 0xb2, 0xa7, 0xfc, 0xf3, 0xb2, - 0xa7, 0x7c, 0x73, 0xd9, 0x53, 0x9e, 0x5f, 0xf6, 0x94, 0xef, 0x2e, 0x7b, 0xca, 0xff, 0x2e, 0x7b, - 0x95, 0xef, 0x2f, 0x7b, 0xca, 0xdf, 0x5f, 0xf6, 0x2a, 0xcf, 0x5f, 0xf6, 0x2a, 0xdf, 0xbe, 0xec, - 0x55, 0x4e, 0xab, 0xf2, 0x4f, 0xc7, 0x8f, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x51, 0xbe, 0xb3, - 0x10, 0xd7, 0x15, 0x00, 0x00, + // 1845 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0x4f, 0x6f, 0x1b, 0xc7, + 0x15, 0xc0, 0xb9, 0xfa, 0x43, 0x8a, 0x43, 0x52, 0xa2, 0x46, 0x94, 0x34, 0xa6, 0x6d, 0x2e, 0xcb, + 0xd8, 0x29, 0xd3, 0x24, 0x0a, 0xe0, 0xa4, 0x68, 0x9a, 0x16, 0x05, 0xb2, 0x76, 0xe2, 0x18, 0x96, + 0x02, 0x61, 0x64, 0xbb, 0x6d, 0x80, 0x62, 0xb1, 0xda, 0x1d, 0xad, 0x16, 0xde, 0xdd, 0x59, 0xec, + 0xcc, 0xca, 0xe1, 0xad, 0xfd, 0x06, 0xed, 0xa9, 0x5f, 0xa1, 0x1f, 0xa0, 0x40, 0xbf, 0x42, 0x8e, + 0x3e, 0x06, 0x3d, 0x10, 0xb1, 0x7c, 0x29, 0x78, 0xca, 0x47, 0x28, 0x66, 0xf6, 0x3f, 0x49, 0x53, + 0x52, 0x6c, 0x03, 0x39, 0x71, 0xe6, 0xbd, 0x37, 0x6f, 0xdf, 0xcc, 0xbc, 0x7d, 0xef, 0xb7, 0x04, + 0x9b, 0x16, 0x61, 0x4e, 0x48, 0x2c, 0xdd, 0x0d, 0x83, 0xbd, 0x20, 0xa4, 0x9c, 0xc2, 0xaa, 0x47, + 0x2d, 0xe2, 0xb2, 0xee, 0x87, 0xb6, 0xc3, 0x4f, 0xa3, 0xe3, 0x3d, 0x93, 0x7a, 0x1f, 0xd9, 0xd4, + 0xa6, 0x1f, 0x49, 0xf5, 0x71, 0x74, 0x22, 0x67, 0x72, 0x22, 0x47, 0xf1, 0xb2, 0x6e, 0xcb, 0x30, + 0xb9, 0x43, 0x7d, 0x96, 0x4c, 0x77, 0x4d, 0xc3, 0x3c, 0x25, 0x96, 0x6e, 0x91, 0x80, 0xf8, 0x16, + 0xf1, 0xcd, 0x51, 0xa2, 0xb8, 0x61, 0x92, 0x90, 0x3b, 0x27, 0x8e, 0x69, 0x70, 0xa2, 0x07, 0x21, + 0x0d, 0xc4, 0x94, 0xa4, 0xcb, 0xae, 0x13, 0xff, 0xcc, 0x09, 0xa9, 0xef, 0x11, 0x9f, 0xeb, 0x67, + 0x46, 0xe8, 0x18, 0xc7, 0x6e, 0xa6, 0xdc, 0xf1, 0xa8, 0x15, 0xaf, 0x74, 0xa8, 0xaf, 0x73, 0xc3, + 0x4e, 0x1f, 0xed, 0x13, 0xfe, 0x8c, 0x86, 0x4f, 0x93, 0x69, 0x87, 0x11, 0x33, 0x0a, 0x1d, 0x3e, + 0xd2, 0xed, 0x90, 0x46, 0xc9, 0xb6, 0xba, 0xf0, 0x8c, 0xba, 0x91, 0x47, 0x74, 0x8f, 0x46, 0x3e, + 0x4f, 0x1d, 0x9a, 0xa7, 0xc4, 0x7c, 0xaa, 0x5b, 0xe4, 0xc4, 0xf1, 0x1d, 0xe1, 0x34, 0x91, 0x6f, + 0x3a, 0x9e, 0x61, 0x13, 0xdd, 0x35, 0x46, 0x24, 0x4c, 0x45, 0x1e, 0xe1, 0xa1, 0x63, 0x8a, 0xa7, + 0xa6, 0xe1, 0xb4, 0x98, 0x63, 0x11, 0xd3, 0x48, 0x2d, 0x3a, 0x2e, 0xb5, 0xf5, 0x50, 0xec, 0xca, + 0x75, 0x3c, 0x27, 0x7d, 0x04, 0x38, 0x71, 0x5c, 0x12, 0x8f, 0x07, 0xff, 0x59, 0x01, 0xe8, 0x5e, + 0x7c, 0xde, 0xfb, 0xf8, 0xf0, 0x48, 0x9c, 0x4f, 0xe4, 0x3a, 0xbe, 0xfd, 0xc0, 0x3f, 0xa1, 0xf0, + 0x21, 0xd8, 0x28, 0xdc, 0x85, 0xfe, 0x94, 0x8c, 0x90, 0xd2, 0x57, 0x86, 0x8d, 0x3b, 0xdb, 0x7b, + 0xf1, 0x85, 0xec, 0xe5, 0x4b, 0x1f, 0x92, 0x91, 0xd6, 0xfc, 0x6e, 0xac, 0x56, 0x9e, 0x8f, 0x55, + 0x65, 0x32, 0x56, 0x2b, 0xb8, 0x95, 0xac, 0xdd, 0x0f, 0x83, 0x87, 0x64, 0x04, 0xf7, 0x00, 0x30, + 0x7c, 0x9f, 0x72, 0x79, 0x52, 0x68, 0xa9, 0xaf, 0x0c, 0xeb, 0xda, 0xfa, 0x64, 0xac, 0x16, 0xa4, + 0xb8, 0x30, 0x86, 0xef, 0x83, 0xba, 0xe3, 0x33, 0x6e, 0xf8, 0x26, 0x61, 0x68, 0xb9, 0xaf, 0x0c, + 0x57, 0xb5, 0xd6, 0x64, 0xac, 0xe6, 0x42, 0x9c, 0x0f, 0xe1, 0x37, 0xa0, 0x53, 0x8c, 0x34, 0x24, + 0x8c, 0x46, 0xa1, 0x49, 0xd0, 0x8a, 0x0c, 0xb7, 0x3b, 0x1b, 0x2e, 0x4e, 0x2c, 0xa6, 0x62, 0x86, + 0x79, 0xcc, 0xa9, 0x05, 0xfc, 0x1d, 0xa8, 0x86, 0x34, 0xe2, 0x84, 0xa1, 0x55, 0xe9, 0x6d, 0x2b, + 0xf5, 0x76, 0x28, 0x4e, 0x10, 0x4b, 0x95, 0xb6, 0x2e, 0xdc, 0xfc, 0x77, 0xac, 0x56, 0xe3, 0x39, + 0x4e, 0x96, 0xc0, 0x43, 0xd0, 0x9e, 0xce, 0x10, 0x54, 0x95, 0x6e, 0x76, 0x53, 0x37, 0x07, 0x05, + 0xfd, 0x23, 0xc3, 0x9e, 0x8a, 0x68, 0xc3, 0x2b, 0xab, 0xa1, 0x06, 0xda, 0x49, 0xda, 0x04, 0xae, + 0x61, 0x12, 0x91, 0x95, 0xa8, 0x56, 0xf6, 0xf8, 0x44, 0xea, 0x0f, 0x53, 0x35, 0xde, 0x38, 0x2b, + 0x0b, 0xa0, 0x06, 0x5a, 0xd9, 0xe4, 0x91, 0x61, 0x33, 0xb4, 0xd6, 0x5f, 0x1e, 0xd6, 0xb5, 0x1b, + 0x93, 0xb1, 0x8a, 0x32, 0xaf, 0x32, 0xaf, 0x3e, 0xa0, 0x9e, 0xc3, 0x89, 0x17, 0xf0, 0x11, 0x2e, + 0x2f, 0x19, 0xbc, 0x6c, 0x81, 0xcd, 0xc2, 0x79, 0x46, 0xfe, 0x9b, 0x4f, 0x99, 0xbf, 0x80, 0xed, + 0xb9, 0xef, 0x1e, 0x5a, 0xea, 0x2f, 0x0f, 0x1b, 0x77, 0xae, 0xa7, 0x2e, 0xbf, 0xc8, 0x8d, 0x9e, + 0x24, 0x36, 0x5a, 0x43, 0x38, 0x9e, 0x8c, 0xd5, 0x65, 0xe2, 0x9f, 0xe1, 0x0e, 0x99, 0xb5, 0x60, + 0xf0, 0x16, 0x58, 0x65, 0x84, 0x47, 0x81, 0xcc, 0xae, 0xc6, 0x9d, 0xf5, 0xd4, 0xdd, 0xe7, 0xb2, + 0x6a, 0xe0, 0x58, 0x09, 0xdf, 0x05, 0xd5, 0xb8, 0x8c, 0x24, 0xc9, 0x34, 0x6d, 0x96, 0x68, 0xe1, + 0x10, 0xd4, 0x3c, 0xea, 0x3b, 0x9c, 0x86, 0x49, 0x9e, 0x4c, 0x1b, 0xa6, 0x6a, 0xf8, 0x0d, 0xe8, + 0x5a, 0x24, 0x08, 0x89, 0x28, 0x37, 0x96, 0xce, 0xb8, 0x11, 0x72, 0x9d, 0x3b, 0x1e, 0xa1, 0x11, + 0xd7, 0x99, 0xcc, 0x8e, 0x96, 0x76, 0x73, 0x32, 0x56, 0x77, 0x4b, 0xaa, 0xfc, 0x26, 0x90, 0x82, + 0x77, 0x73, 0x07, 0x47, 0xc2, 0xe8, 0x51, 0x6c, 0x73, 0x24, 0xde, 0xb2, 0x20, 0x74, 0xce, 0x1c, + 0x97, 0xd8, 0xc4, 0x92, 0x79, 0xb1, 0x16, 0xbf, 0x65, 0xb9, 0x14, 0x17, 0xc6, 0xf0, 0x43, 0x00, + 0xcc, 0x20, 0xd2, 0x9f, 0x11, 0xc7, 0x3e, 0xe5, 0x68, 0x4d, 0x3e, 0x5b, 0xda, 0xe7, 0x52, 0x5c, + 0x37, 0x83, 0xe8, 0x8f, 0x72, 0x08, 0x11, 0x58, 0x0d, 0x68, 0xc8, 0x19, 0xaa, 0xf7, 0x97, 0x87, + 0x2d, 0x6d, 0xa9, 0x5d, 0xc1, 0xb1, 0x00, 0x6a, 0xa0, 0x49, 0xec, 0x90, 0x30, 0xa6, 0x87, 0x91, + 0xb8, 0x22, 0x20, 0xaf, 0xe8, 0x5a, 0x7a, 0x06, 0x47, 0x49, 0xfd, 0xbb, 0x2f, 0xca, 0x1f, 0x8e, + 0x5c, 0xa2, 0xad, 0x88, 0x0b, 0xc2, 0x8d, 0x78, 0x91, 0x90, 0x30, 0x11, 0x8c, 0x28, 0x58, 0xc9, + 0xbb, 0xdb, 0xc8, 0x4b, 0x44, 0x2e, 0xc5, 0x75, 0x97, 0xda, 0x47, 0xf1, 0x8b, 0xf9, 0x6b, 0xd0, + 0x8c, 0x2b, 0x20, 0xd3, 0xed, 0xc8, 0xb1, 0x50, 0x53, 0x2e, 0x80, 0x93, 0xb1, 0x5a, 0x96, 0x2b, + 0xb8, 0x91, 0xcc, 0xef, 0x47, 0x4e, 0xbc, 0xe5, 0x90, 0xc8, 0xb3, 0x37, 0x38, 0x6a, 0xf5, 0x95, + 0xe1, 0x72, 0xb2, 0xe5, 0x4c, 0x8a, 0xeb, 0xc9, 0xf8, 0x73, 0x0e, 0x1f, 0x80, 0xad, 0xe9, 0xbe, + 0xe1, 0x10, 0x86, 0xd6, 0xe5, 0xfe, 0x50, 0xba, 0xbf, 0xbb, 0xd2, 0xe4, 0x5e, 0xd6, 0x59, 0x30, + 0x34, 0xcb, 0x12, 0x87, 0x30, 0xf8, 0x09, 0xe8, 0xb8, 0xc4, 0x36, 0xcc, 0x91, 0x6e, 0xd1, 0x67, + 0xbe, 0x4b, 0x0d, 0x4b, 0x8f, 0x18, 0x09, 0xd1, 0x86, 0x0c, 0x7c, 0x09, 0x29, 0x18, 0xc6, 0xfa, + 0x7b, 0x89, 0xfa, 0x31, 0x23, 0x21, 0xbc, 0x0f, 0xfa, 0x3c, 0x8c, 0x98, 0xcc, 0x95, 0x11, 0xe3, + 0xc4, 0xd3, 0x0b, 0xed, 0x8a, 0xe9, 0x81, 0xc1, 0x4f, 0x51, 0x5b, 0x78, 0xc0, 0x37, 0x13, 0xbb, + 0x23, 0x69, 0x76, 0xb7, 0x60, 0x75, 0x68, 0xf0, 0x53, 0xf8, 0x29, 0x68, 0x15, 0x1b, 0x0e, 0x43, + 0x9b, 0x72, 0x0f, 0x5b, 0xe5, 0xb2, 0x71, 0x20, 0x74, 0xb8, 0x79, 0x96, 0x4f, 0x18, 0x7c, 0x0f, + 0xd4, 0x92, 0x7e, 0x86, 0xa0, 0xcc, 0xed, 0x8d, 0x74, 0xcd, 0xd7, 0xb1, 0x18, 0xa7, 0x7a, 0xf8, + 0x07, 0xd0, 0x2e, 0x67, 0xb4, 0xc7, 0xd0, 0x96, 0x3c, 0xe3, 0xce, 0x64, 0xac, 0xce, 0xe8, 0xf0, + 0x3a, 0x2b, 0xe4, 0xef, 0x81, 0xa8, 0xe4, 0x3b, 0xf3, 0xbb, 0x31, 0xea, 0xc8, 0x27, 0xdf, 0xcc, + 0x4e, 0x3c, 0xb7, 0x3a, 0xcc, 0x8c, 0x64, 0x56, 0x29, 0x78, 0xdb, 0x9c, 0xa7, 0x84, 0xb7, 0xc1, + 0x7a, 0xdc, 0x45, 0xc5, 0xa9, 0xfb, 0x86, 0x47, 0xd0, 0xb6, 0x3c, 0xb7, 0x96, 0x94, 0x3e, 0x4e, + 0x84, 0xb9, 0x59, 0x60, 0x30, 0xf6, 0x8c, 0x86, 0x16, 0xda, 0x29, 0x98, 0x1d, 0x26, 0x42, 0x51, + 0x88, 0xa7, 0x7b, 0x35, 0xda, 0x2d, 0x17, 0xe2, 0xbb, 0x42, 0x7f, 0x2f, 0x53, 0xe3, 0x0d, 0xb3, + 0x2c, 0x10, 0x29, 0x5c, 0xe8, 0xeb, 0x0c, 0x21, 0x79, 0x23, 0x30, 0x5d, 0xff, 0x40, 0xe8, 0xf6, + 0x85, 0x0a, 0x37, 0x9c, 0x6c, 0xcc, 0xe0, 0xd7, 0xa0, 0x51, 0xe8, 0xfd, 0xe8, 0x9a, 0x5c, 0xf5, + 0xde, 0x9c, 0x2e, 0x17, 0x57, 0xe5, 0xbd, 0x03, 0x69, 0x2c, 0xca, 0xf6, 0x17, 0x3e, 0x0f, 0x47, + 0x32, 0xd5, 0x80, 0x97, 0x09, 0xe1, 0xfb, 0x60, 0x2d, 0x01, 0x07, 0x86, 0xba, 0xd2, 0x59, 0x76, + 0xc1, 0x47, 0xb1, 0x1c, 0x67, 0x06, 0xf0, 0x33, 0xb0, 0x5e, 0xc6, 0x0a, 0x74, 0x5d, 0xee, 0xba, + 0x93, 0x2e, 0xd9, 0xa7, 0x36, 0x36, 0x38, 0xd9, 0x17, 0x3a, 0xdc, 0x74, 0x0b, 0x33, 0xf8, 0x27, + 0xd0, 0x29, 0xa6, 0x20, 0xb1, 0x74, 0xc1, 0x22, 0x0c, 0xdd, 0x90, 0x0f, 0x6d, 0xa6, 0x1e, 0xbe, + 0x74, 0x5c, 0xa2, 0xa1, 0xc9, 0x58, 0x9d, 0x6b, 0x8d, 0x61, 0x21, 0x39, 0x89, 0x25, 0x8c, 0x59, + 0xf7, 0x31, 0xd8, 0x98, 0xda, 0x25, 0x6c, 0x83, 0xe5, 0xb4, 0xff, 0xd4, 0xb1, 0x18, 0xc2, 0x0f, + 0xc0, 0xea, 0x99, 0xe1, 0x46, 0x44, 0xe2, 0x47, 0xe3, 0xce, 0x4e, 0xd6, 0x82, 0xd3, 0x95, 0x4f, + 0x84, 0x16, 0xc7, 0x46, 0x9f, 0x2d, 0x7d, 0xaa, 0x0c, 0xfe, 0xa6, 0x80, 0x46, 0xa1, 0xcf, 0xc3, + 0xdf, 0x64, 0x30, 0xa0, 0xc8, 0x90, 0xd5, 0x39, 0x30, 0xb0, 0x17, 0xff, 0xc8, 0x20, 0x52, 0x10, + 0xe8, 0xfe, 0x16, 0x34, 0x0a, 0xe2, 0x39, 0xb1, 0x75, 0x8a, 0xb1, 0x35, 0x8b, 0x31, 0xfc, 0xb0, + 0x04, 0xda, 0xf9, 0x9d, 0x3e, 0x0e, 0x2c, 0x83, 0x13, 0xd8, 0x2b, 0xe2, 0x91, 0x70, 0xb3, 0xfa, + 0x55, 0xa5, 0x48, 0x44, 0x39, 0xb5, 0x2c, 0x2d, 0xa6, 0x16, 0x65, 0x0e, 0xb5, 0xf4, 0x4b, 0xac, + 0x26, 0xda, 0x63, 0xfd, 0x2b, 0xa5, 0x44, 0x67, 0x0f, 0xca, 0x19, 0xb8, 0x22, 0x0f, 0x63, 0x38, + 0x9b, 0x81, 0x71, 0xb4, 0xd3, 0x09, 0x58, 0x4c, 0xbe, 0xb7, 0x74, 0x73, 0x5a, 0x07, 0x40, 0x1a, + 0x88, 0x58, 0x0d, 0x57, 0xcf, 0x8e, 0x45, 0xdb, 0x06, 0x5b, 0x99, 0x34, 0xdf, 0xce, 0xe0, 0x1f, + 0x0a, 0x68, 0x95, 0xc0, 0x04, 0x7e, 0x0c, 0x9a, 0x41, 0x48, 0x4d, 0xd1, 0xd0, 0xe2, 0x26, 0x22, + 0x6b, 0x74, 0x5b, 0x34, 0x97, 0xa2, 0x1c, 0x37, 0x92, 0x99, 0x6c, 0x2d, 0x03, 0x50, 0xb5, 0xa8, + 0x67, 0x38, 0x29, 0xdf, 0x82, 0xc9, 0x58, 0x4d, 0x24, 0x38, 0xf9, 0x85, 0xbf, 0x04, 0x6b, 0xe2, + 0xf5, 0x91, 0x4e, 0xe5, 0xc9, 0x6a, 0xcd, 0xc9, 0x58, 0xcd, 0x64, 0xb8, 0xe6, 0x52, 0x5b, 0x38, + 0x1b, 0xfc, 0x5b, 0x01, 0x70, 0x16, 0x58, 0xe1, 0xaf, 0x40, 0xdd, 0x23, 0x1e, 0x0d, 0x47, 0xba, + 0x77, 0x1c, 0x5f, 0x7c, 0xcc, 0xc5, 0x99, 0x10, 0xaf, 0xc5, 0xc3, 0x83, 0x63, 0x78, 0x0b, 0xd4, + 0x2c, 0x87, 0x3d, 0x15, 0x96, 0x4b, 0xd2, 0xb2, 0x31, 0x19, 0xab, 0xa9, 0x08, 0x57, 0xc5, 0xe0, + 0xe0, 0x18, 0xbe, 0x03, 0x6a, 0x21, 0xa5, 0x5c, 0x3f, 0x61, 0x49, 0x40, 0x32, 0x6c, 0x21, 0x3a, + 0x91, 0x29, 0x41, 0xf9, 0x97, 0x4c, 0x84, 0xed, 0x19, 0xdf, 0xea, 0x81, 0x63, 0x31, 0x09, 0x42, + 0xab, 0x71, 0xd8, 0xa9, 0x0c, 0xd7, 0x3c, 0xe3, 0xdb, 0x43, 0xc7, 0x62, 0x83, 0x7f, 0x6e, 0x02, + 0x90, 0x87, 0xfd, 0xf6, 0xce, 0xf1, 0x52, 0x51, 0x97, 0x3e, 0x22, 0x56, 0x2e, 0xf8, 0x88, 0xf8, + 0xf3, 0xab, 0x70, 0x73, 0xf5, 0x62, 0xdc, 0xac, 0x5d, 0x12, 0x35, 0xab, 0x97, 0x43, 0xcd, 0xda, + 0x42, 0xd4, 0x9c, 0xd7, 0x63, 0xaf, 0x5f, 0xa1, 0xc7, 0x1e, 0x2f, 0x04, 0xd0, 0x18, 0x02, 0x6f, + 0x4f, 0xc6, 0xaa, 0x5a, 0xb0, 0x4a, 0xf5, 0x3e, 0xbb, 0x1c, 0x88, 0x16, 0x70, 0xb8, 0xbe, 0x18, + 0x87, 0x0b, 0x49, 0x0a, 0x5e, 0x9d, 0xa4, 0xa5, 0xb4, 0x6f, 0x2c, 0x4e, 0xfb, 0x32, 0xd4, 0x36, + 0x2f, 0x82, 0xda, 0x32, 0x33, 0xb7, 0x2e, 0x64, 0xe6, 0x0c, 0x82, 0xd7, 0xa7, 0x21, 0x38, 0x2f, + 0xba, 0x1b, 0x57, 0x2f, 0xba, 0x65, 0xfa, 0x6d, 0x5f, 0x44, 0xbf, 0xc5, 0x3a, 0xb2, 0xb9, 0xa0, + 0x8e, 0xcc, 0x60, 0x32, 0xbc, 0x1c, 0x26, 0x97, 0xbf, 0xd7, 0xb7, 0x2e, 0xfc, 0x5e, 0xff, 0xfd, + 0xd4, 0x07, 0x40, 0xe7, 0x82, 0x0f, 0x80, 0x32, 0xfa, 0x6b, 0x73, 0xbe, 0x93, 0xb7, 0x17, 0x7e, + 0x27, 0xcf, 0x7e, 0x19, 0xbf, 0x82, 0xd4, 0x77, 0xde, 0x20, 0xa9, 0xef, 0xbe, 0x36, 0xa9, 0xa3, + 0x9f, 0x44, 0xea, 0xd7, 0x7e, 0x02, 0xa9, 0x77, 0x2f, 0x20, 0xf5, 0x99, 0x3f, 0x01, 0x6e, 0x5c, + 0xf9, 0x4f, 0x80, 0x52, 0x57, 0xb8, 0xb9, 0xa0, 0x2b, 0x2c, 0xc0, 0xfa, 0xde, 0x5b, 0xc0, 0x7a, + 0xf5, 0x72, 0x58, 0xdf, 0xbf, 0x2c, 0xd6, 0xff, 0xe2, 0x35, 0xb1, 0x7e, 0x70, 0x39, 0xac, 0xbf, + 0x5b, 0x86, 0xaa, 0x77, 0xe4, 0xaa, 0xc1, 0x2c, 0x54, 0x2d, 0xc2, 0xa9, 0x12, 0xcb, 0xdf, 0xba, + 0x3a, 0xcb, 0xdf, 0x7e, 0x6d, 0x96, 0x7f, 0xf7, 0x67, 0xca, 0xf2, 0xda, 0x27, 0xcf, 0x5f, 0xf4, + 0x2a, 0xdf, 0xbf, 0xe8, 0x55, 0x7e, 0x7c, 0xd1, 0x53, 0xfe, 0x7a, 0xde, 0x53, 0xfe, 0x75, 0xde, + 0x53, 0xbe, 0x3b, 0xef, 0x29, 0xcf, 0xcf, 0x7b, 0xca, 0x0f, 0xe7, 0x3d, 0xe5, 0x7f, 0xe7, 0xbd, + 0xca, 0x8f, 0xe7, 0x3d, 0xe5, 0xef, 0x2f, 0x7b, 0x95, 0xe7, 0x2f, 0x7b, 0x95, 0xef, 0x5f, 0xf6, + 0x2a, 0xc7, 0x55, 0xf9, 0x47, 0xe9, 0xc7, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x43, 0x41, + 0x1c, 0x97, 0x16, 0x00, 0x00, } func (this *DesiredLRPSchedulingInfo) Equal(that interface{}) bool { @@ -1276,6 +1295,14 @@ func (this *DesiredLRPRunInfo) Equal(that interface{}) bool { if !this.LogRateLimit.Equal(that1.LogRateLimit) { return false } + if len(this.VolumeMountedFiles) != len(that1.VolumeMountedFiles) { + return false + } + for i := range this.VolumeMountedFiles { + if !this.VolumeMountedFiles[i].Equal(that1.VolumeMountedFiles[i]) { + return false + } + } return true } func (this *ProtoRoutes) Equal(that interface{}) bool { @@ -1651,6 +1678,14 @@ func (this *DesiredLRP) Equal(that interface{}) bool { if !this.LogRateLimit.Equal(that1.LogRateLimit) { return false } + if len(this.VolumeMountedFiles) != len(that1.VolumeMountedFiles) { + return false + } + for i := range this.VolumeMountedFiles { + if !this.VolumeMountedFiles[i].Equal(that1.VolumeMountedFiles[i]) { + return false + } + } return true } func (this *DesiredLRPSchedulingInfo) GoString() string { @@ -1676,7 +1711,7 @@ func (this *DesiredLRPRunInfo) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 31) + s := make([]string, 0, 32) s = append(s, "&models.DesiredLRPRunInfo{") s = append(s, "DesiredLRPKey: "+strings.Replace(this.DesiredLRPKey.GoString(), `&`, ``, 1)+",\n") if this.EnvironmentVariables != nil { @@ -1751,6 +1786,9 @@ func (this *DesiredLRPRunInfo) GoString() string { if this.LogRateLimit != nil { s = append(s, "LogRateLimit: "+fmt.Sprintf("%#v", this.LogRateLimit)+",\n") } + if this.VolumeMountedFiles != nil { + s = append(s, "VolumeMountedFiles: "+fmt.Sprintf("%#v", this.VolumeMountedFiles)+",\n") + } s = append(s, "}") return strings.Join(s, "") } @@ -1850,7 +1888,7 @@ func (this *DesiredLRP) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 41) + s := make([]string, 0, 42) s = append(s, "&models.DesiredLRP{") s = append(s, "ProcessGuid: "+fmt.Sprintf("%#v", this.ProcessGuid)+",\n") s = append(s, "Domain: "+fmt.Sprintf("%#v", this.Domain)+",\n") @@ -1929,6 +1967,9 @@ func (this *DesiredLRP) GoString() string { if this.LogRateLimit != nil { s = append(s, "LogRateLimit: "+fmt.Sprintf("%#v", this.LogRateLimit)+",\n") } + if this.VolumeMountedFiles != nil { + s = append(s, "VolumeMountedFiles: "+fmt.Sprintf("%#v", this.VolumeMountedFiles)+",\n") + } s = append(s, "}") return strings.Join(s, "") } @@ -2056,6 +2097,22 @@ func (m *DesiredLRPRunInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.VolumeMountedFiles) > 0 { + for iNdEx := len(m.VolumeMountedFiles) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VolumeMountedFiles[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xe2 + } + } if m.LogRateLimit != nil { { size, err := m.LogRateLimit.MarshalToSizedBuffer(dAtA[:i]) @@ -2624,6 +2681,22 @@ func (m *DesiredLRP) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.VolumeMountedFiles) > 0 { + for iNdEx := len(m.VolumeMountedFiles) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VolumeMountedFiles[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDesiredLrp(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0xb2 + } + } if m.LogRateLimit != nil { { size, err := m.LogRateLimit.MarshalToSizedBuffer(dAtA[:i]) @@ -3201,6 +3274,12 @@ func (m *DesiredLRPRunInfo) Size() (n int) { l = m.LogRateLimit.Size() n += 2 + l + sovDesiredLrp(uint64(l)) } + if len(m.VolumeMountedFiles) > 0 { + for _, e := range m.VolumeMountedFiles { + l = e.Size() + n += 2 + l + sovDesiredLrp(uint64(l)) + } + } return n } @@ -3489,6 +3568,12 @@ func (m *DesiredLRP) Size() (n int) { l = m.LogRateLimit.Size() n += 2 + l + sovDesiredLrp(uint64(l)) } + if len(m.VolumeMountedFiles) > 0 { + for _, e := range m.VolumeMountedFiles { + l = e.Size() + n += 2 + l + sovDesiredLrp(uint64(l)) + } + } return n } @@ -3549,6 +3634,11 @@ func (this *DesiredLRPRunInfo) String() string { repeatedStringForSidecars += strings.Replace(fmt.Sprintf("%v", f), "Sidecar", "Sidecar", 1) + "," } repeatedStringForSidecars += "}" + repeatedStringForVolumeMountedFiles := "[]*File{" + for _, f := range this.VolumeMountedFiles { + repeatedStringForVolumeMountedFiles += strings.Replace(fmt.Sprintf("%v", f), "File", "File", 1) + "," + } + repeatedStringForVolumeMountedFiles += "}" keysForMetricTags := make([]string, 0, len(this.MetricTags)) for k, _ := range this.MetricTags { keysForMetricTags = append(keysForMetricTags, k) @@ -3587,6 +3677,7 @@ func (this *DesiredLRPRunInfo) String() string { `MetricTags:` + mapStringForMetricTags + `,`, `Sidecars:` + repeatedStringForSidecars + `,`, `LogRateLimit:` + strings.Replace(fmt.Sprintf("%v", this.LogRateLimit), "LogRateLimit", "LogRateLimit", 1) + `,`, + `VolumeMountedFiles:` + repeatedStringForVolumeMountedFiles + `,`, `}`, }, "") return s @@ -3713,6 +3804,11 @@ func (this *DesiredLRP) String() string { repeatedStringForSidecars += strings.Replace(fmt.Sprintf("%v", f), "Sidecar", "Sidecar", 1) + "," } repeatedStringForSidecars += "}" + repeatedStringForVolumeMountedFiles := "[]*File{" + for _, f := range this.VolumeMountedFiles { + repeatedStringForVolumeMountedFiles += strings.Replace(fmt.Sprintf("%v", f), "File", "File", 1) + "," + } + repeatedStringForVolumeMountedFiles += "}" keysForMetricTags := make([]string, 0, len(this.MetricTags)) for k, _ := range this.MetricTags { keysForMetricTags = append(keysForMetricTags, k) @@ -3761,6 +3857,7 @@ func (this *DesiredLRP) String() string { `MetricTags:` + mapStringForMetricTags + `,`, `Sidecars:` + repeatedStringForSidecars + `,`, `LogRateLimit:` + strings.Replace(fmt.Sprintf("%v", this.LogRateLimit), "LogRateLimit", "LogRateLimit", 1) + `,`, + `VolumeMountedFiles:` + repeatedStringForVolumeMountedFiles + `,`, `}`, }, "") return s @@ -5085,6 +5182,40 @@ func (m *DesiredLRPRunInfo) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 28: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VolumeMountedFiles", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDesiredLrp + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDesiredLrp + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDesiredLrp + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VolumeMountedFiles = append(m.VolumeMountedFiles, &File{}) + if err := m.VolumeMountedFiles[len(m.VolumeMountedFiles)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDesiredLrp(dAtA[iNdEx:]) @@ -7135,6 +7266,40 @@ func (m *DesiredLRP) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 38: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VolumeMountedFiles", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDesiredLrp + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDesiredLrp + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDesiredLrp + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VolumeMountedFiles = append(m.VolumeMountedFiles, &File{}) + if err := m.VolumeMountedFiles[len(m.VolumeMountedFiles)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDesiredLrp(dAtA[iNdEx:]) diff --git a/models/desired_lrp.proto b/models/desired_lrp.proto index a0777892..26b081a3 100644 --- a/models/desired_lrp.proto +++ b/models/desired_lrp.proto @@ -16,6 +16,7 @@ import "image_layer.proto"; import "metric_tags.proto"; import "sidecar.proto"; import "log_rate_limit.proto"; +import "file.proto"; message DesiredLRPSchedulingInfo { DesiredLRPKey desired_lrp_key = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; @@ -70,6 +71,8 @@ message DesiredLRPRunInfo { repeated Sidecar sidecars = 26; LogRateLimit log_rate_limit = 27; + + repeated File volume_mounted_files = 28 [(gogoproto.jsontag) = "volume_mounted_files"]; } // helper message for marshalling routes @@ -147,4 +150,5 @@ message DesiredLRP { repeated Sidecar sidecars = 36; LogRateLimit log_rate_limit = 37; + repeated File volume_mounted_files = 38 [(gogoproto.jsontag) = "volume_mounted_files"]; } diff --git a/models/desired_lrp_test.go b/models/desired_lrp_test.go index 2e37be56..4828a2f0 100644 --- a/models/desired_lrp_test.go +++ b/models/desired_lrp_test.go @@ -83,7 +83,8 @@ var _ = Describe("DesiredLRP", func() { }, "user": "vcap", "log_source": "APP", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } }, { @@ -122,7 +123,8 @@ var _ = Describe("DesiredLRP", func() { "nofile": 16384 }, "user": "vcap", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } } ] @@ -141,7 +143,8 @@ var _ = Describe("DesiredLRP", func() { }, "user": "vcap", "log_source": "HEALTH", - "suppress_log_output": true + "suppress_log_output": true, + "volume_mounted_files": null } }, "timeout_ms": 30000000 @@ -316,7 +319,8 @@ var _ = Describe("DesiredLRP", func() { }, "user": "vcap", "log_source": "SIDECAR", - "suppress_log_output": false + "suppress_log_output": false, + "volume_mounted_files": null } } ] @@ -328,7 +332,8 @@ var _ = Describe("DesiredLRP", func() { ], "log_rate_limit": { "bytes_per_second": 2048 - } + }, + "volume_mounted_files": null }` BeforeEach(func() { @@ -1002,6 +1007,43 @@ var _ = Describe("DesiredLRP", func() { } }) + It("fails when service binding files exceed 1MB", func() { + var exceedSize string + for range (1024 * 1024) + 100 { + exceedSize += "a" + } + + var InvalidVolumeMountedFiles = []*models.File{ + {Path: "/redis/username", Content: exceedSize}, + } + + desiredLRP.VolumeMountedFiles = InvalidVolumeMountedFiles + + assertDesiredLRPValidationFailsWithMessage(desiredLRP, "volumeMountedFiles") + }) + + It("fails when total size of service binding files exceeds 1MB", func() { + var smallFileContent, mediumFileContent, largeFileContent string + for i := 0; i < 1024*100; i++ { + smallFileContent += "a" + } + for i := 0; i < 1024*500; i++ { + mediumFileContent += "b" + } + for i := 0; i < 1024*500+100; i++ { + largeFileContent += "c" + } + + var InvalidVolumeMountedFiles = []*models.File{ + {Path: "/redis/small", Content: smallFileContent}, + {Path: "/httpd/medium", Content: mediumFileContent}, + {Path: "/pgsql/large", Content: largeFileContent}, + } + desiredLRP.VolumeMountedFiles = InvalidVolumeMountedFiles + + assertDesiredLRPValidationFailsWithMessage(desiredLRP, "volumeMountedFiles") + }) + It("requires a positive nonzero number of instances", func() { desiredLRP.Instances = -1 assertDesiredLRPValidationFailsWithMessage(desiredLRP, "instances") @@ -1591,6 +1633,27 @@ var _ = Describe("DesiredLRPRunInfo", func() { var httpCheckDef = model_helpers.NewValidHTTPCheckDefinition() var logRateLimit = &models.LogRateLimit{BytesPerSecond: 1024} + var volumeMountedFiles = []*models.File{{Path: "/redis/username", Content: "username"}} + + var smallFileContent, mediumFileContent, largeFileContent string + + // Create files of different sizes + for i := 0; i < 1024*100; i++ { // 100 KB + smallFileContent += "a" + } + for i := 0; i < 1024*500; i++ { // 500 KB + mediumFileContent += "b" + } + for i := 0; i < 1024*500+100; i++ { // 500 KB + 100 bytes + largeFileContent += "c" + } + + var InvalidVolumeMountedFiles = []*models.File{ + {Path: "/redis/small", Content: smallFileContent}, + {Path: "/httpd/medium", Content: mediumFileContent}, + {Path: "/pgsql/large", Content: largeFileContent}, + } + DescribeTable("Validation", func(key models.DesiredLRPRunInfo, expectedErr string) { err := key.Validate() @@ -1601,23 +1664,24 @@ var _ = Describe("DesiredLRPRunInfo", func() { Expect(err.Error()).To(ContainSubstring(expectedErr)) } }, - Entry("valid run info", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{{Action: action}}, logRateLimit), ""), - Entry("invalid key", models.NewDesiredLRPRunInfo(models.DesiredLRPKey{}, createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "process_guid"), - Entry("invalid env vars", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, append(envVars, models.EnvironmentVariable{}), nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "name"), - Entry("invalid setup action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, &models.Action{}, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "inner-action"), - Entry("invalid run action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, &models.Action{}, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "inner-action"), - Entry("invalid monitor action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, &models.Action{}, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "inner-action"), - Entry("invalid http check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{Port: 65536}}}, "healthcheck_log_source", []*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{Port: 77777}}}}, nil, []*models.Sidecar{}, logRateLimit), "port"), - Entry("invalid tcp check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{TcpCheck: &models.TCPCheck{}}}, "healthcheck_log_source", []*models.Check{&models.Check{TcpCheck: &models.TCPCheck{}}}}, nil, []*models.Sidecar{}, logRateLimit), "port"), - Entry("invalid check in check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{}, TcpCheck: &models.TCPCheck{}}}, "healthcheck_log_source", []*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{}, TcpCheck: &models.TCPCheck{}}}}, nil, []*models.Sidecar{}, logRateLimit), "check"), - Entry("invalid legacy download user", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, []*models.ImageLayer{{Url: "url", DestinationPath: "path", MediaType: models.MediaTypeTgz, LayerType: models.LayerTypeExclusive}}, []*models.Sidecar{}, logRateLimit), "legacy_download_user"), - Entry("invalid cached dependency", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, []*models.CachedDependency{{To: "here"}}, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "cached_dependency"), - Entry("invalid volume mount", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{{Mode: "lol"}}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "volume_mount"), - Entry("invalid image username", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "password", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "image_username"), - Entry("invalid image password", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "username", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit), "image_password"), - Entry("invalid layers", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, []*models.ImageLayer{{Url: "some-url"}}, []*models.Sidecar{}, logRateLimit), "image_layer"), - Entry("invalid sidecars", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{{DiskMb: -1}}, logRateLimit), "sidecars"), - Entry("invalid log rate limit", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{{DiskMb: -1}}, &models.LogRateLimit{BytesPerSecond: -2}), "log_rate_limit"), + Entry("valid run info", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{{Action: action}}, logRateLimit, volumeMountedFiles), ""), + Entry("invalid key", models.NewDesiredLRPRunInfo(models.DesiredLRPKey{}, createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "process_guid"), + Entry("invalid env vars", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, append(envVars, models.EnvironmentVariable{}), nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "name"), + Entry("invalid setup action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, &models.Action{}, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "inner-action"), + Entry("invalid run action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, &models.Action{}, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "inner-action"), + Entry("invalid monitor action", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, &models.Action{}, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "inner-action"), + Entry("invalid http check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{Port: 65536}}}, "healthcheck_log_source", []*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{Port: 77777}}}}, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "port"), + Entry("invalid tcp check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{TcpCheck: &models.TCPCheck{}}}, "healthcheck_log_source", []*models.Check{&models.Check{TcpCheck: &models.TCPCheck{}}}}, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "port"), + Entry("invalid check in check definition", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "legacy-jim", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", &models.CheckDefinition{[]*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{}, TcpCheck: &models.TCPCheck{}}}, "healthcheck_log_source", []*models.Check{&models.Check{HttpCheck: &models.HTTPCheck{}, TcpCheck: &models.TCPCheck{}}}}, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "check"), + Entry("invalid legacy download user", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, []*models.ImageLayer{{Url: "url", DestinationPath: "path", MediaType: models.MediaTypeTgz, LayerType: models.LayerTypeExclusive}}, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "legacy_download_user"), + Entry("invalid cached dependency", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, []*models.CachedDependency{{To: "here"}}, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "cached_dependency"), + Entry("invalid volume mount", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{{Mode: "lol"}}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "volume_mount"), + Entry("invalid image username", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "password", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "image_username"), + Entry("invalid image password", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "username", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "image_password"), + Entry("invalid layers", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, []*models.ImageLayer{{Url: "some-url"}}, []*models.Sidecar{}, logRateLimit, volumeMountedFiles), "image_layer"), + Entry("invalid sidecars", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{{DiskMb: -1}}, logRateLimit, volumeMountedFiles), "sidecars"), + Entry("invalid log rate limit", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{{DiskMb: -1}}, &models.LogRateLimit{BytesPerSecond: -2}, volumeMountedFiles), "log_rate_limit"), + Entry("invalid service binding file size", models.NewDesiredLRPRunInfo(newValidLRPKey(), createdAt, envVars, nil, action, action, action, startTimeoutMs, privileged, cpuWeight, ports, egressRules, logSource, metricsGuid, "user", trustedSystemCertificatesPath, []*models.VolumeMount{}, nil, nil, "", "", httpCheckDef, nil, []*models.Sidecar{}, logRateLimit, InvalidVolumeMountedFiles), "volumeMountedFiles"), ) }) diff --git a/models/file.pb.go b/models/file.pb.go new file mode 100644 index 00000000..e93426fc --- /dev/null +++ b/models/file.pb.go @@ -0,0 +1,434 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: file.proto + +package models + +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + math_bits "math/bits" + reflect "reflect" + strings "strings" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type File struct { + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path"` + Content string `protobuf:"bytes,2,opt,name=content,proto3" json:"content"` +} + +func (m *File) Reset() { *m = File{} } +func (*File) ProtoMessage() {} +func (*File) Descriptor() ([]byte, []int) { + return fileDescriptor_9188e3b7e55e1162, []int{0} +} +func (m *File) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *File) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_File.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *File) XXX_Merge(src proto.Message) { + xxx_messageInfo_File.Merge(m, src) +} +func (m *File) XXX_Size() int { + return m.Size() +} +func (m *File) XXX_DiscardUnknown() { + xxx_messageInfo_File.DiscardUnknown(m) +} + +var xxx_messageInfo_File proto.InternalMessageInfo + +func (m *File) GetPath() string { + if m != nil { + return m.Path + } + return "" +} + +func (m *File) GetContent() string { + if m != nil { + return m.Content + } + return "" +} + +func init() { + proto.RegisterType((*File)(nil), "models.File") +} + +func init() { proto.RegisterFile("file.proto", fileDescriptor_9188e3b7e55e1162) } + +var fileDescriptor_9188e3b7e55e1162 = []byte{ + // 192 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4a, 0xcb, 0xcc, 0x49, + 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcb, 0xcd, 0x4f, 0x49, 0xcd, 0x29, 0x96, 0xd2, + 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7, + 0x07, 0x4b, 0x27, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xa6, 0xe4, 0xcd, 0xc5, + 0xe2, 0x96, 0x99, 0x93, 0x2a, 0x24, 0xc3, 0xc5, 0x52, 0x90, 0x58, 0x92, 0x21, 0xc1, 0xa8, 0xc0, + 0xa8, 0xc1, 0xe9, 0xc4, 0xf1, 0xea, 0x9e, 0x3c, 0x98, 0x1f, 0x04, 0x26, 0x85, 0x54, 0xb9, 0xd8, + 0x93, 0xf3, 0xf3, 0x4a, 0x52, 0xf3, 0x4a, 0x24, 0x98, 0xc0, 0x0a, 0xb8, 0x5f, 0xdd, 0x93, 0x87, + 0x09, 0x05, 0xc1, 0x18, 0x4e, 0x26, 0x17, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, + 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, 0x15, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, + 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, + 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0x92, 0xd8, 0xc0, + 0x2e, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x8f, 0x30, 0x8c, 0xce, 0x00, 0x00, 0x00, +} + +func (this *File) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*File) + if !ok { + that2, ok := that.(File) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Path != that1.Path { + return false + } + if this.Content != that1.Content { + return false + } + return true +} +func (this *File) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 6) + s = append(s, "&models.File{") + s = append(s, "Path: "+fmt.Sprintf("%#v", this.Path)+",\n") + s = append(s, "Content: "+fmt.Sprintf("%#v", this.Content)+",\n") + s = append(s, "}") + return strings.Join(s, "") +} +func valueToGoStringFile(v interface{}, typ string) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) +} +func (m *File) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *File) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *File) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Content) > 0 { + i -= len(m.Content) + copy(dAtA[i:], m.Content) + i = encodeVarintFile(dAtA, i, uint64(len(m.Content))) + i-- + dAtA[i] = 0x12 + } + if len(m.Path) > 0 { + i -= len(m.Path) + copy(dAtA[i:], m.Path) + i = encodeVarintFile(dAtA, i, uint64(len(m.Path))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintFile(dAtA []byte, offset int, v uint64) int { + offset -= sovFile(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *File) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Path) + if l > 0 { + n += 1 + l + sovFile(uint64(l)) + } + l = len(m.Content) + if l > 0 { + n += 1 + l + sovFile(uint64(l)) + } + return n +} + +func sovFile(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozFile(x uint64) (n int) { + return sovFile(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (this *File) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&File{`, + `Path:` + fmt.Sprintf("%v", this.Path) + `,`, + `Content:` + fmt.Sprintf("%v", this.Content) + `,`, + `}`, + }, "") + return s +} +func valueToStringFile(v interface{}) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("*%v", pv) +} +func (m *File) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFile + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: File: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: File: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Path", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFile + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFile + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFile + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Path = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Content", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFile + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFile + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFile + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Content = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipFile(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthFile + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipFile(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowFile + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowFile + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowFile + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthFile + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupFile + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthFile + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthFile = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowFile = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupFile = fmt.Errorf("proto: unexpected end of group") +) diff --git a/models/file.proto b/models/file.proto new file mode 100644 index 00000000..026ed505 --- /dev/null +++ b/models/file.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package models; + +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +message File { + string path = 1 [(gogoproto.jsontag) = "path"]; + string content = 2 [(gogoproto.jsontag) = "content"]; +} diff --git a/models/task.pb.go b/models/task.pb.go index d41ff768..a7e40bd3 100644 --- a/models/task.pb.go +++ b/models/task.pb.go @@ -85,6 +85,7 @@ type TaskDefinition struct { ImageLayers []*ImageLayer `protobuf:"bytes,25,rep,name=image_layers,json=imageLayers,proto3" json:"image_layers,omitempty"` LogRateLimit *LogRateLimit `protobuf:"bytes,26,opt,name=log_rate_limit,json=logRateLimit,proto3" json:"log_rate_limit,omitempty"` MetricTags map[string]*MetricTagValue `protobuf:"bytes,27,rep,name=metric_tags,json=metricTags,proto3" json:"metric_tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + VolumeMountedFiles []*File `protobuf:"bytes,28,rep,name=volume_mounted_files,json=volumeMountedFiles,proto3" json:"volume_mounted_files"` } func (m *TaskDefinition) Reset() { *m = TaskDefinition{} } @@ -309,6 +310,13 @@ func (m *TaskDefinition) GetMetricTags() map[string]*MetricTagValue { return nil } +func (m *TaskDefinition) GetVolumeMountedFiles() []*File { + if m != nil { + return m.VolumeMountedFiles + } + return nil +} + type Task struct { *TaskDefinition `protobuf:"bytes,1,opt,name=task_definition,json=taskDefinition,proto3,embedded=task_definition" json:""` TaskGuid string `protobuf:"bytes,2,opt,name=task_guid,json=taskGuid,proto3" json:"task_guid"` @@ -451,92 +459,94 @@ func init() { func init() { proto.RegisterFile("task.proto", fileDescriptor_ce5d8dd45b4a91ff) } var fileDescriptor_ce5d8dd45b4a91ff = []byte{ - // 1351 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x56, 0xcd, 0x6e, 0xdb, 0xc6, - 0x16, 0x36, 0xed, 0x48, 0xb6, 0x46, 0x3f, 0x96, 0xc7, 0x3f, 0x61, 0x9c, 0x1b, 0x51, 0xf0, 0xbd, - 0x37, 0x75, 0x83, 0xc4, 0x29, 0x92, 0xb4, 0x48, 0x83, 0x00, 0x85, 0x65, 0x27, 0x86, 0x01, 0xbb, - 0x30, 0xc6, 0x71, 0xba, 0x24, 0x46, 0xe4, 0x88, 0x9e, 0x9a, 0xe4, 0x10, 0x33, 0x43, 0x39, 0xda, - 0xf5, 0x11, 0xfa, 0x14, 0x45, 0x1f, 0xa5, 0x4b, 0x2f, 0xb3, 0x22, 0x1a, 0x67, 0x53, 0x68, 0x95, - 0x47, 0x28, 0x66, 0x38, 0xa4, 0x24, 0xc7, 0x2b, 0x9d, 0xf3, 0x7d, 0xdf, 0x99, 0x9f, 0x33, 0x3c, - 0xe7, 0x08, 0x00, 0x89, 0xc5, 0xc5, 0x4e, 0xc2, 0x99, 0x64, 0xb0, 0x1a, 0x31, 0x9f, 0x84, 0x62, - 0xf3, 0x49, 0x40, 0xe5, 0x79, 0xda, 0xdf, 0xf1, 0x58, 0xf4, 0x34, 0x60, 0x01, 0x7b, 0xaa, 0xe9, - 0x7e, 0x3a, 0xd0, 0x9e, 0x76, 0xb4, 0x95, 0x87, 0x6d, 0x36, 0xb1, 0x27, 0x29, 0x8b, 0x85, 0x71, - 0xef, 0x93, 0x78, 0x48, 0x39, 0x8b, 0x23, 0x12, 0x4b, 0x77, 0x88, 0x39, 0xc5, 0xfd, 0x90, 0x14, - 0xe4, 0x9a, 0x20, 0x5e, 0xca, 0xa9, 0x1c, 0xb9, 0x01, 0x67, 0x69, 0x62, 0xd0, 0xbb, 0x1e, 0xf6, - 0xce, 0x89, 0xef, 0xfa, 0x24, 0x21, 0xb1, 0x4f, 0x62, 0x6f, 0x64, 0x08, 0x38, 0x64, 0x61, 0x1a, - 0x11, 0x37, 0x62, 0x69, 0x2c, 0x8b, 0xed, 0x62, 0x22, 0x2f, 0x19, 0x37, 0x87, 0xde, 0xfc, 0x8f, - 0x47, 0xb8, 0xa4, 0x03, 0xea, 0x61, 0x49, 0xdc, 0x84, 0xb3, 0x44, 0xb9, 0xe5, 0x7e, 0x2b, 0x34, - 0xc2, 0x01, 0x71, 0x43, 0x3c, 0x22, 0xbc, 0x38, 0x42, 0xc8, 0x02, 0x97, 0x2b, 0x75, 0x48, 0x23, - 0x5a, 0xac, 0xba, 0x12, 0x11, 0xc9, 0xa9, 0xe7, 0x4a, 0x1c, 0x98, 0xd8, 0xad, 0x3f, 0x1a, 0xa0, - 0xf5, 0x0e, 0x8b, 0x8b, 0x7d, 0x32, 0xa0, 0x31, 0x55, 0x57, 0x84, 0xff, 0x05, 0x8b, 0x9c, 0x31, - 0xe9, 0x0e, 0x84, 0x6d, 0x75, 0xad, 0xed, 0x5a, 0x0f, 0x8c, 0x33, 0xa7, 0xaa, 0xa0, 0x81, 0x40, - 0xfa, 0xf7, 0xad, 0x80, 0x1e, 0x58, 0xbf, 0x35, 0x05, 0xf6, 0x7c, 0x77, 0x61, 0xbb, 0xfe, 0xec, - 0xfe, 0x4e, 0x9e, 0xe6, 0x9d, 0x37, 0x13, 0xd1, 0x7b, 0xa3, 0xe9, 0xad, 0x8c, 0x33, 0xa7, 0x49, - 0xe2, 0xe1, 0x63, 0x16, 0x51, 0x49, 0xa2, 0x44, 0x8e, 0xd0, 0x1a, 0xf9, 0x5a, 0x27, 0xe0, 0x43, - 0x50, 0xcd, 0xd3, 0x6e, 0x2f, 0x74, 0xad, 0xed, 0xfa, 0xb3, 0x56, 0xb1, 0xea, 0xae, 0x46, 0x91, - 0x61, 0xe1, 0xff, 0xc0, 0xa2, 0x4f, 0xc5, 0x85, 0x1b, 0xf5, 0xed, 0x3b, 0x5d, 0x6b, 0xbb, 0xd2, - 0xab, 0x8f, 0x33, 0xa7, 0x80, 0x50, 0x55, 0x19, 0xc7, 0x7d, 0xf8, 0x08, 0xd4, 0x22, 0x12, 0x31, - 0x3e, 0x52, 0xba, 0x8a, 0xd6, 0x35, 0xc7, 0x99, 0x33, 0x01, 0xd1, 0x52, 0x6e, 0x1e, 0xf7, 0xe1, - 0x13, 0x00, 0xbc, 0x24, 0x75, 0x2f, 0x09, 0x0d, 0xce, 0xa5, 0x5d, 0xed, 0x5a, 0xdb, 0xcd, 0x5e, - 0x6b, 0x9c, 0x39, 0x53, 0x28, 0xaa, 0x79, 0x49, 0xfa, 0x8b, 0x36, 0xe1, 0x0e, 0x00, 0x09, 0xa7, - 0x43, 0x1a, 0x92, 0x80, 0xf8, 0xf6, 0x62, 0xd7, 0xda, 0x5e, 0xca, 0xe5, 0x13, 0x14, 0x4d, 0xd9, - 0x6a, 0x79, 0xf5, 0x40, 0x82, 0xa5, 0xdc, 0x23, 0xf6, 0x92, 0xce, 0xb2, 0xd6, 0x4f, 0x50, 0x54, - 0x0b, 0x59, 0x70, 0xaa, 0x4d, 0xf8, 0x0d, 0x58, 0x52, 0x44, 0x90, 0x52, 0xdf, 0xae, 0x69, 0x71, - 0x63, 0x9c, 0x39, 0x25, 0x86, 0x16, 0x43, 0x16, 0x1c, 0xa4, 0xd4, 0x87, 0xcf, 0x41, 0x23, 0x7f, - 0x62, 0x91, 0x8b, 0x81, 0x16, 0xb7, 0xc7, 0x99, 0x33, 0x83, 0xa3, 0xba, 0xf1, 0x74, 0xd0, 0x77, - 0xa0, 0xce, 0x89, 0x48, 0x43, 0xe9, 0x0e, 0x68, 0x48, 0xec, 0xba, 0x8e, 0x59, 0x1e, 0x67, 0xce, - 0x34, 0x8c, 0x40, 0xee, 0xbc, 0xa5, 0x21, 0x81, 0x3f, 0x80, 0xbb, 0x1e, 0x8b, 0x92, 0x90, 0xa8, - 0xec, 0xbb, 0x1e, 0x0e, 0xc3, 0x3e, 0xf6, 0x2e, 0xdc, 0x94, 0x87, 0x76, 0x43, 0x45, 0xa3, 0xf5, - 0x09, 0xbd, 0x67, 0xd8, 0x33, 0x1e, 0xc2, 0x0e, 0x00, 0x38, 0x8e, 0x99, 0xc4, 0xfa, 0x4d, 0x9b, - 0x5a, 0x3a, 0x85, 0xc0, 0xd7, 0xa0, 0x41, 0x02, 0x4e, 0x84, 0x70, 0x79, 0xaa, 0xbe, 0xa5, 0x96, - 0xfe, 0x96, 0xee, 0x15, 0xaf, 0x7e, 0x6a, 0xca, 0xea, 0x40, 0x55, 0x15, 0x4a, 0x43, 0x82, 0xea, - 0xb9, 0x5c, 0xd9, 0x02, 0x1e, 0x82, 0xd5, 0x9b, 0x25, 0x46, 0x89, 0xb0, 0x97, 0xf5, 0x22, 0x76, - 0xb1, 0xc8, 0x9e, 0x96, 0xec, 0x97, 0x45, 0x88, 0xa0, 0x37, 0x8b, 0x50, 0x22, 0xe0, 0x0b, 0xb0, - 0x16, 0x92, 0x00, 0x7b, 0x23, 0xd7, 0x67, 0x97, 0x71, 0xc8, 0xb0, 0xef, 0xa6, 0x82, 0x70, 0xbb, - 0xad, 0x73, 0x33, 0x6f, 0x5b, 0x08, 0xe6, 0xfc, 0xbe, 0xa1, 0xcf, 0x04, 0xe1, 0xf0, 0x00, 0x74, - 0x25, 0x4f, 0x85, 0x24, 0xbe, 0x2b, 0x46, 0x42, 0x92, 0xc8, 0x9d, 0x2a, 0x5b, 0xe1, 0x26, 0x58, - 0x9e, 0xdb, 0x2b, 0xfa, 0xd2, 0x0f, 0x8c, 0xee, 0x54, 0xcb, 0xf6, 0xa6, 0x54, 0x27, 0x58, 0x9e, - 0xc3, 0x97, 0xa0, 0x39, 0xdd, 0x13, 0x84, 0x0d, 0xf5, 0x1d, 0x56, 0x8b, 0x3b, 0xbc, 0xd7, 0xe4, - 0xb1, 0xe2, 0x50, 0x63, 0x38, 0x71, 0x04, 0xfc, 0x16, 0x2c, 0x9a, 0xce, 0x61, 0xaf, 0xea, 0x92, - 0x59, 0x2e, 0x62, 0x7e, 0xce, 0x61, 0x54, 0xf0, 0xf0, 0xff, 0xa0, 0x95, 0x84, 0xd8, 0x23, 0xba, - 0x7e, 0x55, 0x47, 0xb0, 0xd7, 0xba, 0x0b, 0xdb, 0x35, 0xd4, 0x2c, 0xd1, 0x77, 0x38, 0x10, 0xea, - 0xdb, 0x8b, 0xf0, 0x07, 0x37, 0xa1, 0xbe, 0xb0, 0xd7, 0x75, 0xd1, 0xe8, 0x6f, 0xaf, 0xc0, 0xd0, - 0x62, 0x84, 0x3f, 0x9c, 0x50, 0x5f, 0xc0, 0x77, 0x60, 0xe3, 0xf6, 0x2e, 0x65, 0x6f, 0xe8, 0x93, - 0x3c, 0x28, 0x5f, 0x60, 0xa2, 0x3a, 0x29, 0x45, 0x68, 0xdd, 0xbb, 0x0d, 0x86, 0x3f, 0x82, 0x56, - 0xde, 0xdd, 0x54, 0xfe, 0x63, 0x1c, 0x11, 0xfb, 0xae, 0x7e, 0x03, 0x38, 0xce, 0x9c, 0x1b, 0x0c, - 0x6a, 0x6a, 0xff, 0xcc, 0xb8, 0x93, 0xd0, 0x04, 0x0b, 0x71, 0xc9, 0xb8, 0x6f, 0xdb, 0x37, 0x43, - 0x0b, 0xc6, 0x84, 0x9e, 0x18, 0x17, 0x7e, 0x0f, 0x1a, 0x53, 0x3d, 0x55, 0xd8, 0xf7, 0x74, 0xfe, - 0x61, 0x71, 0x83, 0x43, 0xc5, 0x1d, 0x29, 0x0a, 0xd5, 0x69, 0x69, 0x0b, 0xf8, 0x0a, 0xb4, 0x66, - 0xfb, 0xae, 0xbd, 0xa9, 0xaf, 0xbe, 0x56, 0x04, 0x1e, 0xb1, 0x00, 0x61, 0x49, 0x8e, 0x14, 0x87, - 0x1a, 0xe1, 0x94, 0x07, 0x0f, 0x40, 0x7d, 0xaa, 0x3b, 0xdb, 0xf7, 0xf5, 0x8e, 0x0f, 0x8b, 0xc0, - 0xd9, 0x16, 0xbd, 0x73, 0xac, 0x95, 0xea, 0x7d, 0xde, 0xc4, 0x92, 0x8f, 0x10, 0x88, 0x4a, 0x60, - 0xf3, 0x0c, 0x2c, 0xdf, 0xa0, 0x61, 0x1b, 0x2c, 0x5c, 0x90, 0x51, 0xde, 0xcd, 0x91, 0x32, 0xe1, - 0x63, 0x50, 0x19, 0xe2, 0x30, 0x25, 0xf6, 0xbc, 0x3e, 0xe0, 0x46, 0xb1, 0x4f, 0x19, 0xf9, 0x5e, - 0xb1, 0x28, 0x17, 0xbd, 0x9a, 0x7f, 0x69, 0x6d, 0x7d, 0xa9, 0x80, 0x3b, 0xea, 0x14, 0xf0, 0x10, - 0x2c, 0xab, 0x71, 0xea, 0xfa, 0xe5, 0x71, 0xf4, 0xc2, 0x53, 0x8b, 0xcc, 0x1e, 0xb6, 0xb7, 0x74, - 0x95, 0x39, 0xd6, 0x38, 0x73, 0xe6, 0x50, 0x4b, 0xce, 0x4e, 0x9a, 0x47, 0xa0, 0xa6, 0x97, 0xd2, - 0xbd, 0x6a, 0x5e, 0x3f, 0x8e, 0xee, 0xc8, 0x25, 0x88, 0x96, 0x94, 0xa9, 0xbb, 0xd4, 0x16, 0xa8, - 0xfa, 0x2c, 0xc2, 0x34, 0x9f, 0x05, 0x66, 0x28, 0xe5, 0x08, 0x32, 0xbf, 0xba, 0x6b, 0x73, 0x82, - 0x55, 0x01, 0x62, 0xa9, 0x47, 0xc1, 0x82, 0xe9, 0xda, 0x25, 0x8a, 0x6a, 0xc6, 0xde, 0x95, 0x4a, - 0x9e, 0x26, 0x7e, 0x21, 0xaf, 0x4c, 0xe4, 0x13, 0x14, 0xd5, 0x8c, 0xbd, 0x2b, 0xe1, 0x3e, 0x80, - 0x03, 0xca, 0x85, 0x74, 0x4d, 0x73, 0xcb, 0xc3, 0xaa, 0x3a, 0x6c, 0x63, 0x9c, 0x39, 0xb7, 0xb0, - 0xa8, 0xad, 0xb1, 0xbd, 0x02, 0xda, 0x95, 0xf0, 0x39, 0xa8, 0x08, 0x89, 0x25, 0xd1, 0x53, 0xa2, - 0x35, 0xf9, 0xa6, 0x54, 0xd2, 0x76, 0x4e, 0x15, 0xd3, 0xab, 0x8d, 0x33, 0x27, 0x17, 0xa1, 0xfc, - 0x47, 0x0d, 0x38, 0x8f, 0x84, 0xa1, 0x4b, 0x7d, 0x33, 0x2c, 0xf4, 0x80, 0x33, 0x10, 0xaa, 0x2a, - 0xe3, 0x50, 0xa7, 0x28, 0x6f, 0xd2, 0x66, 0x48, 0xe4, 0x73, 0x5b, 0x23, 0xc8, 0xfc, 0x2a, 0xcd, - 0x00, 0xd3, 0x90, 0xe4, 0xb3, 0x61, 0x29, 0xd7, 0xe4, 0x08, 0x32, 0xbf, 0xaa, 0x70, 0x94, 0x95, - 0x72, 0xe2, 0x72, 0x82, 0x05, 0x8b, 0xcd, 0x4c, 0xd0, 0x85, 0x33, 0xcb, 0xa0, 0xa6, 0xf1, 0x91, - 0x76, 0xe1, 0x6b, 0xb0, 0xcc, 0xc9, 0xaf, 0xc4, 0xcb, 0x07, 0x83, 0xea, 0x49, 0x7a, 0x22, 0x54, - 0x7a, 0xab, 0xe3, 0xcc, 0xb9, 0x49, 0xa1, 0x56, 0x09, 0xec, 0x29, 0x1f, 0xfe, 0x04, 0xda, 0x13, - 0x89, 0xd9, 0x5a, 0x4f, 0x89, 0xde, 0xda, 0x38, 0x73, 0xbe, 0xe2, 0xd0, 0x64, 0xc1, 0x7c, 0xfb, - 0xad, 0x23, 0x50, 0xd1, 0x29, 0x84, 0x75, 0xb0, 0x78, 0x18, 0x0f, 0x71, 0x48, 0xfd, 0xf6, 0x9c, - 0x72, 0x4e, 0x48, 0xec, 0xd3, 0x38, 0x68, 0x5b, 0xca, 0x41, 0x69, 0x1c, 0x2b, 0x67, 0x1e, 0x36, - 0x41, 0xad, 0x7c, 0x9b, 0xf6, 0x82, 0x72, 0x11, 0x11, 0x2c, 0x1c, 0x2a, 0xf6, 0x4e, 0xef, 0xc5, - 0xd5, 0xa7, 0x8e, 0xf5, 0xf1, 0x53, 0x67, 0xee, 0xcb, 0xa7, 0x8e, 0xf5, 0xdb, 0x75, 0xc7, 0xfa, - 0xf3, 0xba, 0x63, 0xfd, 0x75, 0xdd, 0xb1, 0xae, 0xae, 0x3b, 0xd6, 0xdf, 0xd7, 0x1d, 0xeb, 0x9f, - 0xeb, 0xce, 0xdc, 0x97, 0xeb, 0x8e, 0xf5, 0xfb, 0xe7, 0xce, 0xdc, 0xd5, 0xe7, 0xce, 0xdc, 0xc7, - 0xcf, 0x9d, 0xb9, 0x7e, 0x55, 0xff, 0xb1, 0x7a, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, - 0x48, 0xdf, 0x94, 0x75, 0x0a, 0x00, 0x00, + // 1386 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x56, 0xdd, 0x6e, 0xdb, 0x36, + 0x14, 0x8e, 0x92, 0xda, 0x89, 0xe9, 0x9f, 0x38, 0xcc, 0x4f, 0xd5, 0xb4, 0xb5, 0x8c, 0x6c, 0xeb, + 0xb2, 0xa2, 0x4d, 0x87, 0xb6, 0x1b, 0xba, 0xa2, 0xc0, 0x10, 0x27, 0x6d, 0x10, 0x20, 0x19, 0x02, + 0xa6, 0xe9, 0x76, 0x27, 0xd0, 0x12, 0xad, 0x70, 0x91, 0x44, 0x83, 0xa4, 0x9c, 0xfa, 0xae, 0x8f, + 0xb0, 0xc7, 0xd8, 0xa3, 0xec, 0x32, 0x97, 0xbd, 0x12, 0xd6, 0xf4, 0x66, 0xf0, 0x55, 0x1f, 0x61, + 0xe0, 0x91, 0x64, 0x3b, 0x69, 0xae, 0x74, 0xce, 0xf7, 0x7d, 0x87, 0x34, 0x0f, 0x79, 0xce, 0x31, + 0x42, 0x9a, 0xaa, 0xb3, 0xad, 0xbe, 0x14, 0x5a, 0xe0, 0x72, 0x24, 0x7c, 0x16, 0xaa, 0xf5, 0xc7, + 0x01, 0xd7, 0xa7, 0x49, 0x77, 0xcb, 0x13, 0xd1, 0x93, 0x40, 0x04, 0xe2, 0x09, 0xd0, 0xdd, 0xa4, + 0x07, 0x1e, 0x38, 0x60, 0x65, 0x61, 0xeb, 0x75, 0xea, 0x69, 0x2e, 0x62, 0x95, 0xbb, 0x77, 0x59, + 0x3c, 0xe0, 0x52, 0xc4, 0x11, 0x8b, 0xb5, 0x3b, 0xa0, 0x92, 0xd3, 0x6e, 0xc8, 0x0a, 0x72, 0x45, + 0x31, 0x2f, 0x91, 0x5c, 0x0f, 0xdd, 0x40, 0x8a, 0xa4, 0x9f, 0xa3, 0xb7, 0x3d, 0xea, 0x9d, 0x32, + 0xdf, 0xf5, 0x59, 0x9f, 0xc5, 0x3e, 0x8b, 0xbd, 0x61, 0x4e, 0xe0, 0x81, 0x08, 0x93, 0x88, 0xb9, + 0x91, 0x48, 0x62, 0x5d, 0x6c, 0x17, 0x33, 0x7d, 0x2e, 0x64, 0xfe, 0xa3, 0xd7, 0xef, 0x79, 0x4c, + 0x6a, 0xde, 0xe3, 0x1e, 0xd5, 0xcc, 0xed, 0x4b, 0xd1, 0x37, 0xee, 0x78, 0xbf, 0x25, 0x1e, 0xd1, + 0x80, 0xb9, 0x21, 0x1d, 0x32, 0x59, 0xfc, 0x84, 0x50, 0x04, 0xae, 0x34, 0xea, 0x90, 0x47, 0xbc, + 0x58, 0x75, 0x29, 0x62, 0x5a, 0x72, 0xcf, 0xd5, 0x34, 0x28, 0x62, 0x51, 0x8f, 0x87, 0x2c, 0xb3, + 0x37, 0x3e, 0xd4, 0x51, 0xe3, 0x2d, 0x55, 0x67, 0xbb, 0xac, 0xc7, 0x63, 0x6e, 0x8e, 0x8b, 0xbf, + 0x41, 0xf3, 0x52, 0x08, 0xed, 0xf6, 0x94, 0x6d, 0xb5, 0xad, 0xcd, 0x4a, 0x07, 0x8d, 0x52, 0xa7, + 0x6c, 0xa0, 0x9e, 0x22, 0xf0, 0x7d, 0xa3, 0xb0, 0x87, 0x56, 0x6f, 0x4c, 0x87, 0x3d, 0xdb, 0x9e, + 0xdb, 0xac, 0x3e, 0xbd, 0xbb, 0x95, 0xa5, 0x7c, 0xeb, 0xf5, 0x44, 0xf4, 0x2e, 0xd7, 0x74, 0x96, + 0x46, 0xa9, 0x53, 0x67, 0xf1, 0xe0, 0x91, 0x88, 0xb8, 0x66, 0x51, 0x5f, 0x0f, 0xc9, 0x0a, 0xfb, + 0x5a, 0xa7, 0xf0, 0x03, 0x54, 0xce, 0xae, 0xc0, 0x9e, 0x6b, 0x5b, 0x9b, 0xd5, 0xa7, 0x8d, 0x62, + 0xd5, 0x6d, 0x40, 0x49, 0xce, 0xe2, 0x6f, 0xd1, 0xbc, 0xcf, 0xd5, 0x99, 0x1b, 0x75, 0xed, 0x5b, + 0x6d, 0x6b, 0xb3, 0xd4, 0xa9, 0x8e, 0x52, 0xa7, 0x80, 0x48, 0xd9, 0x18, 0x87, 0x5d, 0xfc, 0x10, + 0x55, 0x22, 0x16, 0x09, 0x39, 0x34, 0xba, 0x12, 0xe8, 0xea, 0xa3, 0xd4, 0x99, 0x80, 0x64, 0x21, + 0x33, 0x0f, 0xbb, 0xf8, 0x31, 0x42, 0x5e, 0x3f, 0x71, 0xcf, 0x19, 0x0f, 0x4e, 0xb5, 0x5d, 0x6e, + 0x5b, 0x9b, 0xf5, 0x4e, 0x63, 0x94, 0x3a, 0x53, 0x28, 0xa9, 0x78, 0xfd, 0xe4, 0x77, 0x30, 0xf1, + 0x16, 0x42, 0x7d, 0xc9, 0x07, 0x3c, 0x64, 0x01, 0xf3, 0xed, 0xf9, 0xb6, 0xb5, 0xb9, 0x90, 0xc9, + 0x27, 0x28, 0x99, 0xb2, 0xcd, 0xf2, 0xe6, 0xb2, 0x94, 0x48, 0xa4, 0xc7, 0xec, 0x05, 0xc8, 0x32, + 0xe8, 0x27, 0x28, 0xa9, 0x84, 0x22, 0x38, 0x06, 0x13, 0x7f, 0x8f, 0x16, 0x0c, 0x11, 0x24, 0xdc, + 0xb7, 0x2b, 0x20, 0xae, 0x8d, 0x52, 0x67, 0x8c, 0x91, 0xf9, 0x50, 0x04, 0x7b, 0x09, 0xf7, 0xf1, + 0x33, 0x54, 0xcb, 0xae, 0x5b, 0x65, 0x62, 0x04, 0xe2, 0xe6, 0x28, 0x75, 0xae, 0xe0, 0xa4, 0x9a, + 0x7b, 0x10, 0xf4, 0x23, 0xaa, 0x4a, 0xa6, 0x92, 0x50, 0xbb, 0xe6, 0x5d, 0xd8, 0x55, 0x88, 0x59, + 0x1c, 0xa5, 0xce, 0x34, 0x4c, 0x50, 0xe6, 0xbc, 0xe1, 0x21, 0xc3, 0x3f, 0xa3, 0xdb, 0x9e, 0x88, + 0xfa, 0x21, 0x33, 0xd9, 0x77, 0x3d, 0x1a, 0x86, 0x5d, 0xea, 0x9d, 0xb9, 0x89, 0x0c, 0xed, 0x9a, + 0x89, 0x26, 0xab, 0x13, 0x7a, 0x27, 0x67, 0x4f, 0x64, 0x88, 0x5b, 0x08, 0xd1, 0x38, 0x16, 0x9a, + 0xc2, 0x9d, 0xd6, 0x41, 0x3a, 0x85, 0xe0, 0x57, 0xa8, 0xc6, 0x02, 0xc9, 0x94, 0x72, 0x65, 0x62, + 0xde, 0x52, 0x03, 0xde, 0xd2, 0x9d, 0xe2, 0xd6, 0x8f, 0xf3, 0x12, 0xdb, 0x33, 0x15, 0x46, 0x92, + 0x90, 0x91, 0x6a, 0x26, 0x37, 0xb6, 0xc2, 0xfb, 0x68, 0xf9, 0x7a, 0xb9, 0x71, 0xa6, 0xec, 0x45, + 0x58, 0xc4, 0x2e, 0x16, 0xd9, 0x01, 0xc9, 0xee, 0xb8, 0x20, 0x09, 0xf6, 0xae, 0x22, 0x9c, 0x29, + 0xfc, 0x1c, 0xad, 0x84, 0x2c, 0xa0, 0xde, 0xd0, 0xf5, 0xc5, 0x79, 0x1c, 0x0a, 0xea, 0xbb, 0x89, + 0x62, 0xd2, 0x6e, 0x42, 0x6e, 0x66, 0x6d, 0x8b, 0xe0, 0x8c, 0xdf, 0xcd, 0xe9, 0x13, 0xc5, 0x24, + 0xde, 0x43, 0x6d, 0x2d, 0x13, 0xa5, 0x99, 0xef, 0xaa, 0xa1, 0xd2, 0x2c, 0x72, 0xa7, 0x4a, 0x58, + 0xb9, 0x7d, 0xaa, 0x4f, 0xed, 0x25, 0x38, 0xf4, 0xfd, 0x5c, 0x77, 0x0c, 0xb2, 0x9d, 0x29, 0xd5, + 0x11, 0xd5, 0xa7, 0xf8, 0x05, 0xaa, 0x4f, 0xf7, 0x07, 0x65, 0x63, 0x38, 0xc3, 0x72, 0x71, 0x86, + 0x77, 0x40, 0x1e, 0x1a, 0x8e, 0xd4, 0x06, 0x13, 0x47, 0xe1, 0x1f, 0xd0, 0x7c, 0xde, 0x45, 0xec, + 0x65, 0x28, 0x99, 0xc5, 0x22, 0xe6, 0xb7, 0x0c, 0x26, 0x05, 0x8f, 0xbf, 0x43, 0x8d, 0x7e, 0x48, + 0x3d, 0x06, 0xf5, 0x6b, 0xba, 0x83, 0xbd, 0xd2, 0x9e, 0xdb, 0xac, 0x90, 0xfa, 0x18, 0x7d, 0x4b, + 0x03, 0x65, 0xde, 0x5e, 0x44, 0xdf, 0xbb, 0x7d, 0xee, 0x2b, 0x7b, 0x15, 0x8a, 0x06, 0xde, 0x5e, + 0x81, 0x91, 0xf9, 0x88, 0xbe, 0x3f, 0xe2, 0xbe, 0xc2, 0x6f, 0xd1, 0xda, 0xcd, 0x1d, 0xcb, 0x5e, + 0x83, 0x5f, 0x72, 0x7f, 0x7c, 0x03, 0x13, 0xd5, 0xd1, 0x58, 0x44, 0x56, 0xbd, 0x9b, 0x60, 0xfc, + 0x0b, 0x6a, 0x64, 0x9d, 0xce, 0xe4, 0x3f, 0xa6, 0x11, 0xb3, 0x6f, 0xc3, 0x1d, 0xe0, 0x51, 0xea, + 0x5c, 0x63, 0x48, 0x1d, 0xfc, 0x93, 0xdc, 0x9d, 0x84, 0xf6, 0xa9, 0x52, 0xe7, 0x42, 0xfa, 0xb6, + 0x7d, 0x3d, 0xb4, 0x60, 0xf2, 0xd0, 0xa3, 0xdc, 0xc5, 0x3f, 0xa1, 0xda, 0x54, 0x7f, 0x55, 0xf6, + 0x1d, 0xc8, 0x3f, 0x2e, 0x4e, 0xb0, 0x6f, 0xb8, 0x03, 0x43, 0x91, 0x2a, 0x1f, 0xdb, 0x0a, 0xbf, + 0x44, 0x8d, 0xab, 0x3d, 0xd8, 0x5e, 0x87, 0xa3, 0xaf, 0x14, 0x81, 0x07, 0x22, 0x20, 0x54, 0xb3, + 0x03, 0xc3, 0x91, 0x5a, 0x38, 0xe5, 0xe1, 0x3d, 0x54, 0x9d, 0xea, 0xd4, 0xf6, 0x5d, 0xd8, 0xf1, + 0x41, 0x11, 0x78, 0xb5, 0x45, 0x6f, 0x1d, 0x82, 0xd2, 0xdc, 0xcf, 0xeb, 0x58, 0xcb, 0x21, 0x41, + 0xd1, 0x18, 0xc0, 0x7f, 0xa0, 0x95, 0xe9, 0xc7, 0xc3, 0x7c, 0xa8, 0x5f, 0x65, 0xdf, 0x83, 0x15, + 0x6b, 0xc5, 0x8a, 0xa6, 0x90, 0x3b, 0xf6, 0x28, 0x75, 0x6e, 0x54, 0x13, 0x3c, 0xf5, 0xac, 0x98, + 0x6f, 0xc4, 0x6a, 0xfd, 0x04, 0x2d, 0x5e, 0xdb, 0x18, 0x37, 0xd1, 0xdc, 0x19, 0x1b, 0x66, 0x73, + 0x82, 0x18, 0x13, 0x3f, 0x42, 0xa5, 0x01, 0x0d, 0x13, 0x66, 0xcf, 0xc2, 0xd1, 0xd7, 0x8a, 0xfd, + 0xc6, 0x91, 0xef, 0x0c, 0x4b, 0x32, 0xd1, 0xcb, 0xd9, 0x17, 0xd6, 0xc6, 0x97, 0x12, 0xba, 0x65, + 0xce, 0x87, 0xf7, 0xd1, 0xa2, 0x19, 0xda, 0xae, 0x3f, 0x3e, 0x28, 0x2c, 0x3c, 0xb5, 0xc8, 0xd5, + 0x34, 0x74, 0x16, 0x2e, 0x52, 0xc7, 0x1a, 0xa5, 0xce, 0x0c, 0x69, 0xe8, 0xab, 0x33, 0xec, 0x21, + 0xaa, 0xc0, 0x52, 0xd0, 0x05, 0x67, 0xe1, 0xda, 0xa1, 0xd7, 0x8f, 0x41, 0xb2, 0x60, 0x4c, 0xe8, + 0x7f, 0x1b, 0xa8, 0xec, 0x8b, 0x88, 0xf2, 0x6c, 0xca, 0xe4, 0xe3, 0x2e, 0x43, 0x48, 0xfe, 0x85, + 0x79, 0x20, 0x19, 0x35, 0xf9, 0xa1, 0x1a, 0x86, 0xcc, 0x5c, 0x3e, 0x0f, 0xc6, 0x28, 0xa9, 0xe4, + 0xf6, 0xb6, 0x36, 0xf2, 0xa4, 0xef, 0x17, 0xf2, 0xd2, 0x44, 0x3e, 0x41, 0x49, 0x25, 0xb7, 0xb7, + 0x35, 0xde, 0x45, 0xb8, 0xc7, 0xa5, 0xd2, 0x6e, 0xde, 0x36, 0xb3, 0xb0, 0x32, 0x84, 0xad, 0x8d, + 0x52, 0xe7, 0x06, 0x96, 0x34, 0x01, 0xdb, 0x29, 0xa0, 0x6d, 0x8d, 0x9f, 0xa1, 0x92, 0xd2, 0x54, + 0x33, 0x98, 0x3f, 0x8d, 0xc9, 0x6b, 0x35, 0x49, 0xdb, 0x3a, 0x36, 0x4c, 0xa7, 0x32, 0x4a, 0x9d, + 0x4c, 0x44, 0xb2, 0x8f, 0x19, 0x9d, 0x1e, 0x0b, 0x43, 0x97, 0xfb, 0xf9, 0x18, 0x82, 0xd1, 0x99, + 0x43, 0xa4, 0x6c, 0x8c, 0x7d, 0x48, 0x51, 0xd6, 0xfe, 0xf3, 0xf1, 0x93, 0xfd, 0x23, 0x00, 0x84, + 0xe4, 0x5f, 0xa3, 0xe9, 0x51, 0x1e, 0xb2, 0x6c, 0xea, 0x2c, 0x64, 0x9a, 0x0c, 0x21, 0xf9, 0xd7, + 0x94, 0xa4, 0xb1, 0x12, 0xc9, 0x5c, 0xc9, 0xa8, 0x12, 0x71, 0x3e, 0x6d, 0xa0, 0x24, 0xaf, 0x32, + 0xa4, 0x9e, 0xfb, 0x04, 0x5c, 0xfc, 0x0a, 0x2d, 0x4a, 0xf6, 0x27, 0xf3, 0xb2, 0x91, 0x63, 0x9e, + 0x25, 0xcc, 0x9a, 0x52, 0x67, 0x79, 0x94, 0x3a, 0xd7, 0x29, 0xd2, 0x18, 0x03, 0x3b, 0xc6, 0xc7, + 0xbf, 0xa2, 0xe6, 0x44, 0x92, 0x6f, 0x0d, 0xf3, 0xa7, 0xb3, 0x32, 0x4a, 0x9d, 0xaf, 0x38, 0x32, + 0x59, 0x30, 0xdb, 0x7e, 0xe3, 0x00, 0x95, 0x20, 0x85, 0xb8, 0x8a, 0xe6, 0xf7, 0xe3, 0x01, 0x0d, + 0xb9, 0xdf, 0x9c, 0x31, 0xce, 0x11, 0x8b, 0x7d, 0x1e, 0x07, 0x4d, 0xcb, 0x38, 0x24, 0x89, 0x63, + 0xe3, 0xcc, 0xe2, 0x3a, 0xaa, 0x8c, 0xef, 0xa6, 0x39, 0x67, 0x5c, 0xc2, 0x94, 0x08, 0x07, 0x86, + 0xbd, 0xd5, 0x79, 0x7e, 0xf1, 0xa9, 0x65, 0x7d, 0xfc, 0xd4, 0x9a, 0xf9, 0xf2, 0xa9, 0x65, 0x7d, + 0xb8, 0x6c, 0x59, 0x7f, 0x5f, 0xb6, 0xac, 0x7f, 0x2e, 0x5b, 0xd6, 0xc5, 0x65, 0xcb, 0xfa, 0xf7, + 0xb2, 0x65, 0xfd, 0x77, 0xd9, 0x9a, 0xf9, 0x72, 0xd9, 0xb2, 0xfe, 0xfa, 0xdc, 0x9a, 0xb9, 0xf8, + 0xdc, 0x9a, 0xf9, 0xf8, 0xb9, 0x35, 0xd3, 0x2d, 0xc3, 0x5f, 0xb6, 0x67, 0xff, 0x07, 0x00, 0x00, + 0xff, 0xff, 0x19, 0x37, 0xa2, 0x26, 0xdb, 0x0a, 0x00, 0x00, } func (x Task_State) String() string { @@ -681,6 +691,14 @@ func (this *TaskDefinition) Equal(that interface{}) bool { return false } } + if len(this.VolumeMountedFiles) != len(that1.VolumeMountedFiles) { + return false + } + for i := range this.VolumeMountedFiles { + if !this.VolumeMountedFiles[i].Equal(that1.VolumeMountedFiles[i]) { + return false + } + } return true } func (this *Task) Equal(that interface{}) bool { @@ -747,7 +765,7 @@ func (this *TaskDefinition) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 31) + s := make([]string, 0, 32) s = append(s, "&models.TaskDefinition{") s = append(s, "RootFs: "+fmt.Sprintf("%#v", this.RootFs)+",\n") if this.EnvironmentVariables != nil { @@ -806,6 +824,9 @@ func (this *TaskDefinition) GoString() string { if this.MetricTags != nil { s = append(s, "MetricTags: "+mapStringForMetricTags+",\n") } + if this.VolumeMountedFiles != nil { + s = append(s, "VolumeMountedFiles: "+fmt.Sprintf("%#v", this.VolumeMountedFiles)+",\n") + } s = append(s, "}") return strings.Join(s, "") } @@ -861,6 +882,22 @@ func (m *TaskDefinition) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.VolumeMountedFiles) > 0 { + for iNdEx := len(m.VolumeMountedFiles) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.VolumeMountedFiles[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTask(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xe2 + } + } if len(m.MetricTags) > 0 { for k := range m.MetricTags { v := m.MetricTags[k] @@ -1401,6 +1438,12 @@ func (m *TaskDefinition) Size() (n int) { n += mapEntrySize + 2 + sovTask(uint64(mapEntrySize)) } } + if len(m.VolumeMountedFiles) > 0 { + for _, e := range m.VolumeMountedFiles { + l = e.Size() + n += 2 + l + sovTask(uint64(l)) + } + } return n } @@ -1494,6 +1537,11 @@ func (this *TaskDefinition) String() string { repeatedStringForImageLayers += strings.Replace(fmt.Sprintf("%v", f), "ImageLayer", "ImageLayer", 1) + "," } repeatedStringForImageLayers += "}" + repeatedStringForVolumeMountedFiles := "[]*File{" + for _, f := range this.VolumeMountedFiles { + repeatedStringForVolumeMountedFiles += strings.Replace(fmt.Sprintf("%v", f), "File", "File", 1) + "," + } + repeatedStringForVolumeMountedFiles += "}" keysForMetricTags := make([]string, 0, len(this.MetricTags)) for k, _ := range this.MetricTags { keysForMetricTags = append(keysForMetricTags, k) @@ -1532,6 +1580,7 @@ func (this *TaskDefinition) String() string { `ImageLayers:` + repeatedStringForImageLayers + `,`, `LogRateLimit:` + strings.Replace(fmt.Sprintf("%v", this.LogRateLimit), "LogRateLimit", "LogRateLimit", 1) + `,`, `MetricTags:` + mapStringForMetricTags + `,`, + `VolumeMountedFiles:` + repeatedStringForVolumeMountedFiles + `,`, `}`, }, "") return s @@ -2518,6 +2567,40 @@ func (m *TaskDefinition) Unmarshal(dAtA []byte) error { } m.MetricTags[mapkey] = mapvalue iNdEx = postIndex + case 28: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field VolumeMountedFiles", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTask + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTask + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTask + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.VolumeMountedFiles = append(m.VolumeMountedFiles, &File{}) + if err := m.VolumeMountedFiles[len(m.VolumeMountedFiles)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTask(dAtA[iNdEx:]) diff --git a/models/task.proto b/models/task.proto index 2e4b1c27..697e33c7 100644 --- a/models/task.proto +++ b/models/task.proto @@ -13,6 +13,7 @@ import "certificate_properties.proto"; import "image_layer.proto"; import "log_rate_limit.proto"; import "metric_tags.proto"; +import "file.proto"; option (gogoproto.goproto_enum_prefix_all) = true; @@ -44,6 +45,7 @@ message TaskDefinition { repeated ImageLayer image_layers = 25; LogRateLimit log_rate_limit = 26; map metric_tags = 27; + repeated File volume_mounted_files = 28 [(gogoproto.jsontag) = "volume_mounted_files"]; } message Task { diff --git a/models/task_test.go b/models/task_test.go index 2f9f7f9a..4d5ab56d 100644 --- a/models/task_test.go +++ b/models/task_test.go @@ -109,7 +109,10 @@ var _ = Describe("Task", func() { "bar": { "dynamic": "INDEX" } - } + }, + "volume_mounted_files": [ + {"path": "/redis/username", "content": "username"} + ] }` task = models.Task{} diff --git a/models/test/model_helpers/constructors.go b/models/test/model_helpers/constructors.go index 037d6f45..473afed6 100644 --- a/models/test/model_helpers/constructors.go +++ b/models/test/model_helpers/constructors.go @@ -134,6 +134,22 @@ func NewValidDesiredLRP(guid string) *models.DesiredLRP { "source_id": {Static: "some-metrics-guid"}, }, } + + desiredLRP.VolumeMountedFiles = append(desiredLRP.VolumeMountedFiles, &models.File{ + Path: "/redis/username", + Content: "redis_user", + }) + + err := desiredLRP.Validate() + Expect(err).NotTo(HaveOccurred()) + + return desiredLRP +} + +func NewValidDesiredLRPWithNoVolumeMountedFiles(guid string) *models.DesiredLRP { + desiredLRP := NewValidDesiredLRP(guid) + desiredLRP.VolumeMountedFiles = []*models.File{} + err := desiredLRP.Validate() Expect(err).NotTo(HaveOccurred())