Merge pull request #1140 from ericchiang/fix-proto-build

*: fix proto build

.travis.yml

@@ -25,6 +25,7 @@ install:
 script:
   - make testall
   - ./scripts/test-k8s.sh
+  - make verify-proto # Ensure proto generation doesn't depend on external packages.
 
 notifications:
   email: false

Makefile

@@ -61,14 +61,14 @@ docker-image:
 	@sudo docker build -t $(DOCKER_IMAGE) .
 
 .PHONY: proto
-proto: api/api.pb.go server/internal/types.pb.go
-
-api/api.pb.go: api/api.proto bin/protoc bin/protoc-gen-go
+proto: bin/protoc bin/protoc-gen-go
 	@./bin/protoc --go_out=plugins=grpc:. --plugin=protoc-gen-go=./bin/protoc-gen-go api/*.proto
-
-server/internal/types.pb.go: server/internal/types.proto bin/protoc bin/protoc-gen-go
 	@./bin/protoc --go_out=. --plugin=protoc-gen-go=./bin/protoc-gen-go server/internal/*.proto
 
+.PHONY: verify-proto
+verify-proto: proto
+	@./scripts/git-diff
+
 bin/protoc: scripts/get-protoc
 	@./scripts/get-protoc bin/protoc
 

api/api.pb.go

@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: api/api.proto
-// DO NOT EDIT!
 
 /*
 Package api is a generated protocol buffer package.
@@ -69,6 +68,55 @@ func (m *Client) String() string            { return proto.CompactTextString(m)
 func (*Client) ProtoMessage()               {}
 func (*Client) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
+func (m *Client) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Client) GetSecret() string {
+	if m != nil {
+		return m.Secret
+	}
+	return ""
+}
+
+func (m *Client) GetRedirectUris() []string {
+	if m != nil {
+		return m.RedirectUris
+	}
+	return nil
+}
+
+func (m *Client) GetTrustedPeers() []string {
+	if m != nil {
+		return m.TrustedPeers
+	}
+	return nil
+}
+
+func (m *Client) GetPublic() bool {
+	if m != nil {
+		return m.Public
+	}
+	return false
+}
+
+func (m *Client) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Client) GetLogoUrl() string {
+	if m != nil {
+		return m.LogoUrl
+	}
+	return ""
+}
+
 // CreateClientReq is a request to make a client.
 type CreateClientReq struct {
 	Client *Client `protobuf:"bytes,1,opt,name=client" json:"client,omitempty"`
@@ -97,6 +145,13 @@ func (m *CreateClientResp) String() string            { return proto.CompactText
 func (*CreateClientResp) ProtoMessage()               {}
 func (*CreateClientResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
+func (m *CreateClientResp) GetAlreadyExists() bool {
+	if m != nil {
+		return m.AlreadyExists
+	}
+	return false
+}
+
 func (m *CreateClientResp) GetClient() *Client {
 	if m != nil {
 		return m.Client
@@ -115,6 +170,13 @@ func (m *DeleteClientReq) String() string            { return proto.CompactTextS
 func (*DeleteClientReq) ProtoMessage()               {}
 func (*DeleteClientReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
+func (m *DeleteClientReq) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
 // DeleteClientResp determines if the client is deleted successfully.
 type DeleteClientResp struct {
 	NotFound bool `protobuf:"varint,1,opt,name=not_found,json=notFound" json:"not_found,omitempty"`
@@ -125,6 +187,13 @@ func (m *DeleteClientResp) String() string            { return proto.CompactText
 func (*DeleteClientResp) ProtoMessage()               {}
 func (*DeleteClientResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
 
+func (m *DeleteClientResp) GetNotFound() bool {
+	if m != nil {
+		return m.NotFound
+	}
+	return false
+}
+
 // Password is an email for password mapping managed by the storage.
 type Password struct {
 	Email string `protobuf:"bytes,1,opt,name=email" json:"email,omitempty"`
@@ -139,6 +208,34 @@ func (m *Password) String() string            { return proto.CompactTextString(m
 func (*Password) ProtoMessage()               {}
 func (*Password) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
 
+func (m *Password) GetEmail() string {
+	if m != nil {
+		return m.Email
+	}
+	return ""
+}
+
+func (m *Password) GetHash() []byte {
+	if m != nil {
+		return m.Hash
+	}
+	return nil
+}
+
+func (m *Password) GetUsername() string {
+	if m != nil {
+		return m.Username
+	}
+	return ""
+}
+
+func (m *Password) GetUserId() string {
+	if m != nil {
+		return m.UserId
+	}
+	return ""
+}
+
 // CreatePasswordReq is a request to make a password.
 type CreatePasswordReq struct {
 	Password *Password `protobuf:"bytes,1,opt,name=password" json:"password,omitempty"`
@@ -166,6 +263,13 @@ func (m *CreatePasswordResp) String() string            { return proto.CompactTe
 func (*CreatePasswordResp) ProtoMessage()               {}
 func (*CreatePasswordResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
 
+func (m *CreatePasswordResp) GetAlreadyExists() bool {
+	if m != nil {
+		return m.AlreadyExists
+	}
+	return false
+}
+
 // UpdatePasswordReq is a request to modify an existing password.
 type UpdatePasswordReq struct {
 	// The email used to lookup the password. This field cannot be modified
@@ -179,6 +283,27 @@ func (m *UpdatePasswordReq) String() string            { return proto.CompactTex
 func (*UpdatePasswordReq) ProtoMessage()               {}
 func (*UpdatePasswordReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
 
+func (m *UpdatePasswordReq) GetEmail() string {
+	if m != nil {
+		return m.Email
+	}
+	return ""
+}
+
+func (m *UpdatePasswordReq) GetNewHash() []byte {
+	if m != nil {
+		return m.NewHash
+	}
+	return nil
+}
+
+func (m *UpdatePasswordReq) GetNewUsername() string {
+	if m != nil {
+		return m.NewUsername
+	}
+	return ""
+}
+
 // UpdatePasswordResp returns the response from modifying an existing password.
 type UpdatePasswordResp struct {
 	NotFound bool `protobuf:"varint,1,opt,name=not_found,json=notFound" json:"not_found,omitempty"`
@@ -189,6 +314,13 @@ func (m *UpdatePasswordResp) String() string            { return proto.CompactTe
 func (*UpdatePasswordResp) ProtoMessage()               {}
 func (*UpdatePasswordResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
 
+func (m *UpdatePasswordResp) GetNotFound() bool {
+	if m != nil {
+		return m.NotFound
+	}
+	return false
+}
+
 // DeletePasswordReq is a request to delete a password.
 type DeletePasswordReq struct {
 	Email string `protobuf:"bytes,1,opt,name=email" json:"email,omitempty"`
@@ -199,6 +331,13 @@ func (m *DeletePasswordReq) String() string            { return proto.CompactTex
 func (*DeletePasswordReq) ProtoMessage()               {}
 func (*DeletePasswordReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
 
+func (m *DeletePasswordReq) GetEmail() string {
+	if m != nil {
+		return m.Email
+	}
+	return ""
+}
+
 // DeletePasswordResp returns the response from deleting a password.
 type DeletePasswordResp struct {
 	NotFound bool `protobuf:"varint,1,opt,name=not_found,json=notFound" json:"not_found,omitempty"`
@@ -209,6 +348,13 @@ func (m *DeletePasswordResp) String() string            { return proto.CompactTe
 func (*DeletePasswordResp) ProtoMessage()               {}
 func (*DeletePasswordResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
 
+func (m *DeletePasswordResp) GetNotFound() bool {
+	if m != nil {
+		return m.NotFound
+	}
+	return false
+}
+
 // ListPasswordReq is a request to enumerate passwords.
 type ListPasswordReq struct {
 }
@@ -258,6 +404,20 @@ func (m *VersionResp) String() string            { return proto.CompactTextStrin
 func (*VersionResp) ProtoMessage()               {}
 func (*VersionResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
 
+func (m *VersionResp) GetServer() string {
+	if m != nil {
+		return m.Server
+	}
+	return ""
+}
+
+func (m *VersionResp) GetApi() int32 {
+	if m != nil {
+		return m.Api
+	}
+	return 0
+}
+
 // RefreshTokenRef contains the metadata for a refresh token that is managed by the storage.
 type RefreshTokenRef struct {
 	// ID of the refresh token.
@@ -272,6 +432,34 @@ func (m *RefreshTokenRef) String() string            { return proto.CompactTextS
 func (*RefreshTokenRef) ProtoMessage()               {}
 func (*RefreshTokenRef) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
 
+func (m *RefreshTokenRef) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *RefreshTokenRef) GetClientId() string {
+	if m != nil {
+		return m.ClientId
+	}
+	return ""
+}
+
+func (m *RefreshTokenRef) GetCreatedAt() int64 {
+	if m != nil {
+		return m.CreatedAt
+	}
+	return 0
+}
+
+func (m *RefreshTokenRef) GetLastUsed() int64 {
+	if m != nil {
+		return m.LastUsed
+	}
+	return 0
+}
+
 // ListRefreshReq is a request to enumerate the refresh tokens of a user.
 type ListRefreshReq struct {
 	// The "sub" claim returned in the ID Token.
@@ -283,6 +471,13 @@ func (m *ListRefreshReq) String() string            { return proto.CompactTextSt
 func (*ListRefreshReq) ProtoMessage()               {}
 func (*ListRefreshReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
 
+func (m *ListRefreshReq) GetUserId() string {
+	if m != nil {
+		return m.UserId
+	}
+	return ""
+}
+
 // ListRefreshResp returns a list of refresh tokens for a user.
 type ListRefreshResp struct {
 	RefreshTokens []*RefreshTokenRef `protobuf:"bytes,1,rep,name=refresh_tokens,json=refreshTokens" json:"refresh_tokens,omitempty"`
@@ -312,6 +507,20 @@ func (m *RevokeRefreshReq) String() string            { return proto.CompactText
 func (*RevokeRefreshReq) ProtoMessage()               {}
 func (*RevokeRefreshReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
 
+func (m *RevokeRefreshReq) GetUserId() string {
+	if m != nil {
+		return m.UserId
+	}
+	return ""
+}
+
+func (m *RevokeRefreshReq) GetClientId() string {
+	if m != nil {
+		return m.ClientId
+	}
+	return ""
+}
+
 // RevokeRefreshResp determines if the refresh token is revoked successfully.
 type RevokeRefreshResp struct {
 	// Set to true is refresh token was not found and token could not be revoked.
@@ -323,6 +532,13 @@ func (m *RevokeRefreshResp) String() string            { return proto.CompactTex
 func (*RevokeRefreshResp) ProtoMessage()               {}
 func (*RevokeRefreshResp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
 
+func (m *RevokeRefreshResp) GetNotFound() bool {
+	if m != nil {
+		return m.NotFound
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterType((*Client)(nil), "api.Client")
 	proto.RegisterType((*CreateClientReq)(nil), "api.CreateClientReq")
@@ -708,55 +924,56 @@ var _Dex_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("api/api.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 786 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x6d, 0x4f, 0xdb, 0x48,
-	0x10, 0x4e, 0xe2, 0x90, 0x38, 0x93, 0xf7, 0x3d, 0x5e, 0x4c, 0xd0, 0x49, 0xb0, 0xe8, 0x24, 0xd0,
-	0x49, 0x70, 0x70, 0xd2, 0x9d, 0x74, 0xe8, 0xb8, 0x3b, 0xc1, 0xb5, 0x20, 0x55, 0x15, 0xb2, 0x9a,
-	0x7e, 0xac, 0x65, 0xe2, 0x01, 0x56, 0x18, 0xdb, 0xdd, 0xdd, 0x10, 0xda, 0x7f, 0x57, 0xf5, 0x8f,
-	0x55, 0xbb, 0xde, 0x04, 0xdb, 0x49, 0x1b, 0xbe, 0x79, 0x9e, 0x9d, 0x79, 0x66, 0xe7, 0xd9, 0x99,
-	0x31, 0xb4, 0xfd, 0x84, 0x1d, 0xfa, 0x09, 0x3b, 0x48, 0x78, 0x2c, 0x63, 0x62, 0xf9, 0x09, 0xa3,
-	0x5f, 0xca, 0x50, 0x3b, 0x0b, 0x19, 0x46, 0x92, 0x74, 0xa0, 0xc2, 0x02, 0xa7, 0xbc, 0x5d, 0xde,
-	0x6b, 0xb8, 0x15, 0x16, 0x90, 0x75, 0xa8, 0x09, 0x1c, 0x71, 0x94, 0x4e, 0x45, 0x63, 0xc6, 0x22,
-	0xbb, 0xd0, 0xe6, 0x18, 0x30, 0x8e, 0x23, 0xe9, 0x8d, 0x39, 0x13, 0x8e, 0xb5, 0x6d, 0xed, 0x35,
-	0xdc, 0xd6, 0x14, 0x1c, 0x72, 0x26, 0x94, 0x93, 0xe4, 0x63, 0x21, 0x31, 0xf0, 0x12, 0x44, 0x2e,
-	0x9c, 0x6a, 0xea, 0x64, 0xc0, 0x2b, 0x85, 0xa9, 0x0c, 0xc9, 0xf8, 0x3a, 0x64, 0x23, 0x67, 0x65,
-	0xbb, 0xbc, 0x67, 0xbb, 0xc6, 0x22, 0x04, 0xaa, 0x91, 0xff, 0x80, 0x4e, 0x4d, 0xe7, 0xd5, 0xdf,
-	0x64, 0x13, 0xec, 0x30, 0xbe, 0x8d, 0xbd, 0x31, 0x0f, 0x9d, 0xba, 0xc6, 0xeb, 0xca, 0x1e, 0xf2,
-	0x90, 0xfe, 0x01, 0xdd, 0x33, 0x8e, 0xbe, 0xc4, 0xb4, 0x10, 0x17, 0x3f, 0x92, 0x5d, 0xa8, 0x8d,
-	0xb4, 0xa1, 0xeb, 0x69, 0x1e, 0x37, 0x0f, 0x54, 0xdd, 0xe6, 0xdc, 0x1c, 0xd1, 0x0f, 0xd0, 0xcb,
-	0xc7, 0x89, 0x84, 0xfc, 0x02, 0x1d, 0x3f, 0xe4, 0xe8, 0x07, 0x9f, 0x3c, 0x7c, 0x62, 0x42, 0x0a,
-	0x4d, 0x60, 0xbb, 0x6d, 0x83, 0xfe, 0xaf, 0xc1, 0x0c, 0x7f, 0xe5, 0xfb, 0xfc, 0x3b, 0xd0, 0x3d,
-	0xc7, 0x10, 0xb3, 0xf7, 0x2a, 0x68, 0x4c, 0x0f, 0xa1, 0x97, 0x77, 0x11, 0x09, 0xd9, 0x82, 0x46,
-	0x14, 0x4b, 0xef, 0x26, 0x1e, 0x47, 0x81, 0xc9, 0x6e, 0x47, 0xb1, 0x7c, 0xa5, 0x6c, 0xca, 0xc0,
-	0xbe, 0xf2, 0x85, 0x98, 0xc4, 0x3c, 0x20, 0xab, 0xb0, 0x82, 0x0f, 0x3e, 0x0b, 0x0d, 0x5f, 0x6a,
-	0x28, 0xf1, 0xee, 0x7c, 0x71, 0xa7, 0x2f, 0xd6, 0x72, 0xf5, 0x37, 0x19, 0x80, 0x3d, 0x16, 0xc8,
-	0xb5, 0xa8, 0x96, 0x76, 0x9e, 0xd9, 0x64, 0x03, 0xea, 0xea, 0xdb, 0x63, 0x81, 0x53, 0x4d, 0xdf,
-	0x59, 0x99, 0x97, 0x01, 0x3d, 0x85, 0x7e, 0x2a, 0xcf, 0x34, 0xa1, 0x2a, 0x60, 0x1f, 0xec, 0xc4,
-	0x98, 0x46, 0xda, 0xb6, 0x2e, 0x7d, 0xe6, 0x33, 0x3b, 0xa6, 0x27, 0x40, 0x8a, 0xf1, 0x2f, 0x16,
-	0x98, 0xde, 0x42, 0x7f, 0x98, 0x04, 0x85, 0xe4, 0x8b, 0x0b, 0xde, 0x04, 0x3b, 0xc2, 0x89, 0x97,
-	0x29, 0xba, 0x1e, 0xe1, 0xe4, 0x42, 0xd5, 0xbd, 0x03, 0x2d, 0x75, 0x54, 0xa8, 0xbd, 0x19, 0xe1,
-	0x64, 0x68, 0x20, 0x7a, 0x04, 0xa4, 0x98, 0x68, 0xd9, 0x1b, 0xec, 0x43, 0x3f, 0x7d, 0xb4, 0xa5,
-	0x77, 0x53, 0xec, 0x45, 0xd7, 0x65, 0xec, 0x7d, 0xe8, 0xbe, 0x61, 0x42, 0x66, 0xb8, 0xe9, 0x3f,
-	0xd0, 0xcb, 0x43, 0x22, 0x21, 0xbf, 0x42, 0x63, 0xaa, 0xb4, 0x92, 0xd0, 0x9a, 0x7f, 0x89, 0xe7,
-	0x73, 0xda, 0x02, 0x78, 0x8f, 0x5c, 0xb0, 0x38, 0x52, 0x74, 0x7f, 0x42, 0x73, 0x66, 0x89, 0x24,
-	0x9d, 0x73, 0xfe, 0x88, 0xdc, 0x5c, 0xdd, 0x58, 0xa4, 0x07, 0x6a, 0x43, 0x68, 0x49, 0x57, 0x5c,
-	0xbd, 0x2c, 0x3e, 0x43, 0xd7, 0xc5, 0x1b, 0x8e, 0xe2, 0xee, 0x5d, 0x7c, 0x8f, 0x91, 0x8b, 0x37,
-	0x73, 0x4b, 0x63, 0x0b, 0x1a, 0x69, 0xf7, 0xab, 0x7e, 0x4a, 0xf7, 0x86, 0x9d, 0x02, 0x97, 0x01,
-	0xf9, 0x19, 0x60, 0xa4, 0x3b, 0x22, 0xf0, 0x7c, 0xa9, 0x67, 0xde, 0x72, 0x1b, 0x06, 0xf9, 0x4f,
-	0xaa, 0xd8, 0xd0, 0x17, 0x52, 0x3d, 0x57, 0xa0, 0x67, 0xdf, 0x72, 0x6d, 0x05, 0x0c, 0x05, 0x2a,
-	0xd1, 0x3b, 0x4a, 0x03, 0x93, 0x5f, 0x29, 0x9e, 0x69, 0xdc, 0x72, 0xae, 0x71, 0xdf, 0xa6, 0x0a,
-	0xce, 0x5c, 0x45, 0x42, 0x4e, 0xa0, 0xc3, 0x53, 0xd3, 0x93, 0xea, 0xea, 0x53, 0xc9, 0x56, 0xb5,
-	0x64, 0x85, 0xa2, 0xdc, 0x36, 0xcf, 0x00, 0x82, 0x5e, 0x40, 0xcf, 0xc5, 0xc7, 0xf8, 0x1e, 0x5f,
-	0x90, 0xfc, 0x87, 0x02, 0xd0, 0xdf, 0xa0, 0x5f, 0x60, 0x5a, 0xd2, 0x0d, 0xc7, 0x5f, 0xab, 0x60,
-	0x9d, 0xe3, 0x13, 0xf9, 0x1b, 0x5a, 0xd9, 0x5d, 0x45, 0xd2, 0x8b, 0x17, 0xd6, 0xde, 0x60, 0x6d,
-	0x01, 0x2a, 0x12, 0x5a, 0x52, 0xe1, 0xd9, 0x3d, 0x63, 0xc2, 0x0b, 0xdb, 0xc9, 0x84, 0x17, 0x17,
-	0x12, 0x2d, 0x91, 0x33, 0xe8, 0xe4, 0x47, 0x99, 0xac, 0x67, 0x32, 0x65, 0x5a, 0x75, 0xb0, 0xb1,
-	0x10, 0x9f, 0x92, 0xe4, 0x27, 0xcd, 0x90, 0xcc, 0xcd, 0xb9, 0x21, 0x99, 0x1f, 0xcb, 0x94, 0x24,
-	0x3f, 0x50, 0x86, 0x64, 0x6e, 0x20, 0x0d, 0xc9, 0xfc, 0xf4, 0xd1, 0x12, 0x39, 0x85, 0x76, 0x76,
-	0x9e, 0x84, 0x91, 0xa3, 0x30, 0x76, 0x46, 0x8e, 0xe2, 0xe4, 0xd1, 0x12, 0x39, 0x02, 0x78, 0x8d,
-	0xd2, 0xcc, 0x10, 0xe9, 0x6a, 0xb7, 0xe7, 0xf9, 0x1a, 0xf4, 0xf2, 0x80, 0x0e, 0xf9, 0x0b, 0x9a,
-	0x99, 0x9e, 0x24, 0x3f, 0xcd, 0xa8, 0x9f, 0x7b, 0x6a, 0xb0, 0x3a, 0x0f, 0xea, 0xd8, 0x7f, 0xa1,
-	0x9d, 0xeb, 0x1a, 0xb2, 0x66, 0xba, 0x36, 0xdf, 0x93, 0x83, 0xf5, 0x45, 0xb0, 0x62, 0xb8, 0xae,
-	0xe9, 0x3f, 0xfe, 0xef, 0xdf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x1f, 0x5a, 0x3e, 0x02, 0x08,
-	0x00, 0x00,
+	// 801 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x6d, 0x4f, 0xe3, 0x46,
+	0x10, 0x4e, 0xe2, 0x90, 0x38, 0x93, 0xf7, 0x6d, 0x00, 0x13, 0x54, 0x09, 0x16, 0x55, 0x02, 0x55,
+	0x0a, 0x85, 0x4a, 0xad, 0x54, 0x54, 0xfa, 0x02, 0x6d, 0x41, 0xaa, 0x2a, 0x64, 0x35, 0xfd, 0x58,
+	0xcb, 0xc4, 0x03, 0xac, 0x30, 0xb6, 0xbb, 0xbb, 0x21, 0xf4, 0xfe, 0xdd, 0xe9, 0xfe, 0xd8, 0x69,
+	0xd7, 0x9b, 0x60, 0x3b, 0xb9, 0x0b, 0xdf, 0x3c, 0xcf, 0xce, 0x3c, 0xb3, 0xf3, 0xec, 0xcc, 0xc8,
+	0xd0, 0xf6, 0x13, 0x76, 0xec, 0x27, 0x6c, 0x94, 0xf0, 0x58, 0xc6, 0xc4, 0xf2, 0x13, 0x46, 0xdf,
+	0x97, 0xa1, 0x76, 0x11, 0x32, 0x8c, 0x24, 0xe9, 0x40, 0x85, 0x05, 0x4e, 0x79, 0xaf, 0x7c, 0xd8,
+	0x70, 0x2b, 0x2c, 0x20, 0x5b, 0x50, 0x13, 0x38, 0xe1, 0x28, 0x9d, 0x8a, 0xc6, 0x8c, 0x45, 0x0e,
+	0xa0, 0xcd, 0x31, 0x60, 0x1c, 0x27, 0xd2, 0x9b, 0x72, 0x26, 0x1c, 0x6b, 0xcf, 0x3a, 0x6c, 0xb8,
+	0xad, 0x39, 0x38, 0xe6, 0x4c, 0x28, 0x27, 0xc9, 0xa7, 0x42, 0x62, 0xe0, 0x25, 0x88, 0x5c, 0x38,
+	0xd5, 0xd4, 0xc9, 0x80, 0x37, 0x0a, 0x53, 0x19, 0x92, 0xe9, 0x6d, 0xc8, 0x26, 0xce, 0xc6, 0x5e,
+	0xf9, 0xd0, 0x76, 0x8d, 0x45, 0x08, 0x54, 0x23, 0xff, 0x09, 0x9d, 0x9a, 0xce, 0xab, 0xbf, 0xc9,
+	0x0e, 0xd8, 0x61, 0x7c, 0x1f, 0x7b, 0x53, 0x1e, 0x3a, 0x75, 0x8d, 0xd7, 0x95, 0x3d, 0xe6, 0x21,
+	0xfd, 0x0e, 0xba, 0x17, 0x1c, 0x7d, 0x89, 0x69, 0x21, 0x2e, 0xfe, 0x47, 0x0e, 0xa0, 0x36, 0xd1,
+	0x86, 0xae, 0xa7, 0x79, 0xda, 0x1c, 0xa9, 0xba, 0xcd, 0xb9, 0x39, 0xa2, 0xff, 0x42, 0x2f, 0x1f,
+	0x27, 0x12, 0xf2, 0x15, 0x74, 0xfc, 0x90, 0xa3, 0x1f, 0xfc, 0xef, 0xe1, 0x0b, 0x13, 0x52, 0x68,
+	0x02, 0xdb, 0x6d, 0x1b, 0xf4, 0x37, 0x0d, 0x66, 0xf8, 0x2b, 0x9f, 0xe6, 0xdf, 0x87, 0xee, 0x25,
+	0x86, 0x98, 0xbd, 0x57, 0x41, 0x63, 0x7a, 0x0c, 0xbd, 0xbc, 0x8b, 0x48, 0xc8, 0x2e, 0x34, 0xa2,
+	0x58, 0x7a, 0x77, 0xf1, 0x34, 0x0a, 0x4c, 0x76, 0x3b, 0x8a, 0xe5, 0xef, 0xca, 0xa6, 0x0c, 0xec,
+	0x1b, 0x5f, 0x88, 0x59, 0xcc, 0x03, 0x32, 0x80, 0x0d, 0x7c, 0xf2, 0x59, 0x68, 0xf8, 0x52, 0x43,
+	0x89, 0xf7, 0xe0, 0x8b, 0x07, 0x7d, 0xb1, 0x96, 0xab, 0xbf, 0xc9, 0x10, 0xec, 0xa9, 0x40, 0xae,
+	0x45, 0xb5, 0xb4, 0xf3, 0xc2, 0x26, 0xdb, 0x50, 0x57, 0xdf, 0x1e, 0x0b, 0x9c, 0x6a, 0xfa, 0xce,
+	0xca, 0xbc, 0x0e, 0xe8, 0x39, 0xf4, 0x53, 0x79, 0xe6, 0x09, 0x55, 0x01, 0x47, 0x60, 0x27, 0xc6,
+	0x34, 0xd2, 0xb6, 0x75, 0xe9, 0x0b, 0x9f, 0xc5, 0x31, 0x3d, 0x03, 0x52, 0x8c, 0x7f, 0xb3, 0xc0,
+	0xf4, 0x1e, 0xfa, 0xe3, 0x24, 0x28, 0x24, 0x5f, 0x5d, 0xf0, 0x0e, 0xd8, 0x11, 0xce, 0xbc, 0x4c,
+	0xd1, 0xf5, 0x08, 0x67, 0x57, 0xaa, 0xee, 0x7d, 0x68, 0xa9, 0xa3, 0x42, 0xed, 0xcd, 0x08, 0x67,
+	0x63, 0x03, 0xd1, 0x13, 0x20, 0xc5, 0x44, 0xeb, 0xde, 0xe0, 0x08, 0xfa, 0xe9, 0xa3, 0xad, 0xbd,
+	0x9b, 0x62, 0x2f, 0xba, 0xae, 0x63, 0xef, 0x43, 0xf7, 0x4f, 0x26, 0x64, 0x86, 0x9b, 0xfe, 0x04,
+	0xbd, 0x3c, 0x24, 0x12, 0xf2, 0x35, 0x34, 0xe6, 0x4a, 0x2b, 0x09, 0xad, 0xe5, 0x97, 0x78, 0x3d,
+	0xa7, 0x2d, 0x80, 0x7f, 0x90, 0x0b, 0x16, 0x47, 0x8a, 0xee, 0x7b, 0x68, 0x2e, 0x2c, 0x91, 0xa4,
+	0x73, 0xce, 0x9f, 0x91, 0x9b, 0xab, 0x1b, 0x8b, 0xf4, 0x40, 0x6d, 0x08, 0x2d, 0xe9, 0x86, 0xab,
+	0x97, 0xc5, 0x3b, 0xe8, 0xba, 0x78, 0xc7, 0x51, 0x3c, 0xfc, 0x1d, 0x3f, 0x62, 0xe4, 0xe2, 0xdd,
+	0xd2, 0xd2, 0xd8, 0x85, 0x46, 0xda, 0xfd, 0xaa, 0x9f, 0xd2, 0xbd, 0x61, 0xa7, 0xc0, 0x75, 0x40,
+	0xbe, 0x04, 0x98, 0xe8, 0x8e, 0x08, 0x3c, 0x5f, 0xea, 0x99, 0xb7, 0xdc, 0x86, 0x41, 0x7e, 0x91,
+	0x2a, 0x36, 0xf4, 0x85, 0x54, 0xcf, 0x15, 0xe8, 0xd9, 0xb7, 0x5c, 0x5b, 0x01, 0x63, 0x81, 0x4a,
+	0xf4, 0x8e, 0xd2, 0xc0, 0xe4, 0x57, 0x8a, 0x67, 0x1a, 0xb7, 0x9c, 0x6b, 0xdc, 0xbf, 0x52, 0x05,
+	0x17, 0xae, 0x22, 0x21, 0x67, 0xd0, 0xe1, 0xa9, 0xe9, 0x49, 0x75, 0xf5, 0xb9, 0x64, 0x03, 0x2d,
+	0x59, 0xa1, 0x28, 0xb7, 0xcd, 0x33, 0x80, 0xa0, 0x57, 0xd0, 0x73, 0xf1, 0x39, 0x7e, 0xc4, 0x37,
+	0x24, 0xff, 0xac, 0x00, 0xf4, 0x1b, 0xe8, 0x17, 0x98, 0xd6, 0x74, 0xc3, 0xe9, 0x87, 0x2a, 0x58,
+	0x97, 0xf8, 0x42, 0x7e, 0x84, 0x56, 0x76, 0x57, 0x91, 0xf4, 0xe2, 0x85, 0xb5, 0x37, 0xdc, 0x5c,
+	0x81, 0x8a, 0x84, 0x96, 0x54, 0x78, 0x76, 0xcf, 0x98, 0xf0, 0xc2, 0x76, 0x32, 0xe1, 0xc5, 0x85,
+	0x44, 0x4b, 0xe4, 0x02, 0x3a, 0xf9, 0x51, 0x26, 0x5b, 0x99, 0x4c, 0x99, 0x56, 0x1d, 0x6e, 0xaf,
+	0xc4, 0xe7, 0x24, 0xf9, 0x49, 0x33, 0x24, 0x4b, 0x73, 0x6e, 0x48, 0x96, 0xc7, 0x32, 0x25, 0xc9,
+	0x0f, 0x94, 0x21, 0x59, 0x1a, 0x48, 0x43, 0xb2, 0x3c, 0x7d, 0xb4, 0x44, 0xce, 0xa1, 0x9d, 0x9d,
+	0x27, 0x61, 0xe4, 0x28, 0x8c, 0x9d, 0x91, 0xa3, 0x38, 0x79, 0xb4, 0x44, 0x4e, 0x00, 0xfe, 0x40,
+	0x69, 0x66, 0x88, 0x74, 0xb5, 0xdb, 0xeb, 0x7c, 0x0d, 0x7b, 0x79, 0x40, 0x87, 0xfc, 0x00, 0xcd,
+	0x4c, 0x4f, 0x92, 0x2f, 0x16, 0xd4, 0xaf, 0x3d, 0x35, 0x1c, 0x2c, 0x83, 0x3a, 0xf6, 0x67, 0x68,
+	0xe7, 0xba, 0x86, 0x6c, 0x9a, 0xae, 0xcd, 0xf7, 0xe4, 0x70, 0x6b, 0x15, 0xac, 0x18, 0x7e, 0x1d,
+	0x00, 0x99, 0xc4, 0x4f, 0xa3, 0x49, 0xcc, 0x31, 0x16, 0xa3, 0x00, 0x5f, 0x94, 0xe7, 0x6d, 0x4d,
+	0xff, 0x07, 0x7c, 0xfb, 0x31, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x6a, 0x64, 0xe2, 0x18, 0x08, 0x00,
+	0x00,
 }

glide.lock

@@ -1,5 +1,5 @@
-hash: 322a63b37abfe42807c2249c7d7b18dfb508c5548853732cf55c0c36a7688da5
-updated: 2017-10-31T14:32:36.104478036Z
+hash: aa8fb290b0e14af4bf4d4cae250ce66561c819a9cdd6447a0432de26f9216318
+updated: 2017-11-30T16:40:26.928155912-08:00
 imports:
 - name: github.com/beevik/etree
   version: 4cd0dd976db869f817248477718071a28e978df0
@@ -25,11 +25,14 @@ imports:
 - name: github.com/go-sql-driver/mysql
   version: 0b58b37b664c21f3010e836f1b931e1d0b0b0685
 - name: github.com/golang/protobuf
-  version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
+  version: 1e59b77b52bf8e4b449a57e6f79f21226d571845
   subpackages:
   - proto
   - protoc-gen-go
+  - protoc-gen-go/descriptor
+  - protoc-gen-go/generator
   - protoc-gen-go/grpc
+  - protoc-gen-go/plugin
   - ptypes/any
 - name: github.com/gorilla/context
   version: aed02d124ae4a0e94fea4541c8effd05bf0c8296

glide.yaml

@@ -128,11 +128,14 @@ import:
   - peer
   - transport
 - package: github.com/golang/protobuf
-  version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
+  version: 1e59b77b52bf8e4b449a57e6f79f21226d571845
   subpackages:
   - proto
   - protoc-gen-go
   - protoc-gen-go/grpc
+  - protoc-gen-go/descriptor        
+  - protoc-gen-go/plugin            
+  - protoc-gen-go/generator   
 - package: google.golang.org/genproto
   version: 411e09b969b1170a9f0c467558eb4c4c110d9c77
 

scripts/git-diff

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+DIFF=$( git diff . )
+if [ "$DIFF" != "" ]; then
+    echo "$DIFF" >&2
+    exit 1
+fi

server/internal/types.pb.go

@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: server/internal/types.proto
-// DO NOT EDIT!
 
 /*
 Package internal is a generated protocol buffer package.
@@ -42,6 +41,20 @@ func (m *RefreshToken) String() string            { return proto.CompactTextStri
 func (*RefreshToken) ProtoMessage()               {}
 func (*RefreshToken) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
+func (m *RefreshToken) GetRefreshId() string {
+	if m != nil {
+		return m.RefreshId
+	}
+	return ""
+}
+
+func (m *RefreshToken) GetToken() string {
+	if m != nil {
+		return m.Token
+	}
+	return ""
+}
+
 // IDTokenSubject represents both the userID and connID which is returned
 // as the "sub" claim in the ID Token.
 type IDTokenSubject struct {
@@ -54,6 +67,20 @@ func (m *IDTokenSubject) String() string            { return proto.CompactTextSt
 func (*IDTokenSubject) ProtoMessage()               {}
 func (*IDTokenSubject) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
+func (m *IDTokenSubject) GetUserId() string {
+	if m != nil {
+		return m.UserId
+	}
+	return ""
+}
+
+func (m *IDTokenSubject) GetConnId() string {
+	if m != nil {
+		return m.ConnId
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterType((*RefreshToken)(nil), "internal.RefreshToken")
 	proto.RegisterType((*IDTokenSubject)(nil), "internal.IDTokenSubject")

vendor/github.com/golang/protobuf/proto/encode.go

@@ -174,11 +174,11 @@ func sizeFixed32(x uint64) int {
 // This is the format used for the sint64 protocol buffer type.
 func (p *Buffer) EncodeZigzag64(x uint64) error {
 	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+	return p.EncodeVarint((x << 1) ^ uint64((int64(x) >> 63)))
 }
 
 func sizeZigzag64(x uint64) int {
-	return sizeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+	return sizeVarint((x << 1) ^ uint64((int64(x) >> 63)))
 }
 
 // EncodeZigzag32 writes a zigzag-encoded 32-bit integer

vendor/github.com/golang/protobuf/proto/lib.go

@@ -73,7 +73,6 @@ for a protocol buffer variable v:
 When the .proto file specifies `syntax="proto3"`, there are some differences:
 
   - Non-repeated fields of non-message type are values instead of pointers.
-  - Getters are only generated for message and oneof fields.
   - Enum types do not get an Enum method.
 
 The simplest way to describe this is to see an example.

vendor/github.com/golang/protobuf/proto/text_parser.go

@@ -865,7 +865,7 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 		return p.readStruct(fv, terminator)
 	case reflect.Uint32:
 		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(uint64(x))
+			fv.SetUint(x)
 			return nil
 		}
 	case reflect.Uint64:

vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go

@@ -0,0 +1,293 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/protobuf/compiler/plugin.proto
+
+/*
+Package plugin_go is a generated protocol buffer package.
+
+It is generated from these files:
+	google/protobuf/compiler/plugin.proto
+
+It has these top-level messages:
+	Version
+	CodeGeneratorRequest
+	CodeGeneratorResponse
+*/
+package plugin_go
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
+
+// 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.ProtoPackageIsVersion2 // please upgrade the proto package
+
+// The version number of protocol compiler.
+type Version struct {
+	Major *int32 `protobuf:"varint,1,opt,name=major" json:"major,omitempty"`
+	Minor *int32 `protobuf:"varint,2,opt,name=minor" json:"minor,omitempty"`
+	Patch *int32 `protobuf:"varint,3,opt,name=patch" json:"patch,omitempty"`
+	// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+	// be empty for mainline stable releases.
+	Suffix           *string `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *Version) Reset()                    { *m = Version{} }
+func (m *Version) String() string            { return proto.CompactTextString(m) }
+func (*Version) ProtoMessage()               {}
+func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *Version) GetMajor() int32 {
+	if m != nil && m.Major != nil {
+		return *m.Major
+	}
+	return 0
+}
+
+func (m *Version) GetMinor() int32 {
+	if m != nil && m.Minor != nil {
+		return *m.Minor
+	}
+	return 0
+}
+
+func (m *Version) GetPatch() int32 {
+	if m != nil && m.Patch != nil {
+		return *m.Patch
+	}
+	return 0
+}
+
+func (m *Version) GetSuffix() string {
+	if m != nil && m.Suffix != nil {
+		return *m.Suffix
+	}
+	return ""
+}
+
+// An encoded CodeGeneratorRequest is written to the plugin's stdin.
+type CodeGeneratorRequest struct {
+	// The .proto files that were explicitly listed on the command-line.  The
+	// code generator should generate code only for these files.  Each file's
+	// descriptor will be included in proto_file, below.
+	FileToGenerate []string `protobuf:"bytes,1,rep,name=file_to_generate,json=fileToGenerate" json:"file_to_generate,omitempty"`
+	// The generator parameter passed on the command-line.
+	Parameter *string `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
+	// FileDescriptorProtos for all files in files_to_generate and everything
+	// they import.  The files will appear in topological order, so each file
+	// appears before any file that imports it.
+	//
+	// protoc guarantees that all proto_files will be written after
+	// the fields above, even though this is not technically guaranteed by the
+	// protobuf wire format.  This theoretically could allow a plugin to stream
+	// in the FileDescriptorProtos and handle them one by one rather than read
+	// the entire set into memory at once.  However, as of this writing, this
+	// is not similarly optimized on protoc's end -- it will store all fields in
+	// memory at once before sending them to the plugin.
+	//
+	// Type names of fields and extensions in the FileDescriptorProto are always
+	// fully qualified.
+	ProtoFile []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file,json=protoFile" json:"proto_file,omitempty"`
+	// The version number of protocol compiler.
+	CompilerVersion  *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"`
+	XXX_unrecognized []byte   `json:"-"`
+}
+
+func (m *CodeGeneratorRequest) Reset()                    { *m = CodeGeneratorRequest{} }
+func (m *CodeGeneratorRequest) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorRequest) ProtoMessage()               {}
+func (*CodeGeneratorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *CodeGeneratorRequest) GetFileToGenerate() []string {
+	if m != nil {
+		return m.FileToGenerate
+	}
+	return nil
+}
+
+func (m *CodeGeneratorRequest) GetParameter() string {
+	if m != nil && m.Parameter != nil {
+		return *m.Parameter
+	}
+	return ""
+}
+
+func (m *CodeGeneratorRequest) GetProtoFile() []*google_protobuf.FileDescriptorProto {
+	if m != nil {
+		return m.ProtoFile
+	}
+	return nil
+}
+
+func (m *CodeGeneratorRequest) GetCompilerVersion() *Version {
+	if m != nil {
+		return m.CompilerVersion
+	}
+	return nil
+}
+
+// The plugin writes an encoded CodeGeneratorResponse to stdout.
+type CodeGeneratorResponse struct {
+	// Error message.  If non-empty, code generation failed.  The plugin process
+	// should exit with status code zero even if it reports an error in this way.
+	//
+	// This should be used to indicate errors in .proto files which prevent the
+	// code generator from generating correct code.  Errors which indicate a
+	// problem in protoc itself -- such as the input CodeGeneratorRequest being
+	// unparseable -- should be reported by writing a message to stderr and
+	// exiting with a non-zero status code.
+	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
+	XXX_unrecognized []byte                        `json:"-"`
+}
+
+func (m *CodeGeneratorResponse) Reset()                    { *m = CodeGeneratorResponse{} }
+func (m *CodeGeneratorResponse) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorResponse) ProtoMessage()               {}
+func (*CodeGeneratorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+func (m *CodeGeneratorResponse) GetError() string {
+	if m != nil && m.Error != nil {
+		return *m.Error
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse) GetFile() []*CodeGeneratorResponse_File {
+	if m != nil {
+		return m.File
+	}
+	return nil
+}
+
+// Represents a single generated file.
+type CodeGeneratorResponse_File struct {
+	// The file name, relative to the output directory.  The name must not
+	// contain "." or ".." components and must be relative, not be absolute (so,
+	// the file cannot lie outside the output directory).  "/" must be used as
+	// the path separator, not "\".
+	//
+	// If the name is omitted, the content will be appended to the previous
+	// file.  This allows the generator to break large files into small chunks,
+	// and allows the generated text to be streamed back to protoc so that large
+	// files need not reside completely in memory at one time.  Note that as of
+	// this writing protoc does not optimize for this -- it will read the entire
+	// CodeGeneratorResponse before writing files to disk.
+	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	// If non-empty, indicates that the named file should already exist, and the
+	// content here is to be inserted into that file at a defined insertion
+	// point.  This feature allows a code generator to extend the output
+	// produced by another code generator.  The original generator may provide
+	// insertion points by placing special annotations in the file that look
+	// like:
+	//   @@protoc_insertion_point(NAME)
+	// The annotation can have arbitrary text before and after it on the line,
+	// which allows it to be placed in a comment.  NAME should be replaced with
+	// an identifier naming the point -- this is what other generators will use
+	// as the insertion_point.  Code inserted at this point will be placed
+	// immediately above the line containing the insertion point (thus multiple
+	// insertions to the same point will come out in the order they were added).
+	// The double-@ is intended to make it unlikely that the generated code
+	// could contain things that look like insertion points by accident.
+	//
+	// For example, the C++ code generator places the following line in the
+	// .pb.h files that it generates:
+	//   // @@protoc_insertion_point(namespace_scope)
+	// This line appears within the scope of the file's package namespace, but
+	// outside of any particular class.  Another plugin can then specify the
+	// insertion_point "namespace_scope" to generate additional classes or
+	// other declarations that should be placed in this scope.
+	//
+	// Note that if the line containing the insertion point begins with
+	// whitespace, the same whitespace will be added to every line of the
+	// inserted text.  This is useful for languages like Python, where
+	// indentation matters.  In these languages, the insertion point comment
+	// should be indented the same amount as any inserted code will need to be
+	// in order to work correctly in that context.
+	//
+	// The code generator that generates the initial file and the one which
+	// inserts into it must both run as part of a single invocation of protoc.
+	// Code generators are executed in the order in which they appear on the
+	// command line.
+	//
+	// If |insertion_point| is present, |name| must also be present.
+	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point,json=insertionPoint" json:"insertion_point,omitempty"`
+	// The file contents.
+	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *CodeGeneratorResponse_File) Reset()                    { *m = CodeGeneratorResponse_File{} }
+func (m *CodeGeneratorResponse_File) String() string            { return proto.CompactTextString(m) }
+func (*CodeGeneratorResponse_File) ProtoMessage()               {}
+func (*CodeGeneratorResponse_File) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
+
+func (m *CodeGeneratorResponse_File) GetName() string {
+	if m != nil && m.Name != nil {
+		return *m.Name
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse_File) GetInsertionPoint() string {
+	if m != nil && m.InsertionPoint != nil {
+		return *m.InsertionPoint
+	}
+	return ""
+}
+
+func (m *CodeGeneratorResponse_File) GetContent() string {
+	if m != nil && m.Content != nil {
+		return *m.Content
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Version)(nil), "google.protobuf.compiler.Version")
+	proto.RegisterType((*CodeGeneratorRequest)(nil), "google.protobuf.compiler.CodeGeneratorRequest")
+	proto.RegisterType((*CodeGeneratorResponse)(nil), "google.protobuf.compiler.CodeGeneratorResponse")
+	proto.RegisterType((*CodeGeneratorResponse_File)(nil), "google.protobuf.compiler.CodeGeneratorResponse.File")
+}
+
+func init() { proto.RegisterFile("google/protobuf/compiler/plugin.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 417 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x6a, 0x14, 0x41,
+	0x10, 0xc6, 0x19, 0x77, 0x63, 0x98, 0x8a, 0x64, 0x43, 0x13, 0xa5, 0x09, 0x39, 0x8c, 0x8b, 0xe2,
+	0x5c, 0x32, 0x0b, 0xc1, 0x8b, 0x78, 0x4b, 0x44, 0x3d, 0x78, 0x58, 0x1a, 0xf1, 0x20, 0xc8, 0x30,
+	0x99, 0xd4, 0x74, 0x5a, 0x66, 0xba, 0xc6, 0xee, 0x1e, 0xf1, 0x49, 0x7d, 0x0f, 0xdf, 0x40, 0xfa,
+	0xcf, 0x24, 0xb2, 0xb8, 0xa7, 0xee, 0xef, 0x57, 0xd5, 0xd5, 0x55, 0x1f, 0x05, 0x2f, 0x25, 0x91,
+	0xec, 0x71, 0x33, 0x1a, 0x72, 0x74, 0x33, 0x75, 0x9b, 0x96, 0x86, 0x51, 0xf5, 0x68, 0x36, 0x63,
+	0x3f, 0x49, 0xa5, 0xab, 0x10, 0x60, 0x3c, 0xa6, 0x55, 0x73, 0x5a, 0x35, 0xa7, 0x9d, 0x15, 0xbb,
+	0x05, 0x6e, 0xd1, 0xb6, 0x46, 0x8d, 0x8e, 0x4c, 0xcc, 0x5e, 0xb7, 0x70, 0xf8, 0x05, 0x8d, 0x55,
+	0xa4, 0xd9, 0x29, 0x1c, 0x0c, 0xcd, 0x77, 0x32, 0x3c, 0x2b, 0xb2, 0xf2, 0x40, 0x44, 0x11, 0xa8,
+	0xd2, 0x64, 0xf8, 0xa3, 0x44, 0xbd, 0xf0, 0x74, 0x6c, 0x5c, 0x7b, 0xc7, 0x17, 0x91, 0x06, 0xc1,
+	0x9e, 0xc1, 0x63, 0x3b, 0x75, 0x9d, 0xfa, 0xc5, 0x97, 0x45, 0x56, 0xe6, 0x22, 0xa9, 0xf5, 0x9f,
+	0x0c, 0x4e, 0xaf, 0xe9, 0x16, 0x3f, 0xa0, 0x46, 0xd3, 0x38, 0x32, 0x02, 0x7f, 0x4c, 0x68, 0x1d,
+	0x2b, 0xe1, 0xa4, 0x53, 0x3d, 0xd6, 0x8e, 0x6a, 0x19, 0x63, 0xc8, 0xb3, 0x62, 0x51, 0xe6, 0xe2,
+	0xd8, 0xf3, 0xcf, 0x94, 0x5e, 0x20, 0x3b, 0x87, 0x7c, 0x6c, 0x4c, 0x33, 0xa0, 0xc3, 0xd8, 0x4a,
+	0x2e, 0x1e, 0x00, 0xbb, 0x06, 0x08, 0xe3, 0xd4, 0xfe, 0x15, 0x5f, 0x15, 0x8b, 0xf2, 0xe8, 0xf2,
+	0x45, 0xb5, 0x6b, 0xcb, 0x7b, 0xd5, 0xe3, 0xbb, 0x7b, 0x03, 0xb6, 0x1e, 0x8b, 0x3c, 0x44, 0x7d,
+	0x84, 0x7d, 0x82, 0x93, 0xd9, 0xb8, 0xfa, 0x67, 0xf4, 0x24, 0x8c, 0x77, 0x74, 0xf9, 0xbc, 0xda,
+	0xe7, 0x70, 0x95, 0xcc, 0x13, 0xab, 0x99, 0x24, 0xb0, 0xfe, 0x9d, 0xc1, 0xd3, 0x9d, 0x99, 0xed,
+	0x48, 0xda, 0xa2, 0xf7, 0x0e, 0x8d, 0x49, 0x3e, 0xe7, 0x22, 0x0a, 0xf6, 0x11, 0x96, 0xff, 0x34,
+	0xff, 0x7a, 0xff, 0x8f, 0xff, 0x2d, 0x1a, 0x66, 0x13, 0xa1, 0xc2, 0xd9, 0x37, 0x58, 0x86, 0x79,
+	0x18, 0x2c, 0x75, 0x33, 0x60, 0xfa, 0x26, 0xdc, 0xd9, 0x2b, 0x58, 0x29, 0x6d, 0xd1, 0x38, 0x45,
+	0xba, 0x1e, 0x49, 0x69, 0x97, 0xcc, 0x3c, 0xbe, 0xc7, 0x5b, 0x4f, 0x19, 0x87, 0xc3, 0x96, 0xb4,
+	0x43, 0xed, 0xf8, 0x2a, 0x24, 0xcc, 0xf2, 0x4a, 0xc2, 0x79, 0x4b, 0xc3, 0xde, 0xfe, 0xae, 0x9e,
+	0x6c, 0xc3, 0x6e, 0x06, 0x7b, 0xed, 0xd7, 0x37, 0x52, 0xb9, 0xbb, 0xe9, 0xc6, 0x87, 0x37, 0x92,
+	0xfa, 0x46, 0xcb, 0x87, 0x65, 0x0c, 0x97, 0xf6, 0x42, 0xa2, 0xbe, 0x90, 0x94, 0x56, 0xfa, 0x6d,
+	0x3c, 0x6a, 0x49, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x15, 0x40, 0xc5, 0xfe, 0x02, 0x00,
+	0x00,
+}

vendor/github.com/golang/protobuf/ptypes/any/any.pb.go

@@ -1,12 +1,11 @@
-// Code generated by protoc-gen-go.
-// source: github.com/golang/protobuf/ptypes/any/any.proto
-// DO NOT EDIT!
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: google/protobuf/any.proto
 
 /*
 Package any is a generated protocol buffer package.
 
 It is generated from these files:
-	github.com/golang/protobuf/ptypes/any/any.proto
+	google/protobuf/any.proto
 
 It has these top-level messages:
 	Any
@@ -63,6 +62,16 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 //       any.Unpack(foo)
 //       ...
 //
+//  Example 4: Pack and unpack a message in Go
+//
+//      foo := &pb.Foo{...}
+//      any, err := ptypes.MarshalAny(foo)
+//      ...
+//      foo := &pb.Foo{}
+//      if err := ptypes.UnmarshalAny(any, foo); err != nil {
+//        ...
+//      }
+//
 // The pack methods provided by protobuf library will by default use
 // 'type.googleapis.com/full.type.name' as the type URL and the unpack
 // methods only use the fully qualified type name after the last '/'
@@ -132,24 +141,38 @@ func (*Any) ProtoMessage()               {}
 func (*Any) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 func (*Any) XXX_WellKnownType() string   { return "Any" }
 
+func (m *Any) GetTypeUrl() string {
+	if m != nil {
+		return m.TypeUrl
+	}
+	return ""
+}
+
+func (m *Any) GetValue() []byte {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Any)(nil), "google.protobuf.Any")
 }
 
-func init() { proto.RegisterFile("github.com/golang/protobuf/ptypes/any/any.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 187 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x4f, 0xcf, 0x2c, 0xc9,
-	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
-	0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xcc,
-	0xab, 0x04, 0x61, 0x3d, 0xb0, 0xb8, 0x10, 0x7f, 0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, 0x1e, 0x4c,
-	0x95, 0x92, 0x19, 0x17, 0xb3, 0x63, 0x5e, 0xa5, 0x90, 0x24, 0x17, 0x07, 0x48, 0x79, 0x7c, 0x69,
-	0x51, 0x8e, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x3b, 0x88, 0x1f, 0x5a, 0x94, 0x23, 0x24,
-	0xc2, 0xc5, 0x5a, 0x96, 0x98, 0x53, 0x9a, 0x2a, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x13, 0x04, 0xe1,
-	0x38, 0x15, 0x71, 0x09, 0x27, 0xe7, 0xe7, 0xea, 0xa1, 0x19, 0xe7, 0xc4, 0xe1, 0x98, 0x57, 0x19,
-	0x00, 0xe2, 0x04, 0x30, 0x46, 0xa9, 0x12, 0xe5, 0xb8, 0x05, 0x8c, 0x8c, 0x8b, 0x98, 0x98, 0xdd,
-	0x03, 0x9c, 0x56, 0x31, 0xc9, 0xb9, 0x43, 0x4c, 0x0b, 0x80, 0xaa, 0xd2, 0x0b, 0x4f, 0xcd, 0xc9,
-	0xf1, 0xce, 0xcb, 0x2f, 0xcf, 0x0b, 0x01, 0xa9, 0x4e, 0x62, 0x03, 0x6b, 0x37, 0x06, 0x04, 0x00,
-	0x00, 0xff, 0xff, 0xc6, 0x4d, 0x03, 0x23, 0xf6, 0x00, 0x00, 0x00,
+	// 185 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f,
+	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4,
+	0x03, 0x73, 0x84, 0xf8, 0x21, 0x52, 0x7a, 0x30, 0x29, 0x25, 0x33, 0x2e, 0x66, 0xc7, 0xbc, 0x4a,
+	0x21, 0x49, 0x2e, 0x8e, 0x92, 0xca, 0x82, 0xd4, 0xf8, 0xd2, 0xa2, 0x1c, 0x09, 0x46, 0x05, 0x46,
+	0x0d, 0xce, 0x20, 0x76, 0x10, 0x3f, 0xb4, 0x28, 0x47, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7,
+	0x34, 0x55, 0x82, 0x49, 0x81, 0x51, 0x83, 0x27, 0x08, 0xc2, 0x71, 0xca, 0xe7, 0x12, 0x4e, 0xce,
+	0xcf, 0xd5, 0x43, 0x33, 0xce, 0x89, 0xc3, 0x31, 0xaf, 0x32, 0x00, 0xc4, 0x09, 0x60, 0x8c, 0x52,
+	0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc,
+	0x4b, 0x47, 0xb8, 0xa8, 0x00, 0x64, 0x7a, 0x31, 0xc8, 0x61, 0x8b, 0x98, 0x98, 0xdd, 0x03, 0x9c,
+	0x56, 0x31, 0xc9, 0xb9, 0x43, 0x8c, 0x0a, 0x80, 0x2a, 0xd1, 0x0b, 0x4f, 0xcd, 0xc9, 0xf1, 0xce,
+	0xcb, 0x2f, 0xcf, 0x0b, 0x01, 0x29, 0x4d, 0x62, 0x03, 0xeb, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff,
+	0xff, 0x13, 0xf8, 0xe8, 0x42, 0xdd, 0x00, 0x00, 0x00,
 }