From 7225dbc01741f32c8c5824920e49165cf8bec5b4 Mon Sep 17 00:00:00 2001 From: Shahms King Date: Mon, 22 Apr 2024 13:22:19 -0700 Subject: chore: update Go dependencies via //:gazelle_update_repos (#6115) --- external.bzl | 16 +- kythe/go/extractors/govname/BUILD | 4 +- kythe/go/languageserver/BUILD | 2 +- kythe/go/util/vnameutil/BUILD | 2 +- kythe/go/util/vnameutil/test/BUILD | 2 +- kythe/proto/BUILD | 7 + .../vnames_config_go_proto/vnames_config.pb.go | 229 +++++++++++++++++++++ 7 files changed, 249 insertions(+), 13 deletions(-) create mode 100644 kythe/proto/vnames_config_go_proto/vnames_config.pb.go diff --git a/external.bzl b/external.bzl index ef72d3523..04360c0bc 100644 --- a/external.bzl +++ b/external.bzl @@ -1650,8 +1650,8 @@ def _go_dependencies(): go_repository( name = "org_golang_x_crypto", importpath = "golang.org/x/crypto", - sum = "h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=", - version = "v0.17.0", + sum = "h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=", + version = "v0.21.0", ) go_repository( name = "org_golang_x_exp", @@ -1680,8 +1680,8 @@ def _go_dependencies(): patches = [ "@io_kythe//third_party/go:add_export_license.patch", ], - sum = "h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=", - version = "v0.17.0", + sum = "h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=", + version = "v0.23.0", ) go_repository( @@ -1713,15 +1713,15 @@ def _go_dependencies(): patches = [ "@io_kythe//third_party/go:add_export_license.patch", ], - sum = "h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=", - version = "v0.15.0", + sum = "h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=", + version = "v0.18.0", ) go_repository( name = "org_golang_x_term", importpath = "golang.org/x/term", - sum = "h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=", - version = "v0.15.0", + sum = "h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=", + version = "v0.18.0", ) go_repository( diff --git a/kythe/go/extractors/govname/BUILD b/kythe/go/extractors/govname/BUILD index f9886a825..a6a2ae93e 100644 --- a/kythe/go/extractors/govname/BUILD +++ b/kythe/go/extractors/govname/BUILD @@ -15,7 +15,7 @@ go_library( "//kythe/go/util/log", "//kythe/go/util/vnameutil", "//kythe/proto:storage_go_proto", - "@org_golang_x_tools//go/vcs", + "@org_golang_x_tools_go_vcs//:vcs", ], ) @@ -31,6 +31,6 @@ go_test( "//kythe/go/util/vnameutil", "//kythe/proto:storage_go_proto", "@org_golang_google_protobuf//proto", - "@org_golang_x_tools//go/vcs", + "@org_golang_x_tools_go_vcs//:vcs", ], ) diff --git a/kythe/go/languageserver/BUILD b/kythe/go/languageserver/BUILD index 7c1481438..0c45d6cbe 100644 --- a/kythe/go/languageserver/BUILD +++ b/kythe/go/languageserver/BUILD @@ -1,4 +1,4 @@ -load("//tools:build_rules/shims.bzl", "go_binary", "go_library", "go_test") +load("//tools:build_rules/shims.bzl", "go_library", "go_test") package(default_visibility = ["//kythe:default_visibility"]) diff --git a/kythe/go/util/vnameutil/BUILD b/kythe/go/util/vnameutil/BUILD index 7e46f792e..3afc38562 100644 --- a/kythe/go/util/vnameutil/BUILD +++ b/kythe/go/util/vnameutil/BUILD @@ -1,6 +1,6 @@ # gazelle:go_test file load("//:visibility.bzl", "PUBLIC_VISIBILITY") -load("//tools:build_rules/shims.bzl", "go_binary", "go_library", "go_test") +load("//tools:build_rules/shims.bzl", "go_library", "go_test") package(default_visibility = ["//kythe:default_visibility"]) diff --git a/kythe/go/util/vnameutil/test/BUILD b/kythe/go/util/vnameutil/test/BUILD index b463b401b..67666a3a4 100644 --- a/kythe/go/util/vnameutil/test/BUILD +++ b/kythe/go/util/vnameutil/test/BUILD @@ -1,4 +1,4 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary") +load("//tools:build_rules/shims.bzl", "go_binary") go_binary( name = "test", diff --git a/kythe/proto/BUILD b/kythe/proto/BUILD index 4556c8e61..b76bccaea 100644 --- a/kythe/proto/BUILD +++ b/kythe/proto/BUILD @@ -844,6 +844,13 @@ cc_proto_library( deps = [":vnames_config_proto"], ) +go_proto_library( + name = "vnames_config_go_proto", + importpath = "kythe.io/kythe/proto/vnames_config_go_proto", + proto = ":vnames_config_proto", + deps = [":storage_go_proto"], +) + # Uses native.existing_rules() to find rules to update; must come last. update_generated_protos( name = "update", diff --git a/kythe/proto/vnames_config_go_proto/vnames_config.pb.go b/kythe/proto/vnames_config_go_proto/vnames_config.pb.go new file mode 100644 index 000000000..416bb551b --- /dev/null +++ b/kythe/proto/vnames_config_go_proto/vnames_config.pb.go @@ -0,0 +1,229 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.31.0 +// protoc v4.25.2 +// source: kythe/proto/vnames_config.proto + +package vnames_config_go_proto + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + storage_go_proto "kythe.io/kythe/proto/storage_go_proto" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type VNamesConfiguration struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Rules []*VNamesConfiguration_Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` +} + +func (x *VNamesConfiguration) Reset() { + *x = VNamesConfiguration{} + if protoimpl.UnsafeEnabled { + mi := &file_kythe_proto_vnames_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VNamesConfiguration) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VNamesConfiguration) ProtoMessage() {} + +func (x *VNamesConfiguration) ProtoReflect() protoreflect.Message { + mi := &file_kythe_proto_vnames_config_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use VNamesConfiguration.ProtoReflect.Descriptor instead. +func (*VNamesConfiguration) Descriptor() ([]byte, []int) { + return file_kythe_proto_vnames_config_proto_rawDescGZIP(), []int{0} +} + +func (x *VNamesConfiguration) GetRules() []*VNamesConfiguration_Rule { + if x != nil { + return x.Rules + } + return nil +} + +type VNamesConfiguration_Rule struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Pattern string `protobuf:"bytes,1,opt,name=pattern,proto3" json:"pattern,omitempty"` + Vname *storage_go_proto.VName `protobuf:"bytes,2,opt,name=vname,proto3" json:"vname,omitempty"` +} + +func (x *VNamesConfiguration_Rule) Reset() { + *x = VNamesConfiguration_Rule{} + if protoimpl.UnsafeEnabled { + mi := &file_kythe_proto_vnames_config_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *VNamesConfiguration_Rule) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*VNamesConfiguration_Rule) ProtoMessage() {} + +func (x *VNamesConfiguration_Rule) ProtoReflect() protoreflect.Message { + mi := &file_kythe_proto_vnames_config_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use VNamesConfiguration_Rule.ProtoReflect.Descriptor instead. +func (*VNamesConfiguration_Rule) Descriptor() ([]byte, []int) { + return file_kythe_proto_vnames_config_proto_rawDescGZIP(), []int{0, 0} +} + +func (x *VNamesConfiguration_Rule) GetPattern() string { + if x != nil { + return x.Pattern + } + return "" +} + +func (x *VNamesConfiguration_Rule) GetVname() *storage_go_proto.VName { + if x != nil { + return x.Vname + } + return nil +} + +var File_kythe_proto_vnames_config_proto protoreflect.FileDescriptor + +var file_kythe_proto_vnames_config_proto_rawDesc = []byte{ + 0x0a, 0x1f, 0x6b, 0x79, 0x74, 0x68, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x6e, + 0x61, 0x6d, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x12, 0x0b, 0x6b, 0x79, 0x74, 0x68, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, + 0x6b, 0x79, 0x74, 0x68, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x13, 0x56, 0x4e, + 0x61, 0x6d, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x3b, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x25, 0x2e, 0x6b, 0x79, 0x74, 0x68, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x56, + 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2e, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x1a, 0x4a, + 0x0a, 0x04, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, + 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, + 0x12, 0x28, 0x0a, 0x05, 0x76, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x12, 0x2e, 0x6b, 0x79, 0x74, 0x68, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x56, 0x4e, + 0x61, 0x6d, 0x65, 0x52, 0x05, 0x76, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x51, 0x0a, 0x1f, 0x63, 0x6f, + 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x64, 0x65, 0x76, 0x74, 0x6f, 0x6f, 0x6c, + 0x73, 0x2e, 0x6b, 0x79, 0x74, 0x68, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x2b, 0x6b, + 0x79, 0x74, 0x68, 0x65, 0x2e, 0x69, 0x6f, 0x2f, 0x6b, 0x79, 0x74, 0x68, 0x65, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x5f, 0x67, 0x6f, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0xf8, 0x01, 0x01, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_kythe_proto_vnames_config_proto_rawDescOnce sync.Once + file_kythe_proto_vnames_config_proto_rawDescData = file_kythe_proto_vnames_config_proto_rawDesc +) + +func file_kythe_proto_vnames_config_proto_rawDescGZIP() []byte { + file_kythe_proto_vnames_config_proto_rawDescOnce.Do(func() { + file_kythe_proto_vnames_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_kythe_proto_vnames_config_proto_rawDescData) + }) + return file_kythe_proto_vnames_config_proto_rawDescData +} + +var file_kythe_proto_vnames_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_kythe_proto_vnames_config_proto_goTypes = []interface{}{ + (*VNamesConfiguration)(nil), // 0: kythe.proto.VNamesConfiguration + (*VNamesConfiguration_Rule)(nil), // 1: kythe.proto.VNamesConfiguration.Rule + (*storage_go_proto.VName)(nil), // 2: kythe.proto.VName +} +var file_kythe_proto_vnames_config_proto_depIdxs = []int32{ + 1, // 0: kythe.proto.VNamesConfiguration.rules:type_name -> kythe.proto.VNamesConfiguration.Rule + 2, // 1: kythe.proto.VNamesConfiguration.Rule.vname:type_name -> kythe.proto.VName + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_kythe_proto_vnames_config_proto_init() } +func file_kythe_proto_vnames_config_proto_init() { + if File_kythe_proto_vnames_config_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_kythe_proto_vnames_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VNamesConfiguration); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_kythe_proto_vnames_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*VNamesConfiguration_Rule); 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{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_kythe_proto_vnames_config_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_kythe_proto_vnames_config_proto_goTypes, + DependencyIndexes: file_kythe_proto_vnames_config_proto_depIdxs, + MessageInfos: file_kythe_proto_vnames_config_proto_msgTypes, + }.Build() + File_kythe_proto_vnames_config_proto = out.File + file_kythe_proto_vnames_config_proto_rawDesc = nil + file_kythe_proto_vnames_config_proto_goTypes = nil + file_kythe_proto_vnames_config_proto_depIdxs = nil +} -- cgit v1.2.3