chore: no LanguagePlugin interface with internalPlugin / externalPlug…

…in (#3285) All we need is a single LanguagePlugin now that there are no internal plugins
block · Nov 1, 2024 · 5e2b31c · 5e2b31c
1 parent 7d29045
commit 5e2b31c
Show file tree

Hide file tree

Showing 9 changed files with 436 additions and 710 deletions.
diff --git a/frontend/cli/cmd_new.go b/frontend/cli/cmd_new.go
@@ -35,7 +35,7 @@ type newCmd struct {
 // - environment variable overrides
 //
 // Language plugins take time to launch, so we return the one we created so it can be reused in Run().
-func prepareNewCmd(ctx context.Context, k *kong.Kong, args []string) (optionalPlugin optional.Option[languageplugin.LanguagePlugin], err error) {
+func prepareNewCmd(ctx context.Context, k *kong.Kong, args []string) (optionalPlugin optional.Option[*languageplugin.LanguagePlugin], err error) {
 	if len(args) < 2 {
 		return optionalPlugin, nil
 	} else if args[0] != "new" {
@@ -85,7 +85,7 @@ func prepareNewCmd(ctx context.Context, k *kong.Kong, args []string) (optionalPl
 	return optional.Some(plugin), nil
 }
 
-func (i newCmd) Run(ctx context.Context, ktctx *kong.Context, config projectconfig.Config, plugin languageplugin.LanguagePlugin) error {
+func (i newCmd) Run(ctx context.Context, ktctx *kong.Context, config projectconfig.Config, plugin *languageplugin.LanguagePlugin) error {
 	name, path, err := validateModule(i.Dir, i.Name)
 	if err != nil {
 		return err

diff --git a/frontend/cli/main.go b/frontend/cli/main.go
@@ -23,7 +23,6 @@ import (
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1beta1/provisioner/provisionerconnect"
 	"github.com/TBD54566975/ftl/internal"
 	_ "github.com/TBD54566975/ftl/internal/automaxprocs" // Set GOMAXPROCS to match Linux container CPU quota.
-	"github.com/TBD54566975/ftl/internal/buildengine/languageplugin"
 	"github.com/TBD54566975/ftl/internal/configuration"
 	"github.com/TBD54566975/ftl/internal/configuration/providers"
 	"github.com/TBD54566975/ftl/internal/log"
@@ -98,7 +97,7 @@ func main() {
 
 	if plugin, ok := languagePlugin.Get(); ok {
 		// Plugins take time to launch, so we bind the "ftl new" plugin to the kong context.
-		kctx.BindTo(plugin, (*languageplugin.LanguagePlugin)(nil))
+		kctx.Bind(plugin)
 	}
 
 	if !cli.Plain {

diff --git a/internal/buildengine/build.go b/internal/buildengine/build.go
@@ -26,7 +26,7 @@ var errInvalidateDependencies = errors.New("dependencies need to be updated")
 // Plugins must use a lock file to ensure that only one build is running at a time.
 //
 // Returns invalidateDependenciesError if the build failed due to a change in dependencies.
-func build(ctx context.Context, plugin languageplugin.LanguagePlugin, projectConfig projectconfig.Config, bctx languageplugin.BuildContext, buildEnv []string, devMode bool) (moduleSchema *schema.Module, deploy []string, err error) {
+func build(ctx context.Context, plugin *languageplugin.LanguagePlugin, projectConfig projectconfig.Config, bctx languageplugin.BuildContext, buildEnv []string, devMode bool) (moduleSchema *schema.Module, deploy []string, err error) {
 	logger := log.FromContext(ctx).Module(bctx.Config.Module).Scope("build")
 	ctx = log.ContextWithLogger(ctx, logger)
 

diff --git a/internal/buildengine/engine.go b/internal/buildengine/engine.go
@@ -38,7 +38,7 @@ type schemaChange struct {
 // moduleMeta is a wrapper around a module that includes the last build's start time.
 type moduleMeta struct {
 	module         Module
-	plugin         languageplugin.LanguagePlugin
+	plugin         *languageplugin.LanguagePlugin
 	events         chan languageplugin.PluginEvent
 	configDefaults moduleconfig.CustomDefaults
 }