diff --git a/MODULE.bazel b/MODULE.bazel index 034744a5..2876615f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -19,14 +19,14 @@ bazel_dep(name = "rules_pkg", version = "1.1.0") bazel_dep(name = "rules_license", version = "1.0.0") bazel_dep(name = "rules_jvm_external", version = "6.8") bazel_dep(name = "rules_java", version = "8.15.1") -bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go") bazel_dep(name = "rules_foreign_cc", version = "0.15.0") # specified to ensure more recent version than @grpc/@opencensus-cpp/@google_benchmark bazel_dep(name = "rules_cc", version = "0.2.0") bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf") bazel_dep(name = "package_metadata", version = "0.0.5") bazel_dep(name = "grpc", version = "1.74.1", repo_name = "com_github_grpc_grpc") bazel_dep(name = "grpc-java", version = "1.71.0", repo_name = "io_grpc_grpc_java") -bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle") +bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle") bazel_dep(name = "bazel_skylib", version = "1.8.1") bazel_dep(name = "bazel_features", version = "1.35.0") bazel_dep(name = "aspect_rules_ts", version = "3.7.0") diff --git a/go.mod b/go.mod index f03d7b95..b110e4a7 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/stackb/rules_proto/v4 go 1.23.1 require ( - github.com/bazelbuild/bazel-gazelle v0.45.0 - github.com/bazelbuild/buildtools v0.0.0-20250826111327-4006b543a694 - github.com/bazelbuild/rules_go v0.57.0 + github.com/bazelbuild/bazel-gazelle v0.47.0 + github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 + github.com/bazelbuild/rules_go v0.59.0 github.com/bmatcuk/doublestar v1.3.4 github.com/emicklei/proto v1.14.2 github.com/gogo/protobuf v1.3.2 @@ -20,13 +20,17 @@ require ( ) require ( - github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect + github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/golang/mock v1.7.0-rc.1 // indirect + github.com/golang/protobuf v1.5.4 // indirect golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.41.0 // indirect - golang.org/x/sync v0.15.0 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.26.0 // indirect + golang.org/x/net v0.42.0 // indirect + golang.org/x/sync v0.16.0 // indirect + golang.org/x/sys v0.34.0 // indirect + golang.org/x/text v0.27.0 // indirect + golang.org/x/tools v0.35.0 // indirect golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect + google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect ) diff --git a/go.sum b/go.sum index e14d3c9b..94e660cd 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,21 @@ github.com/bazelbuild/bazel-gazelle v0.45.0 h1:ZfbDRyNppw0Sd42lXVX7ybar63MJofb58Yvl4SvbtYY= github.com/bazelbuild/bazel-gazelle v0.45.0/go.mod h1:XdBdWhrTc5x50CKzKXOcwrZWdLuX58IX1KcSaWPtEGo= +github.com/bazelbuild/bazel-gazelle v0.47.0 h1:g3Rr1ZbkC1Pk20aOgBITxSD/efS1WbaSty5jC786Z3Q= +github.com/bazelbuild/bazel-gazelle v0.47.0/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w= github.com/bazelbuild/buildtools v0.0.0-20250826111327-4006b543a694 h1:LiKs9FsSfMx3NomNclXYkv9enY77oft5Mc/vX/AKHgI= github.com/bazelbuild/buildtools v0.0.0-20250826111327-4006b543a694/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg= +github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw= +github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg= github.com/bazelbuild/rules_go v0.57.0 h1:qBFxjy29iJg22xWlu5A3mNwrXtCHiEnHcIt91SsiFGU= github.com/bazelbuild/rules_go v0.57.0/go.mod h1:Pn30cb4M513fe2rQ6GiJ3q8QyrRsgC7zhuDvi50Lw4Y= +github.com/bazelbuild/rules_go v0.59.0 h1:RLhOwYIqeMgBpKelHEWTfIPjA37so3oa/rX+/qqq/P4= +github.com/bazelbuild/rules_go v0.59.0/go.mod h1:Pn30cb4M513fe2rQ6GiJ3q8QyrRsgC7zhuDvi50Lw4Y= github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0= github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE= +github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emicklei/proto v1.14.2 h1:wJPxPy2Xifja9cEMrcA/g08art5+7CGJNFNk35iXC1I= @@ -18,6 +26,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/U= +github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= @@ -32,6 +42,7 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= @@ -51,32 +62,52 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= +golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= +golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= +golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= +golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= +golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= +golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0= +golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw= golang.org/x/tools/go/vcs v0.1.0-deprecated h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4= golang.org/x/tools/go/vcs v0.1.0-deprecated/go.mod h1:zUrvATBAvEI9535oC0yWYsLsHIV4Z7g63sNPVMtuBy8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -85,6 +116,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= +google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f h1:387Y+JbxF52bmesc8kq1NyYIp33dnxCw6eiA7JMsTmw= +google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:0joYwWwLQh18AOj8zMYeZLjzuqcYTU3/nC5JdCvC3JI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY= google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/config/config.go b/vendor/github.com/bazelbuild/bazel-gazelle/config/config.go index 065e64be..bfc2614a 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/config/config.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/config/config.go @@ -324,10 +324,12 @@ type indexFlag struct { } func (f indexFlag) String() string { + indexLibraries := f.indexLibraries != nil && *f.indexLibraries + indexLazy := f.indexLazy != nil && *f.indexLazy switch { - case *f.indexLibraries && !*f.indexLazy: + case indexLibraries && !indexLazy: return "all" - case *f.indexLibraries && *f.indexLazy: + case indexLibraries && indexLazy: return "lazy" default: return "none" diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/label/label.go b/vendor/github.com/bazelbuild/bazel-gazelle/label/label.go index 2d4dd399..747c98ec 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/label/label.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/label/label.go @@ -157,12 +157,12 @@ func Parse(s string) (Label, error) { func (l Label) String() string { if l.Relative { - return fmt.Sprintf(":%s", l.Name) + return ":" + l.Name } var repo string if l.Repo != "" && l.Repo != "@" { - repo = fmt.Sprintf("@%s", l.Repo) + repo = "@" + l.Repo } else { // if l.Repo == "", the label string will begin with "//" // if l.Repo == "@", the label string will begin with "@//" @@ -173,9 +173,9 @@ func (l Label) String() string { } if path.Base(l.Pkg) == l.Name { - return fmt.Sprintf("%s//%s", repo, l.Pkg) + return repo + "//" + l.Pkg } - return fmt.Sprintf("%s//%s:%s", repo, l.Pkg, l.Name) + return repo + "//" + l.Pkg + ":" + l.Name } // Abs computes an absolute label (one with a repository and package name) diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/language/go/fileinfo.go b/vendor/github.com/bazelbuild/bazel-gazelle/language/go/fileinfo.go index 6ed2052c..8fb2a9e6 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/language/go/fileinfo.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/language/go/fileinfo.go @@ -345,6 +345,11 @@ func saveCgo(info *fileInfo, srcdir string, cg *ast.CommentGroup) error { continue } + // #cgo (nocallback|noescape) + if fields := strings.Fields(line); len(fields) == 3 && (fields[1] == "nocallback" || fields[1] == "noescape") { + continue + } + // Split at colon. line, argstr, ok := strings.Cut(strings.TrimSpace(line[4:]), ":") if !ok { diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/language/go/generate.go b/vendor/github.com/bazelbuild/bazel-gazelle/language/go/generate.go index cecf0b1d..8ffb113e 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/language/go/generate.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/language/go/generate.go @@ -846,8 +846,8 @@ func (g *generator) commonVisibility(importPath string) []string { // subpackages of the parent. // If the import path contains "internal" but rel does not, this is // probably an internal submodule. Add visibility for all subpackages. - relIndex := pathtools.Index(g.rel, "internal") - importIndex := pathtools.Index(importPath, "internal") + relIndex := pathtools.LastIndex(g.rel, "internal") + importIndex := pathtools.LastIndex(importPath, "internal") visibility := getGoConfig(g.c).goVisibility if relIndex >= 0 { parent := strings.TrimSuffix(g.rel[:relIndex], "/") @@ -861,7 +861,6 @@ func (g *generator) commonVisibility(importPath string) []string { visibility = append(visibility, "@"+repo.Name()+"//:__subpackages__") } } - } else { return []string{"//visibility:public"} } diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/config.go b/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/config.go index 3bde90b8..41dfa32e 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/config.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/config.go @@ -58,6 +58,10 @@ type ProtoConfig struct { // If set, Gazelle will apply this value to the import_prefix attribute // within the proto_library_rule. ImportPrefix string + + // protoSearch is a list of rules for transforming import strings into + // repo-root-relative directory paths where the proto might be found. + protoSearch []protoSearch } // GetProtoConfig returns the proto language configuration. If the proto @@ -163,6 +167,12 @@ func (m Mode) ShouldUseKnownImports() bool { return m != DisableGlobalMode } +// protoSearch is a rule that transforms an import string into a +// repo-root-relative directory path where the proto might be found. +type protoSearch struct { + stripImportPrefix, importPrefix string +} + type modeFlag struct { mode *Mode } @@ -201,7 +211,7 @@ func (*protoLang) CheckFlags(fs *flag.FlagSet, c *config.Config) error { } func (*protoLang) KnownDirectives() []string { - return []string{"proto", "proto_group", "proto_strip_import_prefix", "proto_import_prefix"} + return []string{"proto", "proto_group", "proto_strip_import_prefix", "proto_import_prefix", "proto_search"} } func (*protoLang) Configure(c *config.Config, rel string, f *rule.File) { @@ -228,6 +238,20 @@ func (*protoLang) Configure(c *config.Config, rel string, f *rule.File) { } case "proto_import_prefix": pc.ImportPrefix = d.Value + case "proto_search": + // Special syntax (empty value) to reset directive. + if d.Value == "" { + pc.protoSearch = nil + } else { + args := strings.Fields(d.Value) + if len(args) != 2 { + log.Printf("# gazelle:proto_search: got %d arguments, expected 2, stripImportPrefix and importPrefix", len(args)) + continue + } + stripImportPrefix := args[0] + importPrefix := args[1] + pc.protoSearch = append(pc.protoSearch, protoSearch{stripImportPrefix: stripImportPrefix, importPrefix: importPrefix}) + } } } } diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/generate.go b/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/generate.go index bdaf897e..8a171720 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/generate.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/generate.go @@ -97,6 +97,7 @@ func (*protoLang) GenerateRules(args language.GenerateArgs) language.GenerateRes res.Imports[i] = r.PrivateAttr(config.GazelleImportsKey) } res.Empty = append(res.Empty, generateEmpty(args.File, regularProtoFiles, genProtoFiles)...) + res.RelsToIndex = buildRelsToIndex(pc, pkgs) return res } @@ -335,3 +336,33 @@ outer: } return empty } + +// buildRelsToIndex transforms the import statements read from proto files in the current directory +// into a list of repo-root-relative directory paths to lazily index. +func buildRelsToIndex(pc *ProtoConfig, packages []*Package) []string { + dirSet := make(map[string]bool) + + for _, pkg := range packages { + for importStr := range pkg.Imports { + for _, search := range pc.protoSearch { + transformedRel, ok := transformImport("", importStr, search.stripImportPrefix, search.importPrefix) + if !ok { + continue + } + dir := path.Dir(transformedRel) + if dir == "." { + dir = "" + } + dirSet[dir] = true + } + } + } + + dirs := make([]string, 0, len(dirSet)) + for dir := range dirSet { + dirs = append(dirs, dir) + } + sort.Strings(dirs) + + return dirs +} diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/resolve.go b/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/resolve.go index d96cef61..135948e5 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/resolve.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/language/proto/resolve.go @@ -34,38 +34,17 @@ import ( func (*protoLang) Imports(c *config.Config, r *rule.Rule, f *rule.File) []resolve.ImportSpec { rel := f.Pkg srcs := r.AttrStrings("srcs") - imports := make([]resolve.ImportSpec, len(srcs)) - pc := GetProtoConfig(c) - prefix := rel - if stripImportPrefix := r.AttrString("strip_import_prefix"); stripImportPrefix != "" { - // If strip_import_prefix starts with a /, it's interpreted as being - // relative to the repository root. Otherwise, it's interpreted as being - // relative to the package directory. - // - // So for the file //a/b:c/d.proto, if strip_import_prefix = "/a", - // the proto should be imported as "b/c/d.proto". - // If strip_import_prefix = "c", the proto should be imported as "d.proto". - // - // The package-relativeform only seems useful if there is one Bazel package - // covering protos in subdirectories. Gazelle does not generate build files - // like that, but we might still index proto_library rules like that, - // so we support it here. - if strings.HasPrefix(stripImportPrefix, "/") { - prefix = pathtools.TrimPrefix(rel, stripImportPrefix[len("/"):]) - } else { - prefix = pathtools.TrimPrefix(rel, path.Join(rel, pc.StripImportPrefix)) - } - if rel == prefix { - // Stripped prefix is not a prefix of rel, so the rule won't be buildable. - // Don't index it. - return nil + imports := make([]resolve.ImportSpec, 0, len(srcs)) + + stripImportPrefix := r.AttrString("strip_import_prefix") + importPrefix := r.AttrString("import_prefix") + + for _, src := range srcs { + transformedImport, ok := transformImport(rel, src, stripImportPrefix, importPrefix) + if !ok { + continue } - } - if importPrefix := r.AttrString("import_prefix"); importPrefix != "" { - prefix = path.Join(importPrefix, prefix) - } - for i, src := range srcs { - imports[i] = resolve.ImportSpec{Lang: "proto", Imp: path.Join(prefix, src)} + imports = append(imports, resolve.ImportSpec{Lang: "proto", Imp: transformedImport}) } return imports } @@ -178,3 +157,43 @@ func (*protoLang) CrossResolve(c *config.Config, ix *resolve.RuleIndex, imp reso } return nil } + +// transformImport transforms an import string for indexing. +// +// libRel is a slash-separated path to the directory containing the target. +// +// protoName is the Bazel package-relative file name (like "foo.proto" or +// "sub/foo.proto"). The full repo-root-relative path is computed by joining +// libRel and protoName. +// +// stripImportPrefix is the value of the target's strip_import_prefix +// attribute. If it's "", this has no effect. If it's a relative path (including +// "."), both libRel and stripImportPrefix are stripped from rel. If it's an +// absolute path, the leading '/' is removed, and only stripImportPrefix is +// removed from protoRel. +// +// importPrefix is the value of the target's import_prefix attribute. +// It's prepended to protoRel after stripImportPrefix is applied. +// +// Both importPrefix and stripImportPrefix must be clean (with path.Clean) +// if they are non-empty. +func transformImport(libRel, protoName, stripImportPrefix, importPrefix string) (string, bool) { + // Strip the prefix. + var effectiveStripImportPrefix string + if path.IsAbs(stripImportPrefix) { + effectiveStripImportPrefix = stripImportPrefix[len("/"):] + } else if stripImportPrefix != "" { + effectiveStripImportPrefix = path.Join(libRel, stripImportPrefix) + } + + // Build the repo-root-relative path from package and file name + protoRel := path.Join(libRel, protoName) + if !pathtools.HasPrefix(protoRel, effectiveStripImportPrefix) { + return "", false + } + cleanRel := pathtools.TrimPrefix(protoRel, effectiveStripImportPrefix) + + // Apply the new prefix. + cleanRel = path.Join(importPrefix, cleanRel) + return cleanRel, true +} diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/pathtools/path.go b/vendor/github.com/bazelbuild/bazel-gazelle/pathtools/path.go index 42962c91..8017d925 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/pathtools/path.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/pathtools/path.go @@ -71,15 +71,13 @@ func RelBaseName(rel, prefix, root string) string { return base } -// Index returns the starting index of the string sub within the non-absolute -// slash-separated path p. sub must start and end at component boundaries -// within p. +// Index returns the starting index of the first ocurrence of the string sub +// within the slash-separated path p. sub must start and end at component +// boundaries within p. func Index(p, sub string) int { if sub == "" { return 0 } - p = path.Clean(p) - sub = path.Clean(sub) if path.IsAbs(sub) { if HasPrefix(p, sub) { return 0 @@ -114,6 +112,48 @@ func Index(p, sub string) int { } } +// LastIndex returns the starting index of the last occurrence of the string sub +// within the slash-separated path p. sub must start and end at component +// boundaries within p. +func LastIndex(p, sub string) int { + if sub == "" { + return len(p) + } + if path.IsAbs(sub) { + if HasPrefix(p, sub) { + return 0 + } else { + return -1 + } + } + if p == "" || p == "/" { + return -1 + } + + // prevIndex returns the starting index in p of the component that starts + // before index i. + prevIndex := func(i int) int { + slash := strings.LastIndexByte(p[:i], '/') + if slash < 0 { + return 0 + } + return slash + 1 + } + i := prevIndex(len(p)) + for { + suffix := p[i:] + if len(suffix) >= len(sub) && + suffix[:len(sub)] == sub && + (len(suffix) == len(sub) || suffix[len(sub)] == '/') { + return i + } + if i == 0 || (p[0] == '/' && i == 1) { + return -1 + } + i = prevIndex(i - 1) + } +} + // Prefixes returns an iterator (iter.Seq) over all the prefixes of p. // For example, if p is "a/b/c", the iterator yields "", "a", "a/b", "a/b/c". // diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/rule/value.go b/vendor/github.com/bazelbuild/bazel-gazelle/rule/value.go index 0df42c7c..ad6d6986 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/rule/value.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/rule/value.go @@ -16,10 +16,10 @@ limitations under the License. package rule import ( - "fmt" "log" "reflect" "sort" + "strconv" bzl "github.com/bazelbuild/buildtools/build" ) @@ -228,27 +228,53 @@ func ExprFromValue(val interface{}) bzl.Expr { return be.BzlExpr() } - rv := reflect.ValueOf(val) - switch rv.Kind() { - case reflect.Bool: - tok := "False" - if rv.Bool() { - tok = "True" + // Fast paths for common types to avoid reflection overhead. + switch v := val.(type) { + // primitives + case string: + return &bzl.StringExpr{Value: v} + case bool: + if v { + return &bzl.LiteralExpr{Token: "True"} } - return &bzl.LiteralExpr{Token: tok} - - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, - reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: - return &bzl.LiteralExpr{Token: fmt.Sprintf("%d", val)} - - case reflect.Float32, reflect.Float64: - return &bzl.LiteralExpr{Token: fmt.Sprintf("%f", val)} - - case reflect.String: - return &bzl.StringExpr{Value: val.(string)} + return &bzl.LiteralExpr{Token: "False"} + case int: + return intLiteralExpr(int64(v)) + case int8: + return intLiteralExpr(int64(v)) + case int16: + return intLiteralExpr(int64(v)) + case int32: + return intLiteralExpr(int64(v)) + case int64: + return intLiteralExpr(v) + case uint: + return uintLiteralExpr(uint64(v)) + case uint8: + return uintLiteralExpr(uint64(v)) + case uint16: + return uintLiteralExpr(uint64(v)) + case uint32: + return uintLiteralExpr(uint64(v)) + case uint64: + return uintLiteralExpr(v) + case float32: + return floatLiteralExpr(float64(v)) + case float64: + return floatLiteralExpr(v) + + // common types of slices + case []string: + return stringSliceToExpr(v) + case []interface{}: + return interfaceSliceToExpr(v) + } + // Fallback to reflection for less common types + rv := reflect.ValueOf(val) + switch rv.Kind() { case reflect.Slice, reflect.Array: - var list []bzl.Expr + list := make([]bzl.Expr, 0, rv.Len()) for i := 0; i < rv.Len(); i++ { elem := ExprFromValue(rv.Index(i).Interface()) list = append(list, elem) @@ -274,6 +300,34 @@ func ExprFromValue(val interface{}) bzl.Expr { return nil } +func intLiteralExpr(v int64) bzl.Expr { + return &bzl.LiteralExpr{Token: strconv.FormatInt(v, 10)} +} + +func uintLiteralExpr(v uint64) bzl.Expr { + return &bzl.LiteralExpr{Token: strconv.FormatUint(v, 10)} +} + +func floatLiteralExpr(v float64) bzl.Expr { + return &bzl.LiteralExpr{Token: strconv.FormatFloat(v, 'g', -1, 64)} +} + +func stringSliceToExpr(strs []string) *bzl.ListExpr { + list := make([]bzl.Expr, len(strs)) + for i, s := range strs { + list[i] = &bzl.StringExpr{Value: s} + } + return &bzl.ListExpr{List: list} +} + +func interfaceSliceToExpr(vals []interface{}) *bzl.ListExpr { + list := make([]bzl.Expr, len(vals)) + for i, v := range vals { + list[i] = ExprFromValue(v) + } + return &bzl.ListExpr{List: list} +} + func mapKeyString(k reflect.Value) string { switch s := k.Interface().(type) { case string: diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/walk/cache.go b/vendor/github.com/bazelbuild/bazel-gazelle/walk/cache.go index 5f8c1cfa..e2fbba51 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/walk/cache.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/walk/cache.go @@ -110,8 +110,10 @@ func GetDirInfo(rel string) (DirInfo, error) { // configuration may exclude rel. var prevCfg *walkConfig = nil var di DirInfo + var d string var err error pathtools.Prefixes(rel)(func(prefix string) bool { + d = prefix if prevCfg != nil && prevCfg.isExcludedDir(prefix) { di = DirInfo{} err = fmt.Errorf("directory %q is excluded", prefix) @@ -121,5 +123,12 @@ func GetDirInfo(rel string) (DirInfo, error) { prevCfg = di.config return err == nil }) + + if err != nil { + if d != rel { + di = DirInfo{} + } + } + return di, err } diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/walk/dirinfo.go b/vendor/github.com/bazelbuild/bazel-gazelle/walk/dirinfo.go index 9f7387cd..d2f989b0 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/walk/dirinfo.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/walk/dirinfo.go @@ -5,7 +5,6 @@ import ( "os" "path" "path/filepath" - "strings" "sync" "github.com/bazelbuild/bazel-gazelle/rule" @@ -102,7 +101,7 @@ func (w *walker) loadDirInfo(rel string) (DirInfo, error) { // // populateCache should only be called when recursion is enabled. It avoids // traversing excluded subdirectories. -func (w *walker) populateCache(rels []string) { +func (w *walker) populateCache() { // sem is a semaphore. // // Acquiring the semaphore by sending struct{}{} grants permission to spawn @@ -124,40 +123,22 @@ func (w *walker) populateCache(rels []string) { for _, subdir := range info.Subdirs { subdirRel := path.Join(rel, subdir) - sem <- struct{}{} // acquire semaphore for child - wg.Add(1) - go func() { - defer wg.Done() - visit(subdirRel) - }() - } - } - // Load each directory prefix. walker.loadDirInfo requires the parent - // directory to be visited first so its configuration is known. - w.cache.get("", w.loadDirInfo) - for _, dir := range rels { - slash := 0 - for { - i := strings.Index(dir[slash:], "/") - if i < 0 { - break + // Navigate to the subdirectory if it should be visited. + if w.shouldVisit(subdirRel, true) { + sem <- struct{}{} // acquire semaphore for child + wg.Add(1) + go func() { + defer wg.Done() + visit(subdirRel) + }() } - prefix := dir[:slash+i] - slash = slash + i + 1 - w.cache.get(prefix, w.loadDirInfo) } } - // Visit the directories recursively in parallel. - for _, dir := range rels { - sem <- struct{}{} - wg.Add(1) - go func() { - defer wg.Done() - visit(dir) - }() - } + // Start the traversal at the root directory. + sem <- struct{}{} + visit("") wg.Wait() } diff --git a/vendor/github.com/bazelbuild/bazel-gazelle/walk/walk.go b/vendor/github.com/bazelbuild/bazel-gazelle/walk/walk.go index 47339789..0e59bcfb 100644 --- a/vendor/github.com/bazelbuild/bazel-gazelle/walk/walk.go +++ b/vendor/github.com/bazelbuild/bazel-gazelle/walk/walk.go @@ -231,30 +231,24 @@ func Walk2(c *config.Config, cexts []config.Configurer, dirs []string, mode Mode // Make sure to visit prefixes of relToVisit as well so we apply // configuration directives. pathtools.Prefixes(relToVisit)(func(rel string) bool { - if v, ok := w.visits[rel]; !ok { - var c *config.Config - if ok { - // Already configured this directory but did not call the callback. - c = v.c - } else { - // Never visited this directory. - parentRel := path.Dir(rel) - if parentRel == "." { - parentRel = "" - } - parentCfg := w.visits[parentRel].c - if getWalkConfig(parentCfg).isExcludedDir(rel) { - return false - } - if _, err := w.cache.get(rel, w.loadDirInfo); err != nil { - // Error loading directory. Most commonly, this is because the - // directory doesn't exist, but it could actually be a file - // or we don't have permission, or some other I/O error. - // Skip it. - return false - } - c = parentCfg.Clone() + if _, ok := w.visits[rel]; !ok { + // Never visited this directory. + parentRel := path.Dir(rel) + if parentRel == "." { + parentRel = "" } + parentCfg := w.visits[parentRel].c + if getWalkConfig(parentCfg).isExcludedDir(rel) { + return false + } + if _, err := w.cache.get(rel, w.loadDirInfo); err != nil { + // Error loading directory. Most commonly, this is because the + // directory doesn't exist, but it could actually be a file + // or we don't have permission, or some other I/O error. + // Skip it. + return false + } + c := parentCfg.Clone() w.visit(c, rel, false) if c.Strict && len(w.errs) > 0 { return false @@ -378,9 +372,9 @@ func newWalker(c *config.Config, cexts []config.Configurer, dirs []string, mode visits: make(map[string]visitInfo), relsToVisitSeen: make(map[string]struct{}), } - if mode == VisitAllUpdateSubdirsMode || mode == UpdateSubdirsMode { - w.populateCache(rels) - } + + // Asynchronously populate the walker cache in the background. + go w.populateCache() return w, nil } @@ -388,7 +382,7 @@ func newWalker(c *config.Config, cexts []config.Configurer, dirs []string, mode // shouldVisit returns whether the visit method should be called on rel. // We always need to visit directories requested by the caller and their // parents. We may also need to visit subdirectories. -func (w *walker) shouldVisit(rel string, parentConfig *walkConfig, updateParent bool) bool { +func (w *walker) shouldVisit(rel string, updateParent bool) bool { switch w.mode { case VisitAllUpdateSubdirsMode, VisitAllUpdateDirsMode: return true @@ -455,7 +449,7 @@ func (w *walker) visit(c *config.Config, rel string, updateParent bool) { // Visit subdirectories, as needed. for _, subdir := range subdirs { subdirRel := path.Join(rel, subdir) - if w.shouldVisit(subdirRel, info.config, shouldUpdate) { + if w.shouldVisit(subdirRel, shouldUpdate) { w.visit(c.Clone(), subdirRel, shouldUpdate) if c.Strict && len(w.errs) > 0 { return diff --git a/vendor/github.com/bazelbuild/rules_go/AUTHORS b/vendor/github.com/bazelbuild/rules_go/AUTHORS index 6a776e77..986f5368 100644 --- a/vendor/github.com/bazelbuild/rules_go/AUTHORS +++ b/vendor/github.com/bazelbuild/rules_go/AUTHORS @@ -9,6 +9,7 @@ Benjamin Staffin Brian Silverman David Santiago +David Zbarsky Google Inc. Jake Voytko Yuki Yugui Sonoda diff --git a/vendor/github.com/bazelbuild/rules_go/CONTRIBUTORS b/vendor/github.com/bazelbuild/rules_go/CONTRIBUTORS index 97c11e8f..7b7a9d20 100644 --- a/vendor/github.com/bazelbuild/rules_go/CONTRIBUTORS +++ b/vendor/github.com/bazelbuild/rules_go/CONTRIBUTORS @@ -9,11 +9,13 @@ # Names should be added to this file as: # Name +Andrei Reshetkov Benjamin Staffin Brian Silverman Damien Martin-Guillerez David Chen David Santiago +David Zbarsky Fabian Meumertzheim Han-Wen Nienhuys Ian Cottrell diff --git a/vendor/github.com/bazelbuild/rules_go/go/runfiles/directory.go b/vendor/github.com/bazelbuild/rules_go/go/runfiles/directory.go index c6ccf4f7..680d8d1f 100644 --- a/vendor/github.com/bazelbuild/rules_go/go/runfiles/directory.go +++ b/vendor/github.com/bazelbuild/rules_go/go/runfiles/directory.go @@ -22,7 +22,7 @@ import ( ) // Directory specifies the location of the runfiles directory. You can pass -// this as an option to New. If unset or empty, use the value of the +// this as an option to [New]. If unset or empty, use the value of the // environmental variable RUNFILES_DIR. type Directory string diff --git a/vendor/github.com/bazelbuild/rules_go/go/runfiles/fs.go b/vendor/github.com/bazelbuild/rules_go/go/runfiles/fs.go index 1a691248..16ab6f41 100644 --- a/vendor/github.com/bazelbuild/rules_go/go/runfiles/fs.go +++ b/vendor/github.com/bazelbuild/rules_go/go/runfiles/fs.go @@ -23,7 +23,7 @@ import ( "time" ) -// Open implements fs.FS for a Runfiles instance. +// Open implements [fs.FS] for a [Runfiles] instance. // // Rlocation-style paths are supported with both apparent and canonical repo // names. The root directory of the filesystem (".") additionally lists the diff --git a/vendor/github.com/bazelbuild/rules_go/go/runfiles/global.go b/vendor/github.com/bazelbuild/rules_go/go/runfiles/global.go index 52ec3569..e7e839ff 100644 --- a/vendor/github.com/bazelbuild/rules_go/go/runfiles/global.go +++ b/vendor/github.com/bazelbuild/rules_go/go/runfiles/global.go @@ -20,10 +20,11 @@ import ( "sync" ) -// Rlocation returns the absolute path name of a runfile. The runfile name must be -// a relative path, using the slash (not backslash) as directory separator. If -// the runfiles manifest maps s to an empty name (indicating an empty runfile -// not present in the filesystem), Rlocation returns an error that wraps ErrEmpty. +// Rlocation returns the absolute path name of a runfile. The runfile name +// must be a relative path, using the slash (not backslash) as directory +// separator. If the runfiles manifest maps s to an empty name (indicating an +// empty runfile not present in the filesystem), Rlocation returns an error +// that wraps [ErrEmpty]. func Rlocation(path string) (string, error) { return RlocationFrom(path, CallerRepository()) } @@ -39,7 +40,7 @@ func RlocationFrom(path string, sourceRepo string) (string, error) { // Env returns additional environmental variables to pass to subprocesses. // Each element is of the form “key=value”. Pass these variables to // Bazel-built binaries so they can find their runfiles as well. See the -// Runfiles example for an illustration of this. +// [Runfiles] example for an illustration of this. // // The return value is a newly-allocated slice; you can modify it at will. func Env() ([]string, error) { diff --git a/vendor/github.com/bazelbuild/rules_go/go/runfiles/manifest.go b/vendor/github.com/bazelbuild/rules_go/go/runfiles/manifest.go index ec25794f..5573d167 100644 --- a/vendor/github.com/bazelbuild/rules_go/go/runfiles/manifest.go +++ b/vendor/github.com/bazelbuild/rules_go/go/runfiles/manifest.go @@ -29,7 +29,7 @@ import ( ) // ManifestFile specifies the location of the runfile manifest file. You can -// pass this as an option to New. If unset or empty, use the value of the +// pass this as an option to [New]. If unset or empty, use the value of the // environmental variable RUNFILES_MANIFEST_FILE. type ManifestFile string @@ -77,7 +77,7 @@ func (f ManifestFile) parse() (manifest, error) { defer r.Close() s := bufio.NewScanner(r) - m := manifest{make(map[string]string), nil} + m := manifest{make(map[string]string), nil} for s.Scan() { line := s.Text() var link, target string @@ -238,7 +238,7 @@ type dirFile string func (r dirFile) Stat() (fs.FileInfo, error) { return dirFileInfo(r), nil } func (r dirFile) Read(_ []byte) (int, error) { return 0, syscall.EISDIR } -func (r dirFile) Close() error { return nil } +func (r dirFile) Close() error { return nil } type dirFileInfo string @@ -248,4 +248,4 @@ func (dirFileInfo) Mode() fs.FileMode { return fs.ModeDir | 0555 } func (dirFileInfo) ModTime() time.Time { return time.Time{} } func (dirFileInfo) IsDir() bool { return true } func (dirFileInfo) Sys() interface{} { return nil } -func (i dirFileInfo) String() string { return fs.FormatFileInfo(i) } +func (i dirFileInfo) String() string { return fs.FormatFileInfo(i) } diff --git a/vendor/github.com/bazelbuild/rules_go/go/runfiles/runfiles.go b/vendor/github.com/bazelbuild/rules_go/go/runfiles/runfiles.go index 71b9dd50..c8e592e0 100644 --- a/vendor/github.com/bazelbuild/rules_go/go/runfiles/runfiles.go +++ b/vendor/github.com/bazelbuild/rules_go/go/runfiles/runfiles.go @@ -16,36 +16,36 @@ // // # Usage // -// This package has two main entry points, the global functions Rlocation, Env -// and New, as well as the Runfiles type. +// This package has two main entry points, the global functions [Rlocation], +// [Env] and [New], as well as the [Runfiles] type. // // # Global functions // -// Most users should use the Rlocation and Env functions directly to access -// individual runfiles. Use Rlocation to find the filesystem location of a -// runfile, and use Env to obtain environmental variables to pass on to +// Most users should use the [Rlocation] and [Env] functions directly to access +// individual runfiles. Use [Rlocation] to find the filesystem location of a +// runfile, and use [Env] to obtain environmental variables to pass on to // subprocesses that themselves may need to access runfiles. // -// The New function returns a Runfiles object that implements fs.FS. This allows -// more complex operations on runfiles, such as iterating over all runfiles in a -// certain directory or evaluating glob patterns, consistently across all -// platforms. +// The [New] function returns a [Runfiles] object that implements [fs.FS]. +// This allows more complex operations on runfiles, such as iterating over all +// runfiles in a certain directory or evaluating glob patterns, consistently +// across all platforms. // // All of these functions follow the standard runfiles discovery process, which -// works uniformly across Bazel build actions, `bazel test`, and `bazel run`. It -// does rely on cooperation between processes (see Env for details). +// works uniformly across Bazel build actions, bazel test, and bazel run. It +// does rely on cooperation between processes (see [Env] for details). // // # Custom runfiles discovery and lookup // // If you need to look up runfiles in a custom way (e.g., you use them for a -// packaged application or one that is available on PATH), you can pass Option -// values to New to force a specific runfiles location. +// packaged application or one that is available on PATH), you can pass +// [Option] values to [New] to force a specific runfiles location. // -// ## Restrictions +// # Restrictions // // Functions in this package may not observe changes to the environment or -// os.Args after the first call to any of them. Pass Option values to New to -// customize runfiles discovery instead. +// [os.Args] after the first call to any of them. Pass [Option] values to +// [New] to customize runfiles discovery instead. package runfiles import ( @@ -70,15 +70,15 @@ type repoMappingKey struct { targetRepoApparentName string } -// Runfiles allows access to Bazel runfiles. Use New to create Runfiles +// Runfiles allows access to Bazel runfiles. Use [New] to create Runfiles // objects; the zero Runfiles object always returns errors. See // https://bazel.build/extending/rules#runfiles for some information on // Bazel runfiles. // -// Runfiles implements fs.FS regardless of the type of runfiles that backs it. -// This is the preferred way to interact with runfiles in a platform-agnostic -// way. For example, to find all runfiles beneath a directory, use fs.Glob or -// fs.WalkDir. +// Runfiles implements [fs.FS] regardless of the type of runfiles that backs +// it. This is the preferred way to interact with runfiles in a +// platform-agnostic way. For example, to find all runfiles beneath a +// directory, use [fs.Glob] or [fs.WalkDir]. type Runfiles struct { // We don’t need concurrency control since Runfiles objects are // immutable once created. @@ -90,9 +90,9 @@ type Runfiles struct { const noSourceRepoSentinel = "_not_a_valid_repository_name" -// New creates a given Runfiles object. By default, it uses os.Args and the -// RUNFILES_MANIFEST_FILE and RUNFILES_DIR environmental variables to find the -// runfiles location. This can be overwritten by passing some options. +// New creates a given [Runfiles] object. By default, it uses [os.Args] and +// the RUNFILES_MANIFEST_FILE and RUNFILES_DIR environmental variables to find +// the runfiles location. This can be overwritten by passing some options. // // See section “Runfiles discovery” in // https://docs.google.com/document/d/e/2PACX-1vSDIrFnFvEYhKsCMdGdD40wZRBX3m3aZ5HhVj4CtHPmiXKDCxioTUbYsDydjKtFDAzER5eg7OjJWs3V/pub. @@ -156,9 +156,10 @@ func New(opts ...Option) (*Runfiles, error) { // backslash) as directory separator. It is typically of the form // "repo/path/to/pkg/file". // -// If r is the zero Runfiles object, Rlocation always returns an error. If the -// runfiles manifest maps s to an empty name (indicating an empty runfile not -// present in the filesystem), Rlocation returns an error that wraps ErrEmpty. +// If r is the zero [Runfiles] object, Rlocation always returns an error. If +// the runfiles manifest maps s to an empty name (indicating an empty runfile +// not present in the filesystem), Rlocation returns an error that wraps +// [ErrEmpty]. // // See section “Library interface” in // https://docs.google.com/document/d/e/2PACX-1vSDIrFnFvEYhKsCMdGdD40wZRBX3m3aZ5HhVj4CtHPmiXKDCxioTUbYsDydjKtFDAzER5eg7OjJWs3V/pub. @@ -231,15 +232,15 @@ func (r *Runfiles) loadRepoMapping() error { // Env returns additional environmental variables to pass to subprocesses. // Each element is of the form “key=value”. Pass these variables to // Bazel-built binaries so they can find their runfiles as well. See the -// Runfiles example for an illustration of this. +// [Runfiles] example for an illustration of this. // // The return value is a newly-allocated slice; you can modify it at will. If -// r is the zero Runfiles object, the return value is nil. +// r is the zero [Runfiles] object, the return value is nil. func (r *Runfiles) Env() []string { return r.env } -// WithSourceRepo returns a Runfiles instance identical to the current one, +// WithSourceRepo returns a [Runfiles] instance identical to the current one, // except that it uses the given repository's repository mapping when resolving // runfiles paths. func (r *Runfiles) WithSourceRepo(sourceRepo string) *Runfiles { @@ -251,19 +252,20 @@ func (r *Runfiles) WithSourceRepo(sourceRepo string) *Runfiles { return &clone } -// Option is an option for the New function to override runfiles discovery. +// Option is an option for the [New] function to override runfiles discovery. type Option interface { apply(*options) } -// ProgramName is an Option that sets the program name. If not set, New uses -// os.Args[0]. +// ProgramName is an [Option] that sets the program name. If not set, [New] +// uses os.Args[0]. type ProgramName string -// SourceRepo is an Option that sets the canonical name of the repository whose -// repository mapping should be used to resolve runfiles paths. If not set, New -// uses the repository containing the source file from which New is called. -// Use CurrentRepository to get the name of the current repository. +// SourceRepo is an [Option] that sets the canonical name of the repository +// whose repository mapping should be used to resolve runfiles paths. If not +// set, [New] uses the repository containing the source file from which [New] +// is called. Use [CurrentRepository] to get the name of the current +// repository. type SourceRepo string // Error represents a failure to look up a runfile. @@ -275,12 +277,12 @@ type Error struct { Err error } -// Error implements error.Error. +// Error implements [error.Error]. func (e Error) Error() string { return fmt.Sprintf("runfile %s: %s", e.Name, e.Err.Error()) } -// Unwrap returns the underlying error, for errors.Unwrap. +// Unwrap returns the underlying error, for [errors.Unwrap]. func (e Error) Unwrap() error { return e.Err } // ErrEmpty indicates that a runfile isn’t present in the filesystem, but diff --git a/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/bazel.go b/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/bazel.go index d70c6c00..4badc04a 100644 --- a/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/bazel.go +++ b/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/bazel.go @@ -26,20 +26,21 @@ import ( // The name of the environment variable to access test data files. // -// Deprecated: Use github.com/bazelbuild/rules_go/go/runfiles instead to access -// runfiles. +// Deprecated: Use [github.com/bazelbuild/rules_go/go/runfiles] instead to +// access runfiles. const TEST_SRCDIR = "TEST_SRCDIR" const TEST_TMPDIR = "TEST_TMPDIR" // The name of the environment variable to access the test workspace name. +// With Bzlmod enabled, the corresponding environment variable has the constant +// value "_main". // -// Deprecated: Use github.com/bazelbuild/rules_go/go/runfiles instead to access -// runfiles. With Bzlmod enabled, the corresponding environment variable has the -// constant value "_main". +// Deprecated: Use [github.com/bazelbuild/rules_go/go/runfiles] instead to +// access runfiles. const TEST_WORKSPACE = "TEST_WORKSPACE" -// NewTmpDir creates a new temporary directory in TestTmpDir(). +// NewTmpDir creates a new temporary directory in [TestTmpDir]. func NewTmpDir(prefix string) (string, error) { return ioutil.TempDir(TestTmpDir(), prefix) } @@ -53,9 +54,9 @@ func TestTmpDir() string { return os.TempDir() } -// SpliceDelimitedOSArgs is a utility function that scans the os.Args list for -// entries delimited by the begin and end delimiters (typically the values -// "-begin_files" and "-end_files" are used). Entries between these delimiters +// SpliceDelimitedOSArgs is a utility function that scans the [os.Args] list +// for entries delimited by the begin and end delimiters (typically the values +// "-begin_files" and "-end_files" are used). Entries between these delimiters // are spliced out of from os.Args and returned to the caller. If the ordering // of -begin_files or -end_files is malformed, error is returned. // diff --git a/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/runfiles.go b/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/runfiles.go index efe96e61..3f95eb96 100644 --- a/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/runfiles.go +++ b/vendor/github.com/bazelbuild/rules_go/go/tools/bazel/runfiles.go @@ -41,7 +41,7 @@ const ( // binaries invoked with 'bazel run'. On Windows, // only tests invoked with 'bazel test' are supported. // -// Deprecated: Use github.com/bazelbuild/rules_go/go/runfiles instead for +// Deprecated: Use [github.com/bazelbuild/rules_go/go/runfiles] instead for // cross-platform support matching the behavior of the Bazel-provided runfiles // libraries. func Runfile(path string) (string, error) { @@ -91,17 +91,18 @@ func Runfile(path string) (string, error) { // FindBinary returns an absolute path to the binary built from a go_binary // rule in the given package with the given name. FindBinary is similar to -// Runfile, but it accounts for varying configurations and file extensions, +// [Runfile], but it accounts for varying configurations and file extensions, // which may cause the binary to have different paths on different platforms. // // FindBinary may be called from tests invoked with 'bazel test' and // binaries invoked with 'bazel run'. On Windows, // only tests invoked with 'bazel test' are supported. // -// Deprecated: Use runfiles.Rlocation instead. The path argument can be -// obtained by passing `$(rlocationpath //pkg:name)` to the `go_*` target -// via `args`, `env` or `x_defs` (the latter is also available on `go_library`). -// This avoids hardcoding the package and name of the binary in the source code. +// Deprecated: Use [github.com/bazelbuild/rules_go/go/runfiles.Rlocation] +// instead. The path argument can be obtained by passing +// $(rlocationpath //pkg:name) to the go_* target via args, env or x_defs +// (the latter is also available on go_library). This avoids hardcoding the +// package and name of the binary in the source code. func FindBinary(pkg, name string) (string, bool) { if err := ensureRunfiles(); err != nil { return "", false @@ -171,7 +172,7 @@ func FindBinary(pkg, name string) (string, bool) { // A RunfileEntry describes a runfile. // -// Deprecated: See comment on ListRunfiles. +// Deprecated: See comment on [ListRunfiles]. type RunfileEntry struct { // Workspace is the bazel workspace the file came from. For example, // this would be "io_bazel_rules_go" for a file in rules_go. @@ -188,8 +189,8 @@ type RunfileEntry struct { // ListRunfiles returns a list of available runfiles. // -// Deprecated: Use fs.Glob or fs.WalkDir on the fs.FS implementation provided -// by runfiles.New() instead. +// Deprecated: Use [fs.Glob] or [fs.WalkDir] on the [fs.FS] implementation +// provided by [github.com/bazelbuild/rules_go/go/runfiles.New] instead. func ListRunfiles() ([]RunfileEntry, error) { if err := ensureRunfiles(); err != nil { return nil, err @@ -236,10 +237,10 @@ func ListRunfiles() ([]RunfileEntry, error) { // TestWorkspace returns the name of the Bazel workspace for this test. // TestWorkspace returns an error if the TEST_WORKSPACE environment variable -// was not set or SetDefaultTestWorkspace was not called. +// was not set or [SetDefaultTestWorkspace] was not called. // -// Deprecated: With Bzlmod enabled, the workspace name is always "_main". Use -// github.com/bazelbuild/rules_go/go/runfiles instead to access runfiles. +// Deprecated: With Bzlmod enabled, the workspace name is always "_main". Use +// [github.com/bazelbuild/rules_go/go/runfiles] instead to access runfiles. func TestWorkspace() (string, error) { if err := ensureRunfiles(); err != nil { return "", err @@ -254,8 +255,8 @@ func TestWorkspace() (string, error) { // environment variable TEST_WORKSPACE if it is not defined. This is useful // when running tests on the command line and not through Bazel. // -// Deprecated: With Bzlmod enabled, the workspace name is always "_main". Use -// github.com/bazelbuild/rules_go/go/runfiles instead to access runfiles. +// Deprecated: With Bzlmod enabled, the workspace name is always "_main". Use +// [github.com/bazelbuild/rules_go/go/runfiles] instead to access runfiles. func SetDefaultTestWorkspace(w string) { ensureRunfiles() runfiles.workspace = w @@ -266,8 +267,8 @@ func SetDefaultTestWorkspace(w string) { // the executable is run on Windows or was not invoked with 'bazel test' // or 'bazel run'. // -// Deprecated: Use github.com/bazelbuild/rules_go/go/runfiles instead to access -// runfiles, which provides a platform-agnostic fs.FS implementation. +// Deprecated: Use [github.com/bazelbuild/rules_go/go/runfiles] instead to +// access runfiles, which provides a platform-agnostic [fs.FS] implementation. func RunfilesPath() (string, error) { if err := ensureRunfiles(); err != nil { return "", err diff --git a/vendor/github.com/bmatcuk/doublestar/v4/README.md b/vendor/github.com/bmatcuk/doublestar/v4/README.md index 21929a95..e4d1941e 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/README.md +++ b/vendor/github.com/bmatcuk/doublestar/v4/README.md @@ -138,6 +138,15 @@ Options that may be passed to `Glob`, `GlobWalk`, or `FilepathGlob`. Any number of options may be passed to these functions, and in any order, as the last argument(s). +```go +WithCaseInsensitive() +``` + +WithCaseInsensitive is an option that can be passed to Glob, GlobWalk, or +FilepathGlob. If passed, doublestar will treat all alphabetic characters as +case insensitive (i.e. "a" in the pattern would match "a" or "A"). This is +useful for platforms like Windows where paths are case insensitive by default. + ```go WithFailOnIOErrors() ``` @@ -319,6 +328,9 @@ If SplitPattern cannot find somewhere to split the pattern (for example, `meta*/**`), it will return "." and the unaltered pattern (`meta*/**` in this example). +Note that SplitPattern will also unescape any meta characters in the returned +base string, so that it can be passed straight to os.DirFS(). + Of course, it is your responsibility to decide if the returned base path is "safe" in the context of your application. Perhaps you could use Match() to validate against a list of approved base directories? @@ -373,8 +385,9 @@ Character classes support the following: Class | Meaning ---------- | ------- -`[abc]` | matches any single character within the set -`[a-z]` | matches any single character in the range +`[abc123]` | matches any single character within the set +`[a-z0-9]` | matches any single character in the range a-z or 0-9 +`[125-79]` | matches any single character within the set 129, or the range 5-7 `[^class]` | matches any single character which does *not* match the class `[!class]` | same as `^`: negates the class @@ -414,8 +427,6 @@ ever since. In that time, it has grown into one of the most popular globbing libraries in the Go ecosystem. So, if **doublestar** is a useful library in your project, consider [sponsoring] my work! I'd really appreciate it! -[![MASV](../sponsors/MASV.png?raw=true)](https://massive.io/) - Thanks for sponsoring me! ## License diff --git a/vendor/github.com/bmatcuk/doublestar/v4/glob.go b/vendor/github.com/bmatcuk/doublestar/v4/glob.go index 519601b1..3471bea7 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/glob.go +++ b/vendor/github.com/bmatcuk/doublestar/v4/glob.go @@ -29,7 +29,6 @@ import ( // // Note: users should _not_ count on the returned error, // doublestar.ErrBadPattern, being equal to path.ErrBadPattern. -// func Glob(fsys fs.FS, pattern string, opts ...GlobOption) ([]string, error) { if !ValidatePattern(pattern) { return nil, ErrBadPattern @@ -107,7 +106,7 @@ func (g *glob) doGlob(fsys fs.FS, pattern string, m []string, firstSegment, befo // characters. They would be equal if they are both -1, which means `dir` // will be ".", and we know that doesn't have meta characters either. if splitIdx <= patternStart { - return g.globDir(fsys, dir, pattern, matches, firstSegment, beforeMeta) + return g.globDir(fsys, unescapeMeta(dir), pattern, matches, firstSegment, beforeMeta) } var dirs []string @@ -226,7 +225,7 @@ func (g *glob) globDir(fsys fs.FS, dir, pattern string, matches []string, canMat var matched bool for _, info := range dirs { name := info.Name() - matched, e = matchWithSeparator(pattern, name, '/', false) + matched, e = matchWithSeparator(pattern, name, '/', false, g.caseInsensitive) if e != nil { return } diff --git a/vendor/github.com/bmatcuk/doublestar/v4/globoptions.go b/vendor/github.com/bmatcuk/doublestar/v4/globoptions.go index 9483c4bb..62983560 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/globoptions.go +++ b/vendor/github.com/bmatcuk/doublestar/v4/globoptions.go @@ -4,6 +4,7 @@ import "strings" // glob is an internal type to store options during globbing. type glob struct { + caseInsensitive bool failOnIOErrors bool failOnPatternNotExist bool filesOnly bool @@ -23,12 +24,21 @@ func newGlob(opts ...GlobOption) *glob { return g } +// WithCaseInsensitive is an option that can be passed to Glob, GlobWalk, or +// FilepathGlob. If passed, doublestar will treat all alphabetic characters as +// case insensitive (i.e. "a" in the pattern would match "a" or "A"). This is +// useful for platforms like Windows where paths are case insensitive by default. +func WithCaseInsensitive() GlobOption { + return func(g *glob) { + g.caseInsensitive = true + } +} + // WithFailOnIOErrors is an option that can be passed to Glob, GlobWalk, or // FilepathGlob. If passed, doublestar will abort and return IO errors when // encountered. Note that if the glob pattern references a path that does not // exist (such as `nonexistent/path/*`), this is _not_ considered an IO error: // it is considered a pattern with no matches. -// func WithFailOnIOErrors() GlobOption { return func(g *glob) { g.failOnIOErrors = true @@ -42,7 +52,6 @@ func WithFailOnIOErrors() GlobOption { // `{...}`) are expanded before this check. In other words, a pattern such as // `{a,b}/*` may fail if either `a` or `b` do not exist but `*/{a,b}` will // never fail because the star may match nothing. -// func WithFailOnPatternNotExist() GlobOption { return func(g *glob) { g.failOnPatternNotExist = true @@ -56,7 +65,6 @@ func WithFailOnPatternNotExist() GlobOption { // Note: if combined with the WithNoFollow option, symlinks to directories // _will_ be included in the result since no attempt is made to follow the // symlink. -// func WithFilesOnly() GlobOption { return func(g *glob) { g.filesOnly = true @@ -76,7 +84,6 @@ func WithFilesOnly() GlobOption { // Note: if combined with the WithFilesOnly option, symlinks to directories // _will_ be included in the result since no attempt is made to follow the // symlink. -// func WithNoFollow() GlobOption { return func(g *glob) { g.noFollow = true @@ -86,7 +93,6 @@ func WithNoFollow() GlobOption { // forwardErrIfFailOnIOErrors is used to wrap the return values of I/O // functions. When failOnIOErrors is enabled, it will return err; otherwise, it // always returns nil. -// func (g *glob) forwardErrIfFailOnIOErrors(err error) error { if g.failOnIOErrors { return err @@ -97,7 +103,6 @@ func (g *glob) forwardErrIfFailOnIOErrors(err error) error { // handleErrNotExist handles fs.ErrNotExist errors. If // WithFailOnPatternNotExist has been enabled and canFail is true, this will // return ErrPatternNotExist. Otherwise, it will return nil. -// func (g *glob) handlePatternNotExist(canFail bool) error { if canFail && g.failOnPatternNotExist { return ErrPatternNotExist @@ -111,7 +116,14 @@ func (g *glob) GoString() string { b.WriteString("opts: ") hasOpts := false + if g.caseInsensitive { + b.WriteString("WithCaseInsensitive") + hasOpts = true + } if g.failOnIOErrors { + if hasOpts { + b.WriteString(", ") + } b.WriteString("WithFailOnIOErrors") hasOpts = true } diff --git a/vendor/github.com/bmatcuk/doublestar/v4/globwalk.go b/vendor/github.com/bmatcuk/doublestar/v4/globwalk.go index 84e764f0..16601b76 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/globwalk.go +++ b/vendor/github.com/bmatcuk/doublestar/v4/globwalk.go @@ -50,7 +50,6 @@ type GlobWalkFunc func(path string, d fs.DirEntry) error // // Note: users should _not_ count on the returned error, // doublestar.ErrBadPattern, being equal to path.ErrBadPattern. -// func GlobWalk(fsys fs.FS, pattern string, fn GlobWalkFunc, opts ...GlobOption) error { if !ValidatePattern(pattern) { return ErrBadPattern @@ -112,7 +111,7 @@ func (g *glob) doGlobWalk(fsys fs.FS, pattern string, firstSegment, beforeMeta b // characters. They would be equal if they are both -1, which means `dir` // will be ".", and we know that doesn't have meta characters either. if splitIdx <= patternStart { - return g.globDirWalk(fsys, dir, pattern, firstSegment, beforeMeta, fn) + return g.globDirWalk(fsys, unescapeMeta(dir), pattern, firstSegment, beforeMeta, fn) } return g.doGlobWalk(fsys, dir, false, beforeMeta, func(p string, d fs.DirEntry) error { @@ -290,7 +289,7 @@ func (g *glob) globDirWalk(fsys fs.FS, dir, pattern string, canMatchFiles, befor var matched bool for _, info := range dirs { name := info.Name() - matched, e = matchWithSeparator(pattern, name, '/', false) + matched, e = matchWithSeparator(pattern, name, '/', false, g.caseInsensitive) if e != nil { return } diff --git a/vendor/github.com/bmatcuk/doublestar/v4/match.go b/vendor/github.com/bmatcuk/doublestar/v4/match.go index c0f20afa..1ff50f61 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/match.go +++ b/vendor/github.com/bmatcuk/doublestar/v4/match.go @@ -2,30 +2,31 @@ package doublestar import ( "path/filepath" + "unicode" "unicode/utf8" ) // Match reports whether name matches the shell pattern. // The pattern syntax is: // -// pattern: -// { term } -// term: -// '*' matches any sequence of non-path-separators -// '/**/' matches zero or more directories -// '?' matches any single non-path-separator character -// '[' [ '^' '!' ] { character-range } ']' -// character class (must be non-empty) -// starting with `^` or `!` negates the class -// '{' { term } [ ',' { term } ... ] '}' -// alternatives -// c matches character c (c != '*', '?', '\\', '[') -// '\\' c matches character c +// pattern: +// { term } +// term: +// '*' matches any sequence of non-path-separators +// '/**/' matches zero or more directories +// '?' matches any single non-path-separator character +// '[' [ '^' '!' ] { character-range } ']' +// character class (must be non-empty) +// starting with `^` or `!` negates the class +// '{' { term } [ ',' { term } ... ] '}' +// alternatives +// c matches character c (c != '*', '?', '\\', '[') +// '\\' c matches character c // -// character-range: -// c matches character c (c != '\\', '-', ']') -// '\\' c matches character c -// lo '-' hi matches character c for lo <= c <= hi +// character-range: +// c matches character c (c != '\\', '-', ']') +// '\\' c matches character c +// lo '-' hi matches character c for lo <= c <= hi // // Match returns true if `name` matches the file name `pattern`. `name` and // `pattern` are split on forward slash (`/`) characters and may be relative or @@ -48,9 +49,8 @@ import ( // // Note: users should _not_ count on the returned error, // doublestar.ErrBadPattern, being equal to path.ErrBadPattern. -// func Match(pattern, name string) (bool, error) { - return matchWithSeparator(pattern, name, '/', true) + return matchWithSeparator(pattern, name, '/', true, false) } // MatchUnvalidated can provide a small performance improvement if you don't @@ -60,7 +60,7 @@ func Match(pattern, name string) (bool, error) { // of `name` before reaching the end of `pattern`, such as `Match("a/b/c", // "a")`. func MatchUnvalidated(pattern, name string) bool { - matched, _ := matchWithSeparator(pattern, name, '/', false) + matched, _ := matchWithSeparator(pattern, name, '/', false, false) return matched } @@ -73,9 +73,8 @@ func MatchUnvalidated(pattern, name string) bool { // assumes that both `pattern` and `name` are using the system's path // separator. If you can't be sure of that, use filepath.ToSlash() on both // `pattern` and `name`, and then use the Match() function instead. -// func PathMatch(pattern, name string) (bool, error) { - return matchWithSeparator(pattern, name, filepath.Separator, true) + return matchWithSeparator(pattern, name, filepath.Separator, true, false) } // PathMatchUnvalidated can provide a small performance improvement if you @@ -85,15 +84,15 @@ func PathMatch(pattern, name string) (bool, error) { // end of `name` before reaching the end of `pattern`, such as `Match("a/b/c", // "a")`. func PathMatchUnvalidated(pattern, name string) bool { - matched, _ := matchWithSeparator(pattern, name, filepath.Separator, false) + matched, _ := matchWithSeparator(pattern, name, filepath.Separator, false, false) return matched } -func matchWithSeparator(pattern, name string, separator rune, validate bool) (matched bool, err error) { - return doMatchWithSeparator(pattern, name, separator, validate, -1, -1, -1, -1, 0, 0) +func matchWithSeparator(pattern, name string, separator rune, validate bool, caseInsensitive bool) (matched bool, err error) { + return doMatchWithSeparator(pattern, name, separator, validate, caseInsensitive, -1, -1, -1, -1, 0, 0) } -func doMatchWithSeparator(pattern, name string, separator rune, validate bool, doublestarPatternBacktrack, doublestarNameBacktrack, starPatternBacktrack, starNameBacktrack, patIdx, nameIdx int) (matched bool, err error) { +func doMatchWithSeparator(pattern, name string, separator rune, validate bool, caseInsensitive bool, doublestarPatternBacktrack, doublestarNameBacktrack, starPatternBacktrack, starNameBacktrack, patIdx, nameIdx int) (matched bool, err error) { patLen := len(pattern) nameLen := len(name) startOfSegment := true @@ -194,7 +193,7 @@ MATCH: } // check if the rune matches - if patRune == nameRune { + if matchRune(patRune, nameRune, caseInsensitive) { matched = true break } @@ -240,14 +239,14 @@ MATCH: } commaIdx += patIdx - result, err := doMatchWithSeparator(pattern[:beforeIdx]+pattern[patIdx:commaIdx]+pattern[closingIdx+1:], name, separator, validate, doublestarPatternBacktrack, doublestarNameBacktrack, starPatternBacktrack, starNameBacktrack, beforeIdx, nameIdx) + result, err := doMatchWithSeparator(pattern[:beforeIdx]+pattern[patIdx:commaIdx]+pattern[closingIdx+1:], name, separator, validate, caseInsensitive, doublestarPatternBacktrack, doublestarNameBacktrack, starPatternBacktrack, starNameBacktrack, beforeIdx, nameIdx) if result || err != nil { return result, err } patIdx = commaIdx + 1 } - return doMatchWithSeparator(pattern[:beforeIdx]+pattern[patIdx:closingIdx]+pattern[closingIdx+1:], name, separator, validate, doublestarPatternBacktrack, doublestarNameBacktrack, starPatternBacktrack, starNameBacktrack, beforeIdx, nameIdx) + return doMatchWithSeparator(pattern[:beforeIdx]+pattern[patIdx:closingIdx]+pattern[closingIdx+1:], name, separator, validate, caseInsensitive, doublestarPatternBacktrack, doublestarNameBacktrack, starPatternBacktrack, starNameBacktrack, beforeIdx, nameIdx) case '\\': if separator != '\\' { @@ -262,7 +261,7 @@ MATCH: default: patRune, patRuneLen := utf8.DecodeRuneInString(pattern[patIdx:]) nameRune, nameRuneLen := utf8.DecodeRuneInString(name[nameIdx:]) - if patRune != nameRune { + if !matchRune(patRune, nameRune, caseInsensitive) { if separator != '\\' && patIdx > 0 && pattern[patIdx-1] == '\\' { // if this rune was meant to be escaped, we need to move patIdx // back to the backslash before backtracking or validating below @@ -311,27 +310,44 @@ MATCH: return false, nil } - if nameIdx < nameLen { - // we reached the end of `pattern` before the end of `name` - return false, nil - } - // we've reached the end of `name`; we've successfully matched if we've also // reached the end of `pattern`, or if the rest of `pattern` can match a // zero-length string - return isZeroLengthPattern(pattern[patIdx:], separator) + return isZeroLengthPattern(pattern[patIdx:], separator, validate) +} + +func matchRune(a, b rune, caseInsensitive bool) bool { + if caseInsensitive { + return unicode.ToLower(a) == unicode.ToLower(b) + } + return a == b } -func isZeroLengthPattern(pattern string, separator rune) (ret bool, err error) { +func isZeroLengthPattern(pattern string, separator rune, validate bool) (ret bool, err error) { // `/**`, `**/`, and `/**/` are special cases - a pattern such as `path/to/a/**` or `path/to/a/**/` - // *should* match `path/to/a` because `a` might be a directory - if pattern == "" || - pattern == "*" || - pattern == "**" || - pattern == string(separator)+"**" || - pattern == "**"+string(separator) || - pattern == string(separator)+"**"+string(separator) { + // *should* match `path/to/a` because `a` might be a directory. + // This code is optimized to avoid string concatenation, giving a little performance bump. + switch len(pattern) { + case 0: return true, nil + case 1: + if pattern == "*" { + return true, nil + } + case 2: + if pattern == "**" { + return true, nil + } + case 3: + if pattern[1:] == "**" && rune(pattern[0]) == separator { + return true, nil + } else if pattern[:2] == "**" && rune(pattern[2]) == separator { + return true, nil + } + case 4: + if pattern[1:3] == "**" && rune(pattern[0]) == separator && rune(pattern[3]) == separator { + return true, nil + } } if pattern[0] == '{' { @@ -350,18 +366,18 @@ func isZeroLengthPattern(pattern string, separator rune) (ret bool, err error) { } commaIdx += patIdx - ret, err = isZeroLengthPattern(pattern[patIdx:commaIdx]+pattern[closingIdx+1:], separator) + ret, err = isZeroLengthPattern(pattern[patIdx:commaIdx]+pattern[closingIdx+1:], separator, validate) if ret || err != nil { return } patIdx = commaIdx + 1 } - return isZeroLengthPattern(pattern[patIdx:closingIdx]+pattern[closingIdx+1:], separator) + return isZeroLengthPattern(pattern[patIdx:closingIdx]+pattern[closingIdx+1:], separator, validate) } // no luck - validate the rest of the pattern - if !doValidatePattern(pattern, separator) { + if validate && !doValidatePattern(pattern, separator) { return false, ErrBadPattern } return false, nil diff --git a/vendor/github.com/bmatcuk/doublestar/v4/utils.go b/vendor/github.com/bmatcuk/doublestar/v4/utils.go index 6b8df9a3..7831e5c3 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/utils.go +++ b/vendor/github.com/bmatcuk/doublestar/v4/utils.go @@ -29,6 +29,9 @@ import ( // `meta*/**`), it will return "." and the unaltered pattern (`meta*/**` in // this example). // +// Note that SplitPattern will also unescape any meta characters in the +// returned base string, so that it can be passed straight to os.DirFS(). +// // Of course, it is your responsibility to decide if the returned base path is // "safe" in the context of your application. Perhaps you could use Match() to // validate against a list of approved base directories? @@ -52,7 +55,7 @@ func SplitPattern(p string) (base, pattern string) { if splitIdx == 0 { return "/", p[1:] } else if splitIdx > 0 { - return p[:splitIdx], p[splitIdx+1:] + return unescapeMeta(p[:splitIdx]), p[splitIdx+1:] } return diff --git a/vendor/golang.org/x/sync/errgroup/errgroup.go b/vendor/golang.org/x/sync/errgroup/errgroup.go index cb6bb9ad..1d8cffae 100644 --- a/vendor/golang.org/x/sync/errgroup/errgroup.go +++ b/vendor/golang.org/x/sync/errgroup/errgroup.go @@ -12,8 +12,6 @@ package errgroup import ( "context" "fmt" - "runtime" - "runtime/debug" "sync" ) @@ -33,10 +31,6 @@ type Group struct { errOnce sync.Once err error - - mu sync.Mutex - panicValue any // = PanicError | PanicValue; non-nil if some Group.Go goroutine panicked. - abnormal bool // some Group.Go goroutine terminated abnormally (panic or goexit). } func (g *Group) done() { @@ -56,22 +50,13 @@ func WithContext(ctx context.Context) (*Group, context.Context) { return &Group{cancel: cancel}, ctx } -// Wait blocks until all function calls from the Go method have returned -// normally, then returns the first non-nil error (if any) from them. -// -// If any of the calls panics, Wait panics with a [PanicValue]; -// and if any of them calls [runtime.Goexit], Wait calls runtime.Goexit. +// Wait blocks until all function calls from the Go method have returned, then +// returns the first non-nil error (if any) from them. func (g *Group) Wait() error { g.wg.Wait() if g.cancel != nil { g.cancel(g.err) } - if g.panicValue != nil { - panic(g.panicValue) - } - if g.abnormal { - runtime.Goexit() - } return g.err } @@ -81,53 +66,31 @@ func (g *Group) Wait() error { // It blocks until the new goroutine can be added without the number of // goroutines in the group exceeding the configured limit. // -// The first goroutine in the group that returns a non-nil error, panics, or -// invokes [runtime.Goexit] will cancel the associated Context, if any. +// The first goroutine in the group that returns a non-nil error will +// cancel the associated Context, if any. The error will be returned +// by Wait. func (g *Group) Go(f func() error) { if g.sem != nil { g.sem <- token{} } - g.add(f) -} - -func (g *Group) add(f func() error) { g.wg.Add(1) go func() { defer g.done() - normalReturn := false - defer func() { - if normalReturn { - return - } - v := recover() - g.mu.Lock() - defer g.mu.Unlock() - if !g.abnormal { - if g.cancel != nil { - g.cancel(g.err) - } - g.abnormal = true - } - if v != nil && g.panicValue == nil { - switch v := v.(type) { - case error: - g.panicValue = PanicError{ - Recovered: v, - Stack: debug.Stack(), - } - default: - g.panicValue = PanicValue{ - Recovered: v, - Stack: debug.Stack(), - } - } - } - }() - err := f() - normalReturn = true - if err != nil { + // It is tempting to propagate panics from f() + // up to the goroutine that calls Wait, but + // it creates more problems than it solves: + // - it delays panics arbitrarily, + // making bugs harder to detect; + // - it turns f's panic stack into a mere value, + // hiding it from crash-monitoring tools; + // - it risks deadlocks that hide the panic entirely, + // if f's panic leaves the program in a state + // that prevents the Wait call from being reached. + // See #53757, #74275, #74304, #74306. + + if err := f(); err != nil { g.errOnce.Do(func() { g.err = err if g.cancel != nil { @@ -152,7 +115,19 @@ func (g *Group) TryGo(f func() error) bool { } } - g.add(f) + g.wg.Add(1) + go func() { + defer g.done() + + if err := f(); err != nil { + g.errOnce.Do(func() { + g.err = err + if g.cancel != nil { + g.cancel(g.err) + } + }) + } + }() return true } @@ -174,34 +149,3 @@ func (g *Group) SetLimit(n int) { } g.sem = make(chan token, n) } - -// PanicError wraps an error recovered from an unhandled panic -// when calling a function passed to Go or TryGo. -type PanicError struct { - Recovered error - Stack []byte // result of call to [debug.Stack] -} - -func (p PanicError) Error() string { - if len(p.Stack) > 0 { - return fmt.Sprintf("recovered from errgroup.Group: %v\n%s", p.Recovered, p.Stack) - } - return fmt.Sprintf("recovered from errgroup.Group: %v", p.Recovered) -} - -func (p PanicError) Unwrap() error { return p.Recovered } - -// PanicValue wraps a value that does not implement the error interface, -// recovered from an unhandled panic when calling a function passed to Go or -// TryGo. -type PanicValue struct { - Recovered any - Stack []byte // result of call to [debug.Stack] -} - -func (p PanicValue) String() string { - if len(p.Stack) > 0 { - return fmt.Sprintf("recovered from errgroup.Group: %v\n%s", p.Recovered, p.Stack) - } - return fmt.Sprintf("recovered from errgroup.Group: %v", p.Recovered) -} diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go index 4f432bfe..9e7a6c5a 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go @@ -319,6 +319,7 @@ const ( AUDIT_INTEGRITY_POLICY_RULE = 0x70f AUDIT_INTEGRITY_RULE = 0x70d AUDIT_INTEGRITY_STATUS = 0x70a + AUDIT_INTEGRITY_USERSPACE = 0x710 AUDIT_IPC = 0x517 AUDIT_IPC_SET_PERM = 0x51f AUDIT_IPE_ACCESS = 0x58c @@ -843,9 +844,9 @@ const ( DM_UUID_FLAG = 0x4000 DM_UUID_LEN = 0x81 DM_VERSION = 0xc138fd00 - DM_VERSION_EXTRA = "-ioctl (2023-03-01)" + DM_VERSION_EXTRA = "-ioctl (2025-01-17)" DM_VERSION_MAJOR = 0x4 - DM_VERSION_MINOR = 0x30 + DM_VERSION_MINOR = 0x31 DM_VERSION_PATCHLEVEL = 0x0 DT_BLK = 0x6 DT_CHR = 0x2 @@ -941,6 +942,8 @@ const ( ETHER_FLOW = 0x12 ETHTOOL_BUSINFO_LEN = 0x20 ETHTOOL_EROMVERS_LEN = 0x20 + ETHTOOL_FAMILY_NAME = "ethtool" + ETHTOOL_FAMILY_VERSION = 0x1 ETHTOOL_FEC_AUTO = 0x2 ETHTOOL_FEC_BASER = 0x10 ETHTOOL_FEC_LLRS = 0x20 @@ -1203,6 +1206,9 @@ const ( FAN_DENY = 0x2 FAN_ENABLE_AUDIT = 0x40 FAN_EPIDFD = -0x2 + FAN_ERRNO_BITS = 0x8 + FAN_ERRNO_MASK = 0xff + FAN_ERRNO_SHIFT = 0x18 FAN_EVENT_INFO_TYPE_DFID = 0x3 FAN_EVENT_INFO_TYPE_DFID_NAME = 0x2 FAN_EVENT_INFO_TYPE_ERROR = 0x5 @@ -1210,6 +1216,7 @@ const ( FAN_EVENT_INFO_TYPE_NEW_DFID_NAME = 0xc FAN_EVENT_INFO_TYPE_OLD_DFID_NAME = 0xa FAN_EVENT_INFO_TYPE_PIDFD = 0x4 + FAN_EVENT_INFO_TYPE_RANGE = 0x6 FAN_EVENT_METADATA_LEN = 0x18 FAN_EVENT_ON_CHILD = 0x8000000 FAN_FS_ERROR = 0x8000 @@ -1240,6 +1247,7 @@ const ( FAN_OPEN_EXEC = 0x1000 FAN_OPEN_EXEC_PERM = 0x40000 FAN_OPEN_PERM = 0x10000 + FAN_PRE_ACCESS = 0x100000 FAN_Q_OVERFLOW = 0x4000 FAN_RENAME = 0x10000000 FAN_REPORT_DFID_NAME = 0xc00 @@ -2787,7 +2795,7 @@ const ( RTAX_UNSPEC = 0x0 RTAX_WINDOW = 0x3 RTA_ALIGNTO = 0x4 - RTA_MAX = 0x1e + RTA_MAX = 0x1f RTCF_DIRECTSRC = 0x4000000 RTCF_DOREDIRECT = 0x1000000 RTCF_LOG = 0x2000000 @@ -2864,10 +2872,12 @@ const ( RTM_DELACTION = 0x31 RTM_DELADDR = 0x15 RTM_DELADDRLABEL = 0x49 + RTM_DELANYCAST = 0x3d RTM_DELCHAIN = 0x65 RTM_DELLINK = 0x11 RTM_DELLINKPROP = 0x6d RTM_DELMDB = 0x55 + RTM_DELMULTICAST = 0x39 RTM_DELNEIGH = 0x1d RTM_DELNETCONF = 0x51 RTM_DELNEXTHOP = 0x69 @@ -2917,11 +2927,13 @@ const ( RTM_NEWACTION = 0x30 RTM_NEWADDR = 0x14 RTM_NEWADDRLABEL = 0x48 + RTM_NEWANYCAST = 0x3c RTM_NEWCACHEREPORT = 0x60 RTM_NEWCHAIN = 0x64 RTM_NEWLINK = 0x10 RTM_NEWLINKPROP = 0x6c RTM_NEWMDB = 0x54 + RTM_NEWMULTICAST = 0x38 RTM_NEWNDUSEROPT = 0x44 RTM_NEWNEIGH = 0x1c RTM_NEWNEIGHTBL = 0x40 @@ -2987,11 +2999,12 @@ const ( RUSAGE_THREAD = 0x1 RWF_APPEND = 0x10 RWF_ATOMIC = 0x40 + RWF_DONTCACHE = 0x80 RWF_DSYNC = 0x2 RWF_HIPRI = 0x1 RWF_NOAPPEND = 0x20 RWF_NOWAIT = 0x8 - RWF_SUPPORTED = 0x7f + RWF_SUPPORTED = 0xff RWF_SYNC = 0x4 RWF_WRITE_LIFE_NOT_SET = 0x0 SCHED_BATCH = 0x3 @@ -3271,6 +3284,7 @@ const ( STATX_BTIME = 0x800 STATX_CTIME = 0x80 STATX_DIOALIGN = 0x2000 + STATX_DIO_READ_ALIGN = 0x20000 STATX_GID = 0x10 STATX_INO = 0x100 STATX_MNT_ID = 0x1000 @@ -3322,7 +3336,7 @@ const ( TASKSTATS_GENL_NAME = "TASKSTATS" TASKSTATS_GENL_VERSION = 0x1 TASKSTATS_TYPE_MAX = 0x6 - TASKSTATS_VERSION = 0xe + TASKSTATS_VERSION = 0xf TCIFLUSH = 0x0 TCIOFF = 0x2 TCIOFLUSH = 0x2 @@ -3503,6 +3517,7 @@ const ( TP_STATUS_WRONG_FORMAT = 0x4 TRACEFS_MAGIC = 0x74726163 TS_COMM_LEN = 0x20 + UBI_IOCECNFO = 0xc01c6f06 UDF_SUPER_MAGIC = 0x15013346 UDP_CORK = 0x1 UDP_ENCAP = 0x64 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go index 75207613..a8c421e2 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go @@ -372,6 +372,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x12 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x14 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x14 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go index c68acda5..9a88d181 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go @@ -373,6 +373,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x12 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x14 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x14 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go index a8c607ab..7cb6a867 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go @@ -378,6 +378,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x12 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x14 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x14 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go index 18563dd8..d0ecd2c5 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go @@ -371,6 +371,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x12 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x14 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x14 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go index 22912cda..7a2940ae 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go @@ -365,6 +365,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x12 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x14 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x14 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go index 29344eb3..d14ca8f2 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go @@ -371,6 +371,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x1004 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x1006 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x1006 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go index 20d51fb9..2da1bac1 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go @@ -371,6 +371,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x1004 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x1006 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x1006 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go index 321b6090..28727514 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go @@ -371,6 +371,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x1004 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x1006 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x1006 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go index 9bacdf1e..7f287b54 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go @@ -371,6 +371,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x1004 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x1006 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x1006 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go index c2242726..7e5f9e6a 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go @@ -426,6 +426,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x10 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x12 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x12 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go index 6270c8ee..37c87952 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go @@ -430,6 +430,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x10 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x12 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x12 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go index 9966c194..52201336 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go @@ -430,6 +430,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x10 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x12 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x12 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go index 848e5fcc..4bfe2b5b 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go @@ -362,6 +362,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x12 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x14 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x14 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go index 669b2adb..e3cffb86 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go @@ -434,6 +434,7 @@ const ( SO_RCVBUFFORCE = 0x21 SO_RCVLOWAT = 0x12 SO_RCVMARK = 0x4b + SO_RCVPRIORITY = 0x52 SO_RCVTIMEO = 0x14 SO_RCVTIMEO_NEW = 0x42 SO_RCVTIMEO_OLD = 0x14 diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go index 4834e575..c219c8db 100644 --- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go @@ -473,6 +473,7 @@ const ( SO_RCVBUFFORCE = 0x100b SO_RCVLOWAT = 0x800 SO_RCVMARK = 0x54 + SO_RCVPRIORITY = 0x5b SO_RCVTIMEO = 0x2000 SO_RCVTIMEO_NEW = 0x44 SO_RCVTIMEO_OLD = 0x2000 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go index a46abe64..8bcac283 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -114,7 +114,7 @@ type Statx_t struct { Atomic_write_unit_min uint32 Atomic_write_unit_max uint32 Atomic_write_segments_max uint32 - _ [1]uint32 + Dio_read_offset_align uint32 _ [9]uint64 } @@ -2226,8 +2226,11 @@ const ( NFT_PAYLOAD_LL_HEADER = 0x0 NFT_PAYLOAD_NETWORK_HEADER = 0x1 NFT_PAYLOAD_TRANSPORT_HEADER = 0x2 + NFT_PAYLOAD_INNER_HEADER = 0x3 + NFT_PAYLOAD_TUN_HEADER = 0x4 NFT_PAYLOAD_CSUM_NONE = 0x0 NFT_PAYLOAD_CSUM_INET = 0x1 + NFT_PAYLOAD_CSUM_SCTP = 0x2 NFT_PAYLOAD_L4CSUM_PSEUDOHDR = 0x1 NFTA_PAYLOAD_UNSPEC = 0x0 NFTA_PAYLOAD_DREG = 0x1 @@ -3802,7 +3805,16 @@ const ( ETHTOOL_MSG_PSE_GET = 0x24 ETHTOOL_MSG_PSE_SET = 0x25 ETHTOOL_MSG_RSS_GET = 0x26 - ETHTOOL_MSG_USER_MAX = 0x2d + ETHTOOL_MSG_PLCA_GET_CFG = 0x27 + ETHTOOL_MSG_PLCA_SET_CFG = 0x28 + ETHTOOL_MSG_PLCA_GET_STATUS = 0x29 + ETHTOOL_MSG_MM_GET = 0x2a + ETHTOOL_MSG_MM_SET = 0x2b + ETHTOOL_MSG_MODULE_FW_FLASH_ACT = 0x2c + ETHTOOL_MSG_PHY_GET = 0x2d + ETHTOOL_MSG_TSCONFIG_GET = 0x2e + ETHTOOL_MSG_TSCONFIG_SET = 0x2f + ETHTOOL_MSG_USER_MAX = 0x2f ETHTOOL_MSG_KERNEL_NONE = 0x0 ETHTOOL_MSG_STRSET_GET_REPLY = 0x1 ETHTOOL_MSG_LINKINFO_GET_REPLY = 0x2 @@ -3842,7 +3854,17 @@ const ( ETHTOOL_MSG_MODULE_NTF = 0x24 ETHTOOL_MSG_PSE_GET_REPLY = 0x25 ETHTOOL_MSG_RSS_GET_REPLY = 0x26 - ETHTOOL_MSG_KERNEL_MAX = 0x2e + ETHTOOL_MSG_PLCA_GET_CFG_REPLY = 0x27 + ETHTOOL_MSG_PLCA_GET_STATUS_REPLY = 0x28 + ETHTOOL_MSG_PLCA_NTF = 0x29 + ETHTOOL_MSG_MM_GET_REPLY = 0x2a + ETHTOOL_MSG_MM_NTF = 0x2b + ETHTOOL_MSG_MODULE_FW_FLASH_NTF = 0x2c + ETHTOOL_MSG_PHY_GET_REPLY = 0x2d + ETHTOOL_MSG_PHY_NTF = 0x2e + ETHTOOL_MSG_TSCONFIG_GET_REPLY = 0x2f + ETHTOOL_MSG_TSCONFIG_SET_REPLY = 0x30 + ETHTOOL_MSG_KERNEL_MAX = 0x30 ETHTOOL_FLAG_COMPACT_BITSETS = 0x1 ETHTOOL_FLAG_OMIT_REPLY = 0x2 ETHTOOL_FLAG_STATS = 0x4 @@ -3949,7 +3971,12 @@ const ( ETHTOOL_A_RINGS_TCP_DATA_SPLIT = 0xb ETHTOOL_A_RINGS_CQE_SIZE = 0xc ETHTOOL_A_RINGS_TX_PUSH = 0xd - ETHTOOL_A_RINGS_MAX = 0x10 + ETHTOOL_A_RINGS_RX_PUSH = 0xe + ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN = 0xf + ETHTOOL_A_RINGS_TX_PUSH_BUF_LEN_MAX = 0x10 + ETHTOOL_A_RINGS_HDS_THRESH = 0x11 + ETHTOOL_A_RINGS_HDS_THRESH_MAX = 0x12 + ETHTOOL_A_RINGS_MAX = 0x12 ETHTOOL_A_CHANNELS_UNSPEC = 0x0 ETHTOOL_A_CHANNELS_HEADER = 0x1 ETHTOOL_A_CHANNELS_RX_MAX = 0x2 @@ -4015,7 +4042,9 @@ const ( ETHTOOL_A_TSINFO_TX_TYPES = 0x3 ETHTOOL_A_TSINFO_RX_FILTERS = 0x4 ETHTOOL_A_TSINFO_PHC_INDEX = 0x5 - ETHTOOL_A_TSINFO_MAX = 0x6 + ETHTOOL_A_TSINFO_STATS = 0x6 + ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER = 0x7 + ETHTOOL_A_TSINFO_MAX = 0x7 ETHTOOL_A_CABLE_TEST_UNSPEC = 0x0 ETHTOOL_A_CABLE_TEST_HEADER = 0x1 ETHTOOL_A_CABLE_TEST_MAX = 0x1 @@ -4613,6 +4642,7 @@ const ( NL80211_ATTR_AKM_SUITES = 0x4c NL80211_ATTR_AP_ISOLATE = 0x60 NL80211_ATTR_AP_SETTINGS_FLAGS = 0x135 + NL80211_ATTR_ASSOC_SPP_AMSDU = 0x14a NL80211_ATTR_AUTH_DATA = 0x9c NL80211_ATTR_AUTH_TYPE = 0x35 NL80211_ATTR_BANDS = 0xef @@ -4623,6 +4653,7 @@ const ( NL80211_ATTR_BSS_BASIC_RATES = 0x24 NL80211_ATTR_BSS = 0x2f NL80211_ATTR_BSS_CTS_PROT = 0x1c + NL80211_ATTR_BSS_DUMP_INCLUDE_USE_DATA = 0x147 NL80211_ATTR_BSS_HT_OPMODE = 0x6d NL80211_ATTR_BSSID = 0xf5 NL80211_ATTR_BSS_SELECT = 0xe3 @@ -4682,6 +4713,7 @@ const ( NL80211_ATTR_DTIM_PERIOD = 0xd NL80211_ATTR_DURATION = 0x57 NL80211_ATTR_EHT_CAPABILITY = 0x136 + NL80211_ATTR_EMA_RNR_ELEMS = 0x145 NL80211_ATTR_EML_CAPABILITY = 0x13d NL80211_ATTR_EXT_CAPA = 0xa9 NL80211_ATTR_EXT_CAPA_MASK = 0xaa @@ -4717,6 +4749,7 @@ const ( NL80211_ATTR_HIDDEN_SSID = 0x7e NL80211_ATTR_HT_CAPABILITY = 0x1f NL80211_ATTR_HT_CAPABILITY_MASK = 0x94 + NL80211_ATTR_HW_TIMESTAMP_ENABLED = 0x144 NL80211_ATTR_IE_ASSOC_RESP = 0x80 NL80211_ATTR_IE = 0x2a NL80211_ATTR_IE_PROBE_RESP = 0x7f @@ -4747,9 +4780,10 @@ const ( NL80211_ATTR_MAC_HINT = 0xc8 NL80211_ATTR_MAC_MASK = 0xd7 NL80211_ATTR_MAX_AP_ASSOC_STA = 0xca - NL80211_ATTR_MAX = 0x14d + NL80211_ATTR_MAX = 0x150 NL80211_ATTR_MAX_CRIT_PROT_DURATION = 0xb4 NL80211_ATTR_MAX_CSA_COUNTERS = 0xce + NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS = 0x143 NL80211_ATTR_MAX_MATCH_SETS = 0x85 NL80211_ATTR_MAX_NUM_AKM_SUITES = 0x13c NL80211_ATTR_MAX_NUM_PMKIDS = 0x56 @@ -4774,9 +4808,12 @@ const ( NL80211_ATTR_MGMT_SUBTYPE = 0x29 NL80211_ATTR_MLD_ADDR = 0x13a NL80211_ATTR_MLD_CAPA_AND_OPS = 0x13e + NL80211_ATTR_MLO_LINK_DISABLED = 0x146 NL80211_ATTR_MLO_LINK_ID = 0x139 NL80211_ATTR_MLO_LINKS = 0x138 NL80211_ATTR_MLO_SUPPORT = 0x13b + NL80211_ATTR_MLO_TTLM_DLINK = 0x148 + NL80211_ATTR_MLO_TTLM_ULINK = 0x149 NL80211_ATTR_MNTR_FLAGS = 0x17 NL80211_ATTR_MPATH_INFO = 0x1b NL80211_ATTR_MPATH_NEXT_HOP = 0x1a @@ -4809,12 +4846,14 @@ const ( NL80211_ATTR_PORT_AUTHORIZED = 0x103 NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN = 0x5 NL80211_ATTR_POWER_RULE_MAX_EIRP = 0x6 + NL80211_ATTR_POWER_RULE_PSD = 0x8 NL80211_ATTR_PREV_BSSID = 0x4f NL80211_ATTR_PRIVACY = 0x46 NL80211_ATTR_PROBE_RESP = 0x91 NL80211_ATTR_PROBE_RESP_OFFLOAD = 0x90 NL80211_ATTR_PROTOCOL_FEATURES = 0xad NL80211_ATTR_PS_STATE = 0x5d + NL80211_ATTR_PUNCT_BITMAP = 0x142 NL80211_ATTR_QOS_MAP = 0xc7 NL80211_ATTR_RADAR_BACKGROUND = 0x134 NL80211_ATTR_RADAR_EVENT = 0xa8 @@ -4943,7 +4982,9 @@ const ( NL80211_ATTR_WIPHY_FREQ = 0x26 NL80211_ATTR_WIPHY_FREQ_HINT = 0xc9 NL80211_ATTR_WIPHY_FREQ_OFFSET = 0x122 + NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS = 0x14c NL80211_ATTR_WIPHY_NAME = 0x2 + NL80211_ATTR_WIPHY_RADIOS = 0x14b NL80211_ATTR_WIPHY_RETRY_LONG = 0x3e NL80211_ATTR_WIPHY_RETRY_SHORT = 0x3d NL80211_ATTR_WIPHY_RTS_THRESHOLD = 0x40 @@ -4978,6 +5019,8 @@ const ( NL80211_BAND_ATTR_IFTYPE_DATA = 0x9 NL80211_BAND_ATTR_MAX = 0xd NL80211_BAND_ATTR_RATES = 0x2 + NL80211_BAND_ATTR_S1G_CAPA = 0xd + NL80211_BAND_ATTR_S1G_MCS_NSS_SET = 0xc NL80211_BAND_ATTR_VHT_CAPA = 0x8 NL80211_BAND_ATTR_VHT_MCS_SET = 0x7 NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC = 0x8 @@ -5001,6 +5044,10 @@ const ( NL80211_BSS_BEACON_INTERVAL = 0x4 NL80211_BSS_BEACON_TSF = 0xd NL80211_BSS_BSSID = 0x1 + NL80211_BSS_CANNOT_USE_6GHZ_PWR_MISMATCH = 0x2 + NL80211_BSS_CANNOT_USE_NSTR_NONPRIMARY = 0x1 + NL80211_BSS_CANNOT_USE_REASONS = 0x18 + NL80211_BSS_CANNOT_USE_UHB_PWR_MISMATCH = 0x2 NL80211_BSS_CAPABILITY = 0x5 NL80211_BSS_CHAIN_SIGNAL = 0x13 NL80211_BSS_CHAN_WIDTH_10 = 0x1 @@ -5032,6 +5079,9 @@ const ( NL80211_BSS_STATUS = 0x9 NL80211_BSS_STATUS_IBSS_JOINED = 0x2 NL80211_BSS_TSF = 0x3 + NL80211_BSS_USE_FOR = 0x17 + NL80211_BSS_USE_FOR_MLD_LINK = 0x2 + NL80211_BSS_USE_FOR_NORMAL = 0x1 NL80211_CHAN_HT20 = 0x1 NL80211_CHAN_HT40MINUS = 0x2 NL80211_CHAN_HT40PLUS = 0x3 @@ -5117,7 +5167,8 @@ const ( NL80211_CMD_LEAVE_IBSS = 0x2c NL80211_CMD_LEAVE_MESH = 0x45 NL80211_CMD_LEAVE_OCB = 0x6d - NL80211_CMD_MAX = 0x9b + NL80211_CMD_LINKS_REMOVED = 0x9a + NL80211_CMD_MAX = 0x9d NL80211_CMD_MICHAEL_MIC_FAILURE = 0x29 NL80211_CMD_MODIFY_LINK_STA = 0x97 NL80211_CMD_NAN_MATCH = 0x78 @@ -5161,6 +5212,7 @@ const ( NL80211_CMD_SET_COALESCE = 0x65 NL80211_CMD_SET_CQM = 0x3f NL80211_CMD_SET_FILS_AAD = 0x92 + NL80211_CMD_SET_HW_TIMESTAMP = 0x99 NL80211_CMD_SET_INTERFACE = 0x6 NL80211_CMD_SET_KEY = 0xa NL80211_CMD_SET_MAC_ACL = 0x5d @@ -5180,6 +5232,7 @@ const ( NL80211_CMD_SET_SAR_SPECS = 0x8c NL80211_CMD_SET_STATION = 0x12 NL80211_CMD_SET_TID_CONFIG = 0x89 + NL80211_CMD_SET_TID_TO_LINK_MAPPING = 0x9b NL80211_CMD_SET_TX_BITRATE_MASK = 0x39 NL80211_CMD_SET_WDS_PEER = 0x42 NL80211_CMD_SET_WIPHY = 0x2 @@ -5247,6 +5300,7 @@ const ( NL80211_EXT_FEATURE_AIRTIME_FAIRNESS = 0x21 NL80211_EXT_FEATURE_AP_PMKSA_CACHING = 0x22 NL80211_EXT_FEATURE_AQL = 0x28 + NL80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA = 0x40 NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT = 0x2e NL80211_EXT_FEATURE_BEACON_PROTECTION = 0x29 NL80211_EXT_FEATURE_BEACON_RATE_HE = 0x36 @@ -5262,6 +5316,7 @@ const ( NL80211_EXT_FEATURE_CQM_RSSI_LIST = 0xd NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT = 0x1b NL80211_EXT_FEATURE_DEL_IBSS_STA = 0x2c + NL80211_EXT_FEATURE_DFS_CONCURRENT = 0x43 NL80211_EXT_FEATURE_DFS_OFFLOAD = 0x19 NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER = 0x20 NL80211_EXT_FEATURE_EXT_KEY_ID = 0x24 @@ -5281,9 +5336,12 @@ const ( NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 0x14 NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE = 0x13 NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION = 0x31 + NL80211_EXT_FEATURE_OWE_OFFLOAD_AP = 0x42 + NL80211_EXT_FEATURE_OWE_OFFLOAD = 0x41 NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE = 0x3d NL80211_EXT_FEATURE_PROTECTED_TWT = 0x2b NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE = 0x39 + NL80211_EXT_FEATURE_PUNCT = 0x3e NL80211_EXT_FEATURE_RADAR_BACKGROUND = 0x3c NL80211_EXT_FEATURE_RRM = 0x1 NL80211_EXT_FEATURE_SAE_OFFLOAD_AP = 0x33 @@ -5295,8 +5353,10 @@ const ( NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD = 0x23 NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI = 0xc NL80211_EXT_FEATURE_SECURE_LTF = 0x37 + NL80211_EXT_FEATURE_SECURE_NAN = 0x3f NL80211_EXT_FEATURE_SECURE_RTT = 0x38 NL80211_EXT_FEATURE_SET_SCAN_DWELL = 0x5 + NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT = 0x44 NL80211_EXT_FEATURE_STA_TX_PWR = 0x25 NL80211_EXT_FEATURE_TXQS = 0x1c NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP = 0x35 @@ -5343,7 +5403,10 @@ const ( NL80211_FREQUENCY_ATTR_2MHZ = 0x16 NL80211_FREQUENCY_ATTR_4MHZ = 0x17 NL80211_FREQUENCY_ATTR_8MHZ = 0x18 + NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP = 0x21 + NL80211_FREQUENCY_ATTR_CAN_MONITOR = 0x20 NL80211_FREQUENCY_ATTR_DFS_CAC_TIME = 0xd + NL80211_FREQUENCY_ATTR_DFS_CONCURRENT = 0x1d NL80211_FREQUENCY_ATTR_DFS_STATE = 0x7 NL80211_FREQUENCY_ATTR_DFS_TIME = 0x8 NL80211_FREQUENCY_ATTR_DISABLED = 0x2 @@ -5357,6 +5420,8 @@ const ( NL80211_FREQUENCY_ATTR_NO_160MHZ = 0xc NL80211_FREQUENCY_ATTR_NO_20MHZ = 0x10 NL80211_FREQUENCY_ATTR_NO_320MHZ = 0x1a + NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT = 0x1f + NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT = 0x1e NL80211_FREQUENCY_ATTR_NO_80MHZ = 0xb NL80211_FREQUENCY_ATTR_NO_EHT = 0x1b NL80211_FREQUENCY_ATTR_NO_HE = 0x13 @@ -5364,8 +5429,11 @@ const ( NL80211_FREQUENCY_ATTR_NO_HT40_PLUS = 0xa NL80211_FREQUENCY_ATTR_NO_IBSS = 0x3 NL80211_FREQUENCY_ATTR_NO_IR = 0x3 + NL80211_FREQUENCY_ATTR_NO_UHB_AFC_CLIENT = 0x1f + NL80211_FREQUENCY_ATTR_NO_UHB_VLP_CLIENT = 0x1e NL80211_FREQUENCY_ATTR_OFFSET = 0x14 NL80211_FREQUENCY_ATTR_PASSIVE_SCAN = 0x3 + NL80211_FREQUENCY_ATTR_PSD = 0x1c NL80211_FREQUENCY_ATTR_RADAR = 0x5 NL80211_FREQUENCY_ATTR_WMM = 0x12 NL80211_FTM_RESP_ATTR_CIVICLOC = 0x3 @@ -5430,6 +5498,7 @@ const ( NL80211_IFTYPE_STATION = 0x2 NL80211_IFTYPE_UNSPECIFIED = 0x0 NL80211_IFTYPE_WDS = 0x5 + NL80211_KCK_EXT_LEN_32 = 0x20 NL80211_KCK_EXT_LEN = 0x18 NL80211_KCK_LEN = 0x10 NL80211_KEK_EXT_LEN = 0x20 @@ -5458,6 +5527,7 @@ const ( NL80211_MAX_SUPP_HT_RATES = 0x4d NL80211_MAX_SUPP_RATES = 0x20 NL80211_MAX_SUPP_REG_RULES = 0x80 + NL80211_MAX_SUPP_SELECTORS = 0x80 NL80211_MBSSID_CONFIG_ATTR_EMA = 0x5 NL80211_MBSSID_CONFIG_ATTR_INDEX = 0x3 NL80211_MBSSID_CONFIG_ATTR_MAX = 0x5 @@ -5703,11 +5773,16 @@ const ( NL80211_RADAR_PRE_CAC_EXPIRED = 0x4 NL80211_RATE_INFO_10_MHZ_WIDTH = 0xb NL80211_RATE_INFO_160_MHZ_WIDTH = 0xa + NL80211_RATE_INFO_16_MHZ_WIDTH = 0x1d + NL80211_RATE_INFO_1_MHZ_WIDTH = 0x19 + NL80211_RATE_INFO_2_MHZ_WIDTH = 0x1a NL80211_RATE_INFO_320_MHZ_WIDTH = 0x12 NL80211_RATE_INFO_40_MHZ_WIDTH = 0x3 + NL80211_RATE_INFO_4_MHZ_WIDTH = 0x1b NL80211_RATE_INFO_5_MHZ_WIDTH = 0xc NL80211_RATE_INFO_80_MHZ_WIDTH = 0x8 NL80211_RATE_INFO_80P80_MHZ_WIDTH = 0x9 + NL80211_RATE_INFO_8_MHZ_WIDTH = 0x1c NL80211_RATE_INFO_BITRATE32 = 0x5 NL80211_RATE_INFO_BITRATE = 0x1 NL80211_RATE_INFO_EHT_GI_0_8 = 0x0 @@ -5753,6 +5828,8 @@ const ( NL80211_RATE_INFO_HE_RU_ALLOC = 0x11 NL80211_RATE_INFO_MAX = 0x1d NL80211_RATE_INFO_MCS = 0x2 + NL80211_RATE_INFO_S1G_MCS = 0x17 + NL80211_RATE_INFO_S1G_NSS = 0x18 NL80211_RATE_INFO_SHORT_GI = 0x4 NL80211_RATE_INFO_VHT_MCS = 0x6 NL80211_RATE_INFO_VHT_NSS = 0x7 @@ -5770,14 +5847,19 @@ const ( NL80211_REKEY_DATA_KEK = 0x1 NL80211_REKEY_DATA_REPLAY_CTR = 0x3 NL80211_REPLAY_CTR_LEN = 0x8 + NL80211_RRF_ALLOW_6GHZ_VLP_AP = 0x1000000 NL80211_RRF_AUTO_BW = 0x800 NL80211_RRF_DFS = 0x10 + NL80211_RRF_DFS_CONCURRENT = 0x200000 NL80211_RRF_GO_CONCURRENT = 0x1000 NL80211_RRF_IR_CONCURRENT = 0x1000 NL80211_RRF_NO_160MHZ = 0x10000 NL80211_RRF_NO_320MHZ = 0x40000 + NL80211_RRF_NO_6GHZ_AFC_CLIENT = 0x800000 + NL80211_RRF_NO_6GHZ_VLP_CLIENT = 0x400000 NL80211_RRF_NO_80MHZ = 0x8000 NL80211_RRF_NO_CCK = 0x2 + NL80211_RRF_NO_EHT = 0x80000 NL80211_RRF_NO_HE = 0x20000 NL80211_RRF_NO_HT40 = 0x6000 NL80211_RRF_NO_HT40MINUS = 0x2000 @@ -5788,7 +5870,10 @@ const ( NL80211_RRF_NO_IR = 0x80 NL80211_RRF_NO_OFDM = 0x1 NL80211_RRF_NO_OUTDOOR = 0x8 + NL80211_RRF_NO_UHB_AFC_CLIENT = 0x800000 + NL80211_RRF_NO_UHB_VLP_CLIENT = 0x400000 NL80211_RRF_PASSIVE_SCAN = 0x80 + NL80211_RRF_PSD = 0x100000 NL80211_RRF_PTMP_ONLY = 0x40 NL80211_RRF_PTP_ONLY = 0x20 NL80211_RXMGMT_FLAG_ANSWERED = 0x1 @@ -5849,6 +5934,7 @@ const ( NL80211_STA_FLAG_MAX_OLD_API = 0x6 NL80211_STA_FLAG_MFP = 0x4 NL80211_STA_FLAG_SHORT_PREAMBLE = 0x2 + NL80211_STA_FLAG_SPP_AMSDU = 0x8 NL80211_STA_FLAG_TDLS_PEER = 0x6 NL80211_STA_FLAG_WME = 0x3 NL80211_STA_INFO_ACK_SIGNAL_AVG = 0x23 @@ -6007,6 +6093,13 @@ const ( NL80211_VHT_CAPABILITY_LEN = 0xc NL80211_VHT_NSS_MAX = 0x8 NL80211_WIPHY_NAME_MAXLEN = 0x40 + NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE = 0x2 + NL80211_WIPHY_RADIO_ATTR_INDEX = 0x1 + NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION = 0x3 + NL80211_WIPHY_RADIO_ATTR_MAX = 0x4 + NL80211_WIPHY_RADIO_FREQ_ATTR_END = 0x2 + NL80211_WIPHY_RADIO_FREQ_ATTR_MAX = 0x2 + NL80211_WIPHY_RADIO_FREQ_ATTR_START = 0x1 NL80211_WMMR_AIFSN = 0x3 NL80211_WMMR_CW_MAX = 0x2 NL80211_WMMR_CW_MIN = 0x1 @@ -6038,6 +6131,7 @@ const ( NL80211_WOWLAN_TRIG_PKT_PATTERN = 0x4 NL80211_WOWLAN_TRIG_RFKILL_RELEASE = 0x9 NL80211_WOWLAN_TRIG_TCP_CONNECTION = 0xe + NL80211_WOWLAN_TRIG_UNPROTECTED_DEAUTH_DISASSOC = 0x14 NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211 = 0xa NL80211_WOWLAN_TRIG_WAKEUP_PKT_80211_LEN = 0xb NL80211_WOWLAN_TRIG_WAKEUP_PKT_8023 = 0xc diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go index fd402da4..62db85f6 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go @@ -285,10 +285,16 @@ type Taskstats struct { _ [4]byte Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -324,11 +330,17 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 _ [4]byte Ac_tgetime uint64 @@ -336,8 +348,12 @@ type Taskstats struct { Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go index eb7a5e18..7d89d648 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go @@ -300,10 +300,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -338,19 +344,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go index d78ac108..9c0b39ee 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go @@ -276,10 +276,16 @@ type Taskstats struct { _ [4]byte Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]uint8 @@ -315,11 +321,17 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 _ [4]byte Ac_tgetime uint64 @@ -327,8 +339,12 @@ type Taskstats struct { Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go index cd06d47f..de9c7ff3 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go @@ -279,10 +279,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -317,19 +323,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go index 2f28fe26..2336bd2b 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go @@ -280,10 +280,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -318,19 +324,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go index 71d6cac2..4711f0be 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go @@ -281,10 +281,16 @@ type Taskstats struct { _ [4]byte Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -320,11 +326,17 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 _ [4]byte Ac_tgetime uint64 @@ -332,8 +344,12 @@ type Taskstats struct { Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go index 8596d453..ab99a34b 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go @@ -282,10 +282,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -320,19 +326,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go index cd60ea18..04c9866e 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go @@ -282,10 +282,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -320,19 +326,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go index b0ae420c..60aa69f6 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go @@ -281,10 +281,16 @@ type Taskstats struct { _ [4]byte Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -320,11 +326,17 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 _ [4]byte Ac_tgetime uint64 @@ -332,8 +344,12 @@ type Taskstats struct { Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go index 83597287..cb4fad78 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go @@ -288,10 +288,16 @@ type Taskstats struct { _ [4]byte Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]uint8 @@ -327,11 +333,17 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 _ [4]byte Ac_tgetime uint64 @@ -339,8 +351,12 @@ type Taskstats struct { Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint32 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go index 69eb6a5c..60272cfc 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go @@ -289,10 +289,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]uint8 @@ -327,19 +333,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go index 5f583cb6..3f5b91bc 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go @@ -289,10 +289,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]uint8 @@ -327,19 +333,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go index ad05b51a..51550f15 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go @@ -307,10 +307,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]uint8 @@ -345,19 +351,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go index cf3ce900..3239e50e 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go @@ -302,10 +302,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -340,19 +346,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go index 590b5673..faf20027 100644 --- a/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go +++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go @@ -284,10 +284,16 @@ type Taskstats struct { Ac_nice uint8 Cpu_count uint64 Cpu_delay_total uint64 + Cpu_delay_max uint64 + Cpu_delay_min uint64 Blkio_count uint64 Blkio_delay_total uint64 + Blkio_delay_max uint64 + Blkio_delay_min uint64 Swapin_count uint64 Swapin_delay_total uint64 + Swapin_delay_max uint64 + Swapin_delay_min uint64 Cpu_run_real_total uint64 Cpu_run_virtual_total uint64 Ac_comm [32]int8 @@ -322,19 +328,29 @@ type Taskstats struct { Cpu_scaled_run_real_total uint64 Freepages_count uint64 Freepages_delay_total uint64 + Freepages_delay_max uint64 + Freepages_delay_min uint64 Thrashing_count uint64 Thrashing_delay_total uint64 + Thrashing_delay_max uint64 + Thrashing_delay_min uint64 Ac_btime64 uint64 Compact_count uint64 Compact_delay_total uint64 + Compact_delay_max uint64 + Compact_delay_min uint64 Ac_tgid uint32 Ac_tgetime uint64 Ac_exe_dev uint64 Ac_exe_inode uint64 Wpcopy_count uint64 Wpcopy_delay_total uint64 + Wpcopy_delay_max uint64 + Wpcopy_delay_min uint64 Irq_count uint64 Irq_delay_total uint64 + Irq_delay_max uint64 + Irq_delay_min uint64 } type cpuMask uint64 diff --git a/vendor/modules.txt b/vendor/modules.txt index 1bc82e3d..e9dcf605 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/bazelbuild/bazel-gazelle v0.45.0 +# github.com/bazelbuild/bazel-gazelle v0.47.0 ## explicit; go 1.22.9 github.com/bazelbuild/bazel-gazelle/config github.com/bazelbuild/bazel-gazelle/flag @@ -16,19 +16,19 @@ github.com/bazelbuild/bazel-gazelle/resolve github.com/bazelbuild/bazel-gazelle/rule github.com/bazelbuild/bazel-gazelle/testtools github.com/bazelbuild/bazel-gazelle/walk -# github.com/bazelbuild/buildtools v0.0.0-20250826111327-4006b543a694 +# github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 ## explicit; go 1.20 github.com/bazelbuild/buildtools/build github.com/bazelbuild/buildtools/labels github.com/bazelbuild/buildtools/tables -# github.com/bazelbuild/rules_go v0.57.0 +# github.com/bazelbuild/rules_go v0.59.0 ## explicit; go 1.22.0 github.com/bazelbuild/rules_go/go/runfiles github.com/bazelbuild/rules_go/go/tools/bazel # github.com/bmatcuk/doublestar v1.3.4 ## explicit; go 1.12 github.com/bmatcuk/doublestar -# github.com/bmatcuk/doublestar/v4 v4.7.1 +# github.com/bmatcuk/doublestar/v4 v4.9.1 ## explicit; go 1.16 github.com/bmatcuk/doublestar/v4 # github.com/davecgh/go-spew v1.1.1 @@ -40,6 +40,10 @@ github.com/emicklei/proto # github.com/gogo/protobuf v1.3.2 ## explicit; go 1.15 github.com/gogo/protobuf/proto +# github.com/golang/mock v1.7.0-rc.1 +## explicit; go 1.15 +# github.com/golang/protobuf v1.5.4 +## explicit; go 1.17 # github.com/google/go-cmp v0.7.0 ## explicit; go 1.21 github.com/google/go-cmp/cmp @@ -69,7 +73,7 @@ golang.org/x/mod/internal/lazyregexp golang.org/x/mod/modfile golang.org/x/mod/module golang.org/x/mod/semver -# golang.org/x/net v0.41.0 +# golang.org/x/net v0.42.0 ## explicit; go 1.23.0 golang.org/x/net/http/httpguts golang.org/x/net/http2 @@ -78,23 +82,27 @@ golang.org/x/net/idna golang.org/x/net/internal/httpcommon golang.org/x/net/internal/timeseries golang.org/x/net/trace -# golang.org/x/sync v0.15.0 +# golang.org/x/sync v0.16.0 ## explicit; go 1.23.0 golang.org/x/sync/errgroup -# golang.org/x/sys v0.33.0 +# golang.org/x/sys v0.34.0 ## explicit; go 1.23.0 golang.org/x/sys/execabs golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/text v0.26.0 +# golang.org/x/text v0.27.0 ## explicit; go 1.23.0 golang.org/x/text/secure/bidirule golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm +# golang.org/x/tools v0.35.0 +## explicit; go 1.23.0 # golang.org/x/tools/go/vcs v0.1.0-deprecated ## explicit; go 1.19 golang.org/x/tools/go/vcs +# google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f +## explicit; go 1.22 # google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 ## explicit; go 1.23.0 google.golang.org/genproto/googleapis/rpc/status