fixup project before validate

Author: jordanstephens

src/pkg/cli/compose/fixup.go

@@ -246,6 +246,7 @@ func fixupPostgresService(svccfg *composeTypes.ServiceConfig, provider client.Pr
 			if port.Mode == Mode_INGRESS || port.Mode == "" {
 				svccfg.Ports[i].Mode = Mode_HOST
 				svccfg.Ports[i].Published = ""   // ignore published port in host mode
+				svccfg.Ports[i].AppProtocol = "" // ignore app protocol in host mode
 			}
 		}
 	}
@@ -315,6 +316,7 @@ func fixupRedisService(svccfg *composeTypes.ServiceConfig, provider client.Provi
 			if port.Mode == Mode_INGRESS || port.Mode == "" {
 				svccfg.Ports[i].Mode = Mode_HOST
 				svccfg.Ports[i].Published = ""   // ignore published port in host mode
+				svccfg.Ports[i].AppProtocol = "" // ignore app protocol in host mode
 			}
 		}
 	}

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(project); err != nil {
+		return nil, project, &ComposeError{err}
+	}
+
 	bytes, err := fixedProject.MarshalYAML()
 	if err != nil {
 		return nil, project, err

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/ports/compose.yaml.warnings

@@ -13,7 +13,5 @@
  ! service "short": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "short-published": ingress port without healthcheck defaults to GET / HTTP/1.1
  ! service "short-published": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
- ! service "short-udp": ingress port without healthcheck defaults to GET / HTTP/1.1
  ! service "short-udp": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
- ! service "short-udp-published": ingress port without healthcheck defaults to GET / HTTP/1.1
  ! service "short-udp-published": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors

src/testdata/postgres/compose.yaml.warnings

@@ -2,7 +2,6 @@
  ! service "no-ext": stateful service will lose data on restart; use a managed service instead
  ! service "no-ports": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "no-ports-override": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
- ! service "short-ports": ingress port without healthcheck defaults to GET / HTTP/1.1
  ! service "short-ports": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "with-ext": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "wrong-image": managed Postgres service should use a postgres image

src/testdata/redis/compose.yaml.warnings

@@ -2,7 +2,6 @@
  ! service "no-ext": stateful service will lose data on restart; use a managed service instead
  ! service "no-ports": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "no-ports-override": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
- ! service "short-ports": ingress port without healthcheck defaults to GET / HTTP/1.1
  ! service "short-ports": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "with-ext": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "wrong-image": managed Redis service should use a redis image