diff --git a/plugins/base/base.pb.go b/plugins/base/proto/base.pb.go similarity index 77% rename from plugins/base/base.pb.go rename to plugins/base/proto/base.pb.go index 669ce2842..67bb0b3e2 100644 --- a/plugins/base/base.pb.go +++ b/plugins/base/proto/base.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/hashicorp/nomad/plugins/base/base.proto +// source: github.com/hashicorp/nomad/plugins/base/proto/base.proto package base @@ -48,7 +48,7 @@ func (x PluginType) String() string { return proto.EnumName(PluginType_name, int32(x)) } func (PluginType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_base_0160727fc8db573d, []int{0} + return fileDescriptor_base_01259c48147dbaa4, []int{0} } // PluginInfoRequest is used to request the plugins basic information. @@ -62,7 +62,7 @@ func (m *PluginInfoRequest) Reset() { *m = PluginInfoRequest{} } func (m *PluginInfoRequest) String() string { return proto.CompactTextString(m) } func (*PluginInfoRequest) ProtoMessage() {} func (*PluginInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_base_0160727fc8db573d, []int{0} + return fileDescriptor_base_01259c48147dbaa4, []int{0} } func (m *PluginInfoRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PluginInfoRequest.Unmarshal(m, b) @@ -86,7 +86,7 @@ var xxx_messageInfo_PluginInfoRequest proto.InternalMessageInfo // that Nomad can decide whether to load the plugin or not. type PluginInfoResponse struct { // type indicates what type of plugin this is. - Type PluginType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.nomad.plugins.base.PluginType" json:"type,omitempty"` + Type PluginType `protobuf:"varint,1,opt,name=type,proto3,enum=hashicorp.nomad.plugins.base.proto.PluginType" json:"type,omitempty"` // plugin_api_version indicates the version of the Nomad Plugin API // this plugin is built against. PluginApiVersion string `protobuf:"bytes,2,opt,name=plugin_api_version,json=pluginApiVersion,proto3" json:"plugin_api_version,omitempty"` @@ -104,7 +104,7 @@ func (m *PluginInfoResponse) Reset() { *m = PluginInfoResponse{} } func (m *PluginInfoResponse) String() string { return proto.CompactTextString(m) } func (*PluginInfoResponse) ProtoMessage() {} func (*PluginInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_base_0160727fc8db573d, []int{1} + return fileDescriptor_base_01259c48147dbaa4, []int{1} } func (m *PluginInfoResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PluginInfoResponse.Unmarshal(m, b) @@ -163,7 +163,7 @@ func (m *ConfigSchemaRequest) Reset() { *m = ConfigSchemaRequest{} } func (m *ConfigSchemaRequest) String() string { return proto.CompactTextString(m) } func (*ConfigSchemaRequest) ProtoMessage() {} func (*ConfigSchemaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_base_0160727fc8db573d, []int{2} + return fileDescriptor_base_01259c48147dbaa4, []int{2} } func (m *ConfigSchemaRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigSchemaRequest.Unmarshal(m, b) @@ -196,7 +196,7 @@ func (m *ConfigSchemaResponse) Reset() { *m = ConfigSchemaResponse{} } func (m *ConfigSchemaResponse) String() string { return proto.CompactTextString(m) } func (*ConfigSchemaResponse) ProtoMessage() {} func (*ConfigSchemaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_base_0160727fc8db573d, []int{3} + return fileDescriptor_base_01259c48147dbaa4, []int{3} } func (m *ConfigSchemaResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigSchemaResponse.Unmarshal(m, b) @@ -236,7 +236,7 @@ func (m *SetConfigRequest) Reset() { *m = SetConfigRequest{} } func (m *SetConfigRequest) String() string { return proto.CompactTextString(m) } func (*SetConfigRequest) ProtoMessage() {} func (*SetConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_base_0160727fc8db573d, []int{4} + return fileDescriptor_base_01259c48147dbaa4, []int{4} } func (m *SetConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetConfigRequest.Unmarshal(m, b) @@ -274,7 +274,7 @@ func (m *SetConfigResponse) Reset() { *m = SetConfigResponse{} } func (m *SetConfigResponse) String() string { return proto.CompactTextString(m) } func (*SetConfigResponse) ProtoMessage() {} func (*SetConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_base_0160727fc8db573d, []int{5} + return fileDescriptor_base_01259c48147dbaa4, []int{5} } func (m *SetConfigResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetConfigResponse.Unmarshal(m, b) @@ -295,13 +295,13 @@ func (m *SetConfigResponse) XXX_DiscardUnknown() { var xxx_messageInfo_SetConfigResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*PluginInfoRequest)(nil), "hashicorp.nomad.plugins.base.PluginInfoRequest") - proto.RegisterType((*PluginInfoResponse)(nil), "hashicorp.nomad.plugins.base.PluginInfoResponse") - proto.RegisterType((*ConfigSchemaRequest)(nil), "hashicorp.nomad.plugins.base.ConfigSchemaRequest") - proto.RegisterType((*ConfigSchemaResponse)(nil), "hashicorp.nomad.plugins.base.ConfigSchemaResponse") - proto.RegisterType((*SetConfigRequest)(nil), "hashicorp.nomad.plugins.base.SetConfigRequest") - proto.RegisterType((*SetConfigResponse)(nil), "hashicorp.nomad.plugins.base.SetConfigResponse") - proto.RegisterEnum("hashicorp.nomad.plugins.base.PluginType", PluginType_name, PluginType_value) + proto.RegisterType((*PluginInfoRequest)(nil), "hashicorp.nomad.plugins.base.proto.PluginInfoRequest") + proto.RegisterType((*PluginInfoResponse)(nil), "hashicorp.nomad.plugins.base.proto.PluginInfoResponse") + proto.RegisterType((*ConfigSchemaRequest)(nil), "hashicorp.nomad.plugins.base.proto.ConfigSchemaRequest") + proto.RegisterType((*ConfigSchemaResponse)(nil), "hashicorp.nomad.plugins.base.proto.ConfigSchemaResponse") + proto.RegisterType((*SetConfigRequest)(nil), "hashicorp.nomad.plugins.base.proto.SetConfigRequest") + proto.RegisterType((*SetConfigResponse)(nil), "hashicorp.nomad.plugins.base.proto.SetConfigResponse") + proto.RegisterEnum("hashicorp.nomad.plugins.base.proto.PluginType", PluginType_name, PluginType_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -334,7 +334,7 @@ func NewBasePluginClient(cc *grpc.ClientConn) BasePluginClient { func (c *basePluginClient) PluginInfo(ctx context.Context, in *PluginInfoRequest, opts ...grpc.CallOption) (*PluginInfoResponse, error) { out := new(PluginInfoResponse) - err := c.cc.Invoke(ctx, "/hashicorp.nomad.plugins.base.BasePlugin/PluginInfo", in, out, opts...) + err := c.cc.Invoke(ctx, "/hashicorp.nomad.plugins.base.proto.BasePlugin/PluginInfo", in, out, opts...) if err != nil { return nil, err } @@ -343,7 +343,7 @@ func (c *basePluginClient) PluginInfo(ctx context.Context, in *PluginInfoRequest func (c *basePluginClient) ConfigSchema(ctx context.Context, in *ConfigSchemaRequest, opts ...grpc.CallOption) (*ConfigSchemaResponse, error) { out := new(ConfigSchemaResponse) - err := c.cc.Invoke(ctx, "/hashicorp.nomad.plugins.base.BasePlugin/ConfigSchema", in, out, opts...) + err := c.cc.Invoke(ctx, "/hashicorp.nomad.plugins.base.proto.BasePlugin/ConfigSchema", in, out, opts...) if err != nil { return nil, err } @@ -352,7 +352,7 @@ func (c *basePluginClient) ConfigSchema(ctx context.Context, in *ConfigSchemaReq func (c *basePluginClient) SetConfig(ctx context.Context, in *SetConfigRequest, opts ...grpc.CallOption) (*SetConfigResponse, error) { out := new(SetConfigResponse) - err := c.cc.Invoke(ctx, "/hashicorp.nomad.plugins.base.BasePlugin/SetConfig", in, out, opts...) + err := c.cc.Invoke(ctx, "/hashicorp.nomad.plugins.base.proto.BasePlugin/SetConfig", in, out, opts...) if err != nil { return nil, err } @@ -383,7 +383,7 @@ func _BasePlugin_PluginInfo_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/hashicorp.nomad.plugins.base.BasePlugin/PluginInfo", + FullMethod: "/hashicorp.nomad.plugins.base.proto.BasePlugin/PluginInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BasePluginServer).PluginInfo(ctx, req.(*PluginInfoRequest)) @@ -401,7 +401,7 @@ func _BasePlugin_ConfigSchema_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/hashicorp.nomad.plugins.base.BasePlugin/ConfigSchema", + FullMethod: "/hashicorp.nomad.plugins.base.proto.BasePlugin/ConfigSchema", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BasePluginServer).ConfigSchema(ctx, req.(*ConfigSchemaRequest)) @@ -419,7 +419,7 @@ func _BasePlugin_SetConfig_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/hashicorp.nomad.plugins.base.BasePlugin/SetConfig", + FullMethod: "/hashicorp.nomad.plugins.base.proto.BasePlugin/SetConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BasePluginServer).SetConfig(ctx, req.(*SetConfigRequest)) @@ -428,7 +428,7 @@ func _BasePlugin_SetConfig_Handler(srv interface{}, ctx context.Context, dec fun } var _BasePlugin_serviceDesc = grpc.ServiceDesc{ - ServiceName: "hashicorp.nomad.plugins.base.BasePlugin", + ServiceName: "hashicorp.nomad.plugins.base.proto.BasePlugin", HandlerType: (*BasePluginServer)(nil), Methods: []grpc.MethodDesc{ { @@ -445,40 +445,41 @@ var _BasePlugin_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "github.com/hashicorp/nomad/plugins/base/base.proto", + Metadata: "github.com/hashicorp/nomad/plugins/base/proto/base.proto", } func init() { - proto.RegisterFile("github.com/hashicorp/nomad/plugins/base/base.proto", fileDescriptor_base_0160727fc8db573d) + proto.RegisterFile("github.com/hashicorp/nomad/plugins/base/proto/base.proto", fileDescriptor_base_01259c48147dbaa4) } -var fileDescriptor_base_0160727fc8db573d = []byte{ - // 430 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xdf, 0x8b, 0xd3, 0x40, - 0x10, 0xbe, 0xd4, 0x50, 0xb9, 0xb9, 0x1f, 0xc4, 0x3d, 0x85, 0x12, 0x7c, 0x38, 0x02, 0x42, 0x91, - 0x63, 0xe3, 0xc5, 0x27, 0xc1, 0x87, 0xb3, 0xb5, 0x0f, 0x45, 0xa8, 0x92, 0x6a, 0x15, 0x5f, 0xc2, - 0x76, 0xbb, 0x4d, 0x82, 0xcd, 0xee, 0x36, 0x9b, 0x2a, 0xfd, 0xdb, 0xfc, 0x87, 0xfc, 0x33, 0x64, - 0x77, 0x93, 0x1a, 0x45, 0x4b, 0x7c, 0x49, 0x86, 0x99, 0xef, 0xfb, 0x66, 0xe6, 0x1b, 0x16, 0xa2, - 0x34, 0xaf, 0xb2, 0xdd, 0x12, 0x53, 0x51, 0x84, 0x19, 0x51, 0x59, 0x4e, 0x45, 0x29, 0x43, 0x2e, - 0x0a, 0xb2, 0x0a, 0xe5, 0x66, 0x97, 0xe6, 0x5c, 0x85, 0x4b, 0xa2, 0x98, 0xf9, 0x60, 0x59, 0x8a, - 0x4a, 0xa0, 0xc7, 0x07, 0x20, 0x36, 0x40, 0x5c, 0x03, 0xb1, 0xc6, 0xf8, 0x77, 0x1d, 0x14, 0x55, - 0x46, 0x4a, 0xb6, 0x0a, 0x33, 0xba, 0x51, 0x92, 0x51, 0xfd, 0x4f, 0x74, 0x60, 0xf5, 0x83, 0x2b, - 0x78, 0xf0, 0xce, 0x00, 0xa7, 0x7c, 0x2d, 0x62, 0xb6, 0xdd, 0x31, 0x55, 0x05, 0xdf, 0x1d, 0x40, - 0xed, 0xac, 0x92, 0x82, 0x2b, 0x86, 0x5e, 0x82, 0x5b, 0xed, 0x25, 0x1b, 0x38, 0xd7, 0xce, 0xf0, - 0x32, 0x1a, 0xe2, 0x63, 0xa3, 0x61, 0xcb, 0x7f, 0xbf, 0x97, 0x2c, 0x36, 0x2c, 0x74, 0x03, 0xc8, - 0x02, 0x12, 0x22, 0xf3, 0xe4, 0x2b, 0x2b, 0x55, 0x2e, 0xf8, 0xa0, 0x77, 0xed, 0x0c, 0x4f, 0x63, - 0xcf, 0x56, 0x5e, 0xc9, 0x7c, 0x61, 0xf3, 0xe8, 0x09, 0x5c, 0xd6, 0xe8, 0x06, 0x79, 0xcf, 0x20, - 0x2f, 0x6c, 0xb6, 0x81, 0x21, 0x70, 0x39, 0x29, 0xd8, 0xc0, 0x35, 0x45, 0x13, 0x07, 0x8f, 0xe0, - 0x6a, 0x2c, 0xf8, 0x3a, 0x4f, 0xe7, 0x34, 0x63, 0x05, 0x69, 0x96, 0xfa, 0x04, 0x0f, 0x7f, 0x4f, - 0xd7, 0x5b, 0xdd, 0x81, 0xab, 0xfd, 0x30, 0x5b, 0x9d, 0x45, 0x37, 0xff, 0xdc, 0xca, 0xfa, 0x88, - 0x6b, 0x1f, 0xf1, 0x5c, 0x32, 0x1a, 0x1b, 0x66, 0xf0, 0x02, 0xbc, 0x39, 0xab, 0xac, 0x78, 0xdd, - 0x4d, 0xcf, 0x5f, 0xa8, 0x54, 0x12, 0xfa, 0x25, 0xa1, 0xa6, 0x60, 0xf4, 0xcf, 0xe3, 0x8b, 0x3a, - 0x6b, 0xd1, 0xda, 0xfe, 0x16, 0xd5, 0x4e, 0xf4, 0xf4, 0x16, 0xe0, 0x97, 0x7b, 0xe8, 0x0c, 0xee, - 0x7f, 0x98, 0xbd, 0x99, 0xbd, 0xfd, 0x38, 0xf3, 0x4e, 0x10, 0x40, 0xff, 0x75, 0x3c, 0x5d, 0x4c, - 0x62, 0xcf, 0x31, 0xf1, 0x64, 0x31, 0x1d, 0x4f, 0xbc, 0x5e, 0xf4, 0xa3, 0x07, 0x30, 0x22, 0x8a, - 0x59, 0x1e, 0xda, 0x36, 0x0a, 0xfa, 0x7e, 0x28, 0xec, 0x72, 0xa9, 0xd6, 0xfd, 0xfd, 0x67, 0xdd, - 0x09, 0x76, 0xe4, 0xe0, 0x04, 0x7d, 0x83, 0xf3, 0xb6, 0xbd, 0xe8, 0xf6, 0xb8, 0xc6, 0x5f, 0x2e, - 0xe4, 0x47, 0xff, 0x43, 0x39, 0x34, 0xe6, 0x70, 0x7a, 0xb0, 0x10, 0xe1, 0xe3, 0x12, 0x7f, 0x9e, - 0xc9, 0x0f, 0x3b, 0xe3, 0x9b, 0x7e, 0xa3, 0xfe, 0x67, 0x57, 0xd7, 0x96, 0x7d, 0xf3, 0x80, 0x9e, - 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x66, 0xa2, 0xc0, 0xe2, 0xd6, 0x03, 0x00, 0x00, +var fileDescriptor_base_01259c48147dbaa4 = []byte{ + // 435 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x37, 0xbb, 0xa1, 0xb2, 0x6f, 0xb7, 0x25, 0x4e, 0x15, 0x4a, 0x4e, 0x25, 0x20, 0x14, + 0x29, 0x13, 0xac, 0x56, 0xeb, 0xad, 0xb6, 0xf6, 0x50, 0x84, 0x2a, 0xa9, 0x56, 0xf1, 0x12, 0xa6, + 0xd3, 0x69, 0x12, 0x6c, 0x32, 0x63, 0x26, 0x15, 0x2a, 0x78, 0xf2, 0xec, 0x1f, 0xe5, 0x7f, 0x26, + 0x99, 0x49, 0xda, 0x28, 0x8a, 0xe9, 0x29, 0x8f, 0xf7, 0x3e, 0xdf, 0xef, 0xbc, 0x1f, 0x81, 0x51, + 0x10, 0x65, 0xe1, 0x7e, 0x8d, 0x29, 0x8f, 0xdd, 0x90, 0xc8, 0x30, 0xa2, 0x3c, 0x15, 0x6e, 0xc2, + 0x63, 0xb2, 0x71, 0xc5, 0x6e, 0x1f, 0x44, 0x89, 0x74, 0xd7, 0x44, 0x32, 0x57, 0xa4, 0x3c, 0xe3, + 0x2a, 0xc4, 0x2a, 0x44, 0xce, 0x11, 0xc7, 0x0a, 0xc7, 0x05, 0x8e, 0x4f, 0x8c, 0x3d, 0xae, 0xe1, + 0x2e, 0x43, 0x92, 0xb2, 0x8d, 0x1b, 0xd2, 0x9d, 0x14, 0x8c, 0xe6, 0x5f, 0x3f, 0x0f, 0xb4, 0x83, + 0xd3, 0x86, 0xbb, 0x6f, 0x14, 0x38, 0x4f, 0xb6, 0xdc, 0x63, 0x9f, 0xf7, 0x4c, 0x66, 0xce, 0x4f, + 0x03, 0x50, 0x35, 0x2b, 0x05, 0x4f, 0x24, 0x43, 0x13, 0x30, 0xb3, 0x83, 0x60, 0x1d, 0xa3, 0x6b, + 0xf4, 0x5a, 0x03, 0x8c, 0xff, 0xdf, 0x20, 0xd6, 0x2e, 0x6f, 0x0f, 0x82, 0x79, 0x4a, 0x8b, 0xfa, + 0x80, 0x34, 0xe6, 0x13, 0x11, 0xf9, 0x5f, 0x58, 0x2a, 0x23, 0x9e, 0x74, 0x2e, 0xbb, 0x46, 0xef, + 0xda, 0xb3, 0x74, 0xe5, 0x85, 0x88, 0x56, 0x3a, 0x8f, 0x1e, 0x40, 0xab, 0xa0, 0x4b, 0xf2, 0x4a, + 0x91, 0x4d, 0x9d, 0x2d, 0x31, 0x04, 0x66, 0x42, 0x62, 0xd6, 0x31, 0x55, 0x51, 0xc5, 0xce, 0x7d, + 0x68, 0x4f, 0x79, 0xb2, 0x8d, 0x82, 0x25, 0x0d, 0x59, 0x4c, 0xca, 0xd1, 0x3e, 0xc0, 0xbd, 0xdf, + 0xd3, 0xc5, 0x6c, 0x63, 0x30, 0xf3, 0xad, 0xa8, 0xd9, 0x6e, 0x06, 0xfd, 0x7f, 0xce, 0xa6, 0xb7, + 0x89, 0x8b, 0x6d, 0xe2, 0xa5, 0x60, 0xd4, 0x53, 0x4a, 0xe7, 0x39, 0x58, 0x4b, 0x96, 0x69, 0xf3, + 0xe2, 0xb5, 0xbc, 0xff, 0x58, 0x06, 0x82, 0xd0, 0x4f, 0x3e, 0x55, 0x05, 0xe5, 0x7f, 0xeb, 0x35, + 0x8b, 0xac, 0xa6, 0xf3, 0x23, 0x54, 0xa4, 0xba, 0xa3, 0x87, 0x8f, 0x00, 0x4e, 0xdb, 0x43, 0x37, + 0x70, 0xe7, 0xdd, 0xe2, 0xd5, 0xe2, 0xf5, 0xfb, 0x85, 0x75, 0x81, 0x00, 0x1a, 0x2f, 0xbd, 0xf9, + 0x6a, 0xe6, 0x59, 0x86, 0x8a, 0x67, 0xab, 0xf9, 0x74, 0x66, 0x5d, 0x0e, 0x7e, 0x5c, 0x01, 0x4c, + 0x88, 0x64, 0x5a, 0x87, 0xbe, 0x95, 0x0e, 0xf9, 0x15, 0xd1, 0xb0, 0xfe, 0xbd, 0x2a, 0xff, 0x82, + 0xfd, 0xf4, 0x5c, 0x99, 0x6e, 0xdf, 0xb9, 0x40, 0xdf, 0x0d, 0xb8, 0xad, 0xee, 0x1a, 0x3d, 0xab, + 0x63, 0xf5, 0x97, 0xa3, 0xd9, 0xa3, 0xf3, 0x85, 0xc7, 0x2e, 0xbe, 0xc2, 0xf5, 0x71, 0xb7, 0xe8, + 0x49, 0x1d, 0xa3, 0x3f, 0xaf, 0x68, 0x0f, 0xcf, 0x54, 0x95, 0x6f, 0x4f, 0x1a, 0x1f, 0xcd, 0x9c, + 0x58, 0x37, 0x14, 0xf2, 0xf8, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x3e, 0xab, 0xdf, 0x0d, + 0x04, 0x00, 0x00, } diff --git a/plugins/base/base.proto b/plugins/base/proto/base.proto similarity index 97% rename from plugins/base/base.proto rename to plugins/base/proto/base.proto index 5254eacb9..892f53e85 100644 --- a/plugins/base/base.proto +++ b/plugins/base/proto/base.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package hashicorp.nomad.plugins.base; +package hashicorp.nomad.plugins.base.proto; option go_package = "base"; import "github.com/hashicorp/nomad/plugins/shared/hclspec/hcl_spec.proto";