Use the new compiler for building images (#4407)

Author: doriable

.golangci.yml

@@ -253,7 +253,7 @@ linters:
       - linters:
           - containedctx
         # we actually want to embed a context here
-        path: private/bufpkg/bufimage/parser_accessor_handler.go
+        path: private/bufpkg/bufimage/module_file_resolver.go
       - linters:
           - containedctx
         # we actually want to embed a context here
@@ -449,6 +449,13 @@ linters:
         # term.IsTerminal. Safe on all supported platforms.
         path: private/pkg/slogapp/console.go
         text: "G115:"
+      - linters:
+          - gosec
+        # G115: uintptr->int conversion for passing a terminal file descriptor
+        # to term.IsTerminal, which requires int. Safe on all supported platforms;
+        # fd values fit in int.
+        path: private/buf/bufctl/controller.go
+        text: "G115:"
       - linters:
           - gosec
         # G602: false positive — the loop index i is bounded by the length of

cmd/buf/buf_test.go

@@ -4493,7 +4493,10 @@ func TestProtoFileNoWorkspaceOrModule(t *testing.T) {
 		nil,
 		bufctl.ExitCodeFileAnnotation,
 		"", // no stdout
-		filepath.FromSlash(`testdata/protofileref/noworkspaceormodule/fail/import.proto:3:8:import "`)+`google/type/date.proto": file does not exist`,
+		fmt.Sprintf(
+			"%[1]s:3:1:imported file does not exist\n%[1]s:6:3:cannot find `google.type.Date` in this scope",
+			filepath.FromSlash("testdata/protofileref/noworkspaceormodule/fail/import.proto"),
+		),
 		"build",
 		filepath.Join("testdata", "protofileref", "noworkspaceormodule", "fail", "import.proto"),
 	)

cmd/buf/imports_test.go

@@ -15,6 +15,7 @@
 package main
 
 import (
+	"fmt"
 	"io"
 	"path/filepath"
 	"strings"
@@ -148,7 +149,10 @@ func TestInvalidNonexistentImport(t *testing.T) {
 	t.Parallel()
 	testRunStderrWithCache(
 		t, nil, bufctl.ExitCodeFileAnnotation,
-		filepath.FromSlash(`testdata/imports/failure/people/people/v1/people1.proto:5:8:import "nonexistent.proto": file does not exist`),
+		fmt.Sprintf(
+			"%[1]s:5:1:imported file does not exist",
+			filepath.FromSlash("testdata/imports/failure/people/people/v1/people1.proto"),
+		),
 		"build",
 		filepath.Join("testdata", "imports", "failure", "people"),
 	)
@@ -158,7 +162,10 @@ func TestInvalidNonexistentImportFromDirectDep(t *testing.T) {
 	t.Parallel()
 	testRunStderrWithCache(
 		t, nil, bufctl.ExitCodeFileAnnotation,
-		filepath.FromSlash(`testdata/imports/failure/students/students/v1/students.proto:`)+`6:8:import "people/v1/people_nonexistent.proto": file does not exist`,
+		fmt.Sprintf(
+			"%[1]s:6:1:imported file does not exist\n%[1]s:10:3:cannot find `people.v1.Person2` in this scope",
+			filepath.FromSlash("testdata/imports/failure/students/students/v1/students.proto"),
+		),
 		"build",
 		filepath.Join("testdata", "imports", "failure", "students"),
 	)

cmd/buf/internal/command/breaking/breaking.go

@@ -181,6 +181,7 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
+		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 		bufctl.WithFileAnnotationsToStdout(),
 	)
 	if err != nil {
@@ -368,7 +369,7 @@ func run(
 		}
 	}
 	if len(allFileAnnotations) > 0 {
-		allFileAnnotationSet := bufanalysis.NewFileAnnotationSet(allFileAnnotations...)
+		allFileAnnotationSet := bufanalysis.NewFileAnnotationSet(nil, allFileAnnotations...)
 		if err := bufanalysis.PrintFileAnnotationSet(
 			container.Stdout(),
 			allFileAnnotationSet,

cmd/buf/internal/command/build/build.go

@@ -152,6 +152,7 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
+		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

cmd/buf/internal/command/convert/convert.go

@@ -174,6 +174,7 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
+		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

cmd/buf/internal/command/curl/curl.go

@@ -1334,7 +1334,12 @@ func completeURLFromSchema(ctx context.Context, schemas []string, baseURL, rawPa
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
 	// Discard log output during shell completion.
-	container := appext.NewContainer(nameContainer, slog.New(slog.NewTextHandler(io.Discard, nil)))
+	container := appext.NewContainer(
+		nameContainer,
+		slog.New(slog.NewTextHandler(io.Discard, nil)),
+		appext.LogLevelError, // Doesn't matter, logs are discarded
+		appext.LogFormatText, // Doesn't matter, logs are discarded
+	)
 	controller, err := bufcli.NewController(container)
 	if err != nil {
 		reportError("%v", err)

cmd/buf/internal/command/dep/depgraph/depgraph.go

@@ -155,6 +155,7 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
+		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

cmd/buf/internal/command/format/format.go

@@ -296,6 +296,7 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
+		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

cmd/buf/internal/command/generate/generate.go

@@ -534,6 +534,7 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
+		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err