assume host mode for postgres short ports (#1445)

* assume host mode for postgres short ports

* include redis

* avoid replacing app_protocol

* fixup project before validate

* fixupPort after managed service fixups

* fixup mongo too; fix ingress warnings

---------

Co-authored-by: Lionello Lunesu <[email protected]>

Author: jordanstephens

src/pkg/cli/compose/fixup.go

@@ -27,13 +27,6 @@ func FixupServices(ctx context.Context, provider client.Provider, project *compo
 	}
 	slices.Sort(config.Names) // sort for binary search
 
-	// Fixup ports first (which affects service name replacement by ReplaceServiceNameWithDNS)
-	for _, svccfg := range project.Services {
-		for i, port := range svccfg.Ports {
-			svccfg.Ports[i] = fixupPort(port)
-		}
-	}
-
 	// Fixup any pseudo services (this might create port configs, which will affect service name replacement by ReplaceServiceNameWithDNS)
 	for _, svccfg := range project.Services {
 		repo := GetImageRepo(svccfg.Image)
@@ -67,6 +60,11 @@ func FixupServices(ctx context.Context, provider client.Provider, project *compo
 			fixupLLM(&svccfg)
 		}
 
+		// Fixup ports, which affects service name replacement by ReplaceServiceNameWithDNS below
+		for i, port := range svccfg.Ports {
+			svccfg.Ports[i] = fixupPort(port)
+		}
+
 		// update the concrete service with the fixed up object
 		project.Services[svccfg.Name] = svccfg
 	}
@@ -241,6 +239,8 @@ func fixupPostgresService(svccfg *composeTypes.ServiceConfig, provider client.Pr
 		}
 		term.Debugf("service %q: adding postgres host port %d", svccfg.Name, port)
 		svccfg.Ports = []composeTypes.ServicePortConfig{{Target: port, Mode: Mode_HOST, Protocol: Protocol_TCP}}
+	} else {
+		fixupIngressPorts(svccfg)
 	}
 	return nil
 }
@@ -277,6 +277,8 @@ func fixupMongoService(svccfg *composeTypes.ServiceConfig, provider client.Provi
 		}
 		term.Debugf("service %q: adding mongodb host port %d", svccfg.Name, port)
 		svccfg.Ports = []composeTypes.ServicePortConfig{{Target: port, Mode: Mode_HOST, Protocol: Protocol_TCP}}
+	} else {
+		fixupIngressPorts(svccfg)
 	}
 	return nil
 }
@@ -303,10 +305,21 @@ func fixupRedisService(svccfg *composeTypes.ServiceConfig, provider client.Provi
 		}
 		term.Debugf("service %q: adding redis host port %d", svccfg.Name, port)
 		svccfg.Ports = []composeTypes.ServicePortConfig{{Target: port, Mode: Mode_HOST, Protocol: Protocol_TCP}}
+	} else {
+		fixupIngressPorts(svccfg)
 	}
 	return nil
 }
 
+func fixupIngressPorts(svccfg *composeTypes.ServiceConfig) {
+	for i, port := range svccfg.Ports {
+		if port.Mode == Mode_INGRESS || port.Mode == "" {
+			term.Debugf("service %q: changing port %d to host mode", svccfg.Name, port.Target)
+			svccfg.Ports[i].Mode = Mode_HOST
+		}
+	}
+}
+
 // Declare a private network for the model provider
 const modelProviderNetwork = "model_provider_private"
 
@@ -415,17 +428,17 @@ func fixupPort(port composeTypes.ServicePortConfig) composeTypes.ServicePortConf
 		fallthrough
 	case Mode_INGRESS:
 		// This code is unnecessarily complex because compose-go silently converts short `ports:` syntax to ingress+tcp
-		if port.Protocol != Protocol_UDP {
+		if port.Protocol == Protocol_UDP {
+			term.Warnf("port %d: UDP ports default to 'host' mode (add 'mode: host' to silence)", port.Target)
+			port.Mode = Mode_HOST
+		} else {
 			if port.Published != "" {
 				term.Debugf("port %d: ignoring 'published: %s' in 'ingress' mode", port.Target, port.Published)
 			}
 			if port.AppProtocol == "" {
 				// TCP ingress is not supported; assuming HTTP (add 'app_protocol: http' to silence)"
 				port.AppProtocol = "http"
 			}
-		} else {
-			term.Warnf("port %d: UDP ports default to 'host' mode (add 'mode: host' to silence)", port.Target)
-			port.Mode = Mode_HOST
 		}
 	case Mode_HOST:
 		// no-op

src/pkg/cli/compose/validation.go

@@ -234,8 +234,8 @@ func validateService(svccfg *composeTypes.ServiceConfig, project *composeTypes.P
 	if svccfg.HealthCheck == nil || svccfg.HealthCheck.Disable {
 		// Show a warning when we have ingress ports but no explicit healthcheck
 		for _, port := range svccfg.Ports {
-			if port.Mode == "ingress" {
-				term.Warnf("service %q: ingress port without healthcheck defaults to GET / HTTP/1.1", svccfg.Name)
+			if port.Mode == Mode_INGRESS {
+				term.Warnf("service %q: ingress port %d without healthcheck; defaults to GET / HTTP/1.1", svccfg.Name, port.Target)
 				break
 			}
 		}

src/pkg/cli/compose/validation_test.go

@@ -46,6 +46,11 @@ func TestValidationAndConvert(t *testing.T) {
 			t.Fatal(err)
 		}
 
+		if err := FixupServices(context.Background(), mockClient, project, UploadModeIgnore); err != nil {
+			t.Logf("Service conversion failed: %v", err)
+			logs.WriteString(err.Error() + "\n")
+		}
+
 		if err := ValidateProjectConfig(context.Background(), project, listConfigNamesFunc); err != nil {
 			t.Logf("Project config validation failed: %v", err)
 			logs.WriteString(err.Error() + "\n")
@@ -56,11 +61,6 @@ func TestValidationAndConvert(t *testing.T) {
 			logs.WriteString(err.Error() + "\n")
 		}
 
-		if err := FixupServices(context.Background(), mockClient, project, UploadModeIgnore); err != nil {
-			t.Logf("Service conversion failed: %v", err)
-			logs.WriteString(err.Error() + "\n")
-		}
-
 		// The order of the services is not guaranteed, so we sort the logs before comparing
 		logLines := strings.SplitAfter(logs.String(), "\n")
 		slices.Sort(logLines)

src/pkg/cli/composeUp.go

@@ -47,10 +47,6 @@ func ComposeUp(ctx context.Context, project *compose.Project, fabric client.Fabr
 		}
 	}
 
-	if err := compose.ValidateProject(project); err != nil {
-		return nil, project, &ComposeError{err}
-	}
-
 	// Create a new project with only the necessary resources.
 	// Do not modify the original project, because the caller needs it for debugging.
 	fixedProject := project.WithoutUnnecessaryResources()
@@ -59,6 +55,10 @@ func ComposeUp(ctx context.Context, project *compose.Project, fabric client.Fabr
 		return nil, project, err
 	}
 
+	if err := compose.ValidateProject(fixedProject); err != nil {
+		return nil, project, &ComposeError{err}
+	}
+
 	bytes, err := fixedProject.MarshalYAML()
 	if err != nil {
 		return nil, project, err

src/testdata/compose-go-warn/compose.yaml.warnings

@@ -1,3 +1,3 @@
  ! "yes" for boolean is not supported by YAML 1.2, please use `true`
- ! service "echo": ingress port without healthcheck defaults to GET / HTTP/1.1
+ ! service "echo": ingress port 80 without healthcheck; defaults to GET / HTTP/1.1
  ! service "echo": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors

src/testdata/fixupenv/compose.yaml.warnings

@@ -2,7 +2,7 @@
  ! service "env-in-config": environment variable(s) ["CONFIG1"] will use the `defang config` value instead of adjusted service name
  ! service "env-in-config": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "fixup-args": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
- ! service "ingress-service": ingress port without healthcheck defaults to GET / HTTP/1.1
+ ! service "ingress-service": ingress port 5432 without healthcheck; defaults to GET / HTTP/1.1
  ! service "ingress-service": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "ui": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "use-ingress-service": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors

src/testdata/llm/compose.yaml.warnings

@@ -1,5 +1,5 @@
  ! service "alt-repo": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
- ! service "gateway-with-ports": ingress port without healthcheck defaults to GET / HTTP/1.1
+ ! service "gateway-with-ports": ingress port 5678 without healthcheck; defaults to GET / HTTP/1.1
  ! service "gateway-with-ports": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "gateway-without-ports": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "llm": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors

src/testdata/models/compose.yaml.warnings

@@ -1,2 +1,4 @@
+ ! service "ai_model": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "app": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "my_model": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "withendpoint": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors

src/testdata/mongo/compose.yaml

@@ -77,3 +77,8 @@ services:
   mongo-wrong-image:
     image: example
     x-defang-mongodb: true
+
+  short-ports:
+    image: mongo
+    ports:
+      - 27017:27017

src/testdata/mongo/compose.yaml.fixup

@@ -230,5 +230,21 @@
         "protocol": "tcp"
       }
     ]
+  },
+  "short-ports": {
+    "command": null,
+    "entrypoint": null,
+    "image": "mongo",
+    "networks": {
+      "default": null
+    },
+    "ports": [
+      {
+        "mode": "host",
+        "target": 27017,
+        "published": "27017",
+        "protocol": "tcp"
+      }
+    ]
   }
 }