remove runcontext creation from gcb builder path

pkg/skaffold/plugin/builders/docker/builder.go

@@ -44,6 +44,7 @@ type Builder struct {
 	LocalDocker  docker.LocalDaemon
 	LocalCluster bool
 	PushImages   bool
+	gcbEnv       *gcb.Builder
 	// TODO: remove once old docker build functionality is removed (priyawadhwa@)
 	PluginMode         bool
 	KubeContext        string
@@ -60,16 +61,30 @@ func NewBuilder() *Builder {
 
 // Init stores skaffold options and the execution environment
 func (b *Builder) Init(runCtx *runcontext.RunContext) error {
+	b.opts = runCtx.Opts
+	b.env = runCtx.Cfg.Build.ExecutionEnvironment
+	b.insecureRegistries = runCtx.InsecureRegistries
+
 	if b.PluginMode {
 		if err := event.SetupRPCClient(runCtx.Opts); err != nil {
 			logrus.Warn("error establishing gRPC connection to skaffold process; events will not be handled correctly")
 			logrus.Warn(err.Error())
 			return err
 		}
+		switch b.env.Name {
+		case constants.GoogleCloudBuild:
+			gcbEnv, err := gcb.NewBuilderFromPluginConfig(runCtx)
+			if err != nil {
+				return errors.Wrap(err, "initializing GCB builder")
+			}
+			b.gcbEnv = gcbEnv
+		case constants.Local:
+			//pass
+		default:
+			return errors.Errorf("%s is not a supported environment for builder docker", b.env.Name)
+		}
 	}
-	b.opts = runCtx.Opts
-	b.env = runCtx.Cfg.Build.ExecutionEnvironment
-	b.insecureRegistries = runCtx.InsecureRegistries
+
 	logrus.Debugf("initialized plugin with %+v", runCtx)
 	return nil
 }
@@ -120,27 +135,14 @@ func (b *Builder) Prune(ctx context.Context, out io.Writer) error {
 
 // googleCloudBuild sets any necessary defaults and then builds artifacts with docker in GCB
 func (b *Builder) googleCloudBuild(ctx context.Context, out io.Writer, tags tag.ImageTags, artifacts []*latest.Artifact) ([]build.Artifact, error) {
-	var g *latest.GoogleCloudBuild
-	if err := util.CloneThroughJSON(b.env.Properties, &g); err != nil {
-		return nil, errors.Wrap(err, "converting execution environment to googleCloudBuild struct")
-	}
-	defaults.SetDefaultCloudBuildDockerImage(g)
+
 	for _, a := range artifacts {
 		if err := setArtifact(a); err != nil {
 			return nil, err
 		}
 	}
-	runCtx := &runcontext.RunContext{
-		Opts: b.opts,
-		Cfg: &latest.Pipeline{
-			Build: latest.BuildConfig{
-				BuildType: latest.BuildType{
-					GoogleCloudBuild: g,
-				},
-			},
-		},
-	}
-	return gcb.NewBuilder(runCtx).Build(ctx, out, tags, artifacts)
+
+	return b.gcbEnv.Build(ctx, out, tags, artifacts)
 }
 
 func setArtifact(artifact *latest.Artifact) error {

pkg/skaffold/plugin/environments/gcb/types.go

@@ -21,6 +21,8 @@ import (
 	"io"
 	"time"
 
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/defaults"
+
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/jib"
@@ -75,6 +77,22 @@ func NewBuilder(runCtx *runcontext.RunContext) *Builder {
 	}
 }
 
+// NewBuilderFromPluginConfig creates a new gcb.Builder that builds artifacts with Google Cloud Build.
+// This version bootstraps the config from the new config that is being introduced with the builder plugins.
+func NewBuilderFromPluginConfig(runCtx *runcontext.RunContext) (*Builder, error) {
+	var g *latest.GoogleCloudBuild
+	env := runCtx.Cfg.Build.ExecutionEnvironment
+	if err := util.CloneThroughJSON(env.Properties, &g); err != nil {
+		return nil, errors.Wrap(err, "converting execution environment to googleCloudBuild struct")
+	}
+	defaults.SetDefaultCloudBuildDockerImage(g)
+	return &Builder{
+		GoogleCloudBuild:   g,
+		skipTests:          runCtx.Opts.SkipTests,
+		insecureRegistries: runCtx.InsecureRegistries,
+	}, nil
+}
+
 // Labels are labels specific to Google Cloud Build.
 func (b *Builder) Labels() map[string]string {
 	return map[string]string{