Merge pull request #2262 from superfly/feat/migrate-to-v2/error-on-ex…

…perimental Disallow `experimental` features in V2 configs
superfly · May 12, 2023 · 0fb42c3 · 0fb42c3
2 parents 3bf2cca + e847908
commit 0fb42c3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/internal/appconfig/config.go b/internal/appconfig/config.go
@@ -102,12 +102,13 @@ type Build struct {
 }
 
 type Experimental struct {
-	Cmd          []string `toml:"cmd,omitempty" json:"cmd,omitempty"`
-	Entrypoint   []string `toml:"entrypoint,omitempty" json:"entrypoint,omitempty"`
-	Exec         []string `toml:"exec,omitempty" json:"exec,omitempty"`
-	AutoRollback bool     `toml:"auto_rollback,omitempty" json:"auto_rollback,omitempty"`
-	EnableConsul bool     `toml:"enable_consul,omitempty" json:"enable_consul,omitempty"`
-	EnableEtcd   bool     `toml:"enable_etcd,omitempty" json:"enable_etcd,omitempty"`
+	Cmd                []string `toml:"cmd,omitempty" json:"cmd,omitempty"`
+	Entrypoint         []string `toml:"entrypoint,omitempty" json:"entrypoint,omitempty"`
+	Exec               []string `toml:"exec,omitempty" json:"exec,omitempty"`
+	AutoRollback       bool     `toml:"auto_rollback,omitempty" json:"auto_rollback,omitempty"`
+	EnableConsul       bool     `toml:"enable_consul,omitempty" json:"enable_consul,omitempty"`
+	EnableEtcd         bool     `toml:"enable_etcd,omitempty" json:"enable_etcd,omitempty"`
+	AllowedPublicPorts []int    `toml:"allowed_public_ports,omitempty" json:"allowed_public_ports,omitempty"`
 }
 
 func (c *Config) ConfigFilePath() string {

diff --git a/internal/appconfig/validation.go b/internal/appconfig/validation.go
@@ -96,6 +96,7 @@ func (cfg *Config) ValidateForMachinesPlatform(ctx context.Context) (err error,
 		cfg.validateProcessesSection,
 		cfg.validateMachineConversion,
 		cfg.validateConsoleCommand,
+		cfg.validateNoExperimental,
 	}
 
 	for _, vFunc := range validators {
@@ -119,6 +120,18 @@ func (cfg *Config) ValidateForMachinesPlatform(ctx context.Context) (err error,
 	return nil, extra_info
 }
 
+func (cfg *Config) validateNoExperimental() (extraInfo string, err error) {
+	if cfg.Experimental == nil {
+		return
+	}
+
+	if len(cfg.Experimental.AllowedPublicPorts) != 0 {
+		extraInfo += "experimental.allowed_public_ports is not supported in Apps V2\n"
+		err = ValidationError
+	}
+	return
+}
+
 func (cfg *Config) validateBuildStrategies() (extraInfo string, err error) {
 	buildStrats := cfg.BuildStrategies()
 	if len(buildStrats) > 1 {