From df50c3a649320d5f9f5fedb12afd42d8a42923b5 Mon Sep 17 00:00:00 2001 From: zikaeroh <48577114+zikaeroh@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:34:50 -0800 Subject: [PATCH 1/2] make generate Signed-off-by: Zik Aeroh <48577114+zikaeroh@users.noreply.github.com> --- api/api.pb.txt | 20 +-- .../plugin/deepcopy/test/deepcopypb_test.go | 163 +++++++++--------- 2 files changed, 92 insertions(+), 91 deletions(-) diff --git a/api/api.pb.txt b/api/api.pb.txt index 90ed599171..344a2082b3 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -2735,8 +2735,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65001: 0 65003: "os.FileMode" + 65001: 0 } json_name: "mode" } @@ -2904,8 +2904,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65001: 0 65011: 1 + 65001: 0 } json_name: "delay" } @@ -3348,8 +3348,8 @@ file { } } options { - 62001: 0 62023: "PublishMode" + 62001: 0 } } } @@ -4055,8 +4055,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65001: 0 65003: "os.FileMode" + 65001: 0 } json_name: "mode" } @@ -5052,8 +5052,8 @@ file { } } options { - 62001: 0 62023: "NodeRole" + 62001: 0 } } syntax: "proto3" @@ -9739,8 +9739,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65001: 0 65011: 1 + 65001: 0 } json_name: "period" } @@ -10958,14 +10958,14 @@ file { } } options { - 63001: 0 - 63002: 0 63017: 1 - 63018: 1 63020: 1 + 63018: 1 + 63001: 0 + 63002: 0 + 63035: 0 63026: 0 63034: 0 - 63035: 0 } } file { diff --git a/protobuf/plugin/deepcopy/test/deepcopypb_test.go b/protobuf/plugin/deepcopy/test/deepcopypb_test.go index f542bb67d0..12e30be428 100644 --- a/protobuf/plugin/deepcopy/test/deepcopypb_test.go +++ b/protobuf/plugin/deepcopy/test/deepcopypb_test.go @@ -713,6 +713,88 @@ func TestOneOfProtoCompactText(t *testing.T) { } } +func TestBasicScalarStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedBasicScalar(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedScalarStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedScalar(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedScalarPackedStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedScalarPacked(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestNonNullableExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedNonNullableExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedNonNullableExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedNonNullableExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestMapStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedMapStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestOneOfStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedOneOf(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} + func TestBasicScalarCopy(t *testing.T) { popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) in := NewPopulatedBasicScalar(popr, true) @@ -1050,86 +1132,5 @@ func TestOneOfCopy(t *testing.T) { t.Fatalf("copying nil should return nil, returned: %#v", out) } } -func TestBasicScalarStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedBasicScalar(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedScalarStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedScalar(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedScalarPackedStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedScalarPacked(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestNonNullableExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedNonNullableExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedNonNullableExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedNonNullableExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestMapStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedMapStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestOneOfStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedOneOf(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} //These tests are generated by github.com/gogo/protobuf/plugin/testgen From 8d68df69f6455a81c8b63540ee490de64271e465 Mon Sep 17 00:00:00 2001 From: zikaeroh <48577114+zikaeroh@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:34:58 -0800 Subject: [PATCH 2/2] Add support for devices Signed-off-by: Zik Aeroh <48577114+zikaeroh@users.noreply.github.com> --- agent/exec/dockerapi/container.go | 9 + agent/exec/dockerapi/container_test.go | 32 + api/api.pb.txt | 32 + api/specs.pb.go | 675 ++++++++++++++++------ api/specs.proto | 8 + cmd/swarmctl/service/flagparser/device.go | 49 ++ cmd/swarmctl/service/flagparser/flags.go | 5 + 7 files changed, 649 insertions(+), 161 deletions(-) create mode 100644 cmd/swarmctl/service/flagparser/device.go diff --git a/agent/exec/dockerapi/container.go b/agent/exec/dockerapi/container.go index 2fbf38eb7c..c9f6296e86 100644 --- a/agent/exec/dockerapi/container.go +++ b/agent/exec/dockerapi/container.go @@ -459,6 +459,15 @@ func (c *containerConfig) resources() enginecontainer.Resources { } } + resources.Devices = make([]enginecontainer.DeviceMapping, len(c.spec().Devices)) + for i, device := range c.spec().Devices { + resources.Devices[i] = enginecontainer.DeviceMapping{ + PathOnHost: device.PathOnHost, + PathInContainer: device.PathInContainer, + CgroupPermissions: device.CgroupPermissions, + } + } + // If no limits are specified let the engine use its defaults. // // TODO(aluzzardi): We might want to set some limits anyway otherwise diff --git a/agent/exec/dockerapi/container_test.go b/agent/exec/dockerapi/container_test.go index 7b64a25bc0..ce7920ae9e 100644 --- a/agent/exec/dockerapi/container_test.go +++ b/agent/exec/dockerapi/container_test.go @@ -330,3 +330,35 @@ func TestUlimits(t *testing.T) { t.Fatalf("expected %v, got %v", expected, actual) } } + +func TestDevices(t *testing.T) { + c := containerConfig{ + task: &api.Task{ + Spec: api.TaskSpec{ + Runtime: &api.TaskSpec_Container{ + Container: &api.ContainerSpec{ + Devices: []*api.ContainerSpec_DeviceMapping{ + { + PathOnHost: "/dev/dri/card0", + PathInContainer: "/dev/card0", + CgroupPermissions: "ro", + }, + }, + }, + }, + }, + }, + } + + expected := []enginecontainer.DeviceMapping{ + { + PathOnHost: "/dev/dri/card0", + PathInContainer: "/dev/card0", + CgroupPermissions: "ro", + }, + } + actual := c.resources().Devices + if !reflect.DeepEqual(actual, expected) { + t.Fatalf("expected %v, got %v", expected, actual) + } +} diff --git a/api/api.pb.txt b/api/api.pb.txt index 344a2082b3..f3671f0172 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -5677,6 +5677,14 @@ file { type_name: ".docker.swarmkit.v1.ContainerSpec.Ulimit" json_name: "ulimits" } + field { + name: "Devices" + number: 30 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".docker.swarmkit.v1.ContainerSpec.DeviceMapping" + json_name: "Devices" + } nested_type { name: "LabelsEntry" field { @@ -5775,6 +5783,30 @@ file { json_name: "hard" } } + nested_type { + name: "DeviceMapping" + field { + name: "pathOnHost" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "pathOnHost" + } + field { + name: "pathInContainer" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "pathInContainer" + } + field { + name: "cgroupPermissions" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "cgroupPermissions" + } + } enum_type { name: "Isolation" value { diff --git a/api/specs.pb.go b/api/specs.pb.go index a789d5a95e..45e3f956d4 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -874,7 +874,8 @@ type ContainerSpec struct { CapabilityDrop []string `protobuf:"bytes,28,rep,name=capability_drop,json=capabilityDrop,proto3" json:"capability_drop,omitempty"` // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. - Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` + Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` + Devices []*ContainerSpec_DeviceMapping `protobuf:"bytes,30,rep,name=Devices,proto3" json:"Devices,omitempty"` } func (m *ContainerSpec) Reset() { *m = ContainerSpec{} } @@ -1033,6 +1034,44 @@ func (m *ContainerSpec_Ulimit) XXX_DiscardUnknown() { var xxx_messageInfo_ContainerSpec_Ulimit proto.InternalMessageInfo +type ContainerSpec_DeviceMapping struct { + PathOnHost string `protobuf:"bytes,1,opt,name=pathOnHost,proto3" json:"pathOnHost,omitempty"` + PathInContainer string `protobuf:"bytes,2,opt,name=pathInContainer,proto3" json:"pathInContainer,omitempty"` + CgroupPermissions string `protobuf:"bytes,3,opt,name=cgroupPermissions,proto3" json:"cgroupPermissions,omitempty"` +} + +func (m *ContainerSpec_DeviceMapping) Reset() { *m = ContainerSpec_DeviceMapping{} } +func (*ContainerSpec_DeviceMapping) ProtoMessage() {} +func (*ContainerSpec_DeviceMapping) Descriptor() ([]byte, []int) { + return fileDescriptor_6589acc608f7d4fd, []int{10, 5} +} +func (m *ContainerSpec_DeviceMapping) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ContainerSpec_DeviceMapping) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ContainerSpec_DeviceMapping.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 *ContainerSpec_DeviceMapping) XXX_Merge(src proto.Message) { + xxx_messageInfo_ContainerSpec_DeviceMapping.Merge(m, src) +} +func (m *ContainerSpec_DeviceMapping) XXX_Size() int { + return m.Size() +} +func (m *ContainerSpec_DeviceMapping) XXX_DiscardUnknown() { + xxx_messageInfo_ContainerSpec_DeviceMapping.DiscardUnknown(m) +} + +var xxx_messageInfo_ContainerSpec_DeviceMapping proto.InternalMessageInfo + // EndpointSpec defines the properties that can be configured to // access and loadbalance the service. type EndpointSpec struct { @@ -1416,6 +1455,7 @@ func init() { proto.RegisterType((*ContainerSpec_PullOptions)(nil), "docker.swarmkit.v1.ContainerSpec.PullOptions") proto.RegisterType((*ContainerSpec_DNSConfig)(nil), "docker.swarmkit.v1.ContainerSpec.DNSConfig") proto.RegisterType((*ContainerSpec_Ulimit)(nil), "docker.swarmkit.v1.ContainerSpec.Ulimit") + proto.RegisterType((*ContainerSpec_DeviceMapping)(nil), "docker.swarmkit.v1.ContainerSpec.DeviceMapping") proto.RegisterType((*EndpointSpec)(nil), "docker.swarmkit.v1.EndpointSpec") proto.RegisterType((*NetworkSpec)(nil), "docker.swarmkit.v1.NetworkSpec") proto.RegisterType((*ClusterSpec)(nil), "docker.swarmkit.v1.ClusterSpec") @@ -1429,166 +1469,171 @@ func init() { } var fileDescriptor_6589acc608f7d4fd = []byte{ - // 2537 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x41, 0x73, 0x1b, 0xb7, - 0x15, 0x26, 0x25, 0x8a, 0x22, 0xdf, 0x92, 0x32, 0x8d, 0x38, 0xc9, 0x8a, 0xb6, 0x29, 0x86, 0x71, - 0x1c, 0x25, 0x99, 0x52, 0x13, 0x35, 0x93, 0x26, 0x4e, 0xd3, 0x96, 0x14, 0x19, 0x8b, 0xb1, 0x2d, - 0x73, 0x40, 0x59, 0xad, 0x67, 0x3a, 0xc3, 0x81, 0x76, 0x21, 0x72, 0xab, 0xe5, 0x62, 0x8b, 0x05, - 0x95, 0xf0, 0xd6, 0x63, 0xc6, 0xbd, 0xf4, 0xd0, 0xab, 0x4e, 0x9d, 0x9e, 0x7a, 0x69, 0xff, 0x41, - 0x7b, 0xcb, 0x31, 0xc7, 0xf4, 0xa2, 0x69, 0x94, 0x9f, 0xd0, 0x5b, 0x2f, 0xed, 0x00, 0x8b, 0x5d, - 0x2e, 0x25, 0xd2, 0x72, 0xa7, 0x3e, 0xf4, 0x06, 0x3c, 0x7e, 0xdf, 0x5b, 0xe0, 0xe1, 0xbd, 0x87, - 0xf7, 0x40, 0x78, 0x77, 0xe0, 0x88, 0xe1, 0xf8, 0xb0, 0x6e, 0xb1, 0xd1, 0x96, 0xcd, 0xac, 0x63, - 0xca, 0xb7, 0x82, 0x2f, 0x08, 0x1f, 0x1d, 0x3b, 0x62, 0x8b, 0xf8, 0xce, 0x56, 0xe0, 0x53, 0x2b, - 0xa8, 0xfb, 0x9c, 0x09, 0x86, 0x50, 0x08, 0xa8, 0x47, 0x80, 0xfa, 0xc9, 0xfb, 0xe5, 0xab, 0xf8, - 0x62, 0xe2, 0x53, 0xcd, 0x2f, 0xdf, 0x18, 0xb0, 0x01, 0x53, 0xc3, 0x2d, 0x39, 0xd2, 0xd2, 0xca, - 0x80, 0xb1, 0x81, 0x4b, 0xb7, 0xd4, 0xec, 0x70, 0x7c, 0xb4, 0x65, 0x8f, 0x39, 0x11, 0x0e, 0xf3, - 0xf4, 0xef, 0xeb, 0x17, 0x7f, 0x27, 0xde, 0x64, 0x11, 0xf5, 0x0b, 0x4e, 0x7c, 0x9f, 0x72, 0xfd, - 0xc1, 0xda, 0x69, 0x06, 0x72, 0x7b, 0xcc, 0xa6, 0x3d, 0x9f, 0x5a, 0xe8, 0x3e, 0x18, 0xc4, 0xf3, - 0x98, 0x50, 0xba, 0x03, 0x33, 0x5d, 0x4d, 0x6f, 0x1a, 0xdb, 0x1b, 0xf5, 0xcb, 0x7b, 0xaa, 0x37, - 0xa6, 0xb0, 0x66, 0xe6, 0xeb, 0xb3, 0x8d, 0x14, 0x4e, 0x32, 0xd1, 0x4f, 0xa1, 0x60, 0xd3, 0xc0, - 0xe1, 0xd4, 0xee, 0x73, 0xe6, 0x52, 0x73, 0xa9, 0x9a, 0xde, 0x5c, 0xdb, 0xbe, 0x35, 0x4f, 0x93, - 0xfc, 0x38, 0x66, 0x2e, 0xc5, 0x86, 0x66, 0xc8, 0x09, 0xba, 0x0f, 0x30, 0xa2, 0xa3, 0x43, 0xca, - 0x83, 0xa1, 0xe3, 0x9b, 0xcb, 0x8a, 0xfe, 0xf6, 0x22, 0xba, 0x5c, 0x7b, 0xfd, 0x51, 0x0c, 0xc7, - 0x09, 0x2a, 0x7a, 0x04, 0x05, 0x72, 0x42, 0x1c, 0x97, 0x1c, 0x3a, 0xae, 0x23, 0x26, 0x66, 0x46, - 0xa9, 0x7a, 0xe7, 0xb9, 0xaa, 0x1a, 0x09, 0x02, 0x9e, 0xa1, 0xd7, 0x6c, 0x80, 0xe9, 0x87, 0xd0, - 0x5d, 0x58, 0xed, 0xb6, 0xf7, 0x5a, 0x9d, 0xbd, 0xfb, 0xa5, 0x54, 0x79, 0xfd, 0xd9, 0x69, 0xf5, - 0x55, 0xa9, 0x63, 0x0a, 0xe8, 0x52, 0xcf, 0x76, 0xbc, 0x01, 0xda, 0x84, 0x5c, 0x63, 0x67, 0xa7, - 0xdd, 0xdd, 0x6f, 0xb7, 0x4a, 0xe9, 0x72, 0xf9, 0xd9, 0x69, 0xf5, 0xb5, 0x59, 0x60, 0xc3, 0xb2, - 0xa8, 0x2f, 0xa8, 0x5d, 0xce, 0x7c, 0xf5, 0x87, 0x4a, 0xaa, 0xf6, 0x55, 0x1a, 0x0a, 0xc9, 0x45, - 0xa0, 0xbb, 0x90, 0x6d, 0xec, 0xec, 0x77, 0x0e, 0xda, 0xa5, 0xd4, 0x94, 0x9e, 0x44, 0x34, 0x2c, - 0xe1, 0x9c, 0x50, 0x74, 0x07, 0x56, 0xba, 0x8d, 0x27, 0xbd, 0x76, 0x29, 0x3d, 0x5d, 0x4e, 0x12, - 0xd6, 0x25, 0xe3, 0x40, 0xa1, 0x5a, 0xb8, 0xd1, 0xd9, 0x2b, 0x2d, 0xcd, 0x47, 0xb5, 0x38, 0x71, - 0x3c, 0xbd, 0x94, 0x3f, 0xad, 0x80, 0xd1, 0xa3, 0xfc, 0xc4, 0xb1, 0x5e, 0xb2, 0x8b, 0x7c, 0x08, - 0x19, 0x41, 0x82, 0x63, 0xe5, 0x1a, 0xc6, 0x7c, 0xd7, 0xd8, 0x27, 0xc1, 0xb1, 0xfc, 0xa8, 0xa6, - 0x2b, 0xbc, 0xf4, 0x0c, 0x4e, 0x7d, 0xd7, 0xb1, 0x88, 0xa0, 0xb6, 0xf2, 0x0c, 0x63, 0xfb, 0xad, - 0x79, 0x6c, 0x1c, 0xa3, 0xf4, 0xfa, 0x77, 0x53, 0x38, 0x41, 0x45, 0x9f, 0x40, 0x76, 0xe0, 0xb2, - 0x43, 0xe2, 0x2a, 0x9f, 0x30, 0xb6, 0xdf, 0x98, 0xa7, 0xe4, 0xbe, 0x42, 0x4c, 0x15, 0x68, 0x0a, - 0xfa, 0x1c, 0xd6, 0xa6, 0xaa, 0xfa, 0xbf, 0x62, 0x87, 0x26, 0x2c, 0x56, 0x32, 0x5d, 0xc9, 0xe7, - 0xec, 0x70, 0x37, 0x85, 0x8b, 0x3c, 0x29, 0x40, 0x3f, 0x01, 0x08, 0xb5, 0x2a, 0x3d, 0x86, 0xd2, - 0x73, 0x7b, 0xf1, 0x62, 0x42, 0x1d, 0xf9, 0x41, 0x34, 0x41, 0x1f, 0x41, 0x76, 0xec, 0xdb, 0x44, - 0x50, 0x33, 0xab, 0xb8, 0xd5, 0x79, 0xdc, 0x27, 0x0a, 0xb1, 0xc3, 0xbc, 0x23, 0x67, 0x80, 0x35, - 0x1e, 0xfd, 0x18, 0x72, 0x9c, 0xb9, 0xee, 0x21, 0xb1, 0x8e, 0xcd, 0xfc, 0x0b, 0x72, 0x63, 0x06, - 0x7a, 0x00, 0x39, 0x8f, 0x8a, 0x2f, 0x18, 0x3f, 0x0e, 0xcc, 0xd5, 0xea, 0xf2, 0xa6, 0xb1, 0xfd, - 0xde, 0xdc, 0xb0, 0x0a, 0x31, 0x0d, 0x21, 0x88, 0x35, 0x1c, 0x51, 0x4f, 0x84, 0x8a, 0x9a, 0x4b, - 0x66, 0x1a, 0xc7, 0x0a, 0xe4, 0x52, 0xa8, 0x67, 0xfb, 0xcc, 0xf1, 0x84, 0x99, 0x5b, 0xbc, 0x94, - 0xb6, 0xc6, 0x48, 0xb7, 0xc0, 0x31, 0xa3, 0x99, 0x85, 0xcc, 0x88, 0xd9, 0xb4, 0xb6, 0x05, 0xd7, - 0x2f, 0x1d, 0x3b, 0x2a, 0x43, 0x4e, 0x1b, 0x3c, 0xf4, 0xd7, 0x0c, 0x8e, 0xe7, 0xb5, 0x6b, 0x50, - 0x9c, 0x39, 0xe2, 0x9a, 0x05, 0xc5, 0x99, 0xe3, 0x42, 0x6f, 0xc1, 0xda, 0x88, 0x7c, 0xd9, 0xb7, - 0x98, 0x67, 0x8d, 0x39, 0xa7, 0x9e, 0xd0, 0x3a, 0x8a, 0x23, 0xf2, 0xe5, 0x4e, 0x2c, 0x44, 0xef, - 0xc1, 0x75, 0xc1, 0x04, 0x71, 0xfb, 0x16, 0x1b, 0xf9, 0x2e, 0x0d, 0xa3, 0x63, 0x49, 0x21, 0x4b, - 0xea, 0x87, 0x9d, 0xa9, 0xbc, 0x66, 0x40, 0x3e, 0x3e, 0xcb, 0xda, 0x9f, 0x57, 0x20, 0x17, 0x79, - 0x3a, 0x7a, 0x00, 0x40, 0x62, 0x43, 0x69, 0x43, 0xbc, 0xf3, 0x42, 0x56, 0x95, 0x74, 0xe9, 0xe1, - 0x53, 0x3a, 0x6a, 0x40, 0xde, 0x62, 0x9e, 0x20, 0x8e, 0x47, 0xb9, 0x8e, 0xd4, 0xb9, 0xfe, 0xb9, - 0x13, 0x81, 0xb4, 0x8e, 0x29, 0x0b, 0x35, 0x61, 0x75, 0x40, 0x3d, 0xca, 0x1d, 0x4b, 0x3b, 0xf8, - 0xdd, 0xb9, 0x8e, 0x19, 0x42, 0xf0, 0xd8, 0x13, 0xce, 0x88, 0x6a, 0x2d, 0x11, 0x11, 0x7d, 0x06, - 0x79, 0x4e, 0x03, 0x36, 0xe6, 0x16, 0x0d, 0x74, 0xb8, 0x6f, 0xce, 0x0f, 0x93, 0x10, 0x84, 0xe9, - 0xaf, 0xc7, 0x0e, 0xa7, 0x72, 0x0b, 0x01, 0x9e, 0x52, 0xd1, 0x27, 0xb0, 0xca, 0x69, 0x20, 0x08, - 0x17, 0xcf, 0x8b, 0x58, 0x1c, 0x42, 0xba, 0xcc, 0x75, 0xac, 0x09, 0x8e, 0x18, 0xe8, 0x13, 0xc8, - 0xfb, 0x2e, 0xb1, 0x94, 0x56, 0x73, 0x65, 0x71, 0x8c, 0x75, 0x23, 0x10, 0x9e, 0xe2, 0xd1, 0xc7, - 0x00, 0x2e, 0x1b, 0xf4, 0x6d, 0xee, 0x9c, 0x50, 0xae, 0xa3, 0xac, 0x3c, 0x8f, 0xdd, 0x52, 0x08, - 0x9c, 0x77, 0xd9, 0x20, 0x1c, 0xa2, 0xfb, 0xff, 0x53, 0x90, 0x24, 0x02, 0xe4, 0x0d, 0x28, 0x1c, - 0x31, 0x6e, 0xd1, 0xbe, 0x8e, 0xf5, 0xbc, 0xf2, 0x2d, 0x43, 0xc9, 0xc2, 0x00, 0x45, 0xbf, 0x84, - 0x57, 0x22, 0x6b, 0xf5, 0x39, 0x3d, 0xa2, 0x9c, 0x7a, 0xd2, 0xe4, 0x86, 0xfa, 0xec, 0x5b, 0xcf, - 0x37, 0xb9, 0x46, 0xeb, 0x54, 0x8b, 0xf8, 0xc5, 0x1f, 0x82, 0x66, 0x1e, 0x56, 0x79, 0x78, 0xc0, - 0xb5, 0xdf, 0xa6, 0x65, 0x9c, 0x5d, 0x40, 0xa0, 0x2d, 0x30, 0xe2, 0xcf, 0x3b, 0xb6, 0x72, 0xb8, - 0x7c, 0x73, 0xed, 0xfc, 0x6c, 0x03, 0x22, 0x6c, 0xa7, 0x25, 0x33, 0xb0, 0x1e, 0xdb, 0xa8, 0x0d, - 0xc5, 0x98, 0x20, 0x8b, 0x20, 0x5d, 0x26, 0x54, 0x9f, 0xb7, 0xd2, 0xfd, 0x89, 0x4f, 0x71, 0x81, - 0x27, 0x66, 0xb5, 0x5f, 0x00, 0xba, 0xec, 0x80, 0x08, 0x41, 0xe6, 0xd8, 0xf1, 0xf4, 0x32, 0xb0, - 0x1a, 0xa3, 0x3a, 0xac, 0xfa, 0x64, 0xe2, 0x32, 0x62, 0x6b, 0x3f, 0xbc, 0x51, 0x0f, 0xcb, 0xa3, - 0x7a, 0x54, 0x1e, 0xd5, 0x1b, 0xde, 0x04, 0x47, 0xa0, 0xda, 0x03, 0x78, 0x75, 0x6e, 0x9c, 0xa1, - 0x6d, 0x28, 0xc4, 0x31, 0x32, 0xdd, 0xeb, 0xb5, 0xf3, 0xb3, 0x0d, 0x23, 0x0e, 0xa6, 0x4e, 0x0b, - 0x1b, 0x31, 0xa8, 0x63, 0xd7, 0xfe, 0xba, 0x06, 0xc5, 0x99, 0x48, 0x43, 0x37, 0x60, 0xc5, 0x19, - 0x91, 0x01, 0xd5, 0x6b, 0x0c, 0x27, 0xa8, 0x0d, 0x59, 0x97, 0x1c, 0x52, 0x57, 0xc6, 0x8a, 0x3c, - 0xb8, 0x1f, 0x5c, 0x19, 0xb2, 0xf5, 0x87, 0x0a, 0xdf, 0xf6, 0x04, 0x9f, 0x60, 0x4d, 0x46, 0x26, - 0xac, 0x5a, 0x6c, 0x34, 0x22, 0x9e, 0xbc, 0x24, 0x97, 0x37, 0xf3, 0x38, 0x9a, 0x4a, 0xcb, 0x10, - 0x3e, 0x08, 0xcc, 0x8c, 0x12, 0xab, 0xb1, 0xcc, 0x91, 0x43, 0x16, 0x08, 0x8f, 0x8c, 0xa8, 0xb9, - 0xa6, 0x56, 0x13, 0xcf, 0x51, 0x09, 0x96, 0xa9, 0x77, 0x62, 0xae, 0x28, 0xb8, 0x1c, 0x4a, 0x89, - 0xed, 0x84, 0x81, 0x90, 0xc7, 0x72, 0x28, 0x75, 0x8e, 0x03, 0xca, 0xcd, 0xd5, 0xd0, 0xda, 0x72, - 0x8c, 0x5e, 0x83, 0xec, 0x80, 0xb3, 0xb1, 0x1f, 0x7a, 0x60, 0x1e, 0xeb, 0x99, 0xbc, 0xef, 0x7c, - 0xee, 0x9c, 0x38, 0x2e, 0x1d, 0xd0, 0xc0, 0x7c, 0x4d, 0x1d, 0x44, 0x65, 0x6e, 0x2c, 0xc6, 0x28, - 0x9c, 0x60, 0xa0, 0x3a, 0x64, 0x1c, 0xcf, 0x11, 0xe6, 0xeb, 0x3a, 0x0e, 0x2f, 0x1e, 0x61, 0x93, - 0x31, 0xf7, 0x80, 0xb8, 0x63, 0x8a, 0x15, 0x0e, 0xad, 0xc3, 0xb2, 0x10, 0x13, 0xb3, 0x58, 0x4d, - 0x6f, 0xe6, 0x9a, 0xab, 0xe7, 0x67, 0x1b, 0xcb, 0xfb, 0xfb, 0x4f, 0xb1, 0x94, 0xa1, 0xdb, 0x00, - 0xcc, 0xa7, 0x5e, 0x3f, 0x10, 0xb6, 0xe3, 0x99, 0x48, 0x22, 0x70, 0x5e, 0x4a, 0x7a, 0x52, 0x80, - 0x6e, 0xca, 0xcc, 0x45, 0xec, 0x3e, 0xf3, 0xdc, 0x89, 0xf9, 0x8a, 0xfa, 0x35, 0x27, 0x05, 0x8f, - 0x3d, 0x77, 0x82, 0x36, 0xc0, 0x08, 0x04, 0xf3, 0xfb, 0x81, 0x33, 0xf0, 0x88, 0x6b, 0xde, 0x50, - 0x3b, 0x07, 0x29, 0xea, 0x29, 0x09, 0xfa, 0x11, 0x64, 0x47, 0x6c, 0xec, 0x89, 0xc0, 0xcc, 0xa9, - 0x83, 0x5c, 0x9f, 0xb7, 0xc7, 0x47, 0x12, 0xa1, 0xa3, 0x4e, 0xc3, 0x51, 0x1b, 0xae, 0x2b, 0xcd, - 0x03, 0x4e, 0x2c, 0xda, 0xf7, 0x29, 0x77, 0x98, 0xad, 0xef, 0xe7, 0xf5, 0x4b, 0xbb, 0x6d, 0xe9, - 0x56, 0x00, 0x5f, 0x93, 0x9c, 0xfb, 0x92, 0xd2, 0x55, 0x0c, 0xd4, 0x85, 0x82, 0x3f, 0x76, 0xdd, - 0x3e, 0xf3, 0xc3, 0xdb, 0x28, 0x4c, 0xe0, 0x2f, 0xe0, 0x4e, 0xdd, 0xb1, 0xeb, 0x3e, 0x0e, 0x49, - 0xd8, 0xf0, 0xa7, 0x13, 0xf4, 0x29, 0xac, 0x06, 0xd4, 0xe2, 0x54, 0x04, 0x66, 0x41, 0x6d, 0xe9, - 0xcd, 0x79, 0xca, 0x7a, 0x0a, 0x12, 0xe7, 0x05, 0x1c, 0x71, 0x24, 0xdd, 0x52, 0x69, 0x2d, 0x30, - 0x5f, 0x5d, 0x4c, 0xd7, 0x99, 0x6f, 0x4a, 0xd7, 0x1c, 0x19, 0x2e, 0xd2, 0x27, 0x03, 0xf3, 0xba, - 0x72, 0xa7, 0x70, 0x82, 0x9e, 0x02, 0xd8, 0x5e, 0xd0, 0x0f, 0x41, 0xe6, 0x35, 0xb5, 0xc7, 0xf7, - 0xae, 0xde, 0x63, 0x6b, 0xaf, 0xa7, 0xeb, 0x90, 0xe2, 0xf9, 0xd9, 0x46, 0x3e, 0x9e, 0xe2, 0xbc, - 0xed, 0x05, 0xe1, 0x10, 0x35, 0xc1, 0x18, 0x52, 0xe2, 0x8a, 0xa1, 0x35, 0xa4, 0xd6, 0xb1, 0x59, - 0x5a, 0x5c, 0x96, 0xec, 0x2a, 0x98, 0xd6, 0x90, 0x24, 0xa1, 0x0e, 0xe4, 0x9d, 0x80, 0xb9, 0xea, - 0x88, 0x4c, 0x53, 0xe5, 0xb7, 0x17, 0x58, 0x5d, 0x27, 0xa2, 0xe0, 0x29, 0x1b, 0xdd, 0x82, 0xbc, - 0xef, 0xd8, 0xc1, 0x43, 0x67, 0xe4, 0x08, 0x73, 0xbd, 0x9a, 0xde, 0x5c, 0xc6, 0x53, 0x01, 0xda, - 0x85, 0xd5, 0x60, 0x12, 0x58, 0xc2, 0x0d, 0xcc, 0xb2, 0x32, 0x6e, 0xfd, 0xea, 0xcf, 0xf4, 0x42, - 0x42, 0x98, 0x38, 0x22, 0xba, 0xac, 0x78, 0x2c, 0xe2, 0xeb, 0x5e, 0xa0, 0x4f, 0x6c, 0xdb, 0xbc, - 0xa9, 0x0c, 0x5e, 0x9c, 0x4a, 0x1b, 0xb6, 0x8d, 0xde, 0x86, 0x6b, 0x09, 0x98, 0xcd, 0x99, 0x6f, - 0xde, 0x52, 0xb8, 0x04, 0xbb, 0xc5, 0x99, 0x2f, 0x6b, 0x88, 0xb1, 0x2b, 0xd7, 0x18, 0x98, 0xb7, - 0xd5, 0xca, 0x36, 0xaf, 0x5e, 0xd9, 0x13, 0x45, 0xc0, 0x11, 0xb1, 0xfc, 0x31, 0x18, 0x89, 0x24, - 0x27, 0x13, 0xd0, 0x31, 0x9d, 0xe8, 0xbc, 0x29, 0x87, 0xd2, 0x39, 0x4e, 0x64, 0xcc, 0xab, 0xc4, - 0x9e, 0xc7, 0xe1, 0xe4, 0xde, 0xd2, 0x47, 0xe9, 0xf2, 0x36, 0x18, 0x09, 0x87, 0x46, 0x6f, 0xca, - 0x4b, 0x67, 0xe0, 0x04, 0x82, 0x4f, 0xfa, 0x64, 0x2c, 0x86, 0xe6, 0xcf, 0x14, 0xa1, 0x10, 0x09, - 0x1b, 0x63, 0x31, 0x2c, 0xf7, 0x61, 0xea, 0x11, 0xa8, 0x0a, 0x86, 0xcc, 0x83, 0x01, 0xe5, 0x27, - 0x94, 0xcb, 0x12, 0x52, 0x6e, 0x32, 0x29, 0x92, 0x99, 0x2e, 0xa0, 0x84, 0x5b, 0x43, 0x95, 0xb2, - 0xf3, 0x58, 0xcf, 0x64, 0x0e, 0x8e, 0x82, 0x4f, 0xe7, 0x60, 0x3d, 0x2d, 0xdf, 0x83, 0x42, 0xd2, - 0xf8, 0xff, 0xd5, 0x86, 0x5a, 0x90, 0x0d, 0xcd, 0x23, 0xb3, 0xae, 0xca, 0xd8, 0xfa, 0x8e, 0x53, - 0xd9, 0x1a, 0x41, 0x26, 0x60, 0x47, 0x42, 0xd1, 0x96, 0xb1, 0x1a, 0x4b, 0xd9, 0x90, 0xf0, 0xb0, - 0x5b, 0x5a, 0xc6, 0x6a, 0x5c, 0xfb, 0x4b, 0x1a, 0xf2, 0xb1, 0x9b, 0xa1, 0x0f, 0xe0, 0x7a, 0xa7, - 0xf7, 0xf8, 0x61, 0x63, 0xbf, 0xf3, 0x78, 0xaf, 0xdf, 0x6a, 0x7f, 0xd6, 0x78, 0xf2, 0x70, 0xbf, - 0x94, 0x2a, 0xdf, 0x7e, 0x76, 0x5a, 0x5d, 0x9f, 0xde, 0x68, 0x11, 0xbc, 0x45, 0x8f, 0xc8, 0xd8, - 0x15, 0xb3, 0xac, 0x2e, 0x7e, 0xbc, 0xd3, 0xee, 0xf5, 0x4a, 0xe9, 0x45, 0xac, 0x2e, 0x67, 0x16, - 0x0d, 0x02, 0xb4, 0x0d, 0xa5, 0x29, 0x6b, 0xf7, 0x69, 0xb7, 0x8d, 0x0f, 0x4a, 0x4b, 0xe5, 0x5b, - 0xcf, 0x4e, 0xab, 0xe6, 0x65, 0xd2, 0xee, 0xc4, 0xa7, 0xfc, 0x40, 0x37, 0xa3, 0xff, 0x4c, 0x43, - 0x21, 0xd9, 0x01, 0xa0, 0x9d, 0xb0, 0xee, 0x57, 0x06, 0x58, 0xdb, 0xde, 0xba, 0xaa, 0x63, 0x50, - 0x55, 0x84, 0x3b, 0x96, 0x7a, 0x1f, 0x31, 0x9b, 0x62, 0x45, 0x46, 0x1f, 0xc0, 0x8a, 0xcf, 0xb8, - 0x88, 0xee, 0xdb, 0xf9, 0x57, 0x11, 0xe3, 0x51, 0x49, 0x16, 0x82, 0x6b, 0x43, 0x58, 0x9b, 0xd5, - 0x86, 0xee, 0xc0, 0xf2, 0x41, 0xa7, 0x5b, 0x4a, 0x95, 0x6f, 0x3e, 0x3b, 0xad, 0xbe, 0x3e, 0xfb, - 0xe3, 0x81, 0xc3, 0xc5, 0x98, 0xb8, 0x9d, 0x2e, 0x7a, 0x17, 0x56, 0x5a, 0x7b, 0x3d, 0x8c, 0x4b, - 0xe9, 0xf2, 0xc6, 0xb3, 0xd3, 0xea, 0xcd, 0x59, 0x9c, 0xfc, 0x89, 0x8d, 0x3d, 0x1b, 0xb3, 0xc3, - 0xb8, 0x05, 0xff, 0xd7, 0x12, 0x18, 0xba, 0x0c, 0x79, 0xd9, 0xaf, 0x34, 0xc5, 0xb0, 0xa4, 0x8d, - 0xb2, 0xe7, 0xd2, 0x95, 0x95, 0x6d, 0x21, 0x24, 0xe8, 0xc8, 0x78, 0x03, 0x0a, 0x8e, 0x7f, 0xf2, - 0x61, 0x9f, 0x7a, 0xe4, 0xd0, 0xd5, 0xdd, 0x78, 0x0e, 0x1b, 0x52, 0xd6, 0x0e, 0x45, 0xb2, 0xb0, - 0x70, 0x3c, 0x41, 0xb9, 0xa7, 0xfb, 0xec, 0x1c, 0x8e, 0xe7, 0xe8, 0x53, 0xc8, 0x38, 0x3e, 0x19, - 0xe9, 0x72, 0x7c, 0xee, 0x0e, 0x3a, 0xdd, 0xc6, 0x23, 0x1d, 0xb9, 0xcd, 0xdc, 0xf9, 0xd9, 0x46, - 0x46, 0x0a, 0xb0, 0xa2, 0xa1, 0x4a, 0xd4, 0x2b, 0xc9, 0x2f, 0xa9, 0x62, 0x24, 0x87, 0x13, 0x12, - 0x19, 0x7d, 0x8e, 0x37, 0xe0, 0x34, 0x08, 0x54, 0x59, 0x92, 0xc3, 0xd1, 0x14, 0x95, 0x61, 0x55, - 0xd7, 0xd5, 0xaa, 0xc5, 0xca, 0xcb, 0x6e, 0x45, 0x0b, 0x9a, 0x45, 0x30, 0x42, 0x6b, 0xf4, 0x8f, - 0x38, 0x1b, 0xd5, 0xfe, 0x9d, 0x01, 0x63, 0xc7, 0x1d, 0x07, 0x42, 0xd7, 0x6c, 0x2f, 0xcd, 0xf8, - 0x4f, 0xe1, 0x3a, 0x51, 0xaf, 0x3e, 0xc4, 0x93, 0x97, 0xbc, 0x6a, 0x57, 0xf4, 0x01, 0xdc, 0x99, - 0xab, 0x2e, 0x06, 0x87, 0xad, 0x4d, 0x33, 0x2b, 0x75, 0x9a, 0x69, 0x5c, 0x22, 0x17, 0x7e, 0x41, - 0x3d, 0x28, 0x32, 0x6e, 0x0d, 0x69, 0x20, 0xc2, 0xd2, 0x40, 0xbf, 0x92, 0xcc, 0x7d, 0x3f, 0x7b, - 0x9c, 0x04, 0xea, 0x1b, 0x31, 0x5c, 0xed, 0xac, 0x0e, 0xf4, 0x11, 0x64, 0x38, 0x39, 0x8a, 0x5a, - 0xaf, 0xb9, 0x41, 0x82, 0xc9, 0x91, 0x98, 0x51, 0xa1, 0x18, 0xe8, 0x73, 0x00, 0xdb, 0x09, 0x7c, - 0x22, 0xac, 0x21, 0xe5, 0xfa, 0xb0, 0xe7, 0x6e, 0xb1, 0x15, 0xa3, 0x66, 0xb4, 0x24, 0xd8, 0xe8, - 0x01, 0xe4, 0x2d, 0x12, 0xb9, 0x6b, 0x76, 0xf1, 0xd3, 0xd1, 0x4e, 0x43, 0xab, 0x28, 0x49, 0x15, - 0xe7, 0x67, 0x1b, 0xb9, 0x48, 0x82, 0x73, 0x16, 0xd1, 0xee, 0xfb, 0x00, 0x8a, 0x82, 0x04, 0xc7, - 0x7d, 0x3b, 0x4c, 0x67, 0xa1, 0x9b, 0x2c, 0xb8, 0xe1, 0x65, 0x87, 0xae, 0xd3, 0x5e, 0x74, 0x9c, - 0x05, 0x91, 0x90, 0xa1, 0x9f, 0xc3, 0x75, 0xea, 0x59, 0x7c, 0xa2, 0x9c, 0x35, 0x5a, 0x61, 0x6e, - 0xf1, 0x66, 0xdb, 0x31, 0x78, 0x66, 0xb3, 0x25, 0x7a, 0x41, 0x5e, 0xfb, 0x7b, 0x1a, 0x20, 0x2c, - 0xa9, 0x5e, 0xae, 0x03, 0x22, 0xc8, 0xd8, 0x44, 0x10, 0xe5, 0x73, 0x05, 0xac, 0xc6, 0xe8, 0x1e, - 0x80, 0xa0, 0x23, 0x5f, 0xa6, 0x5e, 0x6f, 0xa0, 0xdd, 0xe6, 0x79, 0xe9, 0x20, 0x81, 0x46, 0xdb, - 0x90, 0xd5, 0x0d, 0x72, 0xe6, 0x4a, 0x9e, 0x46, 0xd6, 0xfe, 0x98, 0x06, 0x08, 0xb7, 0xf9, 0x7f, - 0xbd, 0xb7, 0xda, 0xdf, 0x56, 0x00, 0x0e, 0x98, 0x3b, 0x1e, 0xbd, 0xe4, 0x47, 0xd0, 0x1b, 0xb0, - 0xa2, 0x9a, 0xa2, 0xe8, 0x92, 0x57, 0x93, 0x84, 0x25, 0x97, 0x5f, 0xd4, 0x92, 0xa8, 0x0d, 0x86, - 0xcc, 0x03, 0x41, 0xd0, 0x57, 0x17, 0x62, 0x66, 0xb1, 0xe3, 0x85, 0xfb, 0x68, 0x28, 0xb0, 0xba, - 0x05, 0x81, 0xc4, 0x63, 0x74, 0x6f, 0x5a, 0xe1, 0xaf, 0xa8, 0xdb, 0xb0, 0xba, 0x58, 0x85, 0xae, - 0xf3, 0xe3, 0xf2, 0x9e, 0xc2, 0x7a, 0xa8, 0xd5, 0xd1, 0x4f, 0xe7, 0x89, 0x77, 0x1c, 0x1d, 0xab, - 0x73, 0x53, 0xd0, 0x3e, 0xf3, 0x99, 0xcb, 0x06, 0x49, 0x3c, 0x5e, 0xac, 0x09, 0xed, 0x86, 0xe5, - 0xa9, 0x25, 0xab, 0x4e, 0x4e, 0xbc, 0x01, 0xd5, 0x61, 0x3b, 0xff, 0x69, 0x4b, 0x23, 0xb1, 0x04, - 0x86, 0x15, 0x6c, 0x3c, 0x45, 0x4f, 0x2e, 0xfc, 0x37, 0x90, 0x53, 0x55, 0xc4, 0xfb, 0xcf, 0xd9, - 0xb1, 0xac, 0x21, 0xb4, 0xfd, 0x16, 0xff, 0x47, 0xf0, 0xfb, 0x34, 0xa0, 0xcb, 0x20, 0xb4, 0x99, - 0x78, 0xc3, 0x57, 0xc5, 0xce, 0x65, 0x8c, 0x7e, 0xc5, 0xbf, 0x3b, 0x7d, 0xc5, 0x57, 0xa5, 0xc4, - 0x65, 0x60, 0xf8, 0x8e, 0x7f, 0x77, 0xfa, 0x8e, 0xbf, 0x00, 0x97, 0x78, 0xc9, 0x6f, 0xde, 0xf9, - 0xfa, 0xbb, 0x4a, 0xea, 0xdb, 0xef, 0x2a, 0xa9, 0xdf, 0x9c, 0x57, 0xd2, 0x5f, 0x9f, 0x57, 0xd2, - 0xdf, 0x9c, 0x57, 0xd2, 0xff, 0x38, 0xaf, 0xa4, 0x7f, 0xf7, 0x7d, 0x25, 0xf5, 0xcd, 0xf7, 0x95, - 0xd4, 0xb7, 0xdf, 0x57, 0x52, 0x87, 0x59, 0xd5, 0x58, 0xfe, 0xf0, 0x3f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xd2, 0x36, 0x0b, 0x87, 0xf5, 0x1a, 0x00, 0x00, + // 2618 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xc1, 0x73, 0x1b, 0xb7, + 0xd5, 0x17, 0x25, 0x4a, 0x22, 0x1f, 0x49, 0x99, 0x42, 0x9c, 0x64, 0x45, 0xdb, 0x14, 0xc3, 0x38, + 0x8e, 0x92, 0x7c, 0x1f, 0x35, 0xd1, 0x97, 0xc9, 0x97, 0x38, 0x4d, 0x5b, 0x4a, 0x64, 0x2c, 0xc6, + 0xb6, 0xc4, 0x01, 0x65, 0xb5, 0x9e, 0xe9, 0x0c, 0x07, 0xda, 0x85, 0xc8, 0xad, 0x96, 0x8b, 0x2d, + 0x00, 0x2a, 0xe1, 0xad, 0xb7, 0x66, 0xdc, 0x4b, 0x0f, 0xed, 0x51, 0xa7, 0x4e, 0x4f, 0xbd, 0xb4, + 0x7f, 0x42, 0x6f, 0x39, 0xe6, 0x98, 0x5e, 0x34, 0x8d, 0xf2, 0x27, 0xf4, 0xd6, 0x4b, 0x3b, 0xc0, + 0x62, 0x97, 0x4b, 0x89, 0xb4, 0xdc, 0xa9, 0x0f, 0xbd, 0x01, 0x6f, 0x7f, 0xbf, 0xb7, 0x0f, 0x0f, + 0xef, 0x3d, 0x3c, 0xec, 0xc2, 0xbb, 0x3d, 0x57, 0xf6, 0x87, 0x47, 0x35, 0x9b, 0x0d, 0x36, 0x1d, + 0x66, 0x9f, 0x50, 0xbe, 0x29, 0xbe, 0x20, 0x7c, 0x70, 0xe2, 0xca, 0x4d, 0x12, 0xb8, 0x9b, 0x22, + 0xa0, 0xb6, 0xa8, 0x05, 0x9c, 0x49, 0x86, 0x50, 0x08, 0xa8, 0x45, 0x80, 0xda, 0xe9, 0xfb, 0xa5, + 0xeb, 0xf8, 0x72, 0x14, 0x50, 0xc3, 0x2f, 0xdd, 0xec, 0xb1, 0x1e, 0xd3, 0xc3, 0x4d, 0x35, 0x32, + 0xd2, 0x72, 0x8f, 0xb1, 0x9e, 0x47, 0x37, 0xf5, 0xec, 0x68, 0x78, 0xbc, 0xe9, 0x0c, 0x39, 0x91, + 0x2e, 0xf3, 0xcd, 0xf3, 0xb5, 0xcb, 0xcf, 0x89, 0x3f, 0x9a, 0x45, 0xfd, 0x82, 0x93, 0x20, 0xa0, + 0xdc, 0xbc, 0xb0, 0x7a, 0x96, 0x86, 0xcc, 0x1e, 0x73, 0x68, 0x27, 0xa0, 0x36, 0x7a, 0x00, 0x39, + 0xe2, 0xfb, 0x4c, 0x6a, 0xdd, 0xc2, 0x4a, 0x55, 0x52, 0x1b, 0xb9, 0xad, 0xf5, 0xda, 0xd5, 0x35, + 0xd5, 0xea, 0x63, 0xd8, 0x76, 0xfa, 0xeb, 0xf3, 0xf5, 0x39, 0x9c, 0x64, 0xa2, 0x1f, 0x41, 0xde, + 0xa1, 0xc2, 0xe5, 0xd4, 0xe9, 0x72, 0xe6, 0x51, 0x6b, 0xbe, 0x92, 0xda, 0x58, 0xd9, 0xba, 0x3d, + 0x4d, 0x93, 0x7a, 0x39, 0x66, 0x1e, 0xc5, 0x39, 0xc3, 0x50, 0x13, 0xf4, 0x00, 0x60, 0x40, 0x07, + 0x47, 0x94, 0x8b, 0xbe, 0x1b, 0x58, 0x0b, 0x9a, 0xfe, 0xf6, 0x2c, 0xba, 0xb2, 0xbd, 0xf6, 0x38, + 0x86, 0xe3, 0x04, 0x15, 0x3d, 0x86, 0x3c, 0x39, 0x25, 0xae, 0x47, 0x8e, 0x5c, 0xcf, 0x95, 0x23, + 0x2b, 0xad, 0x55, 0xbd, 0xf3, 0x5c, 0x55, 0xf5, 0x04, 0x01, 0x4f, 0xd0, 0xab, 0x0e, 0xc0, 0xf8, + 0x45, 0xe8, 0x1e, 0x2c, 0xb7, 0x9b, 0x7b, 0x8d, 0xd6, 0xde, 0x83, 0xe2, 0x5c, 0x69, 0xed, 0xd9, + 0x59, 0xe5, 0x55, 0xa5, 0x63, 0x0c, 0x68, 0x53, 0xdf, 0x71, 0xfd, 0x1e, 0xda, 0x80, 0x4c, 0x7d, + 0x67, 0xa7, 0xd9, 0x3e, 0x68, 0x36, 0x8a, 0xa9, 0x52, 0xe9, 0xd9, 0x59, 0xe5, 0xb5, 0x49, 0x60, + 0xdd, 0xb6, 0x69, 0x20, 0xa9, 0x53, 0x4a, 0x7f, 0xf5, 0xfb, 0xf2, 0x5c, 0xf5, 0xab, 0x14, 0xe4, + 0x93, 0x46, 0xa0, 0x7b, 0xb0, 0x54, 0xdf, 0x39, 0x68, 0x1d, 0x36, 0x8b, 0x73, 0x63, 0x7a, 0x12, + 0x51, 0xb7, 0xa5, 0x7b, 0x4a, 0xd1, 0x5d, 0x58, 0x6c, 0xd7, 0x9f, 0x74, 0x9a, 0xc5, 0xd4, 0xd8, + 0x9c, 0x24, 0xac, 0x4d, 0x86, 0x42, 0xa3, 0x1a, 0xb8, 0xde, 0xda, 0x2b, 0xce, 0x4f, 0x47, 0x35, + 0x38, 0x71, 0x7d, 0x63, 0xca, 0x1f, 0x17, 0x21, 0xd7, 0xa1, 0xfc, 0xd4, 0xb5, 0x5f, 0x72, 0x88, + 0x7c, 0x08, 0x69, 0x49, 0xc4, 0x89, 0x0e, 0x8d, 0xdc, 0xf4, 0xd0, 0x38, 0x20, 0xe2, 0x44, 0xbd, + 0xd4, 0xd0, 0x35, 0x5e, 0x45, 0x06, 0xa7, 0x81, 0xe7, 0xda, 0x44, 0x52, 0x47, 0x47, 0x46, 0x6e, + 0xeb, 0xad, 0x69, 0x6c, 0x1c, 0xa3, 0x8c, 0xfd, 0xbb, 0x73, 0x38, 0x41, 0x45, 0x9f, 0xc0, 0x52, + 0xcf, 0x63, 0x47, 0xc4, 0xd3, 0x31, 0x91, 0xdb, 0x7a, 0x63, 0x9a, 0x92, 0x07, 0x1a, 0x31, 0x56, + 0x60, 0x28, 0xe8, 0x73, 0x58, 0x19, 0xab, 0xea, 0xfe, 0x9c, 0x1d, 0x59, 0x30, 0x5b, 0xc9, 0xd8, + 0x92, 0xcf, 0xd9, 0xd1, 0xee, 0x1c, 0x2e, 0xf0, 0xa4, 0x00, 0xfd, 0x10, 0x20, 0xd4, 0xaa, 0xf5, + 0xe4, 0xb4, 0x9e, 0x3b, 0xb3, 0x8d, 0x09, 0x75, 0x64, 0x7b, 0xd1, 0x04, 0x7d, 0x04, 0x4b, 0xc3, + 0xc0, 0x21, 0x92, 0x5a, 0x4b, 0x9a, 0x5b, 0x99, 0xc6, 0x7d, 0xa2, 0x11, 0x3b, 0xcc, 0x3f, 0x76, + 0x7b, 0xd8, 0xe0, 0xd1, 0x0f, 0x20, 0xc3, 0x99, 0xe7, 0x1d, 0x11, 0xfb, 0xc4, 0xca, 0xbe, 0x20, + 0x37, 0x66, 0xa0, 0x87, 0x90, 0xf1, 0xa9, 0xfc, 0x82, 0xf1, 0x13, 0x61, 0x2d, 0x57, 0x16, 0x36, + 0x72, 0x5b, 0xef, 0x4d, 0x4d, 0xab, 0x10, 0x53, 0x97, 0x92, 0xd8, 0xfd, 0x01, 0xf5, 0x65, 0xa8, + 0x68, 0x7b, 0xde, 0x4a, 0xe1, 0x58, 0x81, 0x32, 0x85, 0xfa, 0x4e, 0xc0, 0x5c, 0x5f, 0x5a, 0x99, + 0xd9, 0xa6, 0x34, 0x0d, 0x46, 0x85, 0x05, 0x8e, 0x19, 0xdb, 0x4b, 0x90, 0x1e, 0x30, 0x87, 0x56, + 0x37, 0x61, 0xf5, 0xca, 0xb6, 0xa3, 0x12, 0x64, 0x8c, 0xc3, 0xc3, 0x78, 0x4d, 0xe3, 0x78, 0x5e, + 0xbd, 0x01, 0x85, 0x89, 0x2d, 0xae, 0xda, 0x50, 0x98, 0xd8, 0x2e, 0xf4, 0x16, 0xac, 0x0c, 0xc8, + 0x97, 0x5d, 0x9b, 0xf9, 0xf6, 0x90, 0x73, 0xea, 0x4b, 0xa3, 0xa3, 0x30, 0x20, 0x5f, 0xee, 0xc4, + 0x42, 0xf4, 0x1e, 0xac, 0x4a, 0x26, 0x89, 0xd7, 0xb5, 0xd9, 0x20, 0xf0, 0x68, 0x98, 0x1d, 0xf3, + 0x1a, 0x59, 0xd4, 0x0f, 0x76, 0xc6, 0xf2, 0x6a, 0x0e, 0xb2, 0xf1, 0x5e, 0x56, 0xff, 0xb4, 0x08, + 0x99, 0x28, 0xd2, 0xd1, 0x43, 0x00, 0x12, 0x3b, 0xca, 0x38, 0xe2, 0x9d, 0x17, 0xf2, 0xaa, 0xa2, + 0xab, 0x08, 0x1f, 0xd3, 0x51, 0x1d, 0xb2, 0x36, 0xf3, 0x25, 0x71, 0x7d, 0xca, 0x4d, 0xa6, 0x4e, + 0x8d, 0xcf, 0x9d, 0x08, 0x64, 0x74, 0x8c, 0x59, 0x68, 0x1b, 0x96, 0x7b, 0xd4, 0xa7, 0xdc, 0xb5, + 0x4d, 0x80, 0xdf, 0x9b, 0x1a, 0x98, 0x21, 0x04, 0x0f, 0x7d, 0xe9, 0x0e, 0xa8, 0xd1, 0x12, 0x11, + 0xd1, 0x67, 0x90, 0xe5, 0x54, 0xb0, 0x21, 0xb7, 0xa9, 0x30, 0xe9, 0xbe, 0x31, 0x3d, 0x4d, 0x42, + 0x10, 0xa6, 0xbf, 0x18, 0xba, 0x9c, 0xaa, 0x25, 0x08, 0x3c, 0xa6, 0xa2, 0x4f, 0x60, 0x99, 0x53, + 0x21, 0x09, 0x97, 0xcf, 0xcb, 0x58, 0x1c, 0x42, 0xda, 0xcc, 0x73, 0xed, 0x11, 0x8e, 0x18, 0xe8, + 0x13, 0xc8, 0x06, 0x1e, 0xb1, 0xb5, 0x56, 0x6b, 0x71, 0x76, 0x8e, 0xb5, 0x23, 0x10, 0x1e, 0xe3, + 0xd1, 0xc7, 0x00, 0x1e, 0xeb, 0x75, 0x1d, 0xee, 0x9e, 0x52, 0x6e, 0xb2, 0xac, 0x34, 0x8d, 0xdd, + 0xd0, 0x08, 0x9c, 0xf5, 0x58, 0x2f, 0x1c, 0xa2, 0x07, 0xff, 0x51, 0x92, 0x24, 0x12, 0xe4, 0x0d, + 0xc8, 0x1f, 0x33, 0x6e, 0xd3, 0xae, 0xc9, 0xf5, 0xac, 0x8e, 0xad, 0x9c, 0x96, 0x85, 0x09, 0x8a, + 0x7e, 0x06, 0xaf, 0x44, 0xde, 0xea, 0x72, 0x7a, 0x4c, 0x39, 0xf5, 0x95, 0xcb, 0x73, 0xfa, 0xb5, + 0x6f, 0x3d, 0xdf, 0xe5, 0x06, 0x6d, 0x4a, 0x2d, 0xe2, 0x97, 0x1f, 0x88, 0xed, 0x2c, 0x2c, 0xf3, + 0x70, 0x83, 0xab, 0xbf, 0x4e, 0xa9, 0x3c, 0xbb, 0x84, 0x40, 0x9b, 0x90, 0x8b, 0x5f, 0xef, 0x3a, + 0x3a, 0xe0, 0xb2, 0xdb, 0x2b, 0x17, 0xe7, 0xeb, 0x10, 0x61, 0x5b, 0x0d, 0x55, 0x81, 0xcd, 0xd8, + 0x41, 0x4d, 0x28, 0xc4, 0x04, 0xd5, 0x04, 0x99, 0x36, 0xa1, 0xf2, 0x3c, 0x4b, 0x0f, 0x46, 0x01, + 0xc5, 0x79, 0x9e, 0x98, 0x55, 0x7f, 0x0a, 0xe8, 0x6a, 0x00, 0x22, 0x04, 0xe9, 0x13, 0xd7, 0x37, + 0x66, 0x60, 0x3d, 0x46, 0x35, 0x58, 0x0e, 0xc8, 0xc8, 0x63, 0xc4, 0x31, 0x71, 0x78, 0xb3, 0x16, + 0xb6, 0x47, 0xb5, 0xa8, 0x3d, 0xaa, 0xd5, 0xfd, 0x11, 0x8e, 0x40, 0xd5, 0x87, 0xf0, 0xea, 0xd4, + 0x3c, 0x43, 0x5b, 0x90, 0x8f, 0x73, 0x64, 0xbc, 0xd6, 0x1b, 0x17, 0xe7, 0xeb, 0xb9, 0x38, 0x99, + 0x5a, 0x0d, 0x9c, 0x8b, 0x41, 0x2d, 0xa7, 0xfa, 0xbb, 0x22, 0x14, 0x26, 0x32, 0x0d, 0xdd, 0x84, + 0x45, 0x77, 0x40, 0x7a, 0xd4, 0xd8, 0x18, 0x4e, 0x50, 0x13, 0x96, 0x3c, 0x72, 0x44, 0x3d, 0x95, + 0x2b, 0x6a, 0xe3, 0xfe, 0xf7, 0xda, 0x94, 0xad, 0x3d, 0xd2, 0xf8, 0xa6, 0x2f, 0xf9, 0x08, 0x1b, + 0x32, 0xb2, 0x60, 0xd9, 0x66, 0x83, 0x01, 0xf1, 0xd5, 0x21, 0xb9, 0xb0, 0x91, 0xc5, 0xd1, 0x54, + 0x79, 0x86, 0xf0, 0x9e, 0xb0, 0xd2, 0x5a, 0xac, 0xc7, 0xaa, 0x46, 0xf6, 0x99, 0x90, 0x3e, 0x19, + 0x50, 0x6b, 0x45, 0x5b, 0x13, 0xcf, 0x51, 0x11, 0x16, 0xa8, 0x7f, 0x6a, 0x2d, 0x6a, 0xb8, 0x1a, + 0x2a, 0x89, 0xe3, 0x86, 0x89, 0x90, 0xc5, 0x6a, 0xa8, 0x74, 0x0e, 0x05, 0xe5, 0xd6, 0x72, 0xe8, + 0x6d, 0x35, 0x46, 0xaf, 0xc1, 0x52, 0x8f, 0xb3, 0x61, 0x10, 0x46, 0x60, 0x16, 0x9b, 0x99, 0x3a, + 0xef, 0x02, 0xee, 0x9e, 0xba, 0x1e, 0xed, 0x51, 0x61, 0xbd, 0xa6, 0x37, 0xa2, 0x3c, 0x35, 0x17, + 0x63, 0x14, 0x4e, 0x30, 0x50, 0x0d, 0xd2, 0xae, 0xef, 0x4a, 0xeb, 0x75, 0x93, 0x87, 0x97, 0xb7, + 0x70, 0x9b, 0x31, 0xef, 0x90, 0x78, 0x43, 0x8a, 0x35, 0x0e, 0xad, 0xc1, 0x82, 0x94, 0x23, 0xab, + 0x50, 0x49, 0x6d, 0x64, 0xb6, 0x97, 0x2f, 0xce, 0xd7, 0x17, 0x0e, 0x0e, 0x9e, 0x62, 0x25, 0x43, + 0x77, 0x00, 0x58, 0x40, 0xfd, 0xae, 0x90, 0x8e, 0xeb, 0x5b, 0x48, 0x21, 0x70, 0x56, 0x49, 0x3a, + 0x4a, 0x80, 0x6e, 0xa9, 0xca, 0x45, 0x9c, 0x2e, 0xf3, 0xbd, 0x91, 0xf5, 0x8a, 0x7e, 0x9a, 0x51, + 0x82, 0x7d, 0xdf, 0x1b, 0xa1, 0x75, 0xc8, 0x09, 0xc9, 0x82, 0xae, 0x70, 0x7b, 0x3e, 0xf1, 0xac, + 0x9b, 0x7a, 0xe5, 0xa0, 0x44, 0x1d, 0x2d, 0x41, 0xff, 0x0f, 0x4b, 0x03, 0x36, 0xf4, 0xa5, 0xb0, + 0x32, 0x7a, 0x23, 0xd7, 0xa6, 0xad, 0xf1, 0xb1, 0x42, 0x98, 0xac, 0x33, 0x70, 0xd4, 0x84, 0x55, + 0xad, 0xb9, 0xc7, 0x89, 0x4d, 0xbb, 0x01, 0xe5, 0x2e, 0x73, 0xcc, 0xf9, 0xbc, 0x76, 0x65, 0xb5, + 0x0d, 0x73, 0x15, 0xc0, 0x37, 0x14, 0xe7, 0x81, 0xa2, 0xb4, 0x35, 0x03, 0xb5, 0x21, 0x1f, 0x0c, + 0x3d, 0xaf, 0xcb, 0x82, 0xf0, 0x34, 0x0a, 0x0b, 0xf8, 0x0b, 0x84, 0x53, 0x7b, 0xe8, 0x79, 0xfb, + 0x21, 0x09, 0xe7, 0x82, 0xf1, 0x04, 0x7d, 0x0a, 0xcb, 0x82, 0xda, 0x9c, 0x4a, 0x61, 0xe5, 0xf5, + 0x92, 0xde, 0x9c, 0xa6, 0xac, 0xa3, 0x21, 0x71, 0x5d, 0xc0, 0x11, 0x47, 0xd1, 0x6d, 0x5d, 0xd6, + 0x84, 0xf5, 0xea, 0x6c, 0xba, 0xa9, 0x7c, 0x63, 0xba, 0xe1, 0xa8, 0x74, 0x51, 0x31, 0x29, 0xac, + 0x55, 0x1d, 0x4e, 0xe1, 0x04, 0x3d, 0x05, 0x70, 0x7c, 0xd1, 0x0d, 0x41, 0xd6, 0x0d, 0xbd, 0xc6, + 0xf7, 0xae, 0x5f, 0x63, 0x63, 0xaf, 0x63, 0xfa, 0x90, 0xc2, 0xc5, 0xf9, 0x7a, 0x36, 0x9e, 0xe2, + 0xac, 0xe3, 0x8b, 0x70, 0x88, 0xb6, 0x21, 0xd7, 0xa7, 0xc4, 0x93, 0x7d, 0xbb, 0x4f, 0xed, 0x13, + 0xab, 0x38, 0xbb, 0x2d, 0xd9, 0xd5, 0x30, 0xa3, 0x21, 0x49, 0x42, 0x2d, 0xc8, 0xba, 0x82, 0x79, + 0x7a, 0x8b, 0x2c, 0x4b, 0xd7, 0xb7, 0x17, 0xb0, 0xae, 0x15, 0x51, 0xf0, 0x98, 0x8d, 0x6e, 0x43, + 0x36, 0x70, 0x1d, 0xf1, 0xc8, 0x1d, 0xb8, 0xd2, 0x5a, 0xab, 0xa4, 0x36, 0x16, 0xf0, 0x58, 0x80, + 0x76, 0x61, 0x59, 0x8c, 0x84, 0x2d, 0x3d, 0x61, 0x95, 0xb4, 0x73, 0x6b, 0xd7, 0xbf, 0xa6, 0x13, + 0x12, 0xc2, 0xc2, 0x11, 0xd1, 0x55, 0xc7, 0x63, 0x93, 0xc0, 0xdc, 0x05, 0xba, 0xc4, 0x71, 0xac, + 0x5b, 0xda, 0xe1, 0x85, 0xb1, 0xb4, 0xee, 0x38, 0xe8, 0x6d, 0xb8, 0x91, 0x80, 0x39, 0x9c, 0x05, + 0xd6, 0x6d, 0x8d, 0x4b, 0xb0, 0x1b, 0x9c, 0x05, 0xaa, 0x87, 0x18, 0x7a, 0xca, 0x46, 0x61, 0xdd, + 0xd1, 0x96, 0x6d, 0x5c, 0x6f, 0xd9, 0x13, 0x4d, 0xc0, 0x11, 0x11, 0xb5, 0x60, 0xb9, 0x41, 0x55, + 0x83, 0x26, 0xac, 0xb2, 0xd6, 0xb1, 0xf9, 0x02, 0x5b, 0xac, 0x09, 0x8f, 0x49, 0x10, 0xb8, 0x7e, + 0x0f, 0x47, 0xfc, 0xd2, 0xc7, 0x90, 0x4b, 0xd4, 0x4b, 0x55, 0xcb, 0x4e, 0xe8, 0xc8, 0x94, 0x60, + 0x35, 0x54, 0x71, 0x76, 0xaa, 0xca, 0x87, 0x3e, 0x23, 0xb2, 0x38, 0x9c, 0xdc, 0x9f, 0xff, 0x28, + 0x55, 0xda, 0x82, 0x5c, 0x22, 0x37, 0xd0, 0x9b, 0xea, 0xfc, 0xea, 0xb9, 0x42, 0xf2, 0x51, 0x97, + 0x0c, 0x65, 0xdf, 0xfa, 0xb1, 0x26, 0xe4, 0x23, 0x61, 0x7d, 0x28, 0xfb, 0xa5, 0x2e, 0x8c, 0x83, + 0x0b, 0x55, 0x20, 0xa7, 0x4a, 0xaa, 0xa0, 0xfc, 0x94, 0x72, 0xd5, 0x8d, 0x2a, 0x7f, 0x25, 0x45, + 0xaa, 0x68, 0x0a, 0x4a, 0xb8, 0xdd, 0xd7, 0xd5, 0x3f, 0x8b, 0xcd, 0x4c, 0x95, 0xf3, 0x28, 0x8f, + 0x4d, 0x39, 0x37, 0xd3, 0xd2, 0x7d, 0xc8, 0x27, 0xf7, 0xf1, 0xdf, 0x5a, 0x50, 0x03, 0x96, 0x42, + 0x4f, 0xab, 0x02, 0xae, 0x8b, 0xbf, 0x39, 0x2e, 0x75, 0xe1, 0x47, 0x90, 0x16, 0xec, 0x58, 0x6a, + 0xda, 0x02, 0xd6, 0x63, 0x25, 0xeb, 0x13, 0x1e, 0x5e, 0xbc, 0x16, 0xb0, 0x1e, 0x97, 0x7e, 0x95, + 0x82, 0xc2, 0x84, 0xb3, 0x51, 0x19, 0x20, 0x20, 0xb2, 0xbf, 0xef, 0xef, 0x32, 0x21, 0x8d, 0xce, + 0x84, 0x04, 0x6d, 0xc0, 0x0d, 0x35, 0x6b, 0xf9, 0xf1, 0x8e, 0x19, 0xdb, 0x2e, 0x8b, 0xd1, 0xff, + 0xc0, 0xaa, 0xad, 0xcf, 0x8d, 0x36, 0xe5, 0x03, 0x57, 0x08, 0xe3, 0x01, 0x85, 0xbd, 0xfa, 0xa0, + 0xfa, 0xe7, 0x14, 0x64, 0xe3, 0xdc, 0x41, 0x1f, 0xc0, 0x6a, 0xab, 0xb3, 0xff, 0xa8, 0x7e, 0xd0, + 0xda, 0xdf, 0xeb, 0x36, 0x9a, 0x9f, 0xd5, 0x9f, 0x3c, 0x3a, 0x28, 0xce, 0x95, 0xee, 0x3c, 0x3b, + 0xab, 0xac, 0x8d, 0x8f, 0xe9, 0x08, 0xde, 0xa0, 0xc7, 0x64, 0xe8, 0xc9, 0x49, 0x56, 0x1b, 0xef, + 0xef, 0x34, 0x3b, 0x9d, 0x62, 0x6a, 0x16, 0xab, 0xcd, 0x99, 0x4d, 0x85, 0x40, 0x5b, 0x50, 0x1c, + 0xb3, 0x76, 0x9f, 0xb6, 0x9b, 0xf8, 0xb0, 0x38, 0x5f, 0xba, 0xfd, 0xec, 0xac, 0x62, 0x5d, 0x25, + 0xed, 0x8e, 0x02, 0xca, 0x0f, 0xcd, 0x0d, 0xfb, 0xef, 0x29, 0xc8, 0x27, 0xaf, 0x35, 0x68, 0x27, + 0xbc, 0xcc, 0x68, 0xb7, 0xad, 0x4c, 0x0f, 0xf4, 0x24, 0x5e, 0xb7, 0x46, 0xde, 0x50, 0xe9, 0x7d, + 0xcc, 0x1c, 0x8a, 0x35, 0x19, 0x7d, 0x00, 0x8b, 0x01, 0xe3, 0x32, 0x6a, 0x22, 0xa6, 0x9f, 0xaf, + 0x8c, 0x47, 0x7d, 0x66, 0x08, 0xae, 0xf6, 0x61, 0x65, 0x52, 0x1b, 0xba, 0x0b, 0x0b, 0x87, 0xad, + 0x76, 0x71, 0xae, 0x74, 0xeb, 0xd9, 0x59, 0xe5, 0xf5, 0xc9, 0x87, 0x87, 0x2e, 0x97, 0x43, 0xe2, + 0xb5, 0xda, 0xe8, 0x5d, 0x58, 0x6c, 0xec, 0x75, 0x30, 0x2e, 0xa6, 0x4a, 0xeb, 0xcf, 0xce, 0x2a, + 0xb7, 0x26, 0x71, 0xea, 0x11, 0x1b, 0xfa, 0x0e, 0x66, 0x47, 0xf1, 0x77, 0x85, 0x7f, 0xcc, 0x43, + 0xce, 0xf4, 0x56, 0x2f, 0xfb, 0xd3, 0x53, 0x21, 0xec, 0xd3, 0xa3, 0x23, 0x61, 0xfe, 0xda, 0x76, + 0x3d, 0x1f, 0x12, 0x4c, 0x8e, 0xbe, 0x01, 0x79, 0x37, 0x38, 0xfd, 0xb0, 0x4b, 0x7d, 0x72, 0xe4, + 0x99, 0x4f, 0x0c, 0x19, 0x9c, 0x53, 0xb2, 0x66, 0x28, 0x52, 0xdd, 0x92, 0xeb, 0x4b, 0xca, 0x7d, + 0xf3, 0xf1, 0x20, 0x83, 0xe3, 0x39, 0xfa, 0x14, 0xd2, 0x6e, 0x40, 0x06, 0xe6, 0x8e, 0x31, 0x75, + 0x05, 0xad, 0x76, 0xfd, 0xb1, 0xa9, 0x21, 0xdb, 0x99, 0x8b, 0xf3, 0xf5, 0xb4, 0x12, 0x60, 0x4d, + 0x53, 0x99, 0x13, 0xde, 0xe0, 0xd4, 0x9b, 0x74, 0x87, 0x95, 0xc1, 0x09, 0x89, 0xaa, 0x03, 0xae, + 0xdf, 0xe3, 0x54, 0x08, 0xdd, 0x6b, 0x65, 0x70, 0x34, 0x45, 0x25, 0x58, 0x36, 0x97, 0x05, 0x7d, + 0x6f, 0xcc, 0xaa, 0x2b, 0x98, 0x11, 0x6c, 0x17, 0x20, 0x17, 0x7a, 0xa3, 0x7b, 0xcc, 0xd9, 0xa0, + 0xfa, 0xcf, 0x34, 0xe4, 0x76, 0xbc, 0xa1, 0x90, 0xa6, 0x11, 0x7d, 0x69, 0xce, 0x7f, 0x0a, 0xab, + 0x44, 0x7f, 0xca, 0x22, 0xbe, 0xea, 0x5c, 0xf4, 0x1d, 0xcc, 0x6c, 0xc0, 0xdd, 0xa9, 0xea, 0x62, + 0x70, 0x78, 0x5f, 0xdb, 0x5e, 0x52, 0x3a, 0xad, 0x14, 0x2e, 0x92, 0x4b, 0x4f, 0x50, 0x07, 0x0a, + 0x8c, 0xdb, 0x7d, 0x2a, 0x64, 0xd8, 0xef, 0x98, 0x4f, 0x3f, 0x53, 0x3f, 0x0a, 0xee, 0x27, 0x81, + 0xe6, 0x98, 0x0f, 0xad, 0x9d, 0xd4, 0x81, 0x3e, 0x82, 0x34, 0x27, 0xc7, 0xd1, 0x7d, 0x72, 0x6a, + 0x92, 0x60, 0x72, 0x2c, 0x27, 0x54, 0x68, 0x06, 0xfa, 0x1c, 0xc0, 0x71, 0x45, 0x40, 0xa4, 0xdd, + 0xa7, 0xdc, 0x6c, 0xf6, 0xd4, 0x25, 0x36, 0x62, 0xd4, 0x84, 0x96, 0x04, 0x1b, 0x3d, 0x84, 0xac, + 0x4d, 0xa2, 0x70, 0x5d, 0x9a, 0xfd, 0x3d, 0x6c, 0xa7, 0x6e, 0x54, 0x14, 0x95, 0x8a, 0x8b, 0xf3, + 0xf5, 0x4c, 0x24, 0xc1, 0x19, 0x9b, 0x98, 0xf0, 0x7d, 0x08, 0x05, 0x49, 0xc4, 0x49, 0xd7, 0x09, + 0xcb, 0x59, 0x18, 0x26, 0x33, 0xda, 0x96, 0x03, 0x22, 0x4e, 0x4c, 0xd9, 0x8b, 0xb6, 0x33, 0x2f, + 0x13, 0x32, 0xf4, 0x13, 0x58, 0xa5, 0xbe, 0xcd, 0x47, 0x3a, 0x58, 0x23, 0x0b, 0x33, 0xb3, 0x17, + 0xdb, 0x8c, 0xc1, 0x13, 0x8b, 0x2d, 0xd2, 0x4b, 0xf2, 0xea, 0x5f, 0x53, 0x00, 0x61, 0x9f, 0xf8, + 0x72, 0x03, 0x10, 0x41, 0xda, 0x21, 0x92, 0xe8, 0x98, 0xcb, 0x63, 0x3d, 0x46, 0xf7, 0x01, 0x24, + 0x1d, 0x04, 0xaa, 0xf4, 0xfa, 0x3d, 0x13, 0x36, 0xcf, 0x2b, 0x07, 0x09, 0x34, 0xda, 0x82, 0x25, + 0x73, 0xeb, 0x4f, 0x5f, 0xcb, 0x33, 0xc8, 0xea, 0x1f, 0x52, 0x00, 0xe1, 0x32, 0xff, 0xab, 0xd7, + 0x56, 0xfd, 0xcb, 0x22, 0xc0, 0x21, 0xf3, 0x86, 0x83, 0x97, 0xfc, 0x65, 0xf7, 0x26, 0x2c, 0xea, + 0x83, 0x39, 0x6a, 0x37, 0xf4, 0x24, 0xe1, 0xc9, 0x85, 0x17, 0xf5, 0x24, 0x6a, 0x42, 0x4e, 0xd5, + 0x01, 0x21, 0xba, 0xfa, 0x40, 0x4c, 0xcf, 0x0e, 0xbc, 0x70, 0x1d, 0x75, 0x0d, 0xd6, 0xa7, 0x20, + 0x90, 0x78, 0x8c, 0xee, 0x8f, 0xaf, 0x2d, 0x8b, 0xfa, 0x34, 0xac, 0xcc, 0x56, 0x61, 0x2e, 0x2f, + 0xf1, 0x9d, 0x85, 0xc2, 0x5a, 0xa8, 0xd5, 0x35, 0xff, 0x03, 0x12, 0x1f, 0xa7, 0x4c, 0xae, 0x4e, + 0x2d, 0x41, 0x07, 0x2c, 0x60, 0x1e, 0xeb, 0x25, 0xf1, 0x78, 0xb6, 0x26, 0xb4, 0x1b, 0xf6, 0xdc, + 0xb6, 0x6a, 0xa5, 0x39, 0xf1, 0x7b, 0xd4, 0xa4, 0xed, 0xf4, 0xef, 0x75, 0x06, 0x89, 0x15, 0x30, + 0x6c, 0xcb, 0xe3, 0x29, 0x7a, 0x72, 0xe9, 0x87, 0x47, 0x46, 0x77, 0x11, 0xef, 0x3f, 0x67, 0xc5, + 0xaa, 0x87, 0x30, 0xfe, 0x9b, 0xfd, 0xe3, 0xe3, 0xb7, 0x29, 0x40, 0x57, 0x41, 0x68, 0x23, 0xf1, + 0x63, 0x42, 0x37, 0x3b, 0x57, 0x31, 0xe6, 0xd7, 0xc4, 0xbd, 0xf1, 0xaf, 0x09, 0xdd, 0x4a, 0x5c, + 0x05, 0x86, 0x3f, 0x27, 0xee, 0x8d, 0x7f, 0x4e, 0xcc, 0xc0, 0x25, 0x7e, 0x4f, 0x6c, 0xdf, 0xfd, + 0xfa, 0xbb, 0xf2, 0xdc, 0xb7, 0xdf, 0x95, 0xe7, 0x7e, 0x79, 0x51, 0x4e, 0x7d, 0x7d, 0x51, 0x4e, + 0x7d, 0x73, 0x51, 0x4e, 0xfd, 0xed, 0xa2, 0x9c, 0xfa, 0xcd, 0xf7, 0xe5, 0xb9, 0x6f, 0xbe, 0x2f, + 0xcf, 0x7d, 0xfb, 0x7d, 0x79, 0xee, 0x68, 0x49, 0xdf, 0x96, 0xff, 0xef, 0x5f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x42, 0x22, 0x82, 0xb4, 0xca, 0x1b, 0x00, 0x00, } func (m *NodeSpec) Copy() *NodeSpec { @@ -1958,6 +2003,14 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { } } + if o.Devices != nil { + m.Devices = make([]*ContainerSpec_DeviceMapping, len(o.Devices)) + for i := range m.Devices { + m.Devices[i] = &ContainerSpec_DeviceMapping{} + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Devices[i], o.Devices[i]) + } + } + } func (m *ContainerSpec_PullOptions) Copy() *ContainerSpec_PullOptions { @@ -2020,6 +2073,21 @@ func (m *ContainerSpec_Ulimit) CopyFrom(src interface{}) { *m = *o } +func (m *ContainerSpec_DeviceMapping) Copy() *ContainerSpec_DeviceMapping { + if m == nil { + return nil + } + o := &ContainerSpec_DeviceMapping{} + o.CopyFrom(m) + return o +} + +func (m *ContainerSpec_DeviceMapping) CopyFrom(src interface{}) { + + o := src.(*ContainerSpec_DeviceMapping) + *m = *o +} + func (m *EndpointSpec) Copy() *EndpointSpec { if m == nil { return nil @@ -2836,6 +2904,22 @@ func (m *ContainerSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Devices) > 0 { + for iNdEx := len(m.Devices) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Devices[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSpecs(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xf2 + } + } if len(m.Ulimits) > 0 { for iNdEx := len(m.Ulimits) - 1; iNdEx >= 0; iNdEx-- { { @@ -3293,6 +3377,50 @@ func (m *ContainerSpec_Ulimit) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ContainerSpec_DeviceMapping) 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 *ContainerSpec_DeviceMapping) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ContainerSpec_DeviceMapping) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.CgroupPermissions) > 0 { + i -= len(m.CgroupPermissions) + copy(dAtA[i:], m.CgroupPermissions) + i = encodeVarintSpecs(dAtA, i, uint64(len(m.CgroupPermissions))) + i-- + dAtA[i] = 0x1a + } + if len(m.PathInContainer) > 0 { + i -= len(m.PathInContainer) + copy(dAtA[i:], m.PathInContainer) + i = encodeVarintSpecs(dAtA, i, uint64(len(m.PathInContainer))) + i-- + dAtA[i] = 0x12 + } + if len(m.PathOnHost) > 0 { + i -= len(m.PathOnHost) + copy(dAtA[i:], m.PathOnHost) + i = encodeVarintSpecs(dAtA, i, uint64(len(m.PathOnHost))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *EndpointSpec) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4211,6 +4339,12 @@ func (m *ContainerSpec) Size() (n int) { n += 2 + l + sovSpecs(uint64(l)) } } + if len(m.Devices) > 0 { + for _, e := range m.Devices { + l = e.Size() + n += 2 + l + sovSpecs(uint64(l)) + } + } return n } @@ -4273,6 +4407,27 @@ func (m *ContainerSpec_Ulimit) Size() (n int) { return n } +func (m *ContainerSpec_DeviceMapping) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PathOnHost) + if l > 0 { + n += 1 + l + sovSpecs(uint64(l)) + } + l = len(m.PathInContainer) + if l > 0 { + n += 1 + l + sovSpecs(uint64(l)) + } + l = len(m.CgroupPermissions) + if l > 0 { + n += 1 + l + sovSpecs(uint64(l)) + } + return n +} + func (m *EndpointSpec) Size() (n int) { if m == nil { return 0 @@ -4674,6 +4829,11 @@ func (this *ContainerSpec) String() string { repeatedStringForUlimits += strings.Replace(fmt.Sprintf("%v", f), "ContainerSpec_Ulimit", "ContainerSpec_Ulimit", 1) + "," } repeatedStringForUlimits += "}" + repeatedStringForDevices := "[]*ContainerSpec_DeviceMapping{" + for _, f := range this.Devices { + repeatedStringForDevices += strings.Replace(fmt.Sprintf("%v", f), "ContainerSpec_DeviceMapping", "ContainerSpec_DeviceMapping", 1) + "," + } + repeatedStringForDevices += "}" keysForLabels := make([]string, 0, len(this.Labels)) for k, _ := range this.Labels { keysForLabels = append(keysForLabels, k) @@ -4724,6 +4884,7 @@ func (this *ContainerSpec) String() string { `CapabilityAdd:` + fmt.Sprintf("%v", this.CapabilityAdd) + `,`, `CapabilityDrop:` + fmt.Sprintf("%v", this.CapabilityDrop) + `,`, `Ulimits:` + repeatedStringForUlimits + `,`, + `Devices:` + repeatedStringForDevices + `,`, `}`, }, "") return s @@ -4762,6 +4923,18 @@ func (this *ContainerSpec_Ulimit) String() string { }, "") return s } +func (this *ContainerSpec_DeviceMapping) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&ContainerSpec_DeviceMapping{`, + `PathOnHost:` + fmt.Sprintf("%v", this.PathOnHost) + `,`, + `PathInContainer:` + fmt.Sprintf("%v", this.PathInContainer) + `,`, + `CgroupPermissions:` + fmt.Sprintf("%v", this.CgroupPermissions) + `,`, + `}`, + }, "") + return s +} func (this *EndpointSpec) String() string { if this == nil { return "nil" @@ -7476,6 +7649,40 @@ func (m *ContainerSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 30: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Devices", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpecs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthSpecs + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSpecs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Devices = append(m.Devices, &ContainerSpec_DeviceMapping{}) + if err := m.Devices[len(m.Devices)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipSpecs(dAtA[iNdEx:]) @@ -7845,6 +8052,152 @@ func (m *ContainerSpec_Ulimit) Unmarshal(dAtA []byte) error { } return nil } +func (m *ContainerSpec_DeviceMapping) 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 ErrIntOverflowSpecs + } + 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: DeviceMapping: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DeviceMapping: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PathOnHost", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpecs + } + 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 ErrInvalidLengthSpecs + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSpecs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PathOnHost = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PathInContainer", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpecs + } + 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 ErrInvalidLengthSpecs + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSpecs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PathInContainer = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CgroupPermissions", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpecs + } + 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 ErrInvalidLengthSpecs + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSpecs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CgroupPermissions = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipSpecs(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthSpecs + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *EndpointSpec) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/api/specs.proto b/api/specs.proto index a097b2be3c..8efbc197dc 100644 --- a/api/specs.proto +++ b/api/specs.proto @@ -370,6 +370,14 @@ message ContainerSpec { // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. repeated Ulimit ulimits = 29; + + message DeviceMapping { + string pathOnHost = 1; + string pathInContainer = 2; + string cgroupPermissions = 3; + } + + repeated DeviceMapping Devices = 30; } // EndpointSpec defines the properties that can be configured to diff --git a/cmd/swarmctl/service/flagparser/device.go b/cmd/swarmctl/service/flagparser/device.go new file mode 100644 index 0000000000..d82a44c048 --- /dev/null +++ b/cmd/swarmctl/service/flagparser/device.go @@ -0,0 +1,49 @@ +package flagparser + +import ( + "strings" + + "github.com/moby/swarmkit/v2/api" + "github.com/pkg/errors" + "github.com/spf13/pflag" +) + +func parseDevice(flags *pflag.FlagSet, spec *api.ServiceSpec) error { + if flags.Changed("device") { + container := spec.Task.GetContainer() + if container == nil { + return nil + } + + devices, err := flags.GetStringSlice("device") + if err != nil { + return err + } + + container.Devices = make([]*api.ContainerSpec_DeviceMapping, len(devices)) + + for i, device := range devices { + parts := strings.Split(device, ":") + if len(parts) < 1 || len(parts) > 3 { + return errors.Wrap(err, "failed to parse device") + } + + mapping := &api.ContainerSpec_DeviceMapping{ + PathOnHost: parts[0], + PathInContainer: parts[0], + } + + if len(parts) > 1 { + mapping.PathInContainer = parts[1] + } + + if len(parts) == 3 { + mapping.CgroupPermissions = parts[2] + } + + container.Devices[i] = mapping + } + } + + return nil +} diff --git a/cmd/swarmctl/service/flagparser/flags.go b/cmd/swarmctl/service/flagparser/flags.go index ef1765a0a6..494fab7e60 100644 --- a/cmd/swarmctl/service/flagparser/flags.go +++ b/cmd/swarmctl/service/flagparser/flags.go @@ -58,6 +58,7 @@ func AddServiceFlags(flags *pflag.FlagSet) { flags.StringSlice("volume", nil, "define a volume mount") flags.StringSlice("tmpfs", nil, "define a tmpfs mount") flags.StringSlice("npipe", nil, "define a npipe mount") + flags.StringSlice("device", nil, "device options") flags.String("log-driver", "", "specify a log driver") flags.StringSlice("log-opt", nil, "log driver options, as key value pairs") @@ -150,6 +151,10 @@ func Merge(cmd *cobra.Command, spec *api.ServiceSpec, c api.ControlClient) error return err } + if err := parseDevice(flags, spec); err != nil { + return err + } + driver, err := common.ParseLogDriverFlags(flags) if err != nil { return err