diff --git a/adsys.pb.go b/adsys.pb.go index 024d68774..4dc5d0c74 100644 --- a/adsys.pb.go +++ b/adsys.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v4.25.3 +// protoc-gen-go v1.35.1 +// protoc v3.21.12 // source: adsys.proto package adsys @@ -28,11 +28,9 @@ type Empty struct { func (x *Empty) Reset() { *x = Empty{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Empty) String() string { @@ -43,7 +41,7 @@ func (*Empty) ProtoMessage() {} func (x *Empty) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -68,11 +66,9 @@ type ListUsersRequest struct { func (x *ListUsersRequest) Reset() { *x = ListUsersRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListUsersRequest) String() string { @@ -83,7 +79,7 @@ func (*ListUsersRequest) ProtoMessage() {} func (x *ListUsersRequest) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -115,11 +111,9 @@ type StopRequest struct { func (x *StopRequest) Reset() { *x = StopRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StopRequest) String() string { @@ -130,7 +124,7 @@ func (*StopRequest) ProtoMessage() {} func (x *StopRequest) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -162,11 +156,9 @@ type StringResponse struct { func (x *StringResponse) Reset() { *x = StringResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StringResponse) String() string { @@ -177,7 +169,7 @@ func (*StringResponse) ProtoMessage() {} func (x *StringResponse) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -213,11 +205,9 @@ type UpdatePolicyRequest struct { func (x *UpdatePolicyRequest) Reset() { *x = UpdatePolicyRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpdatePolicyRequest) String() string { @@ -228,7 +218,7 @@ func (*UpdatePolicyRequest) ProtoMessage() {} func (x *UpdatePolicyRequest) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -291,11 +281,9 @@ type DumpPoliciesRequest struct { func (x *DumpPoliciesRequest) Reset() { *x = DumpPoliciesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DumpPoliciesRequest) String() string { @@ -306,7 +294,7 @@ func (*DumpPoliciesRequest) ProtoMessage() {} func (x *DumpPoliciesRequest) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -360,11 +348,9 @@ type DumpPolicyDefinitionsRequest struct { func (x *DumpPolicyDefinitionsRequest) Reset() { *x = DumpPolicyDefinitionsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DumpPolicyDefinitionsRequest) String() string { @@ -375,7 +361,7 @@ func (*DumpPolicyDefinitionsRequest) ProtoMessage() {} func (x *DumpPolicyDefinitionsRequest) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -415,11 +401,9 @@ type DumpPolicyDefinitionsResponse struct { func (x *DumpPolicyDefinitionsResponse) Reset() { *x = DumpPolicyDefinitionsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DumpPolicyDefinitionsResponse) String() string { @@ -430,7 +414,7 @@ func (*DumpPolicyDefinitionsResponse) ProtoMessage() {} func (x *DumpPolicyDefinitionsResponse) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -469,11 +453,9 @@ type GetDocRequest struct { func (x *GetDocRequest) Reset() { *x = GetDocRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetDocRequest) String() string { @@ -484,7 +466,7 @@ func (*GetDocRequest) ProtoMessage() {} func (x *GetDocRequest) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -516,11 +498,9 @@ type ListDocReponse struct { func (x *ListDocReponse) Reset() { *x = ListDocReponse{} - if protoimpl.UnsafeEnabled { - mi := &file_adsys_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_adsys_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListDocReponse) String() string { @@ -531,7 +511,7 @@ func (*ListDocReponse) ProtoMessage() {} func (x *ListDocReponse) ProtoReflect() protoreflect.Message { mi := &file_adsys_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -700,128 +680,6 @@ func file_adsys_proto_init() { if File_adsys_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_adsys_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*Empty); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*ListUsersRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*StopRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*StringResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*UpdatePolicyRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*DumpPoliciesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*DumpPolicyDefinitionsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*DumpPolicyDefinitionsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*GetDocRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_adsys_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*ListDocReponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/adsys_grpc.pb.go b/adsys_grpc.pb.go index 2ea37c5b0..034cf5b5f 100644 --- a/adsys_grpc.pb.go +++ b/adsys_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v4.25.1 +// - protoc v3.21.12 // source: adsys.proto package adsys diff --git a/internal/grpc/logstreamer/test/log_test.pb.go b/internal/grpc/logstreamer/test/log_test.pb.go index f9e26c4c4..213826bbe 100644 --- a/internal/grpc/logstreamer/test/log_test.pb.go +++ b/internal/grpc/logstreamer/test/log_test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 -// protoc v4.25.3 +// protoc-gen-go v1.35.1 +// protoc v3.21.12 // source: log_test.proto package test @@ -30,11 +30,9 @@ type EmptyLogTest struct { func (x *EmptyLogTest) Reset() { *x = EmptyLogTest{} - if protoimpl.UnsafeEnabled { - mi := &file_log_test_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_log_test_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EmptyLogTest) String() string { @@ -45,7 +43,7 @@ func (*EmptyLogTest) ProtoMessage() {} func (x *EmptyLogTest) ProtoReflect() protoreflect.Message { mi := &file_log_test_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -100,20 +98,6 @@ func file_log_test_proto_init() { if File_log_test_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_log_test_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*EmptyLogTest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/tools/go.mod b/tools/go.mod index 9f4171184..b950862bc 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -5,9 +5,9 @@ go 1.22.1 toolchain go1.23.0 require ( + github.com/golang/protobuf v1.5.3 github.com/golangci/golangci-lint v1.60.3 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 - google.golang.org/protobuf v1.34.2 ) require ( @@ -67,7 +67,6 @@ require ( github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gofrs/flock v0.12.1 // indirect - github.com/golang/protobuf v1.5.3 // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect github.com/golangci/misspell v0.6.0 // indirect @@ -163,7 +162,6 @@ require ( github.com/timonwong/loggercheck v0.9.4 // indirect github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect - github.com/ubuntu/decorate v0.0.0-20240820145549-b76bb81d1209 // indirect github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.1.1 // indirect github.com/uudashr/gocognit v1.1.3 // indirect @@ -185,6 +183,7 @@ require ( golang.org/x/sys v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.24.0 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/tools/go.sum b/tools/go.sum index 2317cb05c..1c11d154f 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -540,8 +540,6 @@ github.com/tomarrell/wrapcheck/v2 v2.9.0 h1:801U2YCAjLhdN8zhZ/7tdjB3EnAoRlJHt/s+ github.com/tomarrell/wrapcheck/v2 v2.9.0/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo= github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/ubuntu/decorate v0.0.0-20240820145549-b76bb81d1209 h1:paNkjGGwB/Ypory/EPTwVR5uX94TDgrH4PGSaCNAvhE= -github.com/ubuntu/decorate v0.0.0-20240820145549-b76bb81d1209/go.mod h1:PUpwIgUuCQyuCz/gwiq6WYbo7IvtXXd8JqL01ez+jZE= github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI= github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/Gk8VQ= @@ -925,8 +923,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/tools/tools.go b/tools/tools.go index eccc8dc30..1282df8cf 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -5,5 +5,5 @@ package tools import ( _ "github.com/golangci/golangci-lint/cmd/golangci-lint" _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc" - _ "google.golang.org/protobuf/cmd/protoc-gen-go" + _ "github.com/golang/protobuf/protoc-gen-go" )