From f2d0b4f5b8e5b77af4e7e2ff3667cc75fe800cc7 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 17 Jan 2024 16:47:33 -0600 Subject: [PATCH] still testing Signed-off-by: Jeff Carr --- .gitignore | 1 + Makefile | 18 +- account.pb.go | 321 ------------ account.proto | 2 +- .../addressbook.proto => addressbook.proto | 4 +- config.pb.go | 229 --------- config.proto | 2 +- events.pb.go | 464 ------------------ events.proto | 2 +- {example-protobuf => example-cmd}/Makefile | 0 {example-protobuf => example-cmd}/main.go | 0 widget/widget.proto => widget.proto | 9 +- widget/Makefile | 2 - .../lib/protobuf/widgetpb/widget.pb.go | 283 ----------- 14 files changed, 15 insertions(+), 1322 deletions(-) delete mode 100644 account.pb.go rename addressbook/addressbook.proto => addressbook.proto (92%) delete mode 100644 config.pb.go delete mode 100644 events.pb.go rename {example-protobuf => example-cmd}/Makefile (100%) rename {example-protobuf => example-cmd}/main.go (100%) rename widget/widget.proto => widget.proto (85%) delete mode 100644 widget/Makefile delete mode 100644 widget/go.wit.com/lib/protobuf/widgetpb/widget.pb.go diff --git a/.gitignore b/.gitignore index 0e516bb..e20a7db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ example-protobuf/example-protobuf +*.pb.go diff --git a/Makefile b/Makefile index 0d4e639..1d7dcb7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: +all: compile # You must use the current protoc-gen-go # protoc --version 3.6++ does not mean that protoc will generate version3 .go files # @@ -10,23 +10,19 @@ all: # cd ~/go/src/github.com/golang/protobuf/protoc-gen-go # go install # - # Then: protoc --version - make events.pb.go - make config.pb.go - make account.pb.go clean: rm -f *.pb.go -events.pb.go: events.proto - protoc --go_out=. events.proto +#events.pb.go: events.proto +# protoc --go_out=. events.proto -account.pb.go: account.proto - protoc --go_out=. account.proto +#account.pb.go: account.proto +# protoc --go_out=. account.proto -config.pb.go: config.proto - protoc --go_out=. config.proto +#config.pb.go: config.proto +# protoc --go_out=. config.proto compile: protoc --go_out=. *.proto diff --git a/account.pb.go b/account.pb.go deleted file mode 100644 index 297ca62..0000000 --- a/account.pb.go +++ /dev/null @@ -1,321 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: account.proto - -package witProtobuf - -import ( - fmt "fmt" - proto "github.com/golang/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package - -type Account struct { - ID int64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"` - Nick string `protobuf:"bytes,2,opt,name=nick,proto3" json:"nick,omitempty"` - Username string `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"` - Token string `protobuf:"bytes,4,opt,name=token,proto3" json:"token,omitempty"` - Password string `protobuf:"bytes,5,opt,name=password,proto3" json:"password,omitempty"` - Pwdhash string `protobuf:"bytes,6,opt,name=pwdhash,proto3" json:"pwdhash,omitempty"` - Hostname string `protobuf:"bytes,7,opt,name=hostname,proto3" json:"hostname,omitempty"` - Domain string `protobuf:"bytes,8,opt,name=domain,proto3" json:"domain,omitempty"` - Port int32 `protobuf:"varint,9,opt,name=port,proto3" json:"port,omitempty"` - Email string `protobuf:"bytes,10,opt,name=email,proto3" json:"email,omitempty"` - URL string `protobuf:"bytes,11,opt,name=URL,proto3" json:"URL,omitempty"` - Ctime string `protobuf:"bytes,12,opt,name=ctime,proto3" json:"ctime,omitempty"` - Mtime string `protobuf:"bytes,13,opt,name=mtime,proto3" json:"mtime,omitempty"` - Atime string `protobuf:"bytes,14,opt,name=atime,proto3" json:"atime,omitempty"` - Browser string `protobuf:"bytes,15,opt,name=browser,proto3" json:"browser,omitempty"` - HttpHeaders []*Account_HttpHeader `protobuf:"bytes,16,rep,name=httpHeaders,proto3" json:"httpHeaders,omitempty"` - Code string `protobuf:"bytes,17,opt,name=code,proto3" json:"code,omitempty"` - Codedate string `protobuf:"bytes,18,opt,name=codedate,proto3" json:"codedate,omitempty"` - Createdon string `protobuf:"bytes,19,opt,name=createdon,proto3" json:"createdon,omitempty"` - Codetype string `protobuf:"bytes,20,opt,name=codetype,proto3" json:"codetype,omitempty"` - Secret2Fa string `protobuf:"bytes,21,opt,name=secret2fa,proto3" json:"secret2fa,omitempty"` - Confirmed2Fa string `protobuf:"bytes,22,opt,name=confirmed2fa,proto3" json:"confirmed2fa,omitempty"` - Roles string `protobuf:"bytes,23,opt,name=roles,proto3" json:"roles,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Account) Reset() { *m = Account{} } -func (m *Account) String() string { return proto.CompactTextString(m) } -func (*Account) ProtoMessage() {} -func (*Account) Descriptor() ([]byte, []int) { - return fileDescriptor_8e28828dcb8d24f0, []int{0} -} - -func (m *Account) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Account.Unmarshal(m, b) -} -func (m *Account) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Account.Marshal(b, m, deterministic) -} -func (m *Account) XXX_Merge(src proto.Message) { - xxx_messageInfo_Account.Merge(m, src) -} -func (m *Account) XXX_Size() int { - return xxx_messageInfo_Account.Size(m) -} -func (m *Account) XXX_DiscardUnknown() { - xxx_messageInfo_Account.DiscardUnknown(m) -} - -var xxx_messageInfo_Account proto.InternalMessageInfo - -func (m *Account) GetID() int64 { - if m != nil { - return m.ID - } - return 0 -} - -func (m *Account) GetNick() string { - if m != nil { - return m.Nick - } - return "" -} - -func (m *Account) GetUsername() string { - if m != nil { - return m.Username - } - return "" -} - -func (m *Account) GetToken() string { - if m != nil { - return m.Token - } - return "" -} - -func (m *Account) GetPassword() string { - if m != nil { - return m.Password - } - return "" -} - -func (m *Account) GetPwdhash() string { - if m != nil { - return m.Pwdhash - } - return "" -} - -func (m *Account) GetHostname() string { - if m != nil { - return m.Hostname - } - return "" -} - -func (m *Account) GetDomain() string { - if m != nil { - return m.Domain - } - return "" -} - -func (m *Account) GetPort() int32 { - if m != nil { - return m.Port - } - return 0 -} - -func (m *Account) GetEmail() string { - if m != nil { - return m.Email - } - return "" -} - -func (m *Account) GetURL() string { - if m != nil { - return m.URL - } - return "" -} - -func (m *Account) GetCtime() string { - if m != nil { - return m.Ctime - } - return "" -} - -func (m *Account) GetMtime() string { - if m != nil { - return m.Mtime - } - return "" -} - -func (m *Account) GetAtime() string { - if m != nil { - return m.Atime - } - return "" -} - -func (m *Account) GetBrowser() string { - if m != nil { - return m.Browser - } - return "" -} - -func (m *Account) GetHttpHeaders() []*Account_HttpHeader { - if m != nil { - return m.HttpHeaders - } - return nil -} - -func (m *Account) GetCode() string { - if m != nil { - return m.Code - } - return "" -} - -func (m *Account) GetCodedate() string { - if m != nil { - return m.Codedate - } - return "" -} - -func (m *Account) GetCreatedon() string { - if m != nil { - return m.Createdon - } - return "" -} - -func (m *Account) GetCodetype() string { - if m != nil { - return m.Codetype - } - return "" -} - -func (m *Account) GetSecret2Fa() string { - if m != nil { - return m.Secret2Fa - } - return "" -} - -func (m *Account) GetConfirmed2Fa() string { - if m != nil { - return m.Confirmed2Fa - } - return "" -} - -func (m *Account) GetRoles() string { - if m != nil { - return m.Roles - } - return "" -} - -type Account_HttpHeader struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Account_HttpHeader) Reset() { *m = Account_HttpHeader{} } -func (m *Account_HttpHeader) String() string { return proto.CompactTextString(m) } -func (*Account_HttpHeader) ProtoMessage() {} -func (*Account_HttpHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_8e28828dcb8d24f0, []int{0, 0} -} - -func (m *Account_HttpHeader) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Account_HttpHeader.Unmarshal(m, b) -} -func (m *Account_HttpHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Account_HttpHeader.Marshal(b, m, deterministic) -} -func (m *Account_HttpHeader) XXX_Merge(src proto.Message) { - xxx_messageInfo_Account_HttpHeader.Merge(m, src) -} -func (m *Account_HttpHeader) XXX_Size() int { - return xxx_messageInfo_Account_HttpHeader.Size(m) -} -func (m *Account_HttpHeader) XXX_DiscardUnknown() { - xxx_messageInfo_Account_HttpHeader.DiscardUnknown(m) -} - -var xxx_messageInfo_Account_HttpHeader proto.InternalMessageInfo - -func (m *Account_HttpHeader) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *Account_HttpHeader) GetValue() string { - if m != nil { - return m.Value - } - return "" -} - -func init() { - proto.RegisterType((*Account)(nil), "witProtobuf.Account") - proto.RegisterType((*Account_HttpHeader)(nil), "witProtobuf.Account.HttpHeader") -} - -func init() { - proto.RegisterFile("account.proto", fileDescriptor_8e28828dcb8d24f0) -} - -var fileDescriptor_8e28828dcb8d24f0 = []byte{ - // 398 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xcf, 0x6a, 0xdc, 0x30, - 0x10, 0xc6, 0xf1, 0x3a, 0xde, 0xcd, 0xca, 0x49, 0x9a, 0xaa, 0x69, 0x3a, 0x84, 0x42, 0x4d, 0x4e, - 0x3e, 0xf9, 0x90, 0x42, 0xef, 0x81, 0x1c, 0x12, 0xe8, 0xa1, 0x18, 0xfa, 0x00, 0x5a, 0x69, 0x16, - 0x9b, 0xac, 0x2d, 0x23, 0xc9, 0x35, 0x7d, 0x99, 0x3e, 0x6b, 0x99, 0x91, 0xbd, 0x9b, 0x9c, 0x3c, - 0xbf, 0x6f, 0xe6, 0xc3, 0x9a, 0x3f, 0xe2, 0x52, 0x69, 0x6d, 0xc7, 0x3e, 0x54, 0x83, 0xb3, 0xc1, - 0xca, 0x7c, 0x6a, 0xc3, 0x2f, 0x8a, 0x76, 0xe3, 0xfe, 0xfe, 0x5f, 0x26, 0x36, 0x8f, 0x31, 0x2d, - 0xaf, 0xc4, 0xea, 0xe5, 0x09, 0x92, 0x22, 0x29, 0xd3, 0x7a, 0xf5, 0xf2, 0x24, 0xa5, 0x38, 0xeb, - 0x5b, 0xfd, 0x0a, 0xab, 0x22, 0x29, 0xb7, 0x35, 0xc7, 0xf2, 0x4e, 0x9c, 0x8f, 0x1e, 0x5d, 0xaf, - 0x3a, 0x84, 0x94, 0xf5, 0x23, 0xcb, 0x1b, 0x91, 0x05, 0xfb, 0x8a, 0x3d, 0x9c, 0x71, 0x22, 0x02, - 0x39, 0x06, 0xe5, 0xfd, 0x64, 0x9d, 0x81, 0x2c, 0x3a, 0x16, 0x96, 0x20, 0x36, 0xc3, 0x64, 0x1a, - 0xe5, 0x1b, 0x58, 0x73, 0x6a, 0x41, 0x72, 0x35, 0xd6, 0x07, 0xfe, 0xcf, 0x26, 0xba, 0x16, 0x96, - 0xb7, 0x62, 0x6d, 0x6c, 0xa7, 0xda, 0x1e, 0xce, 0x39, 0x33, 0x13, 0xbd, 0x77, 0xb0, 0x2e, 0xc0, - 0xb6, 0x48, 0xca, 0xac, 0xe6, 0x98, 0xde, 0x84, 0x9d, 0x6a, 0x0f, 0x20, 0xe2, 0x9b, 0x18, 0xe4, - 0xb5, 0x48, 0x7f, 0xd7, 0x3f, 0x21, 0x67, 0x8d, 0x42, 0xaa, 0xd3, 0xa1, 0xed, 0x10, 0x2e, 0x62, - 0x1d, 0x03, 0xa9, 0x1d, 0xab, 0x97, 0x51, 0xed, 0x16, 0x55, 0xb1, 0x7a, 0x15, 0x55, 0x06, 0xea, - 0x65, 0xe7, 0xec, 0xe4, 0xd1, 0xc1, 0x87, 0xd8, 0xcb, 0x8c, 0xf2, 0x51, 0xe4, 0x4d, 0x08, 0xc3, - 0x33, 0x2a, 0x83, 0xce, 0xc3, 0x75, 0x91, 0x96, 0xf9, 0xc3, 0xb7, 0xea, 0xcd, 0x1a, 0xaa, 0x79, - 0x05, 0xd5, 0xf3, 0xb1, 0xae, 0x7e, 0xeb, 0xa1, 0xd6, 0xb4, 0x35, 0x08, 0x1f, 0xe3, 0x2a, 0x28, - 0xa6, 0x11, 0xd1, 0xd7, 0xa8, 0x80, 0x20, 0xe3, 0x88, 0x16, 0x96, 0x5f, 0xc5, 0x56, 0x3b, 0x54, - 0x01, 0x8d, 0xed, 0xe1, 0x13, 0x27, 0x4f, 0xc2, 0xe2, 0x0c, 0x7f, 0x07, 0x84, 0x9b, 0x93, 0x93, - 0x98, 0x9c, 0x1e, 0xb5, 0xc3, 0xf0, 0xb0, 0x57, 0xf0, 0x39, 0x3a, 0x8f, 0x82, 0xbc, 0x17, 0x17, - 0xda, 0xf6, 0xfb, 0xd6, 0x75, 0x68, 0xa8, 0xe0, 0x96, 0x0b, 0xde, 0x69, 0x34, 0x1e, 0x67, 0x0f, - 0xe8, 0xe1, 0x4b, 0x1c, 0x0f, 0xc3, 0xdd, 0x0f, 0x21, 0x4e, 0xcd, 0xf1, 0x69, 0xd1, 0x6a, 0x93, - 0xf9, 0xb4, 0xe6, 0xf3, 0xf9, 0xa3, 0x0e, 0x23, 0xce, 0xf7, 0x16, 0x61, 0xb7, 0xe6, 0xa3, 0xfd, - 0xfe, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x41, 0xc1, 0x89, 0x93, 0xc5, 0x02, 0x00, 0x00, -} diff --git a/account.proto b/account.proto index b317f33..c195cfc 100644 --- a/account.proto +++ b/account.proto @@ -1,7 +1,7 @@ //is this a comment? syntax = "proto3"; -package witProtobuf; +package guipb; //import "Common.proto"; //import "google/protobuf/timestamp.proto"; diff --git a/addressbook/addressbook.proto b/addressbook.proto similarity index 92% rename from addressbook/addressbook.proto rename to addressbook.proto index 5f52698..7506ef9 100644 --- a/addressbook/addressbook.proto +++ b/addressbook.proto @@ -8,7 +8,7 @@ // [START declaration] syntax = "proto3"; -package tutorial; +package guipb; import "google/protobuf/timestamp.proto"; // [END declaration] @@ -24,7 +24,7 @@ option csharp_namespace = "Google.Protobuf.Examples.AddressBook"; // [END csharp_declaration] // [START go_declaration] -option go_package = "github.com/protocolbuffers/protobuf/examples/go/tutorialpb"; +// option go_package = "github.com/protocolbuffers/protobuf/examples/go/tutorialpb"; // [END go_declaration] // [START messages] diff --git a/config.pb.go b/config.pb.go deleted file mode 100644 index acd353a..0000000 --- a/config.pb.go +++ /dev/null @@ -1,229 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: config.proto - -package witProtobuf - -import ( - fmt "fmt" - proto "github.com/golang/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package - -type Config struct { - USER string `protobuf:"bytes,1,opt,name=USER,proto3" json:"USER,omitempty"` - Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"` - Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` - Hostname string `protobuf:"bytes,4,opt,name=hostname,proto3" json:"hostname,omitempty"` - Debug bool `protobuf:"varint,5,opt,name=debug,proto3" json:"debug,omitempty"` - Debugtable bool `protobuf:"varint,6,opt,name=debugtable,proto3" json:"debugtable,omitempty"` - Filename string `protobuf:"bytes,7,opt,name=filename,proto3" json:"filename,omitempty"` - Accounts []*Account `protobuf:"bytes,8,rep,name=accounts,proto3" json:"accounts,omitempty"` - Counter int32 `protobuf:"varint,9,opt,name=counter,proto3" json:"counter,omitempty"` - Errors int32 `protobuf:"varint,10,opt,name=errors,proto3" json:"errors,omitempty"` - Crashes int32 `protobuf:"varint,11,opt,name=crashes,proto3" json:"crashes,omitempty"` - Crash string `protobuf:"bytes,12,opt,name=crash,proto3" json:"crash,omitempty"` - IPv6 string `protobuf:"bytes,13,opt,name=IPv6,proto3" json:"IPv6,omitempty"` - // variables relating to the build - Dirty bool `protobuf:"varint,14,opt,name=dirty,proto3" json:"dirty,omitempty"` - Gitref string `protobuf:"bytes,15,opt,name=gitref,proto3" json:"gitref,omitempty"` - Version string `protobuf:"bytes,16,opt,name=version,proto3" json:"version,omitempty"` - Builddate int64 `protobuf:"varint,17,opt,name=builddate,proto3" json:"builddate,omitempty"` - Goversion string `protobuf:"bytes,18,opt,name=goversion,proto3" json:"goversion,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Config) Reset() { *m = Config{} } -func (m *Config) String() string { return proto.CompactTextString(m) } -func (*Config) ProtoMessage() {} -func (*Config) Descriptor() ([]byte, []int) { - return fileDescriptor_3eaf2c85e69e9ea4, []int{0} -} - -func (m *Config) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Config.Unmarshal(m, b) -} -func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Config.Marshal(b, m, deterministic) -} -func (m *Config) XXX_Merge(src proto.Message) { - xxx_messageInfo_Config.Merge(m, src) -} -func (m *Config) XXX_Size() int { - return xxx_messageInfo_Config.Size(m) -} -func (m *Config) XXX_DiscardUnknown() { - xxx_messageInfo_Config.DiscardUnknown(m) -} - -var xxx_messageInfo_Config proto.InternalMessageInfo - -func (m *Config) GetUSER() string { - if m != nil { - return m.USER - } - return "" -} - -func (m *Config) GetWidth() int32 { - if m != nil { - return m.Width - } - return 0 -} - -func (m *Config) GetHeight() int32 { - if m != nil { - return m.Height - } - return 0 -} - -func (m *Config) GetHostname() string { - if m != nil { - return m.Hostname - } - return "" -} - -func (m *Config) GetDebug() bool { - if m != nil { - return m.Debug - } - return false -} - -func (m *Config) GetDebugtable() bool { - if m != nil { - return m.Debugtable - } - return false -} - -func (m *Config) GetFilename() string { - if m != nil { - return m.Filename - } - return "" -} - -func (m *Config) GetAccounts() []*Account { - if m != nil { - return m.Accounts - } - return nil -} - -func (m *Config) GetCounter() int32 { - if m != nil { - return m.Counter - } - return 0 -} - -func (m *Config) GetErrors() int32 { - if m != nil { - return m.Errors - } - return 0 -} - -func (m *Config) GetCrashes() int32 { - if m != nil { - return m.Crashes - } - return 0 -} - -func (m *Config) GetCrash() string { - if m != nil { - return m.Crash - } - return "" -} - -func (m *Config) GetIPv6() string { - if m != nil { - return m.IPv6 - } - return "" -} - -func (m *Config) GetDirty() bool { - if m != nil { - return m.Dirty - } - return false -} - -func (m *Config) GetGitref() string { - if m != nil { - return m.Gitref - } - return "" -} - -func (m *Config) GetVersion() string { - if m != nil { - return m.Version - } - return "" -} - -func (m *Config) GetBuilddate() int64 { - if m != nil { - return m.Builddate - } - return 0 -} - -func (m *Config) GetGoversion() string { - if m != nil { - return m.Goversion - } - return "" -} - -func init() { - proto.RegisterType((*Config)(nil), "witProtobuf.Config") -} - -func init() { - proto.RegisterFile("config.proto", fileDescriptor_3eaf2c85e69e9ea4) -} - -var fileDescriptor_3eaf2c85e69e9ea4 = []byte{ - // 319 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x5d, 0x4b, 0xc3, 0x30, - 0x14, 0x86, 0xa9, 0xdd, 0xba, 0xee, 0x6c, 0xf3, 0x23, 0x0c, 0x39, 0x0c, 0x91, 0xe2, 0x55, 0xaf, - 0x86, 0x28, 0x78, 0x2f, 0xe2, 0x85, 0x77, 0x23, 0xe2, 0x0f, 0xe8, 0x47, 0xda, 0x06, 0x6a, 0x23, - 0x49, 0xba, 0xe1, 0xff, 0xf5, 0x87, 0x48, 0x4e, 0xda, 0x6d, 0x77, 0xef, 0x73, 0x3e, 0xde, 0xe4, - 0x4d, 0x60, 0x59, 0xa8, 0xae, 0x92, 0xf5, 0xf6, 0x47, 0x2b, 0xab, 0xd8, 0xe2, 0x20, 0xed, 0xce, - 0xa9, 0xbc, 0xaf, 0x36, 0xab, 0xac, 0x28, 0x54, 0xdf, 0x59, 0xdf, 0x7b, 0xf8, 0x0b, 0x21, 0x7a, - 0xa3, 0x61, 0xc6, 0x60, 0xf2, 0xf5, 0xf9, 0xce, 0x31, 0x48, 0x82, 0x74, 0xce, 0x49, 0xb3, 0x35, - 0x4c, 0x0f, 0xb2, 0xb4, 0x0d, 0x5e, 0x24, 0x41, 0x3a, 0xe5, 0x1e, 0xd8, 0x2d, 0x44, 0x8d, 0x90, - 0x75, 0x63, 0x31, 0xa4, 0xf2, 0x40, 0x6c, 0x03, 0x71, 0xa3, 0x8c, 0xed, 0xb2, 0x6f, 0x81, 0x13, - 0x72, 0x39, 0xb2, 0x73, 0x2a, 0x45, 0xde, 0xd7, 0x38, 0x4d, 0x82, 0x34, 0xe6, 0x1e, 0xd8, 0x3d, - 0x00, 0x09, 0x9b, 0xe5, 0xad, 0xc0, 0x88, 0x5a, 0x67, 0x15, 0xe7, 0x58, 0xc9, 0x56, 0x90, 0xe3, - 0xcc, 0x3b, 0x8e, 0xcc, 0x1e, 0x21, 0x1e, 0xb2, 0x18, 0x8c, 0x93, 0x30, 0x5d, 0x3c, 0xad, 0xb7, - 0x67, 0x49, 0xb7, 0xaf, 0xbe, 0xc9, 0x8f, 0x53, 0x0c, 0x61, 0x46, 0x4a, 0x68, 0x9c, 0xd3, 0xc5, - 0x47, 0x74, 0x89, 0x84, 0xd6, 0x4a, 0x1b, 0x04, 0x9f, 0xc8, 0x13, 0x6d, 0xe8, 0xcc, 0x34, 0xc2, - 0xe0, 0x62, 0xd8, 0xf0, 0xe8, 0xf2, 0x90, 0xc4, 0x25, 0x5d, 0xcb, 0x83, 0x7b, 0xc3, 0x8f, 0xdd, - 0xfe, 0x05, 0x57, 0xfe, 0x0d, 0x9d, 0xa6, 0xe4, 0x52, 0xdb, 0x5f, 0xbc, 0x1c, 0x92, 0x3b, 0x70, - 0x27, 0xd6, 0xd2, 0x6a, 0x51, 0xe1, 0x15, 0xcd, 0x0e, 0xe4, 0x4e, 0xdc, 0x0b, 0x6d, 0xa4, 0xea, - 0xf0, 0x9a, 0x1a, 0x23, 0xb2, 0x3b, 0x98, 0xe7, 0xbd, 0x6c, 0xcb, 0x32, 0xb3, 0x02, 0x6f, 0x92, - 0x20, 0x0d, 0xf9, 0xa9, 0xe0, 0xba, 0xb5, 0x1a, 0x37, 0x19, 0x6d, 0x9e, 0x0a, 0x79, 0x44, 0xbf, - 0xfd, 0xfc, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x56, 0x18, 0xac, 0xd2, 0x19, 0x02, 0x00, 0x00, -} diff --git a/config.proto b/config.proto index 3766d6f..1a10c1a 100644 --- a/config.proto +++ b/config.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package witProtobuf; +package guipb; import "account.proto"; diff --git a/events.pb.go b/events.pb.go deleted file mode 100644 index 90ab168..0000000 --- a/events.pb.go +++ /dev/null @@ -1,464 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: events.proto - -package witProtobuf - -import ( - fmt "fmt" - proto "github.com/golang/protobuf/proto" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package - -type Event_EventType int32 - -const ( - Event_ADD Event_EventType = 0 - Event_DELETE Event_EventType = 1 - Event_POWERON Event_EventType = 2 - Event_POWEROFF Event_EventType = 3 - Event_HIBERNATE Event_EventType = 4 - Event_MIGRATE Event_EventType = 5 - Event_DEMO Event_EventType = 6 - Event_GET Event_EventType = 7 - Event_LOGIN Event_EventType = 8 - Event_OK Event_EventType = 9 - Event_FAIL Event_EventType = 10 -) - -var Event_EventType_name = map[int32]string{ - 0: "ADD", - 1: "DELETE", - 2: "POWERON", - 3: "POWEROFF", - 4: "HIBERNATE", - 5: "MIGRATE", - 6: "DEMO", - 7: "GET", - 8: "LOGIN", - 9: "OK", - 10: "FAIL", -} - -var Event_EventType_value = map[string]int32{ - "ADD": 0, - "DELETE": 1, - "POWERON": 2, - "POWEROFF": 3, - "HIBERNATE": 4, - "MIGRATE": 5, - "DEMO": 6, - "GET": 7, - "LOGIN": 8, - "OK": 9, - "FAIL": 10, -} - -func (x Event_EventType) String() string { - return proto.EnumName(Event_EventType_name, int32(x)) -} - -func (Event_EventType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{0, 0} -} - -type Event struct { - Type Event_EventType `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"` - Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` - Comment string `protobuf:"bytes,3,opt,name=comment,proto3" json:"comment,omitempty"` - Config *Config `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` - Account *Account `protobuf:"bytes,5,opt,name=account,proto3" json:"account,omitempty"` - Results []*Event_Response `protobuf:"bytes,6,rep,name=results,proto3" json:"results,omitempty"` - Networks []*Event_Network `protobuf:"bytes,7,rep,name=networks,proto3" json:"networks,omitempty"` - Vms []*Event_VM `protobuf:"bytes,8,rep,name=vms,proto3" json:"vms,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Event) Reset() { *m = Event{} } -func (m *Event) String() string { return proto.CompactTextString(m) } -func (*Event) ProtoMessage() {} -func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{0} -} - -func (m *Event) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Event.Unmarshal(m, b) -} -func (m *Event) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Event.Marshal(b, m, deterministic) -} -func (m *Event) XXX_Merge(src proto.Message) { - xxx_messageInfo_Event.Merge(m, src) -} -func (m *Event) XXX_Size() int { - return xxx_messageInfo_Event.Size(m) -} -func (m *Event) XXX_DiscardUnknown() { - xxx_messageInfo_Event.DiscardUnknown(m) -} - -var xxx_messageInfo_Event proto.InternalMessageInfo - -func (m *Event) GetType() Event_EventType { - if m != nil { - return m.Type - } - return Event_ADD -} - -func (m *Event) GetId() int32 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Event) GetComment() string { - if m != nil { - return m.Comment - } - return "" -} - -func (m *Event) GetConfig() *Config { - if m != nil { - return m.Config - } - return nil -} - -func (m *Event) GetAccount() *Account { - if m != nil { - return m.Account - } - return nil -} - -func (m *Event) GetResults() []*Event_Response { - if m != nil { - return m.Results - } - return nil -} - -func (m *Event) GetNetworks() []*Event_Network { - if m != nil { - return m.Networks - } - return nil -} - -func (m *Event) GetVms() []*Event_VM { - if m != nil { - return m.Vms - } - return nil -} - -type Event_Response struct { - Type Event_EventType `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"` - Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Error string `protobuf:"bytes,4,opt,name=error,proto3" json:"error,omitempty"` - Snippets []string `protobuf:"bytes,5,rep,name=snippets,proto3" json:"snippets,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Event_Response) Reset() { *m = Event_Response{} } -func (m *Event_Response) String() string { return proto.CompactTextString(m) } -func (*Event_Response) ProtoMessage() {} -func (*Event_Response) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{0, 0} -} - -func (m *Event_Response) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Event_Response.Unmarshal(m, b) -} -func (m *Event_Response) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Event_Response.Marshal(b, m, deterministic) -} -func (m *Event_Response) XXX_Merge(src proto.Message) { - xxx_messageInfo_Event_Response.Merge(m, src) -} -func (m *Event_Response) XXX_Size() int { - return xxx_messageInfo_Event_Response.Size(m) -} -func (m *Event_Response) XXX_DiscardUnknown() { - xxx_messageInfo_Event_Response.DiscardUnknown(m) -} - -var xxx_messageInfo_Event_Response proto.InternalMessageInfo - -func (m *Event_Response) GetType() Event_EventType { - if m != nil { - return m.Type - } - return Event_ADD -} - -func (m *Event_Response) GetId() int32 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Event_Response) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *Event_Response) GetError() string { - if m != nil { - return m.Error - } - return "" -} - -func (m *Event_Response) GetSnippets() []string { - if m != nil { - return m.Snippets - } - return nil -} - -type Event_Network struct { - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - TotalCpu int64 `protobuf:"varint,3,opt,name=total_cpu,json=totalCpu,proto3" json:"total_cpu,omitempty"` - TotalMem int64 `protobuf:"varint,4,opt,name=total_mem,json=totalMem,proto3" json:"total_mem,omitempty"` - LoginUrl string `protobuf:"bytes,5,opt,name=login_url,json=loginUrl,proto3" json:"login_url,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Event_Network) Reset() { *m = Event_Network{} } -func (m *Event_Network) String() string { return proto.CompactTextString(m) } -func (*Event_Network) ProtoMessage() {} -func (*Event_Network) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{0, 1} -} - -func (m *Event_Network) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Event_Network.Unmarshal(m, b) -} -func (m *Event_Network) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Event_Network.Marshal(b, m, deterministic) -} -func (m *Event_Network) XXX_Merge(src proto.Message) { - xxx_messageInfo_Event_Network.Merge(m, src) -} -func (m *Event_Network) XXX_Size() int { - return xxx_messageInfo_Event_Network.Size(m) -} -func (m *Event_Network) XXX_DiscardUnknown() { - xxx_messageInfo_Event_Network.DiscardUnknown(m) -} - -var xxx_messageInfo_Event_Network proto.InternalMessageInfo - -func (m *Event_Network) GetId() int32 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Event_Network) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *Event_Network) GetTotalCpu() int64 { - if m != nil { - return m.TotalCpu - } - return 0 -} - -func (m *Event_Network) GetTotalMem() int64 { - if m != nil { - return m.TotalMem - } - return 0 -} - -func (m *Event_Network) GetLoginUrl() string { - if m != nil { - return m.LoginUrl - } - return "" -} - -type Event_VM struct { - Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` - Cpus int64 `protobuf:"varint,4,opt,name=cpus,proto3" json:"cpus,omitempty"` - Memory int64 `protobuf:"varint,5,opt,name=memory,proto3" json:"memory,omitempty"` - Disk int64 `protobuf:"varint,6,opt,name=disk,proto3" json:"disk,omitempty"` - IPv6 string `protobuf:"bytes,7,opt,name=IPv6,proto3" json:"IPv6,omitempty"` - Role string `protobuf:"bytes,8,opt,name=role,proto3" json:"role,omitempty"` - BaseImage string `protobuf:"bytes,9,opt,name=baseImage,proto3" json:"baseImage,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Event_VM) Reset() { *m = Event_VM{} } -func (m *Event_VM) String() string { return proto.CompactTextString(m) } -func (*Event_VM) ProtoMessage() {} -func (*Event_VM) Descriptor() ([]byte, []int) { - return fileDescriptor_8f22242cb04491f9, []int{0, 2} -} - -func (m *Event_VM) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Event_VM.Unmarshal(m, b) -} -func (m *Event_VM) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Event_VM.Marshal(b, m, deterministic) -} -func (m *Event_VM) XXX_Merge(src proto.Message) { - xxx_messageInfo_Event_VM.Merge(m, src) -} -func (m *Event_VM) XXX_Size() int { - return xxx_messageInfo_Event_VM.Size(m) -} -func (m *Event_VM) XXX_DiscardUnknown() { - xxx_messageInfo_Event_VM.DiscardUnknown(m) -} - -var xxx_messageInfo_Event_VM proto.InternalMessageInfo - -func (m *Event_VM) GetId() int64 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Event_VM) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *Event_VM) GetHostname() string { - if m != nil { - return m.Hostname - } - return "" -} - -func (m *Event_VM) GetCpus() int64 { - if m != nil { - return m.Cpus - } - return 0 -} - -func (m *Event_VM) GetMemory() int64 { - if m != nil { - return m.Memory - } - return 0 -} - -func (m *Event_VM) GetDisk() int64 { - if m != nil { - return m.Disk - } - return 0 -} - -func (m *Event_VM) GetIPv6() string { - if m != nil { - return m.IPv6 - } - return "" -} - -func (m *Event_VM) GetRole() string { - if m != nil { - return m.Role - } - return "" -} - -func (m *Event_VM) GetBaseImage() string { - if m != nil { - return m.BaseImage - } - return "" -} - -func init() { - proto.RegisterEnum("witProtobuf.Event_EventType", Event_EventType_name, Event_EventType_value) - proto.RegisterType((*Event)(nil), "witProtobuf.Event") - proto.RegisterType((*Event_Response)(nil), "witProtobuf.Event.Response") - proto.RegisterType((*Event_Network)(nil), "witProtobuf.Event.Network") - proto.RegisterType((*Event_VM)(nil), "witProtobuf.Event.VM") -} - -func init() { - proto.RegisterFile("events.proto", fileDescriptor_8f22242cb04491f9) -} - -var fileDescriptor_8f22242cb04491f9 = []byte{ - // 558 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x4f, 0x6b, 0xdb, 0x40, - 0x10, 0xc5, 0x2b, 0xc9, 0xfa, 0x37, 0x4e, 0x82, 0xd8, 0xa6, 0x65, 0x51, 0x72, 0x10, 0xb9, 0x54, - 0x50, 0x30, 0x25, 0xa5, 0xb9, 0xbb, 0xb1, 0x92, 0x8a, 0xc6, 0x7f, 0x58, 0xdc, 0xf4, 0x18, 0x6c, - 0x79, 0xe3, 0x8a, 0x48, 0x5a, 0xa1, 0x5d, 0x39, 0xf8, 0x5e, 0xe8, 0xbd, 0x1f, 0xab, 0xfd, 0x52, - 0x65, 0x57, 0xb2, 0xe3, 0x50, 0xf7, 0xd6, 0x8b, 0x99, 0x37, 0xef, 0x37, 0xfb, 0x46, 0xbb, 0x18, - 0x0e, 0xe8, 0x8a, 0x16, 0x82, 0xf7, 0xca, 0x8a, 0x09, 0x86, 0xba, 0x8f, 0xa9, 0x98, 0xc8, 0x6a, - 0x5e, 0xdf, 0xfb, 0x07, 0x09, 0x2b, 0xee, 0xd3, 0x65, 0x63, 0xf9, 0x87, 0xb3, 0x24, 0x61, 0x75, - 0x21, 0x1a, 0x79, 0xf6, 0xdb, 0x06, 0x33, 0x92, 0xa3, 0xe8, 0x1d, 0x74, 0xc4, 0xba, 0xa4, 0x58, - 0x0b, 0xb4, 0xf0, 0xe8, 0xfc, 0xb4, 0xb7, 0x73, 0x44, 0x4f, 0x11, 0xcd, 0xef, 0x74, 0x5d, 0x52, - 0xa2, 0x48, 0x74, 0x04, 0x7a, 0xba, 0xc0, 0x7a, 0xa0, 0x85, 0x26, 0xd1, 0xd3, 0x05, 0xc2, 0x60, - 0x27, 0x2c, 0xcf, 0x69, 0x21, 0xb0, 0x11, 0x68, 0xa1, 0x4b, 0x36, 0x12, 0xbd, 0x05, 0xab, 0x59, - 0x02, 0x77, 0x02, 0x2d, 0xec, 0x9e, 0xbf, 0x7c, 0x76, 0xfa, 0xa5, 0xb2, 0x48, 0x8b, 0xa0, 0x1e, - 0xd8, 0xed, 0x8e, 0xd8, 0x54, 0xf4, 0xf1, 0x33, 0xba, 0xdf, 0x78, 0x64, 0x03, 0xa1, 0x0f, 0x60, - 0x57, 0x94, 0xd7, 0x99, 0xe0, 0xd8, 0x0a, 0x8c, 0xb0, 0x7b, 0x7e, 0xb2, 0x67, 0x77, 0x42, 0x79, - 0xc9, 0x0a, 0x4e, 0xc9, 0x86, 0x45, 0x17, 0xe0, 0x14, 0x54, 0x3c, 0xb2, 0xea, 0x81, 0x63, 0x5b, - 0xcd, 0xf9, 0x7b, 0xe6, 0x46, 0x0d, 0x42, 0xb6, 0x2c, 0x7a, 0x03, 0xc6, 0x2a, 0xe7, 0xd8, 0x51, - 0x23, 0xaf, 0xf6, 0x8c, 0xdc, 0x0e, 0x89, 0x24, 0xfc, 0x9f, 0x1a, 0x38, 0x9b, 0xd8, 0xff, 0x70, - 0xbb, 0x08, 0x3a, 0xc5, 0x2c, 0xa7, 0xed, 0xd5, 0xaa, 0x1a, 0x1d, 0x83, 0x49, 0xab, 0x8a, 0x55, - 0xea, 0x5a, 0x5d, 0xd2, 0x08, 0xe4, 0x83, 0xc3, 0x8b, 0xb4, 0x2c, 0xa9, 0xe0, 0xd8, 0x0c, 0x8c, - 0xd0, 0x25, 0x5b, 0xed, 0x7f, 0xd7, 0xc0, 0x6e, 0xbf, 0xa9, 0x4d, 0xd0, 0xfe, 0x4a, 0xd0, 0x77, - 0x12, 0x4e, 0xc0, 0x15, 0x4c, 0xcc, 0xb2, 0xbb, 0xa4, 0xac, 0x55, 0xb4, 0x41, 0x1c, 0xd5, 0xb8, - 0x2c, 0xeb, 0x27, 0x33, 0xa7, 0xb9, 0x5a, 0x61, 0x63, 0x0e, 0x69, 0x2e, 0xcd, 0x8c, 0x2d, 0xd3, - 0xe2, 0xae, 0xae, 0x32, 0xf5, 0x90, 0x2e, 0x71, 0x54, 0xe3, 0x4b, 0x95, 0xf9, 0xbf, 0x34, 0xd0, - 0x6f, 0x87, 0x3b, 0x1b, 0x18, 0xff, 0xdc, 0xc0, 0x07, 0xe7, 0x1b, 0xe3, 0x62, 0xe7, 0xdb, 0xb7, - 0x5a, 0xf2, 0x49, 0x59, 0xf3, 0x36, 0x5b, 0xd5, 0xe8, 0x35, 0x58, 0x39, 0xcd, 0x59, 0xb5, 0x56, - 0xa1, 0x06, 0x69, 0x95, 0x64, 0x17, 0x29, 0x7f, 0xc0, 0x56, 0xc3, 0xca, 0x5a, 0xf6, 0xe2, 0xc9, - 0xea, 0x02, 0xdb, 0x4d, 0x9e, 0xac, 0x65, 0xaf, 0x62, 0x19, 0xc5, 0x4e, 0xd3, 0x93, 0x35, 0x3a, - 0x05, 0x77, 0x3e, 0xe3, 0x34, 0xce, 0x67, 0x4b, 0x8a, 0x5d, 0x65, 0x3c, 0x35, 0xce, 0x7e, 0x68, - 0xe0, 0x6e, 0x5f, 0x0f, 0xd9, 0x60, 0xf4, 0x07, 0x03, 0xef, 0x05, 0x02, 0xb0, 0x06, 0xd1, 0x4d, - 0x34, 0x8d, 0x3c, 0x0d, 0x75, 0xc1, 0x9e, 0x8c, 0xbf, 0x46, 0x64, 0x3c, 0xf2, 0x74, 0x74, 0x00, - 0x4e, 0x23, 0xae, 0xae, 0x3c, 0x03, 0x1d, 0x82, 0xfb, 0x29, 0xfe, 0x18, 0x91, 0x51, 0x7f, 0x1a, - 0x79, 0x1d, 0x49, 0x0e, 0xe3, 0x6b, 0x22, 0x85, 0x89, 0x1c, 0xe8, 0x0c, 0xa2, 0xe1, 0xd8, 0xb3, - 0xe4, 0xa9, 0xd7, 0xd1, 0xd4, 0xb3, 0x91, 0x0b, 0xe6, 0xcd, 0xf8, 0x3a, 0x1e, 0x79, 0x0e, 0xb2, - 0x40, 0x1f, 0x7f, 0xf6, 0x5c, 0x49, 0x5d, 0xf5, 0xe3, 0x1b, 0x0f, 0xe6, 0x96, 0xfa, 0x53, 0xbf, - 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xd7, 0x94, 0x54, 0x0e, 0x04, 0x00, 0x00, -} diff --git a/events.proto b/events.proto index 44cd480..7d4c5f2 100644 --- a/events.proto +++ b/events.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package witProtobuf; +package guipb; import "config.proto"; import "account.proto"; diff --git a/example-protobuf/Makefile b/example-cmd/Makefile similarity index 100% rename from example-protobuf/Makefile rename to example-cmd/Makefile diff --git a/example-protobuf/main.go b/example-cmd/main.go similarity index 100% rename from example-protobuf/main.go rename to example-cmd/main.go diff --git a/widget/widget.proto b/widget.proto similarity index 85% rename from widget/widget.proto rename to widget.proto index 62acf8a..7c1b333 100644 --- a/widget/widget.proto +++ b/widget.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package widget; +package guipb; import "google/protobuf/timestamp.proto"; -option go_package = "go.wit.com/lib/protobuf/widgetpb"; +// option go_package = "go.wit.com/lib/protobuf/widgetpb"; message Widget { int32 id = 1; // Unique ID number for this widget @@ -34,8 +34,3 @@ message Widget { int32 High = 2; } } - -// Our address book file is just one of these. -message AddressBook { - repeated Widget people = 1; -} diff --git a/widget/Makefile b/widget/Makefile deleted file mode 100644 index c51bd17..0000000 --- a/widget/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - protoc --go_out=. widget.proto diff --git a/widget/go.wit.com/lib/protobuf/widgetpb/widget.pb.go b/widget/go.wit.com/lib/protobuf/widgetpb/widget.pb.go deleted file mode 100644 index 6852643..0000000 --- a/widget/go.wit.com/lib/protobuf/widgetpb/widget.pb.go +++ /dev/null @@ -1,283 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// source: widget.proto - -package widgetpb - -import ( - fmt "fmt" - proto "github.com/golang/protobuf/proto" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package - -type Widget_WidgetType int32 - -const ( - Widget_Window Widget_WidgetType = 0 - Widget_Box Widget_WidgetType = 1 - Widget_Grid Widget_WidgetType = 2 - Widget_Group Widget_WidgetType = 3 - Widget_Button Widget_WidgetType = 4 - Widget_Checkbox Widget_WidgetType = 5 - Widget_Dropdown Widget_WidgetType = 6 - Widget_Combobox Widget_WidgetType = 7 - Widget_Label Widget_WidgetType = 8 - Widget_Slider Widget_WidgetType = 9 - Widget_Spinner Widget_WidgetType = 10 - Widget_Separator Widget_WidgetType = 11 -) - -var Widget_WidgetType_name = map[int32]string{ - 0: "Window", - 1: "Box", - 2: "Grid", - 3: "Group", - 4: "Button", - 5: "Checkbox", - 6: "Dropdown", - 7: "Combobox", - 8: "Label", - 9: "Slider", - 10: "Spinner", - 11: "Separator", -} - -var Widget_WidgetType_value = map[string]int32{ - "Window": 0, - "Box": 1, - "Grid": 2, - "Group": 3, - "Button": 4, - "Checkbox": 5, - "Dropdown": 6, - "Combobox": 7, - "Label": 8, - "Slider": 9, - "Spinner": 10, - "Separator": 11, -} - -func (x Widget_WidgetType) String() string { - return proto.EnumName(Widget_WidgetType_name, int32(x)) -} - -func (Widget_WidgetType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_95b5c33b51e24547, []int{0, 0} -} - -type Widget struct { - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Parent int32 `protobuf:"varint,2,opt,name=parent,proto3" json:"parent,omitempty"` - LastUpdated *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_updated,json=lastUpdated,proto3" json:"last_updated,omitempty"` - ProgName string `protobuf:"bytes,4,opt,name=ProgName,proto3" json:"ProgName,omitempty"` - Label string `protobuf:"bytes,5,opt,name=label,proto3" json:"label,omitempty"` - Dropdown []string `protobuf:"bytes,6,rep,name=dropdown,proto3" json:"dropdown,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Widget) Reset() { *m = Widget{} } -func (m *Widget) String() string { return proto.CompactTextString(m) } -func (*Widget) ProtoMessage() {} -func (*Widget) Descriptor() ([]byte, []int) { - return fileDescriptor_95b5c33b51e24547, []int{0} -} - -func (m *Widget) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Widget.Unmarshal(m, b) -} -func (m *Widget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Widget.Marshal(b, m, deterministic) -} -func (m *Widget) XXX_Merge(src proto.Message) { - xxx_messageInfo_Widget.Merge(m, src) -} -func (m *Widget) XXX_Size() int { - return xxx_messageInfo_Widget.Size(m) -} -func (m *Widget) XXX_DiscardUnknown() { - xxx_messageInfo_Widget.DiscardUnknown(m) -} - -var xxx_messageInfo_Widget proto.InternalMessageInfo - -func (m *Widget) GetId() int32 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *Widget) GetParent() int32 { - if m != nil { - return m.Parent - } - return 0 -} - -func (m *Widget) GetLastUpdated() *timestamppb.Timestamp { - if m != nil { - return m.LastUpdated - } - return nil -} - -func (m *Widget) GetProgName() string { - if m != nil { - return m.ProgName - } - return "" -} - -func (m *Widget) GetLabel() string { - if m != nil { - return m.Label - } - return "" -} - -func (m *Widget) GetDropdown() []string { - if m != nil { - return m.Dropdown - } - return nil -} - -type Widget_Range struct { - Low int32 `protobuf:"varint,1,opt,name=Low,proto3" json:"Low,omitempty"` - High int32 `protobuf:"varint,2,opt,name=High,proto3" json:"High,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Widget_Range) Reset() { *m = Widget_Range{} } -func (m *Widget_Range) String() string { return proto.CompactTextString(m) } -func (*Widget_Range) ProtoMessage() {} -func (*Widget_Range) Descriptor() ([]byte, []int) { - return fileDescriptor_95b5c33b51e24547, []int{0, 0} -} - -func (m *Widget_Range) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Widget_Range.Unmarshal(m, b) -} -func (m *Widget_Range) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Widget_Range.Marshal(b, m, deterministic) -} -func (m *Widget_Range) XXX_Merge(src proto.Message) { - xxx_messageInfo_Widget_Range.Merge(m, src) -} -func (m *Widget_Range) XXX_Size() int { - return xxx_messageInfo_Widget_Range.Size(m) -} -func (m *Widget_Range) XXX_DiscardUnknown() { - xxx_messageInfo_Widget_Range.DiscardUnknown(m) -} - -var xxx_messageInfo_Widget_Range proto.InternalMessageInfo - -func (m *Widget_Range) GetLow() int32 { - if m != nil { - return m.Low - } - return 0 -} - -func (m *Widget_Range) GetHigh() int32 { - if m != nil { - return m.High - } - return 0 -} - -// Our address book file is just one of these. -type AddressBook struct { - People []*Widget `protobuf:"bytes,1,rep,name=people,proto3" json:"people,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *AddressBook) Reset() { *m = AddressBook{} } -func (m *AddressBook) String() string { return proto.CompactTextString(m) } -func (*AddressBook) ProtoMessage() {} -func (*AddressBook) Descriptor() ([]byte, []int) { - return fileDescriptor_95b5c33b51e24547, []int{1} -} - -func (m *AddressBook) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AddressBook.Unmarshal(m, b) -} -func (m *AddressBook) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AddressBook.Marshal(b, m, deterministic) -} -func (m *AddressBook) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddressBook.Merge(m, src) -} -func (m *AddressBook) XXX_Size() int { - return xxx_messageInfo_AddressBook.Size(m) -} -func (m *AddressBook) XXX_DiscardUnknown() { - xxx_messageInfo_AddressBook.DiscardUnknown(m) -} - -var xxx_messageInfo_AddressBook proto.InternalMessageInfo - -func (m *AddressBook) GetPeople() []*Widget { - if m != nil { - return m.People - } - return nil -} - -func init() { - proto.RegisterEnum("widget.Widget_WidgetType", Widget_WidgetType_name, Widget_WidgetType_value) - proto.RegisterType((*Widget)(nil), "widget.Widget") - proto.RegisterType((*Widget_Range)(nil), "widget.Widget.Range") - proto.RegisterType((*AddressBook)(nil), "widget.AddressBook") -} - -func init() { - proto.RegisterFile("widget.proto", fileDescriptor_95b5c33b51e24547) -} - -var fileDescriptor_95b5c33b51e24547 = []byte{ - // 397 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x51, 0xc1, 0x8a, 0xd4, 0x40, - 0x10, 0x35, 0x93, 0x49, 0x66, 0xa6, 0x32, 0x2e, 0x4d, 0x21, 0x12, 0xe6, 0x62, 0x98, 0x83, 0xcc, - 0xc5, 0x0c, 0xac, 0x78, 0xf4, 0xe0, 0x28, 0xac, 0x87, 0x45, 0x24, 0xb3, 0x22, 0x78, 0x91, 0xce, - 0x76, 0x99, 0x6d, 0x36, 0x49, 0x35, 0x3d, 0x1d, 0x32, 0xfe, 0x84, 0xbf, 0xe0, 0xaf, 0x4a, 0x27, - 0x19, 0xf7, 0x56, 0xaf, 0xde, 0xab, 0xaa, 0xf7, 0x28, 0x58, 0xf7, 0x5a, 0x55, 0xe4, 0x72, 0x63, - 0xd9, 0x31, 0xc6, 0x23, 0xda, 0xbc, 0xaa, 0x98, 0xab, 0x9a, 0xf6, 0x43, 0xb7, 0xec, 0x7e, 0xed, - 0x9d, 0x6e, 0xe8, 0xe4, 0x64, 0x63, 0x46, 0xe1, 0xf6, 0x4f, 0x08, 0xf1, 0xf7, 0x41, 0x8b, 0x57, - 0x30, 0xd3, 0x2a, 0x0d, 0xb2, 0x60, 0x17, 0x15, 0x33, 0xad, 0xf0, 0x25, 0xc4, 0x46, 0x5a, 0x6a, - 0x5d, 0x3a, 0x1b, 0x7a, 0x13, 0xc2, 0xf7, 0xb0, 0xae, 0xe5, 0xc9, 0xfd, 0xec, 0x8c, 0x92, 0x8e, - 0x54, 0x1a, 0x66, 0xc1, 0x2e, 0xb9, 0xde, 0xe4, 0xe3, 0xa9, 0xfc, 0x72, 0x2a, 0xbf, 0xbb, 0x9c, - 0x2a, 0x12, 0xaf, 0xff, 0x36, 0xca, 0x71, 0x03, 0xcb, 0xaf, 0x96, 0xab, 0x2f, 0xb2, 0xa1, 0x74, - 0x9e, 0x05, 0xbb, 0x55, 0xf1, 0x1f, 0xe3, 0x0b, 0x88, 0x6a, 0x59, 0x52, 0x9d, 0x46, 0x03, 0x31, - 0x02, 0x3f, 0xa1, 0x2c, 0x1b, 0xc5, 0x7d, 0x9b, 0xc6, 0x59, 0xe8, 0x27, 0x2e, 0x78, 0xf3, 0x06, - 0xa2, 0x42, 0xb6, 0x15, 0xa1, 0x80, 0xf0, 0x96, 0xfb, 0xc9, 0xbe, 0x2f, 0x11, 0x61, 0xfe, 0x59, - 0x57, 0x0f, 0x93, 0xfb, 0xa1, 0xde, 0xfe, 0x0d, 0x00, 0xc6, 0xb8, 0x77, 0xbf, 0x0d, 0x21, 0xf8, - 0xf0, 0xad, 0xe2, 0x5e, 0x3c, 0xc3, 0x05, 0x84, 0x07, 0x3e, 0x8b, 0x00, 0x97, 0x30, 0xbf, 0xb1, - 0x5a, 0x89, 0x19, 0xae, 0x20, 0xba, 0xb1, 0xdc, 0x19, 0x11, 0x7a, 0xe5, 0xa1, 0x73, 0x8e, 0x5b, - 0x31, 0xc7, 0x35, 0x2c, 0x3f, 0x3e, 0xd0, 0xfd, 0x63, 0xc9, 0x67, 0x11, 0x79, 0xf4, 0x69, 0x72, - 0x23, 0xe2, 0x81, 0xe3, 0xa6, 0x64, 0xcf, 0x2d, 0xfc, 0x82, 0x5b, 0x1f, 0x41, 0x2c, 0xfd, 0x82, - 0x63, 0xad, 0x15, 0x59, 0xb1, 0xc2, 0x04, 0x16, 0x47, 0xa3, 0xdb, 0x96, 0xac, 0x00, 0x7c, 0x0e, - 0xab, 0x23, 0x19, 0x69, 0xa5, 0x63, 0x2b, 0x92, 0xed, 0x3b, 0x48, 0x3e, 0x28, 0x65, 0xe9, 0x74, - 0x3a, 0x30, 0x3f, 0xe2, 0x6b, 0x88, 0x0d, 0xb1, 0xa9, 0x29, 0x0d, 0xb2, 0x70, 0x97, 0x5c, 0x5f, - 0xe5, 0xd3, 0x9f, 0xc7, 0x14, 0xc5, 0xc4, 0x1e, 0xb6, 0x3f, 0xb2, 0x8a, 0xf3, 0x5e, 0xbb, 0xfc, - 0x9e, 0x9b, 0x7d, 0xad, 0xcb, 0xa7, 0x97, 0x8f, 0x03, 0xa6, 0x2c, 0xe3, 0xa1, 0xf5, 0xf6, 0x5f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0xe2, 0xa4, 0x12, 0x2b, 0x02, 0x00, 0x00, -}