refactor!: Remove deprecated Custom*Command and OutputDir (#364)

internal/bun/identify.go

@@ -45,9 +45,6 @@ func (i *identify) PlanMeta(options plan.NewPlannerOptions) types.PlanMeta {
 		GetMetaOptions{
 			Src:            options.Source,
 			Config:         options.Config,
-			CustomBuildCmd: options.CustomBuildCommand,
-			CustomStartCmd: options.CustomStartCommand,
-			OutputDir:      options.OutputDir,
 			Bun:            true,
 		},
 	)

internal/nodejs/identify.go

@@ -26,11 +26,8 @@ func (i *identify) Match(fs afero.Fs) bool {
 func (i *identify) PlanMeta(options plan.NewPlannerOptions) types.PlanMeta {
 	return GetMeta(
 		GetMetaOptions{
-			Src:            options.Source,
-			Config:         options.Config,
-			CustomBuildCmd: options.CustomBuildCommand,
-			CustomStartCmd: options.CustomStartCommand,
-			OutputDir:      options.OutputDir,
+			Src:    options.Source,
+			Config: options.Config,
 		},
 	)
 }

internal/nodejs/plan.go

@@ -947,10 +947,6 @@ type GetMetaOptions struct {
 	Src    afero.Fs
 	Config plan.ImmutableProjectConfiguration
 
-	CustomBuildCmd *string
-	CustomStartCmd *string
-	OutputDir      *string
-
 	Bun bool
 }
 
@@ -989,9 +985,6 @@ func GetMeta(opt GetMetaOptions) types.PlanMeta {
 	meta["installCmd"] = installCmd
 
 	buildCmd := GetBuildCmd(ctx)
-	if opt.CustomBuildCmd != nil && *opt.CustomBuildCmd != "" {
-		buildCmd = *opt.CustomBuildCmd
-	}
 	meta["buildCmd"] = buildCmd
 
 	serverless := getServerless(ctx)
@@ -1000,29 +993,15 @@ func GetMeta(opt GetMetaOptions) types.PlanMeta {
 	}
 
 	// only set outputDir if there is no custom start command (because if there is, it shouldn't be a static project)
-	if opt.CustomStartCmd == nil || *opt.CustomStartCmd == "" {
-
-		if opt.OutputDir != nil && *opt.OutputDir != "" {
-			if strings.HasPrefix(*opt.OutputDir, "/") {
-				meta["outputDir"] = strings.TrimPrefix(*opt.OutputDir, "/")
-			} else {
-				meta["outputDir"] = *opt.OutputDir
-			}
-			return meta
-		}
-
+	if buildCmd == "" {
 		staticOutputDir := GetStaticOutputDir(ctx)
 		if staticOutputDir != "" {
 			meta["outputDir"] = staticOutputDir
 			return meta
 		}
-
 	}
 
 	startCmd := GetStartCmd(ctx)
-	if opt.CustomStartCmd != nil && *opt.CustomStartCmd != "" {
-		startCmd = *opt.CustomStartCmd
-	}
 	meta["startCmd"] = startCmd
 
 	return meta

internal/php/identify.go

@@ -34,8 +34,8 @@ func (i *identify) PlanMeta(options plan.NewPlannerOptions) types.PlanMeta {
 	deps := DetermineAptDependencies(options.Source, server)
 	exts := DeterminePHPExtensions(options.Source)
 	app, property := DetermineApplication(options.Source)
-	buildCommand := DetermineBuildCommand(options.Source, options.Config, options.CustomBuildCommand)
-	startCommand := DetermineStartCommand(options.Config, options.CustomStartCommand)
+	buildCommand := DetermineBuildCommand(options.Source, options.Config)
+	startCommand := DetermineStartCommand(options.Config)
 
 	// Some meta will be added to the plan dynamically later.
 	meta := types.PlanMeta{

internal/php/plan.go

@@ -186,12 +186,10 @@ func determineStartupFunction(config plan.ImmutableProjectConfiguration) string
 }
 
 // DetermineStartCommand determines the start command of the project.
-func DetermineStartCommand(config plan.ImmutableProjectConfiguration, startCommand *string) string {
+func DetermineStartCommand(config plan.ImmutableProjectConfiguration) string {
 	completeStartCommand := determineStartupFunction(config)
 
-	if startCommand != nil {
-		completeStartCommand += *startCommand
-	} else if startCommand, err := plan.Cast(config.Get(plan.ConfigStartCommand), cast.ToStringE).Take(); err == nil {
+	if startCommand, err := plan.Cast(config.Get(plan.ConfigStartCommand), cast.ToStringE).Take(); err == nil {
 		completeStartCommand += startCommand
 	} else {
 		completeStartCommand += "_startup"
@@ -201,10 +199,7 @@ func DetermineStartCommand(config plan.ImmutableProjectConfiguration, startComma
 }
 
 // DetermineBuildCommand determines the build command of the project.
-func DetermineBuildCommand(source afero.Fs, config plan.ImmutableProjectConfiguration, buildCommand *string) string {
-	if buildCommand != nil {
-		return *buildCommand
-	}
+func DetermineBuildCommand(source afero.Fs, config plan.ImmutableProjectConfiguration) string {
 	if buildCommand, err := plan.Cast(config.Get(plan.ConfigBuildCommand), cast.ToStringE).Take(); err == nil {
 		return buildCommand
 	}

internal/php/plan_test.go

@@ -3,7 +3,6 @@ package php_test
 import (
 	"testing"
 
-	"github.com/samber/lo"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/zeabur/zbpack/internal/php"
@@ -136,15 +135,15 @@ func TestDetermineApplication_AcgFaka(t *testing.T) {
 
 func TestDetermineStartCommand_Default(t *testing.T) {
 	config := plan.NewProjectConfigurationFromFs(afero.NewMemMapFs(), "")
-	command := php.DetermineStartCommand(config, nil)
+	command := php.DetermineStartCommand(config)
 
 	assert.Contains(t, command, "nginx; php-fpm")
 }
 
 func TestDetermineStartCommand_Swoole(t *testing.T) {
 	config := plan.NewProjectConfigurationFromFs(afero.NewMemMapFs(), "")
 	config.Set(php.ConfigLaravelOctaneServer, php.OctaneServerSwoole)
-	command := php.DetermineStartCommand(config, nil)
+	command := php.DetermineStartCommand(config)
 
 	assert.Contains(t, command, "php artisan octane:start --server=swoole --host=0.0.0.0 --port=8080")
 }
@@ -154,15 +153,15 @@ func TestDetermineStartCommand_Roadrunner(t *testing.T) {
 
 	config := plan.NewProjectConfigurationFromFs(afero.NewMemMapFs(), "")
 	config.Set(php.ConfigLaravelOctaneServer, php.OctaneServerRoadrunner)
-	command := php.DetermineStartCommand(config, nil)
+	command := php.DetermineStartCommand(config)
 
 	assert.Contains(t, command, "nginx; php-fpm")
 }
 
 func TestDetermineStartCommand_UnknownOctane(t *testing.T) {
 	config := plan.NewProjectConfigurationFromFs(afero.NewMemMapFs(), "")
 	config.Set(php.ConfigLaravelOctaneServer, "unknown")
-	command := php.DetermineStartCommand(config, nil)
+	command := php.DetermineStartCommand(config)
 
 	assert.Contains(t, command, "nginx; php-fpm")
 }
@@ -173,24 +172,15 @@ func TestDetermineStartCommand_CustomInConfig(t *testing.T) {
 	config := plan.NewProjectConfigurationFromFs(afero.NewMemMapFs(), "")
 	config.Set(plan.ConfigStartCommand, expectedCommand)
 
-	actualCommand := php.DetermineStartCommand(config, nil)
-
-	assert.Contains(t, actualCommand, expectedCommand)
-}
-
-func TestDetermineStartCommand_CustomInOptions(t *testing.T) {
-	const expectedCommand = "php artisan serve; _startup"
-
-	config := plan.NewProjectConfigurationFromFs(afero.NewMemMapFs(), "")
-	actualCommand := php.DetermineStartCommand(config, lo.ToPtr(expectedCommand))
+	actualCommand := php.DetermineStartCommand(config)
 
 	assert.Contains(t, actualCommand, expectedCommand)
 }
 
 func TestDetermineBuildCommand_Default(t *testing.T) {
 	fs := afero.NewMemMapFs()
 	config := plan.NewProjectConfigurationFromFs(fs, "")
-	command := php.DetermineBuildCommand(fs, config, nil)
+	command := php.DetermineBuildCommand(fs, config)
 
 	assert.Equal(t, "", command)
 }
@@ -202,17 +192,7 @@ func TestDetermineBuildCommand_CustomInConfig(t *testing.T) {
 	config := plan.NewProjectConfigurationFromFs(fs, "")
 	config.Set(plan.ConfigBuildCommand, expectedCommand)
 
-	actualCommand := php.DetermineBuildCommand(fs, config, nil)
-
-	assert.Equal(t, expectedCommand, actualCommand)
-}
-
-func TestDetermineBuildCommand_CustomInOptions(t *testing.T) {
-	const expectedCommand = "php bin/build"
-
-	fs := afero.NewMemMapFs()
-	config := plan.NewProjectConfigurationFromFs(fs, "")
-	actualCommand := php.DetermineBuildCommand(fs, config, lo.ToPtr(expectedCommand))
+	actualCommand := php.DetermineBuildCommand(fs, config)
 
 	assert.Equal(t, expectedCommand, actualCommand)
 }
@@ -225,7 +205,7 @@ func TestDetermineBuildCommand_NPMBuild(t *testing.T) {
 		}
 	}`), 0o644)
 	config := plan.NewProjectConfigurationFromFs(fs, "")
-	command := php.DetermineBuildCommand(fs, config, nil)
+	command := php.DetermineBuildCommand(fs, config)
 
 	assert.Equal(t, "npm install && npm run build", command)
 }

pkg/plan/plan.go

@@ -21,12 +21,9 @@ type planner struct {
 
 // NewPlannerOptions is the options for NewPlanner.
 type NewPlannerOptions struct {
-	Source             afero.Fs
-	Config             ImmutableProjectConfiguration
-	SubmoduleName      string
-	CustomBuildCommand *string
-	CustomStartCommand *string
-	OutputDir          *string
+	Source        afero.Fs
+	Config        ImmutableProjectConfiguration
+	SubmoduleName string
 
 	AWSConfig *AWSConfig
 }