Cleanup (#4068)

Author: bufdev

.github/workflows/windows.yaml

@@ -38,4 +38,4 @@ jobs:
             ${{ runner.os }}-buf-windows-
       - name: test
         shell: bash
-        run: ./windows/test.bash
+        run: ./etc/windows/test.bash

data/bandeps/bandeps.yaml etc/bandeps/bandeps.yamldata/bandeps/bandeps.yaml renamed to etc/bandeps/bandeps.yaml

@@ -44,7 +44,7 @@ LICENSE_HEADER_LICENSE_TYPE := apache
 LICENSE_HEADER_COPYRIGHT_HOLDER := Buf Technologies, Inc.
 LICENSE_HEADER_YEAR_RANGE := 2020-2025
 LICENSE_HEADER_IGNORES := \/testdata enterprise
-BANDEPS_CONFIG := data/bandeps/bandeps.yaml
+BANDEPS_CONFIG := etc/bandeps/bandeps.yaml
 BUFPRIVATEUSAGE_PKGS := ./private/...
 PROTOVALIDATE_VERSION := v1.0.0
 # Comment out to use released buf
@@ -119,8 +119,8 @@ bufgenerateclean:: \
 
 .PHONY: bufgeneratego
 bufgeneratego:
-	$(BUF_BIN) generate --template data/template/buf.go.gen.yaml
-	$(BUF_BIN) generate --template data/template/buf.go-client.gen.yaml
+	$(BUF_BIN) generate --template etc/template/buf.go.gen.yaml
+	$(BUF_BIN) generate --template etc/template/buf.go-client.gen.yaml
 
 .PHONY: bufgeneratetestdata
 bufgeneratetestdata:
@@ -184,14 +184,6 @@ bufimageutilupdateexpectations:
 	# You may need to run this after updating protoc versions
 	BUFBUILD_BUF_BUFIMAGEUTIL_SHOULD_UPDATE_EXPECTATIONS=1 go test -parallel 1 ./private/bufpkg/bufimage/bufimageutil
 
-.PHONY: newtodos
-newtodos:
-	@bash make/buf/scripts/newtodos.bash | grep -v FUTURE
-
-.PHONY: newtodofiles
-newtodofiles:
-	@bash make/buf/scripts/newtodos.bash | grep -v FUTURE | cut -f 1 -d : | sort | uniq
-
 .PHONY: checkandupdateprecommithooks
 checkandupdateprecommithooks:
 	@bash make/buf/scripts/checkandupdateprecommithooks.bash

data/template/buf.go-client.gen.yaml etc/template/buf.go-client.gen.yamldata/template/buf.go-client.gen.yaml renamed to etc/template/buf.go-client.gen.yaml

@@ -18,16 +18,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/bufbuild/buf/private/bufpkg/bufstyle"
-	"github.com/bufbuild/buf/private/pkg/encoding"
-	"github.com/bufbuild/buf/private/pkg/osext"
+	"github.com/bufbuild/buf/private/bufpkg/bufstyle/internal"
 	"golang.org/x/tools/go/analysis/multichecker"
 )
 
-var externalConfigPath = ".bufstyle.yaml"
-
 func main() {
-	analyzerProvider, err := newAnalyzerProvider()
+	analyzerProvider, err := newAnalyzerProvider(".")
 	if err != nil {
 		if errString := err.Error(); errString != "" {
 			fmt.Fprintln(os.Stderr, errString)
@@ -37,63 +33,14 @@ func main() {
 	multichecker.Main(analyzerProvider.Analyzers()...)
 }
 
-func newAnalyzerProvider() (bufstyle.AnalyzerProvider, error) {
-	externalConfig, err := readExternalConfig()
+func newAnalyzerProvider(dirPath string) (internal.AnalyzerProvider, error) {
+	externalConfig, err := internal.ReadExternalConfig(dirPath)
 	if err != nil {
 		return nil, err
 	}
-	ignoreAnalyzerNameToRelFilePaths, err := getIgnoreAnalyzerNameToRelFilePaths(externalConfig)
+	analyzerProviderOptions, err := internal.AnalyzerProviderOptionsForExternalConfig(externalConfig)
 	if err != nil {
 		return nil, err
 	}
-	var analyzerProviderOptions []bufstyle.AnalyzerProviderOption
-	for analyzerName, relFilePaths := range ignoreAnalyzerNameToRelFilePaths {
-		for relFilePath := range relFilePaths {
-			analyzerProviderOptions = append(
-				analyzerProviderOptions,
-				bufstyle.WithIgnore(analyzerName, relFilePath),
-			)
-		}
-	}
-	rootDirPath, err := osext.Getwd()
-	if err != nil {
-		return nil, err
-	}
-	return bufstyle.NewAnalyzerProvider(rootDirPath, analyzerProviderOptions...)
-}
-
-func readExternalConfig() (bufstyle.ExternalConfig, error) {
-	var externalConfig bufstyle.ExternalConfig
-	data, err := os.ReadFile(externalConfigPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return externalConfig, nil
-		}
-		return externalConfig, err
-	}
-	if err := encoding.UnmarshalYAMLStrict(data, &externalConfig); err != nil {
-		return externalConfig, err
-	}
-	return externalConfig, nil
-}
-
-func getIgnoreAnalyzerNameToRelFilePaths(externalConfig bufstyle.ExternalConfig) (map[string]map[string]struct{}, error) {
-	ignoreAnalyzerNameToRelFilePaths := make(map[string]map[string]struct{})
-	for analyzerName, relFilePaths := range externalConfig.Ignore {
-		if len(relFilePaths) == 0 {
-			return nil, fmt.Errorf("empty ignore file paths")
-		}
-		relFilePathMap := make(map[string]struct{})
-		for _, relFilePath := range relFilePaths {
-			if _, ok := relFilePathMap[relFilePath]; ok {
-				return nil, fmt.Errorf("duplicate ignore file path %q for analyzer %q", relFilePath, analyzerName)
-			}
-			relFilePathMap[relFilePath] = struct{}{}
-		}
-		if _, ok := ignoreAnalyzerNameToRelFilePaths[analyzerName]; ok {
-			return nil, fmt.Errorf("duplicate ignore analyzer name: %q", analyzerName)
-		}
-		ignoreAnalyzerNameToRelFilePaths[analyzerName] = relFilePathMap
-	}
-	return ignoreAnalyzerNameToRelFilePaths, nil
+	return internal.NewAnalyzerProvider(dirPath, analyzerProviderOptions...)
 }

data/template/buf.go.gen.yaml etc/template/buf.go.gen.yamldata/template/buf.go.gen.yaml renamed to etc/template/buf.go.gen.yaml

@@ -12,17 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package bufstyle
+package internal
 
 import (
 	"errors"
 	"path/filepath"
 
+	"github.com/bufbuild/buf/private/bufpkg/bufstyle/internal/analyzers"
 	"golang.org/x/tools/go/analysis"
 )
 
 type analyzerProvider struct {
 	absRootDirPath                   string
+	disableAnalyzerNames             map[string]struct{}
 	ignoreAnalyzerNameToRelFilePaths map[string]map[string]struct{}
 }
 
@@ -36,6 +38,7 @@ func newAnalyzerProvider(rootDirPath string, options ...AnalyzerProviderOption)
 	}
 	analyzerProvider := &analyzerProvider{
 		absRootDirPath:                   absRootDirPath,
+		disableAnalyzerNames:             make(map[string]struct{}),
 		ignoreAnalyzerNameToRelFilePaths: make(map[string]map[string]struct{}),
 	}
 	for _, option := range options {
@@ -45,7 +48,7 @@ func newAnalyzerProvider(rootDirPath string, options ...AnalyzerProviderOption)
 }
 
 func (a *analyzerProvider) Analyzers() []*analysis.Analyzer {
-	analyzers := newAnalyzers()
+	analyzers := analyzers.New()
 	for _, analyzer := range analyzers {
 		a.modifyAnalyzer(analyzer)
 		for _, requireAnalyzer := range analyzer.Requires {
@@ -64,6 +67,9 @@ func (a *analyzerProvider) modifyAnalyzer(analyzer *analysis.Analyzer) {
 		oldReport := pass.Report
 		var reportErr error
 		pass.Report = func(diagnostic analysis.Diagnostic) {
+			if _, ok := a.disableAnalyzerNames[analyzer.Name]; ok {
+				return
+			}
 			if pass.Fset == nil {
 				oldReport(diagnostic)
 				return