Move bazel code into plugins directory

.gitignore

@@ -1,7 +1,7 @@
 out/
 examples/bazel/bazel-*
 integration/examples/bazel/bazel-*
-integration/examples/test-plugin/local/bazel/bazel-*
+integration/testdata/plugin/local/bazel/bazel-*
 *.new
 .idea/
 docs/.firebase

docs/content/en/schemas/v1beta6.json

@@ -1042,12 +1042,6 @@
           "x-intellij-html-description": "should build dependencies be skipped.",
           "default": "false"
         },
-        "useHelmSecrets": {
-          "type": "boolean",
-          "description": "instructs skaffold to use secrets plugin on deployment.",
-          "x-intellij-html-description": "instructs skaffold to use secrets plugin on deployment.",
-          "default": "false"
-        },
         "values": {
           "additionalProperties": {
             "type": "string"
@@ -1090,7 +1084,6 @@
         "wait",
         "recreatePods",
         "skipBuildDependencies",
-        "useHelmSecrets",
         "overrides",
         "packaged",
         "imageStrategy"

docs/content/en/schemas/v1beta7.json

@@ -1042,6 +1042,12 @@
           "x-intellij-html-description": "should build dependencies be skipped.",
           "default": "false"
         },
+        "useHelmSecrets": {
+          "type": "boolean",
+          "description": "instructs skaffold to use secrets plugin on deployment.",
+          "x-intellij-html-description": "instructs skaffold to use secrets plugin on deployment.",
+          "default": "false"
+        },
         "values": {
           "additionalProperties": {
             "type": "string"
@@ -1084,6 +1090,7 @@
         "wait",
         "recreatePods",
         "skipBuildDependencies",
+        "useHelmSecrets",
         "overrides",
         "packaged",
         "imageStrategy"

pkg/skaffold/build/local/bazel.go

@@ -18,136 +18,24 @@ package local
 
 import (
 	"context"
-	"fmt"
 	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/plugin/builders/bazel"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/name"
-	"github.com/google/go-containerregistry/pkg/v1/remote"
-	"github.com/google/go-containerregistry/pkg/v1/tarball"
-	"github.com/pkg/errors"
 )
 
-func (b *Builder) buildBazel(ctx context.Context, out io.Writer, workspace string, a *latest.BazelArtifact, tag string) (string, error) {
-	args := []string{"build"}
-	args = append(args, a.BuildArgs...)
-	args = append(args, a.BuildTarget)
+func (b *Builder) buildBazel(ctx context.Context, out io.Writer, a *latest.Artifact, tag string) (string, error) {
+	builder := bazel.NewBuilder()
+	builder.LocalBuild = b.cfg
+	builder.LocalDocker = b.localDocker
+	builder.KubeContext = b.kubeContext
+	builder.PushImages = b.pushImages
+	builder.PluginMode = false
 
-	// FIXME: is it possible to apply b.skipTests?
-	cmd := exec.CommandContext(ctx, "bazel", args...)
-	cmd.Dir = workspace
-	cmd.Stdout = out
-	cmd.Stderr = out
-	if err := util.RunCmd(cmd); err != nil {
-		return "", errors.Wrap(err, "running command")
+	opts := &config.SkaffoldOptions{
+		SkipTests: b.skipTests,
 	}
-
-	bazelBin, err := bazelBin(ctx, workspace, a)
-	if err != nil {
-		return "", errors.Wrap(err, "getting path of bazel-bin")
-	}
-
-	tarPath := filepath.Join(bazelBin, buildTarPath(a.BuildTarget))
-
-	if b.pushImages {
-		return pushImage(tarPath, tag)
-	}
-
-	return b.loadImage(ctx, out, tarPath, a, tag)
-}
-
-func pushImage(tarPath, tag string) (string, error) {
-	t, err := name.NewTag(tag, name.WeakValidation)
-	if err != nil {
-		return "", errors.Wrapf(err, "parsing tag %q", tag)
-	}
-
-	auth, err := authn.DefaultKeychain.Resolve(t.Registry)
-	if err != nil {
-		return "", errors.Wrapf(err, "getting creds for %q", t)
-	}
-
-	i, err := tarball.ImageFromPath(tarPath, nil)
-	if err != nil {
-		return "", errors.Wrapf(err, "reading image %q", tarPath)
-	}
-
-	if err := remote.Write(t, i, auth, http.DefaultTransport); err != nil {
-		return "", errors.Wrapf(err, "writing image %q", t)
-	}
-
-	return docker.RemoteDigest(tag)
-}
-
-func (b *Builder) loadImage(ctx context.Context, out io.Writer, tarPath string, a *latest.BazelArtifact, tag string) (string, error) {
-	imageTar, err := os.Open(tarPath)
-	if err != nil {
-		return "", errors.Wrap(err, "opening image tarball")
-	}
-	defer imageTar.Close()
-
-	bazelTag := buildImageTag(a.BuildTarget)
-	imageID, err := b.localDocker.Load(ctx, out, imageTar, bazelTag)
-	if err != nil {
-		return "", errors.Wrap(err, "loading image into docker daemon")
-	}
-
-	if err := b.localDocker.Tag(ctx, imageID, tag); err != nil {
-		return "", errors.Wrap(err, "tagging the image")
-	}
-
-	return imageID, nil
-}
-
-func bazelBin(ctx context.Context, workspace string, a *latest.BazelArtifact) (string, error) {
-	args := []string{"info", "bazel-bin"}
-	args = append(args, a.BuildArgs...)
-
-	cmd := exec.CommandContext(ctx, "bazel", args...)
-	cmd.Dir = workspace
-
-	buf, err := util.RunCmdOut(cmd)
-	if err != nil {
-		return "", err
-	}
-
-	return strings.TrimSpace(string(buf)), nil
-}
-
-func trimTarget(buildTarget string) string {
-	//TODO(r2d4): strip off leading //:, bad
-	trimmedTarget := strings.TrimPrefix(buildTarget, "//")
-	// Useful if root target "//:target"
-	trimmedTarget = strings.TrimPrefix(trimmedTarget, ":")
-
-	return trimmedTarget
-}
-
-func buildTarPath(buildTarget string) string {
-	tarPath := trimTarget(buildTarget)
-	tarPath = strings.Replace(tarPath, ":", string(os.PathSeparator), 1)
-
-	return tarPath
-}
-
-func buildImageTag(buildTarget string) string {
-	imageTag := trimTarget(buildTarget)
-	imageTag = strings.TrimPrefix(imageTag, ":")
-
-	//TODO(r2d4): strip off trailing .tar, even worse
-	imageTag = strings.TrimSuffix(imageTag, ".tar")
-
-	if strings.Contains(imageTag, ":") {
-		return fmt.Sprintf("bazel/%s", imageTag)
-	}
-
-	return fmt.Sprintf("bazel:%s", imageTag)
+	builder.Init(opts, &latest.ExecutionEnvironment{})
+	return builder.BuildArtifact(ctx, out, a, tag)
 }

pkg/skaffold/build/local/local.go

@@ -22,12 +22,12 @@ import (
 	"io"
 	"strings"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/bazel"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/tag"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/jib"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/plugin/builders/bazel"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
@@ -76,7 +76,7 @@ func (b *Builder) runBuildForArtifact(ctx context.Context, out io.Writer, artifa
 		return b.buildDocker(ctx, out, artifact, tag)
 
 	case artifact.BazelArtifact != nil:
-		return b.buildBazel(ctx, out, artifact.Workspace, artifact.BazelArtifact, tag)
+		return b.buildBazel(ctx, out, artifact, tag)
 
 	case artifact.JibMavenArtifact != nil:
 		return b.buildJibMaven(ctx, out, artifact.Workspace, artifact.JibMavenArtifact, tag)

pkg/skaffold/plugin/builders/bazel/bazel.go

@@ -17,7 +17,6 @@ limitations under the License.
 package bazel
 
 import (
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/bazel"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/plugin/shared"
 	plugin "github.com/hashicorp/go-plugin"
 )
@@ -26,7 +25,7 @@ import (
 func Execute() error {
 	// pluginMap is the map of plugins we can dispense.
 	var pluginMap = map[string]plugin.Plugin{
-		"bazel": &shared.BuilderPlugin{Impl: bazel.NewBuilder()},
+		"bazel": &shared.BuilderPlugin{Impl: NewBuilder()},
 	}
 
 	plugin.Serve(&plugin.ServeConfig{

pkg/skaffold/build/bazel/bazel.go → pkg/skaffold/plugin/builders/bazel/builder.go

@@ -20,14 +20,12 @@ import (
 	"context"
 	"io"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/bazel"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/local"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/tag"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
-	kubectx "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/context"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/pkg/errors"
@@ -39,18 +37,28 @@ import (
 type Builder struct {
 	opts *config.SkaffoldOptions
 	env  *latest.ExecutionEnvironment
+	*latest.LocalBuild
+	LocalDocker  docker.LocalDaemon
+	LocalCluster bool
+	PushImages   bool
+	PluginMode   bool
+	KubeContext  string
 }
 
 // NewBuilder creates a new Builder that builds artifacts with Bazel.
 func NewBuilder() *Builder {
-	return &Builder{}
+	return &Builder{
+		PluginMode: true,
+	}
 }
 
 // Init stores skaffold options and the execution environment
 func (b *Builder) Init(opts *config.SkaffoldOptions, env *latest.ExecutionEnvironment) {
-	if err := event.SetupRPCClient(opts); err != nil {
-		logrus.Warn("error establishing gRPC connection to skaffold process; events will not be handled correctly")
-		logrus.Warn(err.Error())
+	if b.PluginMode {
+		if err := event.SetupRPCClient(opts); err != nil {
+			logrus.Warn("error establishing gRPC connection to skaffold process; events will not be handled correctly")
+			logrus.Warn(err.Error())
+		}
 	}
 	b.opts = opts
 	b.env = env
@@ -71,7 +79,7 @@ func (b *Builder) DependenciesForArtifact(ctx context.Context, artifact *latest.
 	if artifact.BazelArtifact == nil {
 		return nil, errors.New("bazel artifact is nil")
 	}
-	paths, err := bazel.GetDependencies(ctx, artifact.Workspace, artifact.BazelArtifact)
+	paths, err := GetDependencies(ctx, artifact.Workspace, artifact.BazelArtifact)
 	if err != nil {
 		return nil, errors.Wrap(err, "getting bazel dependencies")
 	}
@@ -89,31 +97,6 @@ func (b *Builder) Build(ctx context.Context, out io.Writer, tags tag.ImageTags,
 	}
 }
 
-// local sets any necessary defaults and then builds artifacts with bazel locally
-func (b *Builder) local(ctx context.Context, out io.Writer, tags tag.ImageTags, artifacts []*latest.Artifact) ([]build.Artifact, error) {
-	var l *latest.LocalBuild
-	if err := util.CloneThroughJSON(b.env.Properties, &l); err != nil {
-		return nil, errors.Wrap(err, "converting execution env to localBuild struct")
-	}
-	if l == nil {
-		l = &latest.LocalBuild{}
-	}
-	kubeContext, err := kubectx.CurrentContext()
-	if err != nil {
-		return nil, errors.Wrap(err, "getting current cluster context")
-	}
-	builder, err := local.NewBuilder(l, kubeContext, b.opts.SkipTests)
-	if err != nil {
-		return nil, errors.Wrap(err, "getting local builder")
-	}
-	for _, a := range artifacts {
-		if err := setArtifact(a); err != nil {
-			return nil, errors.Wrapf(err, "setting artifact %s", a.ImageName)
-		}
-	}
-	return builder.Build(ctx, out, tags, artifacts)
-}
-
 func setArtifact(artifact *latest.Artifact) error {
 	if artifact.ArtifactType.BazelArtifact != nil {
 		return nil