From ff152c16f3b08ab9cea50b88f2df4fabea8f6a6c Mon Sep 17 00:00:00 2001 From: Pavel Kalinnikov Date: Wed, 4 May 2022 15:36:20 -0400 Subject: [PATCH] Update protoc to 3.20.1 Since v3.14.0 protoc started using the new import path for Go types: `google.golang.org/protobuf`. This change updates the protobuf compiler to the latest v3.20.1, to get rid of the deprecated import path and take advantage of newer versions after v3.14.0. --- crypto/keyspb/keyspb.pb.go | 2 +- gen.go | 2 +- go.mod | 1 - integration/cloudbuild/testbase/Dockerfile | 2 +- quota/etcd/quotapb/gen.go | 2 +- quota/etcd/quotapb/quotapb.pb.go | 14 +++--- quota/etcd/quotapb/quotapb_grpc.pb.go | 14 +++--- quota/etcd/storagepb/storagepb.pb.go | 2 +- storage/cloudspanner/spannerpb/spanner.pb.go | 10 ++-- storage/storagepb/storage.pb.go | 2 +- trillian.pb.go | 48 ++++++++++---------- trillian_admin_api.pb.go | 26 +++++------ trillian_admin_api_grpc.pb.go | 2 +- trillian_log_api.pb.go | 14 +++--- trillian_log_api_grpc.pb.go | 2 +- 15 files changed, 71 insertions(+), 72 deletions(-) diff --git a/crypto/keyspb/keyspb.pb.go b/crypto/keyspb/keyspb.pb.go index 10f2d62a55..1b09222a5e 100644 --- a/crypto/keyspb/keyspb.pb.go +++ b/crypto/keyspb/keyspb.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: crypto/keyspb/keyspb.proto package keyspb diff --git a/gen.go b/gen.go index b0db0b2cb2..df5b8036ad 100644 --- a/gen.go +++ b/gen.go @@ -14,7 +14,7 @@ package trillian -//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/googleapis/googleapis --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. --go-grpc_opt=require_unimplemented_servers=false trillian_log_api.proto trillian_admin_api.proto trillian.proto --doc_out=markdown,api.md:./docs/ +//go:generate protoc -I=. -I=$GOPATH/src/github.com/googleapis/googleapis --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. --go-grpc_opt=require_unimplemented_servers=false trillian_log_api.proto trillian_admin_api.proto trillian.proto --doc_out=markdown,api.md:./docs/ //go:generate protoc -I=. --go_out=paths=source_relative:. crypto/keyspb/keyspb.proto //go:generate mockgen -package tmock -destination testonly/tmock/mock_log_server.go github.com/google/trillian TrillianLogServer diff --git a/go.mod b/go.mod index 4b77ea08dc..10741db711 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,6 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/mock v1.6.0 - github.com/golang/protobuf v1.5.2 github.com/google/btree v1.0.1 github.com/google/certificate-transparency-go v1.1.2-0.20210512142713-bed466244fa6 github.com/google/go-cmp v0.5.8 diff --git a/integration/cloudbuild/testbase/Dockerfile b/integration/cloudbuild/testbase/Dockerfile index 8dae3ffe54..c810d6254b 100644 --- a/integration/cloudbuild/testbase/Dockerfile +++ b/integration/cloudbuild/testbase/Dockerfile @@ -26,7 +26,7 @@ RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/i RUN mkdir protoc && \ (cd protoc && \ - PROTOC_VERSION="3.12.4" && \ + PROTOC_VERSION="3.20.1" && \ PROTOC_ZIP="protoc-${PROTOC_VERSION}-linux-x86_64.zip" && \ wget "https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP}" && \ unzip -o ${PROTOC_ZIP} -d /usr/local bin/protoc && \ diff --git a/quota/etcd/quotapb/gen.go b/quota/etcd/quotapb/gen.go index b3a382ea47..699977cc56 100644 --- a/quota/etcd/quotapb/gen.go +++ b/quota/etcd/quotapb/gen.go @@ -14,4 +14,4 @@ package quotapb -//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/googleapis/googleapis --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. --go-grpc_opt=require_unimplemented_servers=false quotapb.proto +//go:generate protoc -I=. -I=$GOPATH/src/github.com/googleapis/googleapis --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. --go-grpc_opt=require_unimplemented_servers=false quotapb.proto diff --git a/quota/etcd/quotapb/quotapb.pb.go b/quota/etcd/quotapb/quotapb.pb.go index b75b203ede..f2661e9a5f 100644 --- a/quota/etcd/quotapb/quotapb.pb.go +++ b/quota/etcd/quotapb/quotapb.pb.go @@ -15,17 +15,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: quotapb.proto package quotapb import ( - empty "github.com/golang/protobuf/ptypes/empty" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -682,7 +682,7 @@ type UpdateConfigRequest struct { Config *Config `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"` // Fields modified by the update request. // For example: "state" or "max_tokens". - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` // If true the updated quota is reset, regardless of the update's contents. // A reset quota is replenished to its maximum number of tokens. ResetQuota bool `protobuf:"varint,4,opt,name=reset_quota,json=resetQuota,proto3" json:"reset_quota,omitempty"` @@ -734,7 +734,7 @@ func (x *UpdateConfigRequest) GetConfig() *Config { return nil } -func (x *UpdateConfigRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -891,8 +891,8 @@ var file_quotapb_proto_goTypes = []interface{}{ (*ListConfigsRequest)(nil), // 8: quotapb.ListConfigsRequest (*ListConfigsResponse)(nil), // 9: quotapb.ListConfigsResponse (*UpdateConfigRequest)(nil), // 10: quotapb.UpdateConfigRequest - (*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask - (*empty.Empty)(nil), // 12: google.protobuf.Empty + (*fieldmaskpb.FieldMask)(nil), // 11: google.protobuf.FieldMask + (*emptypb.Empty)(nil), // 12: google.protobuf.Empty } var file_quotapb_proto_depIdxs = []int32{ 0, // 0: quotapb.Config.state:type_name -> quotapb.Config.State diff --git a/quota/etcd/quotapb/quotapb_grpc.pb.go b/quota/etcd/quotapb/quotapb_grpc.pb.go index f6f36394a5..47f98c5c8f 100644 --- a/quota/etcd/quotapb/quotapb_grpc.pb.go +++ b/quota/etcd/quotapb/quotapb_grpc.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.12.4 +// - protoc v3.20.1 // source: quotapb.proto package quotapb import ( context "context" - empty "github.com/golang/protobuf/ptypes/empty" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -27,7 +27,7 @@ type QuotaClient interface { CreateConfig(ctx context.Context, in *CreateConfigRequest, opts ...grpc.CallOption) (*Config, error) // Deletes an existing quota. Non-existing quotas are considered infinite by // the quota system. - DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) + DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) // Retrieves a quota by name. GetConfig(ctx context.Context, in *GetConfigRequest, opts ...grpc.CallOption) (*Config, error) // Lists quotas according to the specified criteria. @@ -53,8 +53,8 @@ func (c *quotaClient) CreateConfig(ctx context.Context, in *CreateConfigRequest, return out, nil } -func (c *quotaClient) DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) { - out := new(empty.Empty) +func (c *quotaClient) DeleteConfig(ctx context.Context, in *DeleteConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, "/quotapb.Quota/DeleteConfig", in, out, opts...) if err != nil { return nil, err @@ -97,7 +97,7 @@ type QuotaServer interface { CreateConfig(context.Context, *CreateConfigRequest) (*Config, error) // Deletes an existing quota. Non-existing quotas are considered infinite by // the quota system. - DeleteConfig(context.Context, *DeleteConfigRequest) (*empty.Empty, error) + DeleteConfig(context.Context, *DeleteConfigRequest) (*emptypb.Empty, error) // Retrieves a quota by name. GetConfig(context.Context, *GetConfigRequest) (*Config, error) // Lists quotas according to the specified criteria. @@ -113,7 +113,7 @@ type UnimplementedQuotaServer struct { func (UnimplementedQuotaServer) CreateConfig(context.Context, *CreateConfigRequest) (*Config, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateConfig not implemented") } -func (UnimplementedQuotaServer) DeleteConfig(context.Context, *DeleteConfigRequest) (*empty.Empty, error) { +func (UnimplementedQuotaServer) DeleteConfig(context.Context, *DeleteConfigRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteConfig not implemented") } func (UnimplementedQuotaServer) GetConfig(context.Context, *GetConfigRequest) (*Config, error) { diff --git a/quota/etcd/storagepb/storagepb.pb.go b/quota/etcd/storagepb/storagepb.pb.go index 56be2861d8..5cc4dd4871 100644 --- a/quota/etcd/storagepb/storagepb.pb.go +++ b/quota/etcd/storagepb/storagepb.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: storagepb.proto // Package storagepb contains definitions for quota storage protos, which are diff --git a/storage/cloudspanner/spannerpb/spanner.pb.go b/storage/cloudspanner/spannerpb/spanner.pb.go index 04a2130d98..be51eb4f42 100644 --- a/storage/cloudspanner/spannerpb/spanner.pb.go +++ b/storage/cloudspanner/spannerpb/spanner.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: spanner.proto package spannerpb import ( - any "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" ) @@ -432,7 +432,7 @@ type TreeInfo struct { // epoch. UpdateTimeNanos int64 `protobuf:"varint,14,opt,name=update_time_nanos,json=updateTimeNanos,proto3" json:"update_time_nanos,omitempty"` // private_key should be used to generate signatures for this tree. - PrivateKey *any.Any `protobuf:"bytes,15,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"` + PrivateKey *anypb.Any `protobuf:"bytes,15,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"` // public_key_der should be used to verify signatures produced by this tree. // It is the key in DER-encoded PKIX form. PublicKeyDer []byte `protobuf:"bytes,16,opt,name=public_key_der,json=publicKeyDer,proto3" json:"public_key_der,omitempty"` @@ -561,7 +561,7 @@ func (x *TreeInfo) GetUpdateTimeNanos() int64 { return 0 } -func (x *TreeInfo) GetPrivateKey() *any.Any { +func (x *TreeInfo) GetPrivateKey() *anypb.Any { if x != nil { return x.PrivateKey } @@ -878,7 +878,7 @@ var file_spanner_proto_goTypes = []interface{}{ (*MapStorageConfig)(nil), // 6: spannerpb.MapStorageConfig (*TreeInfo)(nil), // 7: spannerpb.TreeInfo (*TreeHead)(nil), // 8: spannerpb.TreeHead - (*any.Any)(nil), // 9: google.protobuf.Any + (*anypb.Any)(nil), // 9: google.protobuf.Any } var file_spanner_proto_depIdxs = []int32{ 1, // 0: spannerpb.TreeInfo.tree_type:type_name -> spannerpb.TreeType diff --git a/storage/storagepb/storage.pb.go b/storage/storagepb/storage.pb.go index 292ac18bda..cb32a3e993 100644 --- a/storage/storagepb/storage.pb.go +++ b/storage/storagepb/storage.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: storage.proto package storagepb diff --git a/trillian.pb.go b/trillian.pb.go index 28a40f549e..e127dd0a6b 100644 --- a/trillian.pb.go +++ b/trillian.pb.go @@ -15,17 +15,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: trillian.proto package trillian import ( - any "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -316,16 +316,16 @@ type Tree struct { Description string `protobuf:"bytes,9,opt,name=description,proto3" json:"description,omitempty"` // Storage-specific settings. // Varies according to the storage implementation backing Trillian. - StorageSettings *any.Any `protobuf:"bytes,13,opt,name=storage_settings,json=storageSettings,proto3" json:"storage_settings,omitempty"` + StorageSettings *anypb.Any `protobuf:"bytes,13,opt,name=storage_settings,json=storageSettings,proto3" json:"storage_settings,omitempty"` // Interval after which a new signed root is produced even if there have been // no submission. If zero, this behavior is disabled. - MaxRootDuration *duration.Duration `protobuf:"bytes,15,opt,name=max_root_duration,json=maxRootDuration,proto3" json:"max_root_duration,omitempty"` + MaxRootDuration *durationpb.Duration `protobuf:"bytes,15,opt,name=max_root_duration,json=maxRootDuration,proto3" json:"max_root_duration,omitempty"` // Time of tree creation. // Readonly. - CreateTime *timestamp.Timestamp `protobuf:"bytes,16,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` + CreateTime *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` // Time of last tree update. // Readonly (automatically assigned on updates). - UpdateTime *timestamp.Timestamp `protobuf:"bytes,17,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` + UpdateTime *timestamppb.Timestamp `protobuf:"bytes,17,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"` // If true, the tree has been deleted. // Deleted trees may be undeleted during a certain time window, after which // they're permanently deleted (and unrecoverable). @@ -333,7 +333,7 @@ type Tree struct { Deleted bool `protobuf:"varint,19,opt,name=deleted,proto3" json:"deleted,omitempty"` // Time of tree deletion, if any. // Readonly. - DeleteTime *timestamp.Timestamp `protobuf:"bytes,20,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"` + DeleteTime *timestamppb.Timestamp `protobuf:"bytes,20,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"` } func (x *Tree) Reset() { @@ -403,28 +403,28 @@ func (x *Tree) GetDescription() string { return "" } -func (x *Tree) GetStorageSettings() *any.Any { +func (x *Tree) GetStorageSettings() *anypb.Any { if x != nil { return x.StorageSettings } return nil } -func (x *Tree) GetMaxRootDuration() *duration.Duration { +func (x *Tree) GetMaxRootDuration() *durationpb.Duration { if x != nil { return x.MaxRootDuration } return nil } -func (x *Tree) GetCreateTime() *timestamp.Timestamp { +func (x *Tree) GetCreateTime() *timestamppb.Timestamp { if x != nil { return x.CreateTime } return nil } -func (x *Tree) GetUpdateTime() *timestamp.Timestamp { +func (x *Tree) GetUpdateTime() *timestamppb.Timestamp { if x != nil { return x.UpdateTime } @@ -438,7 +438,7 @@ func (x *Tree) GetDeleted() bool { return false } -func (x *Tree) GetDeleteTime() *timestamp.Timestamp { +func (x *Tree) GetDeleteTime() *timestamppb.Timestamp { if x != nil { return x.DeleteTime } @@ -709,16 +709,16 @@ func file_trillian_proto_rawDescGZIP() []byte { var file_trillian_proto_enumTypes = make([]protoimpl.EnumInfo, 4) var file_trillian_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_trillian_proto_goTypes = []interface{}{ - (LogRootFormat)(0), // 0: trillian.LogRootFormat - (HashStrategy)(0), // 1: trillian.HashStrategy - (TreeState)(0), // 2: trillian.TreeState - (TreeType)(0), // 3: trillian.TreeType - (*Tree)(nil), // 4: trillian.Tree - (*SignedLogRoot)(nil), // 5: trillian.SignedLogRoot - (*Proof)(nil), // 6: trillian.Proof - (*any.Any)(nil), // 7: google.protobuf.Any - (*duration.Duration)(nil), // 8: google.protobuf.Duration - (*timestamp.Timestamp)(nil), // 9: google.protobuf.Timestamp + (LogRootFormat)(0), // 0: trillian.LogRootFormat + (HashStrategy)(0), // 1: trillian.HashStrategy + (TreeState)(0), // 2: trillian.TreeState + (TreeType)(0), // 3: trillian.TreeType + (*Tree)(nil), // 4: trillian.Tree + (*SignedLogRoot)(nil), // 5: trillian.SignedLogRoot + (*Proof)(nil), // 6: trillian.Proof + (*anypb.Any)(nil), // 7: google.protobuf.Any + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration + (*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp } var file_trillian_proto_depIdxs = []int32{ 2, // 0: trillian.Tree.tree_state:type_name -> trillian.TreeState diff --git a/trillian_admin_api.pb.go b/trillian_admin_api.pb.go index 6d58920385..8e05f5bb1f 100644 --- a/trillian_admin_api.pb.go +++ b/trillian_admin_api.pb.go @@ -15,15 +15,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: trillian_admin_api.proto package trillian import ( - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -244,7 +244,7 @@ type UpdateTreeRequest struct { Tree *Tree `protobuf:"bytes,1,opt,name=tree,proto3" json:"tree,omitempty"` // Fields modified by the update request. // For example: "tree_state", "display_name", "description". - UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` } func (x *UpdateTreeRequest) Reset() { @@ -286,7 +286,7 @@ func (x *UpdateTreeRequest) GetTree() *Tree { return nil } -func (x *UpdateTreeRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateTreeRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -474,15 +474,15 @@ func file_trillian_admin_api_proto_rawDescGZIP() []byte { var file_trillian_admin_api_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_trillian_admin_api_proto_goTypes = []interface{}{ - (*ListTreesRequest)(nil), // 0: trillian.ListTreesRequest - (*ListTreesResponse)(nil), // 1: trillian.ListTreesResponse - (*GetTreeRequest)(nil), // 2: trillian.GetTreeRequest - (*CreateTreeRequest)(nil), // 3: trillian.CreateTreeRequest - (*UpdateTreeRequest)(nil), // 4: trillian.UpdateTreeRequest - (*DeleteTreeRequest)(nil), // 5: trillian.DeleteTreeRequest - (*UndeleteTreeRequest)(nil), // 6: trillian.UndeleteTreeRequest - (*Tree)(nil), // 7: trillian.Tree - (*field_mask.FieldMask)(nil), // 8: google.protobuf.FieldMask + (*ListTreesRequest)(nil), // 0: trillian.ListTreesRequest + (*ListTreesResponse)(nil), // 1: trillian.ListTreesResponse + (*GetTreeRequest)(nil), // 2: trillian.GetTreeRequest + (*CreateTreeRequest)(nil), // 3: trillian.CreateTreeRequest + (*UpdateTreeRequest)(nil), // 4: trillian.UpdateTreeRequest + (*DeleteTreeRequest)(nil), // 5: trillian.DeleteTreeRequest + (*UndeleteTreeRequest)(nil), // 6: trillian.UndeleteTreeRequest + (*Tree)(nil), // 7: trillian.Tree + (*fieldmaskpb.FieldMask)(nil), // 8: google.protobuf.FieldMask } var file_trillian_admin_api_proto_depIdxs = []int32{ 7, // 0: trillian.ListTreesResponse.tree:type_name -> trillian.Tree diff --git a/trillian_admin_api_grpc.pb.go b/trillian_admin_api_grpc.pb.go index e0aa312b82..6253c03093 100644 --- a/trillian_admin_api_grpc.pb.go +++ b/trillian_admin_api_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.12.4 +// - protoc v3.20.1 // source: trillian_admin_api.proto package trillian diff --git a/trillian_log_api.pb.go b/trillian_log_api.pb.go index ca1ef53385..451bfa2475 100644 --- a/trillian_log_api.pb.go +++ b/trillian_log_api.pb.go @@ -15,16 +15,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.0 -// protoc v3.12.4 +// protoc v3.20.1 // source: trillian_log_api.proto package trillian import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" status "google.golang.org/genproto/googleapis/rpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -1350,10 +1350,10 @@ type LogLeaf struct { // queue_timestamp holds the time at which this leaf was queued for // inclusion in the Log, or zero if the entry was submitted without // queuing. Clients should not set this field on submissions. - QueueTimestamp *timestamp.Timestamp `protobuf:"bytes,6,opt,name=queue_timestamp,json=queueTimestamp,proto3" json:"queue_timestamp,omitempty"` + QueueTimestamp *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=queue_timestamp,json=queueTimestamp,proto3" json:"queue_timestamp,omitempty"` // integrate_timestamp holds the time at which this leaf was integrated into // the tree. Clients should not set this field on submissions. - IntegrateTimestamp *timestamp.Timestamp `protobuf:"bytes,7,opt,name=integrate_timestamp,json=integrateTimestamp,proto3" json:"integrate_timestamp,omitempty"` + IntegrateTimestamp *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=integrate_timestamp,json=integrateTimestamp,proto3" json:"integrate_timestamp,omitempty"` } func (x *LogLeaf) Reset() { @@ -1423,14 +1423,14 @@ func (x *LogLeaf) GetLeafIdentityHash() []byte { return nil } -func (x *LogLeaf) GetQueueTimestamp() *timestamp.Timestamp { +func (x *LogLeaf) GetQueueTimestamp() *timestamppb.Timestamp { if x != nil { return x.QueueTimestamp } return nil } -func (x *LogLeaf) GetIntegrateTimestamp() *timestamp.Timestamp { +func (x *LogLeaf) GetIntegrateTimestamp() *timestamppb.Timestamp { if x != nil { return x.IntegrateTimestamp } @@ -1730,7 +1730,7 @@ var file_trillian_log_api_proto_goTypes = []interface{}{ (*Proof)(nil), // 21: trillian.Proof (*SignedLogRoot)(nil), // 22: trillian.SignedLogRoot (*status.Status)(nil), // 23: google.rpc.Status - (*timestamp.Timestamp)(nil), // 24: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 24: google.protobuf.Timestamp } var file_trillian_log_api_proto_depIdxs = []int32{ 20, // 0: trillian.QueueLeafRequest.leaf:type_name -> trillian.LogLeaf diff --git a/trillian_log_api_grpc.pb.go b/trillian_log_api_grpc.pb.go index 0450c1d52f..f2fe92d11c 100644 --- a/trillian_log_api_grpc.pb.go +++ b/trillian_log_api_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.12.4 +// - protoc v3.20.1 // source: trillian_log_api.proto package trillian