Skip to content

Commit 91e71ac

Browse files
bufdevbufdev
authored
Remove private/pkg/app in favor of buf.build/go/app (#3829)
1 parent d8f7c30 commit 91e71ac

File tree

200 files changed

+284
-3621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+284
-3621
lines changed

‎go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250425153114-8976f5be98c1.1
1010
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.18.1-20250424215339-a457693b5db4.1
1111
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.6-20250424215339-a457693b5db4.1
12+
buf.build/go/app v0.1.0
1213
buf.build/go/bufplugin v0.9.0
13-
buf.build/go/interrupt v1.1.0
1414
buf.build/go/protovalidate v0.12.0
1515
buf.build/go/protoyaml v0.6.0
1616
buf.build/go/spdx v0.2.0
@@ -54,6 +54,7 @@ require (
5454

5555
require (
5656
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.6-20241007202033-cf42259fcbfc.1 // indirect
57+
buf.build/go/interrupt v1.1.0 // indirect
5758
cel.dev/expr v0.23.1 // indirect
5859
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
5960
github.com/Microsoft/go-winio v0.6.2 // indirect

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.6-20250424215339-a45
88
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.6-20250424215339-a457693b5db4.1/go.mod h1:bUPpZtzAkcnTA7OLfKCvkvkxEAC6dG/ZIlbnbUJicL4=
99
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.6-20241007202033-cf42259fcbfc.1 h1:trcsXBDm8exui7mvndZnvworCyBq1xuMnod2N0j79K8=
1010
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.6-20241007202033-cf42259fcbfc.1/go.mod h1:OUbhXurY+VHFGn9FBxcRy8UB7HXk9NvJ2qCgifOMypQ=
11+
buf.build/go/app v0.1.0 h1:nlqD/h0rhIN73ZoiDElprrPiO2N6JV+RmNK34K29Ihg=
12+
buf.build/go/app v0.1.0/go.mod h1:0XVOYemubVbxNXVY0DnsVgWeGkcbbAvjDa1fmhBC+Wo=
1113
buf.build/go/bufplugin v0.9.0 h1:ktZJNP3If7ldcWVqh46XKeiYJVPxHQxCfjzVQDzZ/lo=
1214
buf.build/go/bufplugin v0.9.0/go.mod h1:Z0CxA3sKQ6EPz/Os4kJJneeRO6CjPeidtP1ABh5jPPY=
1315
buf.build/go/interrupt v1.1.0 h1:olBuhgv9Sav4/9pkSLoxgiOsZDgM5VhRhvRpn3DL0lE=

‎private/buf/bufapp/bufapp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"crypto/tls"
1919
"fmt"
2020

21-
"github.com/bufbuild/buf/private/pkg/app/appext"
21+
"buf.build/go/app/appext"
2222
"github.com/bufbuild/buf/private/pkg/cert/certclient"
2323
)
2424

‎private/buf/bufcli/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"os"
2323
"path/filepath"
2424

25+
"buf.build/go/app/appext"
2526
"github.com/bufbuild/buf/private/buf/bufwkt/bufwktstore"
2627
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2728
"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
@@ -34,7 +35,6 @@ import (
3435
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
3536
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiowner"
3637
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiplugin"
37-
"github.com/bufbuild/buf/private/pkg/app/appext"
3838
"github.com/bufbuild/buf/private/pkg/filelock"
3939
"github.com/bufbuild/buf/private/pkg/normalpath"
4040
"github.com/bufbuild/buf/private/pkg/storage/storageos"

‎private/buf/bufcli/connectclient_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
package bufcli
1616

1717
import (
18+
"buf.build/go/app/appext"
1819
"connectrpc.com/connect"
1920
otelconnect "connectrpc.com/otelconnect"
2021
"github.com/bufbuild/buf/private/buf/bufapp"
2122
"github.com/bufbuild/buf/private/bufpkg/bufconnect"
2223
"github.com/bufbuild/buf/private/bufpkg/buftransport"
23-
"github.com/bufbuild/buf/private/pkg/app/appext"
2424
"github.com/bufbuild/buf/private/pkg/connectclient"
2525
"github.com/bufbuild/buf/private/pkg/netrc"
2626
"github.com/bufbuild/buf/private/pkg/transport/http/httpclient"

‎private/buf/bufcli/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
package bufcli
1616

1717
import (
18+
"buf.build/go/app/appext"
1819
"github.com/bufbuild/buf/private/buf/bufctl"
1920
"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
2021
"github.com/bufbuild/buf/private/bufpkg/bufplugin/bufpluginapi"
2122
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
2223
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiowner"
2324
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiplugin"
24-
"github.com/bufbuild/buf/private/pkg/app/appext"
2525
)
2626

2727
// NewController returns a new Controller.

‎private/buf/bufcli/env.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"net/http"
2020

21-
"github.com/bufbuild/buf/private/pkg/app/appext"
21+
"buf.build/go/app/appext"
2222
"github.com/bufbuild/buf/private/pkg/git"
2323
"github.com/bufbuild/buf/private/pkg/httpauth"
2424
)

‎private/buf/bufcli/flags_args.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121

2222
modulev1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/module/v1"
2323
pluginv1beta1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/plugin/v1beta1"
24+
"buf.build/go/app"
25+
"buf.build/go/app/appcmd"
2426
"github.com/bufbuild/buf/private/buf/buffetch"
25-
"github.com/bufbuild/buf/private/pkg/app"
26-
"github.com/bufbuild/buf/private/pkg/app/appcmd"
2727
"github.com/bufbuild/buf/private/pkg/stringutil"
2828
"github.com/spf13/pflag"
2929
)

‎private/buf/bufcli/graph_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
package bufcli
1616

1717
import (
18+
"buf.build/go/app/appext"
1819
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
1920
"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
2021
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
2122
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiowner"
22-
"github.com/bufbuild/buf/private/pkg/app/appext"
2323
)
2424

2525
// NewGraphProvider returns a new GraphProvider.

‎private/buf/bufcli/module_key_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
package bufcli
1616

1717
import (
18+
"buf.build/go/app/appext"
1819
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
1920
"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
2021
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
21-
"github.com/bufbuild/buf/private/pkg/app/appext"
2222
)
2323

2424
// NewModuleKeyProvider returns a new ModuleKeyProvider.

‎private/buf/bufcli/plugin_key_provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
package bufcli
1616

1717
import (
18+
"buf.build/go/app/appext"
1819
"github.com/bufbuild/buf/private/bufpkg/bufplugin"
1920
"github.com/bufbuild/buf/private/bufpkg/bufplugin/bufpluginapi"
2021
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiplugin"
21-
"github.com/bufbuild/buf/private/pkg/app/appext"
2222
)
2323

2424
// NewPluginKeyProvider returns a new PluginKeyProvider.

‎private/buf/bufcli/prompt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os"
2323
"strings"
2424

25-
"github.com/bufbuild/buf/private/pkg/app"
25+
"buf.build/go/app"
2626
"github.com/bufbuild/buf/private/pkg/syserror"
2727
"golang.org/x/term"
2828
)

‎private/buf/bufcli/uploader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
package bufcli
1616

1717
import (
18+
"buf.build/go/app/appext"
1819
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
1920
"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
2021
"github.com/bufbuild/buf/private/bufpkg/bufplugin"
2122
"github.com/bufbuild/buf/private/bufpkg/bufplugin/bufpluginapi"
2223
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapimodule"
2324
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiplugin"
24-
"github.com/bufbuild/buf/private/pkg/app/appext"
2525
)
2626

2727
// NewModuleUploader returns a new Uploader for ModuleSets.

‎private/buf/bufctl/bufctl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package bufctl
1616

1717
import (
18-
"github.com/bufbuild/buf/private/pkg/app"
18+
"buf.build/go/app"
1919
)
2020

2121
const (

‎private/buf/bufctl/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import (
2525
"slices"
2626
"sort"
2727

28+
"buf.build/go/app"
29+
"buf.build/go/app/appcmd"
2830
"buf.build/go/protovalidate"
2931
"buf.build/go/protoyaml"
3032
"github.com/bufbuild/buf/private/buf/buffetch"
@@ -41,8 +43,6 @@ import (
4143
"github.com/bufbuild/buf/private/bufpkg/bufreflect"
4244
"github.com/bufbuild/buf/private/gen/data/datawkt"
4345
imagev1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/image/v1"
44-
"github.com/bufbuild/buf/private/pkg/app"
45-
"github.com/bufbuild/buf/private/pkg/app/appcmd"
4646
"github.com/bufbuild/buf/private/pkg/git"
4747
"github.com/bufbuild/buf/private/pkg/httpauth"
4848
"github.com/bufbuild/buf/private/pkg/ioext"

‎private/buf/bufcurl/invoker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"net/http/httptest"
2727
"sync"
2828

29+
"buf.build/go/app"
30+
"buf.build/go/app/appext"
2931
"connectrpc.com/connect"
30-
"github.com/bufbuild/buf/private/pkg/app"
31-
"github.com/bufbuild/buf/private/pkg/app/appext"
3232
"github.com/bufbuild/buf/private/pkg/protoencoding"
3333
"github.com/bufbuild/buf/private/pkg/verbose"
3434
"google.golang.org/protobuf/proto"

‎private/buf/buffetch/buffetch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"log/slog"
2323
"net/http"
2424

25+
"buf.build/go/app"
2526
"github.com/bufbuild/buf/private/buf/buffetch/internal"
2627
"github.com/bufbuild/buf/private/buf/buftarget"
2728
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2829
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
29-
"github.com/bufbuild/buf/private/pkg/app"
3030
"github.com/bufbuild/buf/private/pkg/git"
3131
"github.com/bufbuild/buf/private/pkg/httpauth"
3232
"github.com/bufbuild/buf/private/pkg/storage/storageos"

‎private/buf/buffetch/buffetch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"path/filepath"
2222
"testing"
2323

24+
"buf.build/go/app"
2425
"github.com/bufbuild/buf/private/buf/buffetch/internal"
25-
"github.com/bufbuild/buf/private/pkg/app"
2626
"github.com/bufbuild/buf/private/pkg/slogtestext"
2727
"github.com/bufbuild/buf/private/pkg/storage/storageos"
2828
"github.com/stretchr/testify/require"

‎private/buf/buffetch/internal/dir_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package internal
1717
import (
1818
"strings"
1919

20-
"github.com/bufbuild/buf/private/pkg/app"
20+
"buf.build/go/app"
2121
"github.com/bufbuild/buf/private/pkg/filepathext"
2222
"github.com/bufbuild/buf/private/pkg/normalpath"
2323
)

‎private/buf/buffetch/internal/git_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package internal
1717
import (
1818
"strings"
1919

20-
"github.com/bufbuild/buf/private/pkg/app"
20+
"buf.build/go/app"
2121
"github.com/bufbuild/buf/private/pkg/git"
2222
"github.com/bufbuild/buf/private/pkg/normalpath"
2323
)

‎private/buf/buffetch/internal/internal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"net/http"
2323
"strconv"
2424

25+
"buf.build/go/app"
2526
"github.com/bufbuild/buf/private/buf/buftarget"
2627
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2728
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
2829
"github.com/bufbuild/buf/private/bufpkg/bufparse"
29-
"github.com/bufbuild/buf/private/pkg/app"
3030
"github.com/bufbuild/buf/private/pkg/git"
3131
"github.com/bufbuild/buf/private/pkg/httpauth"
3232
"github.com/bufbuild/buf/private/pkg/storage"

‎private/buf/buffetch/internal/module_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package internal
1717
import (
1818
"strings"
1919

20+
"buf.build/go/app"
2021
"github.com/bufbuild/buf/private/bufpkg/bufparse"
21-
"github.com/bufbuild/buf/private/pkg/app"
2222
)
2323

2424
var (

‎private/buf/buffetch/internal/proto_file_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package internal
1616

17-
import "github.com/bufbuild/buf/private/pkg/app"
17+
import "buf.build/go/app"
1818

1919
var (
2020
_ ParsedProtoFileRef = &protoFileRef{}

‎private/buf/buffetch/internal/proto_file_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"log/slog"
2323
"os"
2424

25-
"github.com/bufbuild/buf/private/pkg/app"
25+
"buf.build/go/app"
2626
"github.com/bufbuild/buf/private/pkg/ioext"
2727
"github.com/bufbuild/buf/private/pkg/normalpath"
2828
)

‎private/buf/buffetch/internal/reader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"os"
2727
"path/filepath"
2828

29+
"buf.build/go/app"
2930
"github.com/bufbuild/buf/private/buf/buftarget"
3031
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
3132
"github.com/bufbuild/buf/private/bufpkg/bufparse"
32-
"github.com/bufbuild/buf/private/pkg/app"
3333
"github.com/bufbuild/buf/private/pkg/git"
3434
"github.com/bufbuild/buf/private/pkg/httpauth"
3535
"github.com/bufbuild/buf/private/pkg/ioext"

‎private/buf/buffetch/internal/ref_parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strconv"
2222
"strings"
2323

24+
"buf.build/go/app"
2425
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
25-
"github.com/bufbuild/buf/private/pkg/app"
2626
"github.com/bufbuild/buf/private/pkg/git"
2727
"github.com/bufbuild/buf/private/pkg/normalpath"
2828
"github.com/bufbuild/buf/private/pkg/syserror"

‎private/buf/buffetch/internal/single_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package internal
1717
import (
1818
"strings"
1919

20-
"github.com/bufbuild/buf/private/pkg/app"
20+
"buf.build/go/app"
2121
"github.com/bufbuild/buf/private/pkg/normalpath"
2222
)
2323

‎private/buf/buffetch/internal/writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"log/slog"
2424
"os"
2525

26-
"github.com/bufbuild/buf/private/pkg/app"
26+
"buf.build/go/app"
2727
"github.com/bufbuild/buf/private/pkg/ioext"
2828
"github.com/klauspost/compress/zstd"
2929
)

‎private/buf/buffetch/proto_file_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"io"
2020
"log/slog"
2121

22+
"buf.build/go/app"
2223
"github.com/bufbuild/buf/private/buf/buffetch/internal"
23-
"github.com/bufbuild/buf/private/pkg/app"
2424
)
2525

2626
type protoFileWriter struct {

‎private/buf/buffetch/reader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"log/slog"
2121
"net/http"
2222

23+
"buf.build/go/app"
2324
"github.com/bufbuild/buf/private/buf/buffetch/internal"
2425
"github.com/bufbuild/buf/private/buf/buftarget"
2526
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
26-
"github.com/bufbuild/buf/private/pkg/app"
2727
"github.com/bufbuild/buf/private/pkg/git"
2828
"github.com/bufbuild/buf/private/pkg/httpauth"
2929
"github.com/bufbuild/buf/private/pkg/storage/storageos"

‎private/buf/buffetch/ref_parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"path/filepath"
2424
"strings"
2525

26+
"buf.build/go/app"
2627
"github.com/bufbuild/buf/private/buf/buffetch/internal"
2728
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2829
"github.com/bufbuild/buf/private/bufpkg/bufparse"
29-
"github.com/bufbuild/buf/private/pkg/app"
3030
"github.com/bufbuild/buf/private/pkg/syserror"
3131
)
3232

‎private/buf/buffetch/ref_parser_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"path/filepath"
2121
"testing"
2222

23+
"buf.build/go/app"
2324
"github.com/bufbuild/buf/private/buf/buffetch/internal"
2425
"github.com/bufbuild/buf/private/bufpkg/bufparse"
25-
"github.com/bufbuild/buf/private/pkg/app"
2626
"github.com/bufbuild/buf/private/pkg/git"
2727
"github.com/bufbuild/buf/private/pkg/normalpath"
2828
"github.com/bufbuild/buf/private/pkg/slogtestext"

‎private/buf/buffetch/ref_parser_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package buffetch
1919
import (
2020
"testing"
2121

22+
"buf.build/go/app"
2223
"github.com/bufbuild/buf/private/buf/buffetch/internal"
23-
"github.com/bufbuild/buf/private/pkg/app"
2424
)
2525

2626
func TestGetParsedRefSuccess_UnixOnly(t *testing.T) {

‎private/buf/buffetch/writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"io"
2020
"log/slog"
2121

22+
"buf.build/go/app"
2223
"github.com/bufbuild/buf/private/buf/buffetch/internal"
23-
"github.com/bufbuild/buf/private/pkg/app"
2424
)
2525

2626
type writer struct {

‎private/buf/bufgen/bufgen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"log/slog"
2424
"strconv"
2525

26+
"buf.build/go/app"
2627
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
2728
"github.com/bufbuild/buf/private/bufpkg/bufimage"
28-
"github.com/bufbuild/buf/private/pkg/app"
2929
"github.com/bufbuild/buf/private/pkg/connectclient"
3030
"github.com/bufbuild/buf/private/pkg/storage/storageos"
3131
)

0 commit comments

Comments
 (0)