.

Author: mostlygeek

proxy/config.go

@@ -207,7 +207,7 @@ func LoadConfigFromReader(r io.Reader) (Config, error) {
 
 		// enforce ${PORT} used in both cmd and proxy
 		if !strings.Contains(modelConfig.Cmd, "${PORT}") && strings.Contains(modelConfig.Proxy, "${PORT}") {
-			return Config{}, fmt.Errorf("model %s requires a proxy value when not using automatic ${PORT}", modelId)
+			return Config{}, fmt.Errorf("model %s: proxy uses ${PORT} but cmd does not - ${PORT} is only available when used in cmd", modelId)
 		}
 
 		// go through model config fields: cmd, cmdStop, proxy, checkEndPoint and replace macros with macro values

proxy/config_posix_test.go

@@ -44,7 +44,7 @@ func TestConfig_SanitizeCommand(t *testing.T) {
 
 // Test the default values are automatically set for global, model and group configurations
 // after loading the configuration
-func TestConfig_DefaultValues(t *testing.T) {
+func TestConfig_DefaultValuesPosix(t *testing.T) {
 	content := `
 models:
   model1:

proxy/config_test.go

@@ -336,7 +336,7 @@ models:
     cmd: svr --port 111
 `
 		_, err := LoadConfigFromReader(strings.NewReader(content))
-		assert.Equal(t, "model model1 requires a proxy value when not using automatic ${PORT}", err.Error())
+		assert.Equal(t, "model model1: proxy uses ${PORT} but cmd does not - ${PORT} is only available when used in cmd", err.Error())
 	})
 }