Skip to content

Commit

Permalink
Add plugin push command
Browse files Browse the repository at this point in the history
This adds the `buf plugin push` command to upload Buf plugins to the
BSR. Only wASM binary check plugins are supported for now. Plugins
must implement the PluginRPC framework.

```
buf plugin push buf.build/organization/plugin --binary plugin.wasm
```
  • Loading branch information
emcfarlane committed Nov 14, 2024
1 parent d12a559 commit e02257e
Show file tree
Hide file tree
Showing 4 changed files with 364 additions and 4 deletions.
16 changes: 12 additions & 4 deletions private/buf/cmd/buf/buf.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/bufpluginv2"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/lsp"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/price"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/registry/plugin/plugindelete"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/registry/plugin/pluginpush"
betaplugindelete "github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/registry/plugin/plugindelete"
betapluginpush "github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/registry/plugin/pluginpush"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/registry/webhook/webhookcreate"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/registry/webhook/webhookdelete"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/beta/registry/webhook/webhooklist"
Expand All @@ -62,6 +62,7 @@ import (
"github.com/bufbuild/buf/private/buf/cmd/buf/command/mod/modlsbreakingrules"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/mod/modlslintrules"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/mod/modopen"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/plugin/pluginpush"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/push"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/registry/module/modulecommit/modulecommitaddlabel"
"github.com/bufbuild/buf/private/buf/cmd/buf/command/registry/module/modulecommit/modulecommitinfo"
Expand Down Expand Up @@ -171,6 +172,13 @@ func NewRootCommand(name string) *appcmd.Command {
modlsbreakingrules.NewCommand("ls-breaking-rules", builder),
},
},
{
Use: "plugin",
Short: "Work with buf plugins",
SubCommands: []*appcmd.Command{
pluginpush.NewCommand("push", builder),
},
},
{
Use: "registry",
Short: "Manage assets on the Buf Schema Registry",
Expand Down Expand Up @@ -282,8 +290,8 @@ func NewRootCommand(name string) *appcmd.Command {
Use: "plugin",
Short: "Manage plugins on the Buf Schema Registry",
SubCommands: []*appcmd.Command{
pluginpush.NewCommand("push", builder),
plugindelete.NewCommand("delete", builder),
betapluginpush.NewCommand("push", builder),
betaplugindelete.NewCommand("delete", builder),
},
},
},
Expand Down
53 changes: 53 additions & 0 deletions private/buf/cmd/buf/command/plugin/pluginpush/convert.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// Copyright 2020-2024 Buf Technologies, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package pluginpush

import (
"fmt"

pluginv1beta1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/plugin/v1beta1"
"github.com/bufbuild/buf/private/bufpkg/bufcas"
"github.com/bufbuild/buf/private/bufpkg/bufplugin"
)

var (
v1beta1ProtoDigestTypeToDigestType = map[pluginv1beta1.DigestType]bufplugin.DigestType{
pluginv1beta1.DigestType_DIGEST_TYPE_P1: bufplugin.DigestTypeP1,
}
)

func v1beta1ProtoToDigestType(protoDigestType pluginv1beta1.DigestType) (bufplugin.DigestType, error) {
digestType, ok := v1beta1ProtoDigestTypeToDigestType[protoDigestType]
if !ok {
return 0, fmt.Errorf("unknown pluginv1beta1.DigestType: %v", protoDigestType)
}
return digestType, nil
}

// v1beta1ProtoToDigest converts the given proto Digest to a Digest.
//
// Validation is performed to ensure the DigestType is known, and the value
// is a valid digest value for the given DigestType.
func v1beta1ProtoToDigest(protoDigest *pluginv1beta1.Digest) (bufplugin.Digest, error) {
digestType, err := v1beta1ProtoToDigestType(protoDigest.Type)
if err != nil {
return nil, err
}
bufcasDigest, err := bufcas.NewDigest(protoDigest.Value)
if err != nil {
return nil, err
}
return bufplugin.NewDigest(digestType, bufcasDigest)
}
280 changes: 280 additions & 0 deletions private/buf/cmd/buf/command/plugin/pluginpush/pluginpush.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,280 @@
// Copyright 2020-2024 Buf Technologies, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package pluginpush

import (
"context"
"fmt"
"os"
"strings"

pluginv1beta1 "buf.build/gen/go/bufbuild/registry/protocolbuffers/go/buf/registry/plugin/v1beta1"
"connectrpc.com/connect"
"github.com/bufbuild/buf/private/buf/bufcli"
"github.com/bufbuild/buf/private/bufpkg/bufparse"
"github.com/bufbuild/buf/private/bufpkg/bufplugin"
"github.com/bufbuild/buf/private/bufpkg/bufregistryapi/bufregistryapiplugin"
"github.com/bufbuild/buf/private/pkg/app/appcmd"
"github.com/bufbuild/buf/private/pkg/app/appext"
"github.com/bufbuild/buf/private/pkg/connectclient"
"github.com/bufbuild/buf/private/pkg/slicesext"
"github.com/bufbuild/buf/private/pkg/syserror"
"github.com/bufbuild/buf/private/pkg/uuidutil"
"github.com/bufbuild/buf/private/pkg/wasm"
"github.com/klauspost/compress/zstd"
"github.com/spf13/pflag"
"go.uber.org/multierr"
)

const (
labelFlagName = "label"
binaryFlagName = "binary"
sourceControlURLFlagName = "source-control-url"
)

// NewCommand returns a new Command.
func NewCommand(
name string,
builder appext.SubCommandBuilder,
) *appcmd.Command {
flags := newFlags()
return &appcmd.Command{
Use: name + " <remote/owner/plugin>",
Short: "Push a plugin to a registry",
Long: `The first argument is the plugin full name in the format <remote/owner/plugin>.`,
Args: appcmd.MaximumNArgs(1),
Run: builder.NewRunFunc(
func(ctx context.Context, container appext.Container) error {
return run(ctx, container, flags)
},
),
BindFlags: flags.Bind,
}
}

type flags struct {
Labels []string
Binary string
SourceControlURL string
}

func newFlags() *flags {
return &flags{}
}

func (f *flags) Bind(flagSet *pflag.FlagSet) {
flagSet.StringSliceVar(
&f.Labels,
labelFlagName,
nil,
"Associate the label with the plugins pushed. Can be used multiple times.",
)
flagSet.StringVar(
&f.Binary,
binaryFlagName,
"",
"Push the plugin binary to the registry.",
)
flagSet.StringVar(
&f.SourceControlURL,
sourceControlURLFlagName,
"",
"The URL for viewing the source code of the pushed modules (e.g. the specific commit in source control).",
)
}

func run(
ctx context.Context,
container appext.Container,
flags *flags,
) (retErr error) {
if err := validateFlags(flags); err != nil {
return err
}
// We parse the plugin full name from the user-provided argument.
pluginFullName, err := bufparse.ParseFullName(container.Arg(0))
if err != nil {
return appcmd.WrapInvalidArgumentError(err)
}

clientConfig, err := bufcli.NewConnectClientConfig(container)
if err != nil {
return err
}
pluginKey, err := upload(ctx, container, flags, clientConfig, pluginFullName)
if err != nil {
return err
}
// Only one plugin key is returned.
if _, err := fmt.Fprintf(container.Stdout(), "%s\n", pluginKey.String()); err != nil {
return syserror.Wrap(err)
}
return nil
}

func upload(
ctx context.Context,
container appext.Container,
flags *flags,
clientConfig *connectclient.Config,
pluginFullName bufparse.FullName,
) (_ bufplugin.PluginKey, retErr error) {
switch {
case flags.Binary != "":
return uploadBinary(ctx, container, flags, clientConfig, pluginFullName)
default:
// This should never happen because the flags are validated.
return nil, syserror.Newf("--%s must be set", binaryFlagName)
}
}

func uploadBinary(
ctx context.Context,
container appext.Container,
flags *flags,
clientConfig *connectclient.Config,
pluginFullName bufparse.FullName,
) (pluginKey bufplugin.PluginKey, retErr error) {
uploadServiceClient := bufregistryapiplugin.NewClientProvider(clientConfig).
V1Beta1UploadServiceClient(pluginFullName.Registry())

wasmRuntimeCacheDir, err := bufcli.CreateWasmRuntimeCacheDir(container)
if err != nil {
return nil, err
}
wasmRuntime, err := wasm.NewRuntime(ctx, wasm.WithLocalCacheDir(wasmRuntimeCacheDir))
if err != nil {
return nil, err
}
defer func() {
retErr = multierr.Append(retErr, wasmRuntime.Close(ctx))
}()
// Load the binary from the `--binary` flag.
wasmBinary, err := os.ReadFile(flags.Binary)
if err != nil {
return nil, fmt.Errorf("could not read binary %q: %w", flags.Binary, err)
}
compressionType := pluginv1beta1.CompressionType_COMPRESSION_TYPE_ZSTD
compressedWasmBinary, err := zstdCompress(wasmBinary)
if err != nil {
return nil, fmt.Errorf("could not compress binary %q: %w", flags.Binary, err)
}

// Defer validation of the plugin binary to the server, but compile the
// binary locally to catch any errors early.
_, err = wasmRuntime.Compile(ctx, pluginFullName.Name(), wasmBinary)
if err != nil {
return nil, fmt.Errorf("could not compile binary %q: %w", flags.Binary, err)
}
// Upload the binary to the registry.
content := &pluginv1beta1.UploadRequest_Content{
PluginRef: &pluginv1beta1.PluginRef{
Value: &pluginv1beta1.PluginRef_Name_{
Name: &pluginv1beta1.PluginRef_Name{
Owner: pluginFullName.Owner(),
Plugin: pluginFullName.Name(),
},
},
},
CompressionType: compressionType,
Content: compressedWasmBinary,
ScopedLabelRefs: slicesext.Map(flags.Labels, func(label string) *pluginv1beta1.ScopedLabelRef {
return &pluginv1beta1.ScopedLabelRef{
Value: &pluginv1beta1.ScopedLabelRef_Name{
Name: label,
},
}
}),
SourceControlUrl: flags.SourceControlURL,
}
uploadResponse, err := uploadServiceClient.Upload(ctx, connect.NewRequest(&pluginv1beta1.UploadRequest{
Contents: []*pluginv1beta1.UploadRequest_Content{content},
}))
if err != nil {
return nil, err
}
if len(uploadResponse.Msg.Commits) != 1 {
return nil, syserror.Newf("unexpected number of commits returned from server: %d", len(uploadResponse.Msg.Commits))
}
protoCommit := uploadResponse.Msg.Commits[0]
commitID, err := uuidutil.FromDashless(protoCommit.Id)
if err != nil {
return nil, err
}
pluginKey, err = bufplugin.NewPluginKey(
pluginFullName,
commitID,
func() (bufplugin.Digest, error) {
return v1beta1ProtoToDigest(protoCommit.Digest)
},
)
if err != nil {
return nil, err
}
return pluginKey, nil
}

func zstdCompress(data []byte) ([]byte, error) {
encoder, err := zstd.NewWriter(nil)
if err != nil {
return nil, fmt.Errorf("failed to create zstd encoder: %w", err)
}
defer encoder.Close()
return encoder.EncodeAll(data, nil), nil
}

func validateFlags(flags *flags) error {
if err := validateLabelFlags(flags); err != nil {
return err
}
if err := validateTypeFlags(flags); err != nil {
return err
}
return nil
}

func validateLabelFlags(flags *flags) error {
return validateLabelFlagValues(flags)
}

func validateTypeFlags(flags *flags) error {
var typeFlags []string
if flags.Binary != "" {
typeFlags = append(typeFlags, binaryFlagName)
}
if len(typeFlags) > 1 {
usedFlagsErrStr := strings.Join(
slicesext.Map(
typeFlags,
func(flag string) string { return fmt.Sprintf("--%s", flag) },
),
", ",
)
return appcmd.NewInvalidArgumentErrorf("These flags cannot be used in combination with one another: %s", usedFlagsErrStr)
}
if len(typeFlags) == 0 {
return appcmd.NewInvalidArgumentErrorf("--%s must be set", binaryFlagName)
}
return nil
}

func validateLabelFlagValues(flags *flags) error {
for _, label := range flags.Labels {
if label == "" {
return appcmd.NewInvalidArgumentErrorf("--%s requires a non-empty string", labelFlagName)
}
}
return nil
}
19 changes: 19 additions & 0 deletions private/buf/cmd/buf/command/plugin/pluginpush/usage.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e02257e

Please sign in to comment.