mirror of
https://github.com/cloudflare/cloudflared.git
synced 2025-07-28 01:09:56 +00:00
TUN-9016: update go to 1.24
## Summary Update several moving parts of cloudflared build system: * use goboring 1.24.2 in cfsetup * update linter and fix lint issues * update packages namely **quic-go and net** * install script for macos * update docker files to use go 1.24.1 * remove usage of cloudflare-go * pin golang linter Closes TUN-9016
This commit is contained in:
4
vendor/golang.org/x/mod/LICENSE
generated
vendored
4
vendor/golang.org/x/mod/LICENSE
generated
vendored
@@ -1,4 +1,4 @@
|
||||
Copyright (c) 2009 The Go Authors. All rights reserved.
|
||||
Copyright 2009 The Go Authors.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
@@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer.
|
||||
copyright notice, this list of conditions and the following disclaimer
|
||||
in the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
* Neither the name of Google Inc. nor the names of its
|
||||
* Neither the name of Google LLC nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
|
12
vendor/golang.org/x/mod/modfile/read.go
generated
vendored
12
vendor/golang.org/x/mod/modfile/read.go
generated
vendored
@@ -226,8 +226,9 @@ func (x *FileSyntax) Cleanup() {
|
||||
continue
|
||||
}
|
||||
if ww == 1 && len(stmt.RParen.Comments.Before) == 0 {
|
||||
// Collapse block into single line.
|
||||
line := &Line{
|
||||
// Collapse block into single line but keep the Line reference used by the
|
||||
// parsed File structure.
|
||||
*stmt.Line[0] = Line{
|
||||
Comments: Comments{
|
||||
Before: commentsAdd(stmt.Before, stmt.Line[0].Before),
|
||||
Suffix: commentsAdd(stmt.Line[0].Suffix, stmt.Suffix),
|
||||
@@ -235,7 +236,7 @@ func (x *FileSyntax) Cleanup() {
|
||||
},
|
||||
Token: stringsAdd(stmt.Token, stmt.Line[0].Token),
|
||||
}
|
||||
x.Stmt[w] = line
|
||||
x.Stmt[w] = stmt.Line[0]
|
||||
w++
|
||||
continue
|
||||
}
|
||||
@@ -876,6 +877,11 @@ func (in *input) parseLineBlock(start Position, token []string, lparen token) *L
|
||||
in.Error(fmt.Sprintf("syntax error (unterminated block started at %s:%d:%d)", in.filename, x.Start.Line, x.Start.LineRune))
|
||||
case ')':
|
||||
rparen := in.lex()
|
||||
// Don't preserve blank lines (denoted by a single empty comment, added above)
|
||||
// at the end of the block.
|
||||
if len(comments) == 1 && comments[0] == (Comment{}) {
|
||||
comments = nil
|
||||
}
|
||||
x.RParen.Before = comments
|
||||
x.RParen.Pos = rparen.pos
|
||||
if !in.peek().isEOL() {
|
||||
|
80
vendor/golang.org/x/mod/modfile/rule.go
generated
vendored
80
vendor/golang.org/x/mod/modfile/rule.go
generated
vendored
@@ -43,6 +43,7 @@ type File struct {
|
||||
Exclude []*Exclude
|
||||
Replace []*Replace
|
||||
Retract []*Retract
|
||||
Tool []*Tool
|
||||
|
||||
Syntax *FileSyntax
|
||||
}
|
||||
@@ -93,6 +94,12 @@ type Retract struct {
|
||||
Syntax *Line
|
||||
}
|
||||
|
||||
// A Tool is a single tool statement.
|
||||
type Tool struct {
|
||||
Path string
|
||||
Syntax *Line
|
||||
}
|
||||
|
||||
// A VersionInterval represents a range of versions with upper and lower bounds.
|
||||
// Intervals are closed: both bounds are included. When Low is equal to High,
|
||||
// the interval may refer to a single version ('v1.2.3') or an interval
|
||||
@@ -297,7 +304,7 @@ func parseToFile(file string, data []byte, fix VersionFixer, strict bool) (parse
|
||||
})
|
||||
}
|
||||
continue
|
||||
case "module", "godebug", "require", "exclude", "replace", "retract":
|
||||
case "module", "godebug", "require", "exclude", "replace", "retract", "tool":
|
||||
for _, l := range x.Line {
|
||||
f.add(&errs, x, l, x.Token[0], l.Token, fix, strict)
|
||||
}
|
||||
@@ -509,6 +516,21 @@ func (f *File) add(errs *ErrorList, block *LineBlock, line *Line, verb string, a
|
||||
Syntax: line,
|
||||
}
|
||||
f.Retract = append(f.Retract, retract)
|
||||
|
||||
case "tool":
|
||||
if len(args) != 1 {
|
||||
errorf("tool directive expects exactly one argument")
|
||||
return
|
||||
}
|
||||
s, err := parseString(&args[0])
|
||||
if err != nil {
|
||||
errorf("invalid quoted string: %v", err)
|
||||
return
|
||||
}
|
||||
f.Tool = append(f.Tool, &Tool{
|
||||
Path: s,
|
||||
Syntax: line,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1567,6 +1589,36 @@ func (f *File) DropRetract(vi VersionInterval) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// AddTool adds a new tool directive with the given path.
|
||||
// It does nothing if the tool line already exists.
|
||||
func (f *File) AddTool(path string) error {
|
||||
for _, t := range f.Tool {
|
||||
if t.Path == path {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
f.Tool = append(f.Tool, &Tool{
|
||||
Path: path,
|
||||
Syntax: f.Syntax.addLine(nil, "tool", path),
|
||||
})
|
||||
|
||||
f.SortBlocks()
|
||||
return nil
|
||||
}
|
||||
|
||||
// RemoveTool removes a tool directive with the given path.
|
||||
// It does nothing if no such tool directive exists.
|
||||
func (f *File) DropTool(path string) error {
|
||||
for _, t := range f.Tool {
|
||||
if t.Path == path {
|
||||
t.Syntax.markRemoved()
|
||||
*t = Tool{}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (f *File) SortBlocks() {
|
||||
f.removeDups() // otherwise sorting is unsafe
|
||||
|
||||
@@ -1593,9 +1645,9 @@ func (f *File) SortBlocks() {
|
||||
}
|
||||
}
|
||||
|
||||
// removeDups removes duplicate exclude and replace directives.
|
||||
// removeDups removes duplicate exclude, replace and tool directives.
|
||||
//
|
||||
// Earlier exclude directives take priority.
|
||||
// Earlier exclude and tool directives take priority.
|
||||
//
|
||||
// Later replace directives take priority.
|
||||
//
|
||||
@@ -1605,10 +1657,10 @@ func (f *File) SortBlocks() {
|
||||
// retract directives are not de-duplicated since comments are
|
||||
// meaningful, and versions may be retracted multiple times.
|
||||
func (f *File) removeDups() {
|
||||
removeDups(f.Syntax, &f.Exclude, &f.Replace)
|
||||
removeDups(f.Syntax, &f.Exclude, &f.Replace, &f.Tool)
|
||||
}
|
||||
|
||||
func removeDups(syntax *FileSyntax, exclude *[]*Exclude, replace *[]*Replace) {
|
||||
func removeDups(syntax *FileSyntax, exclude *[]*Exclude, replace *[]*Replace, tool *[]*Tool) {
|
||||
kill := make(map[*Line]bool)
|
||||
|
||||
// Remove duplicate excludes.
|
||||
@@ -1649,6 +1701,24 @@ func removeDups(syntax *FileSyntax, exclude *[]*Exclude, replace *[]*Replace) {
|
||||
}
|
||||
*replace = repl
|
||||
|
||||
if tool != nil {
|
||||
haveTool := make(map[string]bool)
|
||||
for _, t := range *tool {
|
||||
if haveTool[t.Path] {
|
||||
kill[t.Syntax] = true
|
||||
continue
|
||||
}
|
||||
haveTool[t.Path] = true
|
||||
}
|
||||
var newTool []*Tool
|
||||
for _, t := range *tool {
|
||||
if !kill[t.Syntax] {
|
||||
newTool = append(newTool, t)
|
||||
}
|
||||
}
|
||||
*tool = newTool
|
||||
}
|
||||
|
||||
// Duplicate require and retract directives are not removed.
|
||||
|
||||
// Drop killed statements from the syntax tree.
|
||||
|
2
vendor/golang.org/x/mod/modfile/work.go
generated
vendored
2
vendor/golang.org/x/mod/modfile/work.go
generated
vendored
@@ -331,5 +331,5 @@ func (f *WorkFile) SortBlocks() {
|
||||
// retract directives are not de-duplicated since comments are
|
||||
// meaningful, and versions may be retracted multiple times.
|
||||
func (f *WorkFile) removeDups() {
|
||||
removeDups(f.Syntax, nil, &f.Replace)
|
||||
removeDups(f.Syntax, nil, &f.Replace, nil)
|
||||
}
|
||||
|
2
vendor/golang.org/x/mod/module/module.go
generated
vendored
2
vendor/golang.org/x/mod/module/module.go
generated
vendored
@@ -506,7 +506,6 @@ var badWindowsNames = []string{
|
||||
"PRN",
|
||||
"AUX",
|
||||
"NUL",
|
||||
"COM0",
|
||||
"COM1",
|
||||
"COM2",
|
||||
"COM3",
|
||||
@@ -516,7 +515,6 @@ var badWindowsNames = []string{
|
||||
"COM7",
|
||||
"COM8",
|
||||
"COM9",
|
||||
"LPT0",
|
||||
"LPT1",
|
||||
"LPT2",
|
||||
"LPT3",
|
||||
|
Reference in New Issue
Block a user