Merge remote-tracking branch 'origin/master'

# Conflicts: # pkg/astutil/testdata/testdata_with_deprecated_build_tag.go
incu6us · Jul 15, 2022 · d4b0fb0 · d4b0fb0
2 parents b1fd0ae + 49f9945
commit d4b0fb0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/pkg/astutil/astutil.go b/pkg/astutil/astutil.go
@@ -10,7 +10,8 @@ import (
 )
 
 const (
-	buildTagPrefix = "//go:build "
+	buildTagPrefix           = "//go:build"
+	deprecatedBuildTagPrefix = "//+build"
 )
 
 // PackageImports is map of imports with their package names
@@ -95,14 +96,14 @@ func LoadPackageDependencies(dir, buildTag string) (PackageImports, error) {
 	return result, nil
 }
 
-// ParseBuildTag parse `// +build ...` on a first line of *ast.File
+// ParseBuildTag parse `//+build ...` or `//go:build ` on a first line of *ast.File
 func ParseBuildTag(f *ast.File) string {
 	for _, g := range f.Comments {
 		for _, c := range g.List {
-			if !strings.HasPrefix(c.Text, buildTagPrefix) {
+			if !(strings.HasPrefix(c.Text, buildTagPrefix) || strings.HasPrefix(c.Text, deprecatedBuildTagPrefix)) {
 				continue
 			}
-			return strings.TrimSpace(strings.TrimPrefix(c.Text, buildTagPrefix))
+			return strings.TrimSpace(strings.TrimPrefix(strings.TrimPrefix(c.Text, buildTagPrefix), deprecatedBuildTagPrefix))
 		}
 	}
 

diff --git a/pkg/astutil/astutil_test.go b/pkg/astutil/astutil_test.go
@@ -167,7 +167,8 @@ func main(){
 
 func TestLoadPackageDeps(t *testing.T) {
 	type args struct {
-		dir string
+		dir      string
+		filename string
 	}
 
 	tests := []struct {
@@ -179,7 +180,20 @@ func TestLoadPackageDeps(t *testing.T) {
 		{
 			name: "success",
 			args: args{
-				dir: "./testdata/",
+				dir:      "./testdata/",
+				filename: "testdata.go",
+			},
+			want: map[string]string{
+				"fmt":                   "fmt",
+				"github.com/pkg/errors": "errors",
+			},
+			wantErr: false,
+		},
+		{
+			name: "success with deprecated build tag",
+			args: args{
+				dir:      "./testdata/",
+				filename: "testdata_with_deprecated_build_tag.go",
 			},
 			want: map[string]string{
 				"fmt":                   "fmt",
@@ -193,7 +207,7 @@ func TestLoadPackageDeps(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			f, err := parser.ParseFile(
 				token.NewFileSet(),
-				fmt.Sprintf("%s/%s", tt.args.dir, "testdata.go"),
+				fmt.Sprintf("%s/%s", tt.args.dir, tt.args.filename),
 				nil,
 				parser.ParseComments,
 			)

diff --git a/pkg/astutil/testdata/testdata_with_deprecated_build_tag.go b/pkg/astutil/testdata/testdata_with_deprecated_build_tag.go
@@ -1,5 +1,4 @@
-//go:build test
-// +build test
+//+build test
 
 package testdata