From 8852925c77f4cf02e651e19588d990f37d0033e6 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 1 Jun 2023 13:36:39 +0200 Subject: [PATCH] controller: remove MetadataFile from CommonOptions Signed-off-by: CrazyMax --- commands/bake.go | 17 +- commands/build.go | 19 ++- controller/pb/controller.pb.go | 275 ++++++++++++++++----------------- controller/pb/controller.proto | 11 +- 4 files changed, 156 insertions(+), 166 deletions(-) diff --git a/commands/bake.go b/commands/bake.go index 354a2bc4487a..e2d5f1535a50 100644 --- a/commands/bake.go +++ b/commands/bake.go @@ -23,11 +23,12 @@ import ( ) type bakeOptions struct { - files []string - overrides []string - printOnly bool - sbom string - provenance string + files []string + overrides []string + printOnly bool + sbom string + provenance string + metadataFile string controllerapi.CommonOptions //control.ControlOptions @@ -194,12 +195,12 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com return wrapBuildError(err, true) } - if len(in.MetadataFile) > 0 { + if len(in.metadataFile) > 0 { dt := make(map[string]interface{}) for t, r := range resp { dt[t] = decodeExporterResponse(r.ExporterResponse) } - if err := writeMetadataFile(in.MetadataFile, dt); err != nil { + if err := writeMetadataFile(in.metadataFile, dt); err != nil { return err } } @@ -224,7 +225,7 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command { cFlags.pull = nil } options.Builder = rootOpts.builder - options.MetadataFile = cFlags.metadataFile + options.metadataFile = cFlags.metadataFile // Other common flags (noCache, pull and progress) are processed in runBake function. return runBake(dockerCli, args, options, cFlags) }, diff --git a/commands/build.go b/commands/build.go index 53dd72ae2e1b..cd5ff0b97362 100644 --- a/commands/build.go +++ b/commands/build.go @@ -62,6 +62,7 @@ type buildOptions struct { dockerfileName string extraHosts []string imageIDFile string + metadataFile string labels []string networkMode string noCacheFilter []string @@ -74,17 +75,15 @@ type buildOptions struct { tags []string target string ulimits *dockeropts.UlimitOpt + attests []string + sbom string + provenance string + progress string + quiet bool invoke *invokeConfig noBuild bool - attests []string - sbom string - provenance string - - progress string - quiet bool - controllerapi.CommonOptions control.ControlOptions } @@ -276,8 +275,8 @@ func runBuild(dockerCli command.Cli, options buildOptions) (err error) { return errors.Wrap(err, "writing image ID file") } } - if options.MetadataFile != "" { - if err := writeMetadataFile(options.MetadataFile, decodeExporterResponse(resp.ExporterResponse)); err != nil { + if options.metadataFile != "" { + if err := writeMetadataFile(options.metadataFile, decodeExporterResponse(resp.ExporterResponse)); err != nil { return err } } @@ -403,7 +402,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { options.contextPath = args[0] options.Builder = rootOpts.builder - options.MetadataFile = cFlags.metadataFile + options.metadataFile = cFlags.metadataFile options.NoCache = false if cFlags.noCache != nil { options.NoCache = *cFlags.noCache diff --git a/controller/pb/controller.pb.go b/controller/pb/controller.pb.go index b679db32ced9..4a887f48c320 100644 --- a/controller/pb/controller.pb.go +++ b/controller/pb/controller.pb.go @@ -594,18 +594,17 @@ func (m *NamedContext) GetDefinition() *pb.Definition { } type CommonOptions struct { - Builder string `protobuf:"bytes,1,opt,name=Builder,proto3" json:"Builder,omitempty"` - MetadataFile string `protobuf:"bytes,2,opt,name=MetadataFile,proto3" json:"MetadataFile,omitempty"` - NoCache bool `protobuf:"varint,3,opt,name=NoCache,proto3" json:"NoCache,omitempty"` + Builder string `protobuf:"bytes,1,opt,name=Builder,proto3" json:"Builder,omitempty"` + NoCache bool `protobuf:"varint,2,opt,name=NoCache,proto3" json:"NoCache,omitempty"` // string Progress: no progress view on server side - Pull bool `protobuf:"varint,4,opt,name=Pull,proto3" json:"Pull,omitempty"` - ExportPush bool `protobuf:"varint,5,opt,name=ExportPush,proto3" json:"ExportPush,omitempty"` - ExportLoad bool `protobuf:"varint,6,opt,name=ExportLoad,proto3" json:"ExportLoad,omitempty"` + Pull bool `protobuf:"varint,3,opt,name=Pull,proto3" json:"Pull,omitempty"` + ExportPush bool `protobuf:"varint,4,opt,name=ExportPush,proto3" json:"ExportPush,omitempty"` + ExportLoad bool `protobuf:"varint,5,opt,name=ExportLoad,proto3" json:"ExportLoad,omitempty"` // TODO: we should remove Linked from the controllerapi, it's only used to // produce a single warning. To allow this, we need to move the default // export detection out from the controller server, as well as load the // driver on the controller client. - Linked bool `protobuf:"varint,7,opt,name=Linked,proto3" json:"Linked,omitempty"` + Linked bool `protobuf:"varint,6,opt,name=Linked,proto3" json:"Linked,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -642,13 +641,6 @@ func (m *CommonOptions) GetBuilder() string { return "" } -func (m *CommonOptions) GetMetadataFile() string { - if m != nil { - return m.MetadataFile - } - return "" -} - func (m *CommonOptions) GetNoCache() bool { if m != nil { return m.NoCache @@ -2209,134 +2201,133 @@ func init() { func init() { proto.RegisterFile("controller.proto", fileDescriptor_ed7f10298fa1d90f) } var fileDescriptor_ed7f10298fa1d90f = []byte{ - // 2030 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x72, 0xdb, 0xc6, - 0x15, 0x2e, 0x48, 0x8a, 0x3f, 0x87, 0xa2, 0x2c, 0x6f, 0x65, 0x0f, 0x82, 0xb8, 0x89, 0x0c, 0xdb, - 0xa9, 0x26, 0xce, 0x80, 0x89, 0x92, 0xd4, 0x76, 0xec, 0x5c, 0x48, 0x94, 0x38, 0x52, 0x46, 0x7f, - 0xb3, 0x94, 0x9d, 0x69, 0x2f, 0x9a, 0x01, 0xc9, 0x15, 0x85, 0x21, 0x88, 0x45, 0xb1, 0x4b, 0xfd, - 0xf4, 0xaa, 0x37, 0xbd, 0xeb, 0xf4, 0x3d, 0x3a, 0x7d, 0x84, 0xce, 0x74, 0xa6, 0xcf, 0xd0, 0xf7, - 0xe8, 0xf4, 0xb6, 0x77, 0x9d, 0xfd, 0x01, 0x08, 0x88, 0x04, 0x24, 0xb5, 0x57, 0xdc, 0x3d, 0xf8, - 0xbe, 0xb3, 0x7b, 0xce, 0x9e, 0x3d, 0xe7, 0x2c, 0x61, 0x75, 0x40, 0x03, 0x1e, 0x51, 0xdf, 0x27, - 0x91, 0x13, 0x46, 0x94, 0x53, 0xb4, 0xd6, 0x9f, 0x7a, 0xfe, 0xf0, 0xca, 0x49, 0x7d, 0xb8, 0xf8, - 0xca, 0x7a, 0x3b, 0xf2, 0xf8, 0xf9, 0xb4, 0xef, 0x0c, 0xe8, 0xa4, 0x3d, 0xa1, 0xfd, 0xeb, 0xb6, - 0x44, 0x8d, 0x3d, 0xde, 0x76, 0x43, 0xaf, 0xcd, 0x48, 0x74, 0xe1, 0x0d, 0x08, 0x6b, 0x6b, 0x52, - 0xfc, 0xab, 0x54, 0x5a, 0xdf, 0xe6, 0x92, 0x19, 0x9d, 0x46, 0x03, 0x12, 0x52, 0xdf, 0x1b, 0x5c, - 0xb7, 0xc3, 0x7e, 0x5b, 0x8d, 0x34, 0xed, 0x8b, 0x02, 0x9a, 0x7f, 0x41, 0x22, 0x41, 0xa0, 0x21, - 0x53, 0x68, 0x7b, 0x03, 0xd6, 0x0e, 0x3c, 0xc6, 0x4f, 0x22, 0x3a, 0x20, 0x8c, 0x11, 0x86, 0xc9, - 0xef, 0xa6, 0x84, 0x71, 0xb4, 0x0a, 0x65, 0x4c, 0xce, 0x4c, 0x63, 0xdd, 0xd8, 0x68, 0x60, 0x31, - 0xb4, 0x4f, 0xe0, 0xd1, 0x0d, 0x24, 0x0b, 0x69, 0xc0, 0x08, 0x7a, 0x05, 0x4b, 0xfb, 0xc1, 0x19, - 0x65, 0xa6, 0xb1, 0x5e, 0xde, 0x68, 0x6e, 0x3e, 0x75, 0x16, 0xb9, 0xc2, 0xd1, 0x3c, 0x81, 0xc4, - 0x0a, 0x6f, 0x33, 0x68, 0xa6, 0xa4, 0xe8, 0x09, 0x34, 0xe2, 0xe9, 0x8e, 0x5e, 0x78, 0x26, 0x40, - 0x5d, 0x58, 0xde, 0x0f, 0x2e, 0xe8, 0x98, 0x74, 0x68, 0x70, 0xe6, 0x8d, 0xcc, 0xd2, 0xba, 0xb1, - 0xd1, 0xdc, 0xb4, 0x17, 0x2f, 0x96, 0x46, 0xe2, 0x0c, 0xcf, 0xfe, 0x01, 0xcc, 0x1d, 0x8f, 0x0d, - 0x68, 0x10, 0x90, 0x41, 0x6c, 0x4c, 0xae, 0xd1, 0xd9, 0x3d, 0x95, 0x6e, 0xec, 0xc9, 0xfe, 0x18, - 0x3e, 0x5a, 0xa0, 0x4b, 0xb9, 0xc5, 0xfe, 0x2d, 0x2c, 0x6f, 0x8b, 0xbd, 0xe5, 0x2b, 0x7f, 0x07, - 0xb5, 0xe3, 0x90, 0x7b, 0x34, 0x60, 0xc5, 0xd6, 0x48, 0x35, 0x1a, 0x89, 0x63, 0x8a, 0xfd, 0x9f, - 0x12, 0x54, 0xf7, 0x83, 0x70, 0xca, 0x19, 0x5a, 0x87, 0x66, 0x87, 0x06, 0x9c, 0x5c, 0xf1, 0x13, - 0x97, 0x9f, 0xeb, 0x25, 0xd2, 0x22, 0xf4, 0x19, 0xac, 0xec, 0xd0, 0xc1, 0x98, 0x44, 0x67, 0x9e, - 0x4f, 0x8e, 0xdc, 0x09, 0xd1, 0xc6, 0xdc, 0x90, 0xa2, 0xcf, 0x61, 0x75, 0x26, 0xd9, 0x0f, 0x7c, - 0x2f, 0x20, 0x66, 0x59, 0x22, 0xe7, 0xe4, 0xe8, 0x1d, 0x3c, 0xd4, 0x4b, 0xec, 0x90, 0x33, 0x2f, - 0xf0, 0xc4, 0xb6, 0xcc, 0x8a, 0x34, 0x64, 0xc5, 0x09, 0xfb, 0xce, 0x4c, 0x8a, 0xe7, 0x81, 0xe8, - 0x3d, 0xb4, 0xc4, 0x8a, 0x43, 0xfd, 0x85, 0x99, 0x4b, 0x32, 0x7a, 0xda, 0x79, 0x07, 0x2a, 0x0c, - 0x75, 0x32, 0x8c, 0xdd, 0x80, 0x47, 0xd7, 0x38, 0xab, 0xc5, 0x1a, 0x02, 0x9a, 0x07, 0x09, 0xdf, - 0x8f, 0xc9, 0x75, 0xec, 0xfb, 0x31, 0xb9, 0x46, 0xaf, 0x61, 0xe9, 0xc2, 0xf5, 0xa7, 0xa4, 0xd8, - 0xf3, 0x69, 0x55, 0x58, 0x11, 0xbe, 0x2b, 0xbd, 0x36, 0xec, 0xbf, 0x37, 0xf4, 0xe1, 0xea, 0xc3, - 0x40, 0xdf, 0xc4, 0x67, 0x21, 0xd7, 0x68, 0x6e, 0x3e, 0x29, 0x32, 0x03, 0xc7, 0xe7, 0xf6, 0xbd, - 0x88, 0x2e, 0x2f, 0xe0, 0xdd, 0x69, 0x30, 0xd0, 0x1b, 0xf9, 0x34, 0xef, 0xf6, 0x68, 0x18, 0x9e, - 0x31, 0xd0, 0x2b, 0xa8, 0x1c, 0x87, 0x9c, 0xc9, 0x03, 0x6a, 0x6e, 0x3e, 0x5b, 0xcc, 0xec, 0xd0, - 0xc9, 0x84, 0x06, 0x71, 0xf4, 0x48, 0x02, 0x5a, 0x83, 0xa5, 0x2d, 0xdf, 0xa7, 0x97, 0x66, 0x65, - 0xbd, 0xbc, 0xd1, 0xc0, 0x6a, 0x82, 0x7e, 0x05, 0xb5, 0x2d, 0xce, 0x09, 0x4b, 0xce, 0x22, 0xc7, - 0x08, 0x05, 0xc2, 0x31, 0x18, 0x1d, 0x43, 0x43, 0xfa, 0x62, 0x2b, 0x1a, 0x31, 0xb3, 0x2a, 0x99, - 0x5f, 0xdd, 0x1e, 0xc8, 0x4e, 0xc2, 0x51, 0xe7, 0x38, 0xd3, 0x81, 0x76, 0xa1, 0xd1, 0x71, 0x07, - 0xe7, 0xa4, 0x1b, 0xd1, 0x89, 0x59, 0x93, 0x0a, 0x7f, 0x99, 0x63, 0x9c, 0x80, 0x69, 0x85, 0x5a, - 0x4d, 0xc2, 0x44, 0x5b, 0x50, 0x93, 0x93, 0x53, 0x6a, 0xd6, 0xef, 0xa7, 0x24, 0xe6, 0x21, 0x1b, - 0x96, 0x3b, 0xa3, 0x88, 0x4e, 0xc3, 0x13, 0x37, 0x22, 0x01, 0x37, 0x1b, 0x32, 0x80, 0x32, 0x32, - 0xf4, 0x16, 0x6a, 0xbb, 0x57, 0x21, 0x8d, 0x38, 0x33, 0xa1, 0x28, 0x01, 0x2a, 0x90, 0x5e, 0x40, - 0x33, 0xd0, 0x27, 0x00, 0xbb, 0x57, 0x3c, 0x72, 0xf7, 0xa8, 0x70, 0x7b, 0x53, 0x1e, 0x47, 0x4a, - 0x82, 0xba, 0x50, 0x3d, 0x70, 0xfb, 0xc4, 0x67, 0xe6, 0xb2, 0xd4, 0xed, 0xdc, 0xc1, 0xb1, 0x8a, - 0xa0, 0x16, 0xd2, 0x6c, 0x91, 0x21, 0x8e, 0x08, 0xbf, 0xa4, 0xd1, 0xf8, 0x90, 0x0e, 0x89, 0xd9, - 0x52, 0x19, 0x22, 0x25, 0x42, 0xcf, 0xa1, 0x75, 0x44, 0x95, 0xf3, 0x3c, 0x9f, 0x93, 0xc8, 0x5c, - 0x91, 0x9b, 0xc9, 0x0a, 0x65, 0x3e, 0xf4, 0x5d, 0x7e, 0x46, 0xa3, 0x09, 0x33, 0x1f, 0x48, 0xc4, - 0x4c, 0x20, 0x22, 0xa8, 0x47, 0x06, 0x11, 0xe1, 0xcc, 0x5c, 0x2d, 0x8a, 0x20, 0x05, 0xc2, 0x31, - 0x18, 0x99, 0x50, 0xeb, 0x9d, 0x4f, 0x7a, 0xde, 0xef, 0x89, 0xf9, 0x70, 0xdd, 0xd8, 0x28, 0xe3, - 0x78, 0x8a, 0x5e, 0x42, 0xb9, 0xd7, 0xdb, 0x33, 0x91, 0xd4, 0xf6, 0x51, 0x8e, 0xb6, 0xde, 0x1e, - 0x16, 0x28, 0x84, 0xa0, 0x72, 0xea, 0x8e, 0x98, 0xf9, 0x73, 0xb9, 0x2f, 0x39, 0x46, 0x8f, 0xa1, - 0x7a, 0xea, 0x46, 0x23, 0xc2, 0xcd, 0x35, 0x69, 0xb3, 0x9e, 0xa1, 0x37, 0x50, 0x7b, 0xef, 0x7b, - 0x13, 0x8f, 0x33, 0xf3, 0x51, 0xd1, 0xc5, 0x53, 0xa0, 0xe3, 0x90, 0xe3, 0x18, 0x8f, 0xf6, 0x61, - 0xb9, 0x27, 0x0b, 0xf0, 0x89, 0x2c, 0xbb, 0xe6, 0x63, 0xc9, 0x7f, 0xe1, 0x88, 0x62, 0xeb, 0xc4, - 0xc5, 0x56, 0x70, 0xd3, 0x65, 0xda, 0x51, 0x60, 0x9c, 0xa1, 0x5a, 0xef, 0x60, 0x25, 0x7b, 0x0d, - 0x16, 0x64, 0xaa, 0xb5, 0x74, 0xa6, 0x6a, 0xa4, 0xb2, 0x90, 0xf5, 0x06, 0x9a, 0xa9, 0xb3, 0xbe, - 0x0f, 0xd5, 0xc6, 0xb0, 0x9c, 0xce, 0x6d, 0xc2, 0x75, 0xa9, 0xd2, 0x21, 0xc7, 0xc8, 0x01, 0x48, - 0x25, 0xf6, 0xd2, 0xc2, 0xc4, 0x9e, 0x42, 0xd8, 0xff, 0x34, 0xa0, 0x95, 0xc9, 0x36, 0xe2, 0x5c, - 0xa5, 0x79, 0x24, 0xd2, 0x8a, 0xe3, 0xa9, 0xb8, 0x58, 0x87, 0x84, 0xbb, 0x43, 0x97, 0xbb, 0x5d, - 0xcf, 0x8f, 0x37, 0x98, 0x91, 0x09, 0xb6, 0x0e, 0x3e, 0x99, 0xe1, 0xea, 0x38, 0x9e, 0xca, 0xdd, - 0x4e, 0x7d, 0x5f, 0x16, 0x9b, 0x3a, 0x96, 0x63, 0x75, 0x93, 0xc4, 0xa5, 0x3a, 0x99, 0xb2, 0x73, - 0x73, 0x49, 0x7e, 0x49, 0x49, 0x66, 0xdf, 0x0f, 0xa8, 0x3b, 0x34, 0xab, 0xe9, 0xef, 0x42, 0x22, - 0x02, 0xe5, 0xc0, 0x0b, 0xc6, 0x64, 0x68, 0xd6, 0xe4, 0x37, 0x3d, 0xb3, 0xff, 0x61, 0x40, 0x33, - 0x75, 0x75, 0x65, 0x90, 0x5d, 0x87, 0x24, 0xf6, 0x94, 0x18, 0xa3, 0x6d, 0x58, 0xda, 0xe2, 0x3c, - 0x12, 0x65, 0x5c, 0xc4, 0xe9, 0x17, 0xb7, 0x26, 0x00, 0x47, 0xc2, 0xd5, 0x15, 0x55, 0x54, 0x71, - 0x43, 0x77, 0x08, 0xe3, 0x5e, 0xe0, 0x4a, 0x77, 0xab, 0xa2, 0x9b, 0x16, 0x59, 0xaf, 0x01, 0x66, - 0xb4, 0x7b, 0x9d, 0xf6, 0x5f, 0x0d, 0x78, 0x38, 0x97, 0xe5, 0x16, 0x5a, 0xb2, 0x97, 0xb5, 0x64, - 0xf3, 0x8e, 0x19, 0x73, 0xde, 0x9e, 0xff, 0x63, 0xb7, 0x47, 0x50, 0x55, 0xa5, 0x65, 0xe1, 0x0e, - 0x2d, 0xa8, 0xef, 0x78, 0xcc, 0xed, 0xfb, 0x64, 0x28, 0xa9, 0x75, 0x9c, 0xcc, 0x65, 0x5d, 0x93, - 0xbb, 0x57, 0xde, 0x53, 0x13, 0x5b, 0xe5, 0x10, 0xb4, 0x02, 0xa5, 0xa4, 0xaf, 0x2c, 0xed, 0xef, - 0x08, 0xb0, 0x08, 0x73, 0x65, 0x6a, 0x03, 0xab, 0x89, 0xdd, 0x85, 0xaa, 0xca, 0x4a, 0x73, 0x78, - 0x0b, 0xea, 0x22, 0x2c, 0xe5, 0x35, 0x51, 0x7b, 0x4e, 0xe6, 0xc2, 0xbc, 0xdd, 0xe0, 0x42, 0x2f, - 0x2b, 0x86, 0xf6, 0xab, 0x54, 0x69, 0x17, 0x76, 0xc8, 0x9e, 0x4b, 0xdb, 0x21, 0x3b, 0xad, 0xc7, - 0x50, 0xed, 0xd2, 0x68, 0xe2, 0x72, 0xad, 0x4c, 0xcf, 0x6c, 0x1b, 0x56, 0xf6, 0x03, 0x16, 0x92, - 0x01, 0xcf, 0x6f, 0xc5, 0x8f, 0xe1, 0x41, 0x82, 0xd1, 0x4d, 0x78, 0xaa, 0x97, 0x34, 0xee, 0xdf, - 0x4b, 0xfe, 0xc5, 0x80, 0x46, 0x92, 0xe9, 0x50, 0x07, 0xaa, 0xf2, 0x34, 0xe2, 0x8e, 0xfe, 0xe5, - 0x2d, 0xa9, 0xd1, 0xf9, 0x20, 0xd1, 0xba, 0xe2, 0x28, 0xaa, 0xf5, 0x23, 0x34, 0x53, 0xe2, 0x05, - 0x01, 0xb0, 0x99, 0xed, 0xc0, 0x9e, 0x14, 0x2d, 0x92, 0x0e, 0x8f, 0x1d, 0xa8, 0x2a, 0xe1, 0x42, - 0xb7, 0x22, 0xa8, 0xec, 0xb9, 0x91, 0x0a, 0x8d, 0x32, 0x96, 0x63, 0x21, 0xeb, 0xd1, 0x33, 0x2e, - 0x8f, 0xa7, 0x8c, 0xe5, 0xd8, 0xfe, 0x9b, 0x01, 0x2d, 0xdd, 0x9e, 0x6b, 0x0f, 0x12, 0x58, 0x55, - 0x37, 0x94, 0x44, 0xb1, 0x4c, 0xdb, 0xff, 0xa6, 0xc0, 0x95, 0x31, 0xd4, 0xb9, 0xc9, 0x55, 0xde, - 0x98, 0x53, 0x69, 0x75, 0xe0, 0xd1, 0x42, 0xe8, 0xbd, 0xae, 0xc8, 0x0b, 0x78, 0x38, 0x7b, 0x78, - 0xe4, 0xc7, 0xc9, 0x1a, 0xa0, 0x34, 0x4c, 0x3f, 0x4c, 0x3e, 0x85, 0xa6, 0x78, 0xc8, 0xe5, 0xd3, - 0x6c, 0x58, 0x56, 0x00, 0xed, 0x19, 0x04, 0x95, 0x31, 0xb9, 0x56, 0xd1, 0xd0, 0xc0, 0x72, 0x6c, - 0xff, 0xd9, 0x10, 0xef, 0xb1, 0x70, 0xca, 0x0f, 0x09, 0x63, 0xee, 0x48, 0x04, 0x60, 0x65, 0x3f, - 0xf0, 0xb8, 0x8e, 0xbe, 0xcf, 0x0a, 0xfa, 0x5f, 0x01, 0xd3, 0xac, 0xbd, 0x9f, 0x61, 0xc9, 0x12, - 0xad, 0xec, 0x8e, 0xcb, 0x5d, 0x1d, 0x0b, 0x39, 0x1d, 0x94, 0x40, 0xa4, 0x88, 0x62, 0xba, 0x5d, - 0x13, 0x8f, 0xcf, 0x70, 0xca, 0xed, 0xe7, 0xb0, 0x7a, 0x53, 0xfb, 0x02, 0xd3, 0xbe, 0x86, 0x66, - 0x4a, 0x8b, 0xbc, 0xb7, 0xc7, 0x5d, 0x09, 0xa8, 0x63, 0x31, 0x14, 0xb6, 0x26, 0x1b, 0x59, 0x56, - 0x6b, 0xd8, 0x0f, 0xa0, 0x25, 0x55, 0x27, 0x1e, 0xfc, 0x43, 0x09, 0x6a, 0xb1, 0x8a, 0x57, 0x19, - 0xbb, 0x9f, 0xe6, 0xd9, 0x3d, 0x6f, 0xf2, 0xb7, 0x50, 0x49, 0x4a, 0x5f, 0x6e, 0xfb, 0xd1, 0x1d, - 0xa6, 0x68, 0xb2, 0x2a, 0x7e, 0x0f, 0x55, 0x4c, 0x98, 0x68, 0x95, 0x0a, 0xdb, 0x7e, 0x85, 0x99, - 0x91, 0x35, 0x49, 0xd0, 0x7b, 0xde, 0x28, 0x70, 0x7d, 0xfd, 0x52, 0xcb, 0xa1, 0x2b, 0x4c, 0x8a, - 0xae, 0x04, 0x33, 0x77, 0xff, 0xd1, 0x80, 0x66, 0xa1, 0xab, 0x8b, 0x9f, 0xce, 0x73, 0xcf, 0xf9, - 0xf2, 0xff, 0xf8, 0x9c, 0xff, 0x97, 0x91, 0x55, 0x24, 0xeb, 0xbc, 0xb8, 0x4f, 0x21, 0xf5, 0x02, - 0xae, 0x43, 0x36, 0x25, 0x11, 0x1b, 0xed, 0x4c, 0x86, 0x3a, 0xe9, 0x8b, 0xe1, 0x2c, 0x79, 0x97, - 0x75, 0xf2, 0x16, 0x41, 0xf0, 0x9e, 0x91, 0x48, 0xba, 0xa8, 0x81, 0xe5, 0x58, 0xe4, 0xeb, 0x23, - 0x2a, 0xa5, 0xaa, 0xb7, 0xd0, 0x33, 0xa9, 0xef, 0x52, 0x35, 0x14, 0x42, 0xdf, 0xa5, 0xac, 0x42, - 0x47, 0x54, 0xc8, 0x54, 0x23, 0xa1, 0x26, 0x02, 0x77, 0xca, 0xaf, 0xcd, 0xba, 0x0a, 0xb5, 0x53, - 0x7e, 0x2d, 0x0a, 0x0a, 0xa6, 0xbe, 0xdf, 0x77, 0x07, 0x63, 0xf9, 0xb0, 0xa8, 0xe3, 0x64, 0x2e, - 0x7a, 0x1f, 0xe1, 0x5d, 0xcf, 0xf5, 0x4d, 0x50, 0xbd, 0x8f, 0x9e, 0xda, 0x5b, 0xd0, 0x48, 0x82, - 0x42, 0xd4, 0xa8, 0xee, 0x50, 0x3a, 0xbd, 0x85, 0x4b, 0xdd, 0x61, 0x1c, 0xcf, 0xa5, 0xf9, 0x78, - 0x2e, 0xa7, 0xe2, 0xf9, 0x15, 0xb4, 0x32, 0xe1, 0x21, 0x40, 0x98, 0x5e, 0x32, 0xad, 0x48, 0x8e, - 0x85, 0xac, 0x43, 0x7d, 0xf5, 0xcf, 0x44, 0x0b, 0xcb, 0xb1, 0xfd, 0x0c, 0x5a, 0x99, 0xc0, 0x58, - 0x94, 0x81, 0xed, 0xa7, 0xd0, 0xea, 0x71, 0x97, 0x4f, 0x0b, 0xfe, 0x4a, 0xfa, 0xb7, 0x01, 0x2b, - 0x31, 0x46, 0xe7, 0x98, 0x6f, 0xa0, 0x7e, 0x41, 0x22, 0x4e, 0xae, 0x92, 0xaa, 0x63, 0xce, 0x37, - 0xd4, 0x1f, 0x24, 0x02, 0x27, 0x48, 0xf4, 0x1d, 0xd4, 0x99, 0xd4, 0x43, 0xe2, 0x8e, 0xe5, 0x93, - 0x3c, 0x96, 0x5e, 0x2f, 0xc1, 0xa3, 0x36, 0x54, 0x7c, 0x3a, 0x62, 0xf2, 0xdc, 0x9b, 0x9b, 0x1f, - 0xe7, 0xf1, 0x0e, 0xe8, 0x08, 0x4b, 0x20, 0x7a, 0x0b, 0xf5, 0x4b, 0x37, 0x0a, 0xbc, 0x60, 0xc4, - 0xe4, 0xc3, 0x59, 0x5c, 0xda, 0x1c, 0xd2, 0x8f, 0x0a, 0x87, 0x13, 0x82, 0xdd, 0x12, 0xd7, 0xe5, - 0x8c, 0x6a, 0x9f, 0xd8, 0xbf, 0x16, 0x51, 0x2b, 0xa6, 0xda, 0xfc, 0x7d, 0x68, 0xa9, 0xc8, 0xff, - 0x40, 0x22, 0x26, 0xfa, 0x3f, 0xa3, 0xe8, 0x76, 0x6e, 0xa7, 0xa1, 0x38, 0xcb, 0xb4, 0x7f, 0xd2, - 0x85, 0x2d, 0x16, 0x88, 0x58, 0x0a, 0xdd, 0xc1, 0xd8, 0x1d, 0xc5, 0xe7, 0x14, 0x4f, 0xc5, 0x97, - 0x0b, 0xbd, 0x9e, 0xba, 0xa0, 0xf1, 0x54, 0xc4, 0x66, 0x44, 0x2e, 0x3c, 0x36, 0x6b, 0x45, 0x93, - 0xf9, 0xe6, 0x9f, 0x6a, 0x00, 0x9d, 0x64, 0x3f, 0xe8, 0x04, 0x96, 0xe4, 0x7a, 0xc8, 0x2e, 0x2c, - 0x93, 0xd2, 0x6e, 0xeb, 0xd9, 0x1d, 0x4a, 0x29, 0xfa, 0x20, 0x82, 0x5f, 0xb6, 0x37, 0xe8, 0x79, - 0x5e, 0x42, 0x48, 0x77, 0x48, 0xd6, 0x8b, 0x5b, 0x50, 0x5a, 0xef, 0x7b, 0xa8, 0xaa, 0x28, 0x40, - 0x79, 0x59, 0x2f, 0x1d, 0xb7, 0xd6, 0xf3, 0x62, 0x90, 0x52, 0xfa, 0xa5, 0x81, 0xb0, 0xce, 0x89, - 0xc8, 0x2e, 0x28, 0x7a, 0xfa, 0xc6, 0xe4, 0x39, 0x20, 0x53, 0x5f, 0x36, 0x0c, 0xf4, 0x03, 0x54, - 0x55, 0x56, 0x43, 0xbf, 0x58, 0x4c, 0x88, 0xf5, 0x15, 0x7f, 0xde, 0x30, 0xbe, 0x34, 0xd0, 0x21, - 0x54, 0x44, 0x39, 0x47, 0x39, 0xb5, 0x29, 0xd5, 0x0b, 0x58, 0x76, 0x11, 0x44, 0x7b, 0xf1, 0x27, - 0x80, 0x59, 0x53, 0x81, 0x72, 0xfe, 0x53, 0x99, 0xeb, 0x4e, 0xac, 0x8d, 0xdb, 0x81, 0x7a, 0x81, - 0x43, 0x51, 0x51, 0xcf, 0x28, 0xca, 0xad, 0xa5, 0xc9, 0x35, 0xb2, 0xec, 0x22, 0x88, 0x56, 0x77, - 0x0e, 0xad, 0xcc, 0xff, 0xd6, 0xe8, 0xf3, 0x7c, 0x23, 0x6f, 0xfe, 0x0d, 0x6e, 0xbd, 0xbc, 0x13, - 0x56, 0xaf, 0xc4, 0xd3, 0x5d, 0x99, 0xfe, 0x8c, 0x9c, 0xdb, 0xec, 0xce, 0xfe, 0x07, 0x6d, 0xb5, - 0xef, 0x8c, 0x57, 0xab, 0x6e, 0x57, 0x7e, 0x53, 0x0a, 0xfb, 0xfd, 0xaa, 0xfc, 0x3b, 0xff, 0xeb, - 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x09, 0xb4, 0x4e, 0xa7, 0x9a, 0x18, 0x00, 0x00, + // 2015 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4f, 0x73, 0xdb, 0xc6, + 0x15, 0x2f, 0x48, 0x8a, 0x7f, 0x1e, 0x45, 0x59, 0xde, 0xca, 0x1e, 0x04, 0x71, 0x13, 0x19, 0xb6, + 0x53, 0x4d, 0x9c, 0x01, 0x13, 0x25, 0xa9, 0xec, 0xd8, 0x39, 0x48, 0x94, 0x38, 0x52, 0x46, 0x96, + 0x34, 0x4b, 0xd9, 0x99, 0xf6, 0xd0, 0x0c, 0x48, 0xae, 0x28, 0x0c, 0x41, 0x2c, 0x8a, 0x5d, 0xea, + 0x4f, 0x4f, 0xbd, 0xf4, 0xd6, 0xe9, 0xf7, 0xe8, 0xf4, 0xd0, 0x0f, 0xd0, 0x99, 0xce, 0xf4, 0x0b, + 0x75, 0x7a, 0xed, 0xad, 0xb3, 0x7f, 0x00, 0x02, 0x22, 0x01, 0x49, 0xed, 0x89, 0xbb, 0x0f, 0xbf, + 0xdf, 0xdb, 0x7d, 0x6f, 0xdf, 0xbe, 0xf7, 0x96, 0xb0, 0x3a, 0xa0, 0x01, 0x8f, 0xa8, 0xef, 0x93, + 0xc8, 0x09, 0x23, 0xca, 0x29, 0x5a, 0xeb, 0x4f, 0x3d, 0x7f, 0x78, 0xe5, 0xa4, 0x3e, 0x5c, 0x7c, + 0x65, 0xbd, 0x19, 0x79, 0xfc, 0x7c, 0xda, 0x77, 0x06, 0x74, 0xd2, 0x9e, 0xd0, 0xfe, 0x75, 0x5b, + 0xa2, 0xc6, 0x1e, 0x6f, 0xbb, 0xa1, 0xd7, 0x66, 0x24, 0xba, 0xf0, 0x06, 0x84, 0xb5, 0x35, 0x29, + 0xfe, 0x55, 0x2a, 0xad, 0x6f, 0x73, 0xc9, 0x8c, 0x4e, 0xa3, 0x01, 0x09, 0xa9, 0xef, 0x0d, 0xae, + 0xdb, 0x61, 0xbf, 0xad, 0x46, 0x9a, 0xf6, 0x45, 0x01, 0xcd, 0xbf, 0x20, 0x91, 0x20, 0xd0, 0x90, + 0x29, 0xb4, 0xbd, 0x01, 0x6b, 0x87, 0x1e, 0xe3, 0x27, 0x11, 0x1d, 0x10, 0xc6, 0x08, 0xc3, 0xe4, + 0x77, 0x53, 0xc2, 0x38, 0x5a, 0x85, 0x32, 0x26, 0x67, 0xa6, 0xb1, 0x6e, 0x6c, 0x34, 0xb0, 0x18, + 0xda, 0x27, 0xf0, 0xe8, 0x06, 0x92, 0x85, 0x34, 0x60, 0x04, 0x6d, 0xc1, 0xd2, 0x41, 0x70, 0x46, + 0x99, 0x69, 0xac, 0x97, 0x37, 0x9a, 0x9b, 0x4f, 0x9d, 0x45, 0xae, 0x70, 0x34, 0x4f, 0x20, 0xb1, + 0xc2, 0xdb, 0x0c, 0x9a, 0x29, 0x29, 0x7a, 0x02, 0x8d, 0x78, 0xba, 0xab, 0x17, 0x9e, 0x09, 0x50, + 0x17, 0x96, 0x0f, 0x82, 0x0b, 0x3a, 0x26, 0x1d, 0x1a, 0x9c, 0x79, 0x23, 0xb3, 0xb4, 0x6e, 0x6c, + 0x34, 0x37, 0xed, 0xc5, 0x8b, 0xa5, 0x91, 0x38, 0xc3, 0xb3, 0x7f, 0x00, 0x73, 0xd7, 0x63, 0x03, + 0x1a, 0x04, 0x64, 0x10, 0x1b, 0x93, 0x6b, 0x74, 0x76, 0x4f, 0xa5, 0x1b, 0x7b, 0xb2, 0x3f, 0x86, + 0x8f, 0x16, 0xe8, 0x52, 0x6e, 0xb1, 0x7f, 0x0b, 0xcb, 0x3b, 0x62, 0x6f, 0xf9, 0xca, 0xdf, 0x42, + 0xed, 0x38, 0xe4, 0x1e, 0x0d, 0x58, 0xb1, 0x35, 0x52, 0x8d, 0x46, 0xe2, 0x98, 0x62, 0xff, 0xa7, + 0x04, 0xd5, 0x83, 0x20, 0x9c, 0x72, 0x86, 0xd6, 0xa1, 0xd9, 0xa1, 0x01, 0x27, 0x57, 0xfc, 0xc4, + 0xe5, 0xe7, 0x7a, 0x89, 0xb4, 0x08, 0x7d, 0x06, 0x2b, 0xbb, 0x74, 0x30, 0x26, 0xd1, 0x99, 0xe7, + 0x93, 0x23, 0x77, 0x42, 0xb4, 0x31, 0x37, 0xa4, 0xe8, 0x73, 0x58, 0x9d, 0x49, 0x0e, 0x02, 0xdf, + 0x0b, 0x88, 0x59, 0x96, 0xc8, 0x39, 0x39, 0x7a, 0x0b, 0x0f, 0xf5, 0x12, 0xbb, 0xe4, 0xcc, 0x0b, + 0x3c, 0xb1, 0x2d, 0xb3, 0x22, 0x0d, 0x59, 0x71, 0xc2, 0xbe, 0x33, 0x93, 0xe2, 0x79, 0x20, 0x7a, + 0x0f, 0x2d, 0xb1, 0xe2, 0x50, 0x7f, 0x61, 0xe6, 0x92, 0x8c, 0x9e, 0x76, 0xde, 0x81, 0x0a, 0x43, + 0x9d, 0x0c, 0x63, 0x2f, 0xe0, 0xd1, 0x35, 0xce, 0x6a, 0xb1, 0x86, 0x80, 0xe6, 0x41, 0xc2, 0xf7, + 0x63, 0x72, 0x1d, 0xfb, 0x7e, 0x4c, 0xae, 0xd1, 0x2b, 0x58, 0xba, 0x70, 0xfd, 0x29, 0x29, 0xf6, + 0x7c, 0x5a, 0x15, 0x56, 0x84, 0xef, 0x4a, 0xaf, 0x0c, 0xfb, 0x1f, 0x0d, 0x7d, 0xb8, 0xfa, 0x30, + 0xd0, 0x37, 0xf1, 0x59, 0xc8, 0x35, 0x9a, 0x9b, 0x4f, 0x8a, 0xcc, 0xc0, 0xf1, 0xb9, 0x7d, 0x2f, + 0xa2, 0xcb, 0x0b, 0x78, 0x77, 0x1a, 0x0c, 0xf4, 0x46, 0x3e, 0xcd, 0xbb, 0x3d, 0x1a, 0x86, 0x67, + 0x0c, 0xb4, 0x05, 0x95, 0xe3, 0x90, 0x33, 0x79, 0x40, 0xcd, 0xcd, 0x67, 0x8b, 0x99, 0x1d, 0x3a, + 0x99, 0xd0, 0x20, 0x8e, 0x1e, 0x49, 0x40, 0x6b, 0xb0, 0xb4, 0xed, 0xfb, 0xf4, 0xd2, 0xac, 0xac, + 0x97, 0x37, 0x1a, 0x58, 0x4d, 0xd0, 0xaf, 0xa0, 0xb6, 0xcd, 0x39, 0x61, 0xc9, 0x59, 0xe4, 0x18, + 0xa1, 0x40, 0x38, 0x06, 0xa3, 0x63, 0x68, 0x48, 0x5f, 0x6c, 0x47, 0x23, 0x66, 0x56, 0x25, 0xf3, + 0xab, 0xdb, 0x03, 0xd9, 0x49, 0x38, 0xea, 0x1c, 0x67, 0x3a, 0xd0, 0x1e, 0x34, 0x3a, 0xee, 0xe0, + 0x9c, 0x74, 0x23, 0x3a, 0x31, 0x6b, 0x52, 0xe1, 0x2f, 0x73, 0x8c, 0x13, 0x30, 0xad, 0x50, 0xab, + 0x49, 0x98, 0x68, 0x1b, 0x6a, 0x72, 0x72, 0x4a, 0xcd, 0xfa, 0xfd, 0x94, 0xc4, 0x3c, 0x64, 0xc3, + 0x72, 0x67, 0x14, 0xd1, 0x69, 0x78, 0xe2, 0x46, 0x24, 0xe0, 0x66, 0x43, 0x06, 0x50, 0x46, 0x86, + 0xde, 0x40, 0x6d, 0xef, 0x2a, 0xa4, 0x11, 0x67, 0x26, 0x14, 0x25, 0x40, 0x05, 0xd2, 0x0b, 0x68, + 0x06, 0xfa, 0x04, 0x60, 0xef, 0x8a, 0x47, 0xee, 0x3e, 0x15, 0x6e, 0x6f, 0xca, 0xe3, 0x48, 0x49, + 0x50, 0x17, 0xaa, 0x87, 0x6e, 0x9f, 0xf8, 0xcc, 0x5c, 0x96, 0xba, 0x9d, 0x3b, 0x38, 0x56, 0x11, + 0xd4, 0x42, 0x9a, 0x2d, 0x32, 0xc4, 0x11, 0xe1, 0x97, 0x34, 0x1a, 0xbf, 0xa3, 0x43, 0x62, 0xb6, + 0x54, 0x86, 0x48, 0x89, 0xd0, 0x73, 0x68, 0x1d, 0x51, 0xe5, 0x3c, 0xcf, 0xe7, 0x24, 0x32, 0x57, + 0xe4, 0x66, 0xb2, 0x42, 0x99, 0x0f, 0x7d, 0x97, 0x9f, 0xd1, 0x68, 0xc2, 0xcc, 0x07, 0x12, 0x31, + 0x13, 0x88, 0x08, 0xea, 0x91, 0x41, 0x44, 0x38, 0x33, 0x57, 0x8b, 0x22, 0x48, 0x81, 0x70, 0x0c, + 0x46, 0x26, 0xd4, 0x7a, 0xe7, 0x93, 0x9e, 0xf7, 0x7b, 0x62, 0x3e, 0x5c, 0x37, 0x36, 0xca, 0x38, + 0x9e, 0xa2, 0x97, 0x50, 0xee, 0xf5, 0xf6, 0x4d, 0x24, 0xb5, 0x7d, 0x94, 0xa3, 0xad, 0xb7, 0x8f, + 0x05, 0x0a, 0x21, 0xa8, 0x9c, 0xba, 0x23, 0x66, 0xfe, 0x5c, 0xee, 0x4b, 0x8e, 0xd1, 0x63, 0xa8, + 0x9e, 0xba, 0xd1, 0x88, 0x70, 0x73, 0x4d, 0xda, 0xac, 0x67, 0xe8, 0x35, 0xd4, 0xde, 0xfb, 0xde, + 0xc4, 0xe3, 0xcc, 0x7c, 0x54, 0x74, 0xf1, 0x14, 0xe8, 0x38, 0xe4, 0x38, 0xc6, 0xa3, 0x03, 0x58, + 0xee, 0xc9, 0x02, 0x7c, 0x22, 0xcb, 0xae, 0xf9, 0x58, 0xf2, 0x5f, 0x38, 0xa2, 0xd8, 0x3a, 0x71, + 0xb1, 0x15, 0xdc, 0x74, 0x99, 0x76, 0x14, 0x18, 0x67, 0xa8, 0xd6, 0x5b, 0x58, 0xc9, 0x5e, 0x83, + 0x05, 0x99, 0x6a, 0x2d, 0x9d, 0xa9, 0x1a, 0xa9, 0x2c, 0x64, 0xbd, 0x86, 0x66, 0xea, 0xac, 0xef, + 0x43, 0xb5, 0x31, 0x2c, 0xa7, 0x73, 0x9b, 0x70, 0x5d, 0xaa, 0x74, 0xc8, 0x31, 0x72, 0x00, 0x52, + 0x89, 0xbd, 0xb4, 0x30, 0xb1, 0xa7, 0x10, 0xf6, 0xdf, 0x0c, 0x68, 0x65, 0xb2, 0x8d, 0x38, 0x57, + 0x69, 0x1e, 0x89, 0xb4, 0xe2, 0x78, 0x2a, 0xbe, 0xe8, 0xc0, 0x92, 0x8a, 0xeb, 0x38, 0x9e, 0xca, + 0x9d, 0x4c, 0x7d, 0x5f, 0x26, 0xb5, 0x3a, 0x96, 0x63, 0x75, 0x4b, 0xc4, 0x85, 0x39, 0x99, 0xb2, + 0x73, 0x59, 0x62, 0xea, 0x38, 0x25, 0x99, 0x7d, 0x3f, 0xa4, 0xee, 0xd0, 0x5c, 0x4a, 0x7f, 0x17, + 0x12, 0x11, 0x04, 0x87, 0x5e, 0x30, 0x26, 0x43, 0xb3, 0x2a, 0xbf, 0xe9, 0x99, 0xfd, 0x4f, 0x03, + 0x9a, 0xa9, 0x6b, 0x29, 0x03, 0xe8, 0x3a, 0x24, 0xb1, 0x17, 0xc4, 0x18, 0xed, 0xc0, 0xd2, 0x36, + 0xe7, 0x91, 0x28, 0xd1, 0x22, 0x06, 0xbf, 0xb8, 0xf5, 0x72, 0x3b, 0x12, 0xae, 0xae, 0x9f, 0xa2, + 0x8a, 0xdb, 0xb7, 0x4b, 0x18, 0xf7, 0x02, 0x57, 0xba, 0x52, 0x15, 0xd4, 0xb4, 0xc8, 0x7a, 0x05, + 0x30, 0xa3, 0xdd, 0xeb, 0x24, 0xff, 0x6a, 0xc0, 0xc3, 0xb9, 0x0c, 0xb6, 0xd0, 0x92, 0xfd, 0xac, + 0x25, 0x9b, 0x77, 0xcc, 0x86, 0xf3, 0xf6, 0xfc, 0x1f, 0xbb, 0x3d, 0x82, 0xaa, 0x2a, 0x1b, 0x0b, + 0x77, 0x68, 0x41, 0x7d, 0xd7, 0x63, 0x6e, 0xdf, 0x27, 0x43, 0x1d, 0x16, 0xc9, 0x5c, 0xd6, 0x2c, + 0xb9, 0x7b, 0xe5, 0x3d, 0x35, 0xb1, 0x55, 0x7e, 0x40, 0x2b, 0x50, 0x4a, 0x7a, 0xc6, 0xd2, 0xc1, + 0xae, 0x00, 0x8b, 0x10, 0x56, 0xa6, 0x36, 0xb0, 0x9a, 0xd8, 0x5d, 0xa8, 0xaa, 0x8c, 0x33, 0x87, + 0xb7, 0xa0, 0xde, 0xf5, 0x7c, 0x22, 0xaf, 0x80, 0xda, 0x73, 0x32, 0x17, 0xe6, 0xed, 0x05, 0x17, + 0x7a, 0x59, 0x31, 0xb4, 0xb7, 0x52, 0x65, 0x5b, 0xd8, 0x21, 0xfb, 0x29, 0x6d, 0x87, 0xec, 0xa2, + 0x1e, 0x43, 0xb5, 0x4b, 0xa3, 0x89, 0xcb, 0xb5, 0x32, 0x3d, 0xb3, 0x6d, 0x58, 0x39, 0x08, 0x58, + 0x48, 0x06, 0x3c, 0xbf, 0xcd, 0x3e, 0x86, 0x07, 0x09, 0x46, 0x37, 0xd8, 0xa9, 0x3e, 0xd1, 0xb8, + 0x7f, 0x9f, 0xf8, 0x17, 0x03, 0x1a, 0x49, 0x16, 0x43, 0x1d, 0xa8, 0xca, 0xd3, 0x88, 0xbb, 0xf5, + 0x97, 0xb7, 0xa4, 0x3d, 0xe7, 0x83, 0x44, 0xeb, 0x6a, 0xa2, 0xa8, 0xd6, 0x8f, 0xd0, 0x4c, 0x89, + 0x17, 0x04, 0xc0, 0x66, 0xb6, 0xbb, 0x7a, 0x52, 0xb4, 0x48, 0x3a, 0x3c, 0x76, 0xa1, 0xaa, 0x84, + 0x0b, 0xdd, 0x8a, 0xa0, 0xb2, 0xef, 0x46, 0x2a, 0x34, 0xca, 0x58, 0x8e, 0x85, 0xac, 0x47, 0xcf, + 0xb8, 0x3c, 0x9e, 0x32, 0x96, 0x63, 0xfb, 0xef, 0x06, 0xb4, 0x74, 0xeb, 0xad, 0x3d, 0x48, 0x60, + 0x55, 0xdd, 0x50, 0x12, 0xc5, 0x32, 0x6d, 0xff, 0xeb, 0x02, 0x57, 0xc6, 0x50, 0xe7, 0x26, 0x57, + 0x79, 0x63, 0x4e, 0xa5, 0xd5, 0x81, 0x47, 0x0b, 0xa1, 0xf7, 0xba, 0x22, 0x2f, 0xe0, 0xe1, 0xec, + 0x51, 0x91, 0x1f, 0x27, 0x6b, 0x80, 0xd2, 0x30, 0xfd, 0xe8, 0xf8, 0x14, 0x9a, 0xe2, 0x91, 0x96, + 0x4f, 0xb3, 0x61, 0x59, 0x01, 0xb4, 0x67, 0x10, 0x54, 0xc6, 0xe4, 0x5a, 0x45, 0x43, 0x03, 0xcb, + 0xb1, 0xfd, 0x67, 0x43, 0xbc, 0xb5, 0xc2, 0x29, 0x7f, 0x47, 0x18, 0x73, 0x47, 0x22, 0x00, 0x2b, + 0x07, 0x81, 0xc7, 0x75, 0xf4, 0x7d, 0x56, 0xd0, 0xdb, 0x0a, 0x98, 0x66, 0xed, 0xff, 0x0c, 0x4b, + 0x96, 0x68, 0x53, 0x77, 0x5d, 0xee, 0xea, 0x58, 0xc8, 0xe9, 0x8e, 0x04, 0x22, 0x45, 0x14, 0xd3, + 0x9d, 0x9a, 0x78, 0x58, 0x86, 0x53, 0x6e, 0x3f, 0x87, 0xd5, 0x9b, 0xda, 0x17, 0x98, 0xf6, 0x35, + 0x34, 0x53, 0x5a, 0xe4, 0xbd, 0x3d, 0xee, 0x4a, 0x40, 0x1d, 0x8b, 0xa1, 0xb0, 0x35, 0xd9, 0xc8, + 0xb2, 0x5a, 0xc3, 0x7e, 0x00, 0x2d, 0xa9, 0x3a, 0xf1, 0xe0, 0x1f, 0x4a, 0x50, 0x8b, 0x55, 0x6c, + 0x65, 0xec, 0x7e, 0x9a, 0x67, 0xf7, 0xbc, 0xc9, 0xdf, 0x42, 0x45, 0xe4, 0x8f, 0xe2, 0x9e, 0xbe, + 0x3b, 0x4c, 0xd1, 0x04, 0x1c, 0x7d, 0x0f, 0x55, 0x4c, 0x98, 0x68, 0x83, 0x0a, 0x5b, 0x7a, 0x85, + 0x99, 0x91, 0x35, 0x49, 0xd0, 0x7b, 0xde, 0x28, 0x70, 0x7d, 0xfd, 0x0a, 0xcb, 0xa1, 0x2b, 0x4c, + 0x8a, 0xae, 0x04, 0x33, 0x77, 0xff, 0xd1, 0x80, 0x66, 0xa1, 0xab, 0x8b, 0x9f, 0xc5, 0x73, 0x4f, + 0xf5, 0xf2, 0xff, 0xf8, 0x54, 0xff, 0x97, 0x91, 0x55, 0x24, 0xeb, 0xbc, 0xb8, 0x4f, 0x21, 0xf5, + 0x02, 0xae, 0x43, 0x36, 0x25, 0x11, 0x1b, 0xed, 0x4c, 0x86, 0x3a, 0xe9, 0x8b, 0xe1, 0x2c, 0x79, + 0x97, 0x75, 0xf2, 0x16, 0x41, 0xf0, 0x9e, 0x91, 0x48, 0xba, 0xa8, 0x81, 0xe5, 0x58, 0xe4, 0xeb, + 0x23, 0x2a, 0xa5, 0xaa, 0x77, 0xd0, 0x33, 0xa9, 0xef, 0x52, 0x35, 0x0d, 0x42, 0xdf, 0xa5, 0xac, + 0x42, 0x47, 0x54, 0xc8, 0x6a, 0x12, 0xa8, 0x26, 0x02, 0x77, 0xca, 0xaf, 0xcd, 0xba, 0x0a, 0xb5, + 0x53, 0x7e, 0x2d, 0x0a, 0x0a, 0xa6, 0xbe, 0xdf, 0x77, 0x07, 0x63, 0xf9, 0x68, 0xa8, 0xe3, 0x64, + 0x2e, 0x7a, 0x1f, 0xe1, 0x5d, 0xcf, 0xf5, 0x4d, 0x50, 0xbd, 0x8f, 0x9e, 0xda, 0xdb, 0xd0, 0x48, + 0x82, 0x42, 0xd4, 0xa8, 0xee, 0x50, 0x3a, 0xbd, 0x85, 0x4b, 0xdd, 0x61, 0x1c, 0xcf, 0xa5, 0xf9, + 0x78, 0x2e, 0xa7, 0xe2, 0x79, 0x0b, 0x5a, 0x99, 0xf0, 0x10, 0x20, 0x4c, 0x2f, 0x99, 0x56, 0x24, + 0xc7, 0x42, 0xd6, 0xa1, 0xbe, 0xfa, 0xd7, 0xa1, 0x85, 0xe5, 0xd8, 0x7e, 0x06, 0xad, 0x4c, 0x60, + 0x2c, 0xca, 0xc0, 0xf6, 0x53, 0x68, 0xf5, 0xb8, 0xcb, 0xa7, 0x05, 0x7f, 0x13, 0xfd, 0xdb, 0x80, + 0x95, 0x18, 0xa3, 0x73, 0xcc, 0x37, 0x50, 0xbf, 0x20, 0x11, 0x27, 0x57, 0x49, 0xd5, 0x31, 0xe7, + 0x9b, 0xe5, 0x0f, 0x12, 0x81, 0x13, 0x24, 0xfa, 0x0e, 0xea, 0x4c, 0xea, 0x21, 0x71, 0xc7, 0xf2, + 0x49, 0x1e, 0x4b, 0xaf, 0x97, 0xe0, 0x51, 0x1b, 0x2a, 0x3e, 0x1d, 0x31, 0x79, 0xee, 0xcd, 0xcd, + 0x8f, 0xf3, 0x78, 0x87, 0x74, 0x84, 0x25, 0x10, 0xbd, 0x81, 0xfa, 0xa5, 0x1b, 0x05, 0x5e, 0x30, + 0x62, 0xf2, 0x51, 0x2c, 0x2e, 0x6d, 0x0e, 0xe9, 0x47, 0x85, 0xc3, 0x09, 0xc1, 0x6e, 0x89, 0xeb, + 0x72, 0x46, 0xb5, 0x4f, 0xec, 0x5f, 0x8b, 0xa8, 0x15, 0x53, 0x6d, 0xfe, 0x01, 0xb4, 0x54, 0xe4, + 0x7f, 0x20, 0x11, 0x13, 0xfd, 0x9f, 0x51, 0x74, 0x3b, 0x77, 0xd2, 0x50, 0x9c, 0x65, 0xda, 0x3f, + 0xe9, 0xc2, 0x16, 0x0b, 0x44, 0x2c, 0x85, 0xee, 0x60, 0xec, 0x8e, 0xe2, 0x73, 0x8a, 0xa7, 0xe2, + 0xcb, 0x85, 0x5e, 0x4f, 0x5d, 0xd0, 0x78, 0x2a, 0x62, 0x33, 0x22, 0x17, 0x1e, 0x9b, 0xb5, 0xa2, + 0xc9, 0x7c, 0xf3, 0x4f, 0x35, 0x80, 0x4e, 0xb2, 0x1f, 0x74, 0x02, 0x4b, 0x72, 0x3d, 0x64, 0x17, + 0x96, 0x49, 0x69, 0xb7, 0xf5, 0xec, 0x0e, 0xa5, 0x14, 0x7d, 0x10, 0xc1, 0x2f, 0xdb, 0x1b, 0xf4, + 0x3c, 0x2f, 0x21, 0xa4, 0x3b, 0x24, 0xeb, 0xc5, 0x2d, 0x28, 0xad, 0xf7, 0x3d, 0x54, 0x55, 0x14, + 0xa0, 0xbc, 0xac, 0x97, 0x8e, 0x5b, 0xeb, 0x79, 0x31, 0x48, 0x29, 0xfd, 0xd2, 0x40, 0x58, 0xe7, + 0x44, 0x64, 0x17, 0x14, 0x3d, 0x7d, 0x63, 0xf2, 0x1c, 0x90, 0xa9, 0x2f, 0x1b, 0x06, 0xfa, 0x01, + 0xaa, 0x2a, 0xab, 0xa1, 0x5f, 0x2c, 0x26, 0xc4, 0xfa, 0x8a, 0x3f, 0x6f, 0x18, 0x5f, 0x1a, 0xe8, + 0x1d, 0x54, 0x44, 0x39, 0x47, 0x39, 0xb5, 0x29, 0xd5, 0x0b, 0x58, 0x76, 0x11, 0x44, 0x7b, 0xf1, + 0x27, 0x80, 0x59, 0x53, 0x81, 0x72, 0xfe, 0x2f, 0x99, 0xeb, 0x4e, 0xac, 0x8d, 0xdb, 0x81, 0x7a, + 0x81, 0x77, 0xa2, 0xa2, 0x9e, 0x51, 0x94, 0x5b, 0x4b, 0x93, 0x6b, 0x64, 0xd9, 0x45, 0x10, 0xad, + 0xee, 0x1c, 0x5a, 0x99, 0xff, 0xa4, 0xd1, 0xe7, 0xf9, 0x46, 0xde, 0xfc, 0x8b, 0xdb, 0x7a, 0x79, + 0x27, 0xac, 0x5e, 0x89, 0xa7, 0xbb, 0x32, 0xfd, 0x19, 0x39, 0xb7, 0xd9, 0x9d, 0xfd, 0x7f, 0xd9, + 0x6a, 0xdf, 0x19, 0xaf, 0x56, 0xdd, 0xa9, 0xfc, 0xa6, 0x14, 0xf6, 0xfb, 0x55, 0xf9, 0x57, 0xfd, + 0xd7, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xec, 0x74, 0xba, 0x4b, 0x76, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/controller/pb/controller.proto b/controller/pb/controller.proto index 6156e4ddf5ba..751d2932224f 100644 --- a/controller/pb/controller.proto +++ b/controller/pb/controller.proto @@ -89,17 +89,16 @@ message NamedContext { message CommonOptions { string Builder = 1; - string MetadataFile = 2; - bool NoCache = 3; + bool NoCache = 2; // string Progress: no progress view on server side - bool Pull = 4; - bool ExportPush = 5; - bool ExportLoad = 6; + bool Pull = 3; + bool ExportPush = 4; + bool ExportLoad = 5; // TODO: we should remove Linked from the controllerapi, it's only used to // produce a single warning. To allow this, we need to move the default // export detection out from the controller server, as well as load the // driver on the controller client. - bool Linked = 7; + bool Linked = 6; } message ExportEntry {