Fix validation test, update expected warnings (#621)

edwardrf · edw-defang · web-flow · commit 5e704c67b04c · 2024-08-12T14:28:19.000-07:00
Co-authored-by: Edward J &lt;edw@defang.io&gt;
diff --git a/src/tests/compose-go-warn/compose.yaml.warnings b/src/tests/compose-go-warn/compose.yaml.warnings
@@ -1,4 +1,4 @@
  ! "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": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "echo": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "echo": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
diff --git a/src/tests/configoverride/compose.yaml.warnings b/src/tests/configoverride/compose.yaml.warnings
@@ -1,2 +1,2 @@
  ! service "service1": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "service1": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "service1": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
diff --git a/src/tests/debugproj/compose.yaml.warnings b/src/tests/debugproj/compose.yaml.warnings
@@ -1,6 +1,6 @@
  ! service "failing": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "failing": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "failing": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "ok": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "ok": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "ok": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  * Compressing build context for failing at ./app
  * Compressing build context for ok at .
diff --git a/src/tests/emptyenv/compose.yaml.warnings b/src/tests/emptyenv/compose.yaml.warnings
@@ -1,3 +1,3 @@
  ! service "emptyenv": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "emptyenv": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "emptyenv": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  * Compressing build context for emptyenv at .
diff --git a/src/tests/fixupenv/compose.yaml.warnings b/src/tests/fixupenv/compose.yaml.warnings
@@ -1,15 +1,15 @@
  ! service "Mistral": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "Mistral": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "Mistral": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "bad-service": ingress port without healthcheck defaults to GET / HTTP/1.1
  ! service "bad-service": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "bad-service": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "bad-service": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "env-in-config": environment variable "CONFIG1" needs service name fix-up, but is overridden by config, which will not be fixed up.
  ! service "env-in-config": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "env-in-config": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "env-in-config": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "ui": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "ui": missing memory reservation; 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 "ui": service names were fixed up in environment variable "API_URL": "http://mock-mistral:8000"
  ! service "use-bad-service": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "use-bad-service": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "use-bad-service": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "use-bad-service": service names in the environment variable "DB_URL" were not fixed up, only services with port mode set to host will be fixed up.
  ! service name "Mistral" was normalized to "mistral"
diff --git a/src/tests/healthcheck/compose.yaml.warnings b/src/tests/healthcheck/compose.yaml.warnings
@@ -1,12 +1,12 @@
  ! service "cmd-shell": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "cmd-shell": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "cmd-shell": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "curl": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "curl": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "curl": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "flask1": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "flask1": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "flask1": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "flask2": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "flask2": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "flask2": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "none": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "none": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "none": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "wget": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "wget": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "wget": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
diff --git a/src/tests/networks/compose.yaml.warnings b/src/tests/networks/compose.yaml.warnings
@@ -1,10 +1,10 @@
  ! service "service1": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "service1": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "service1": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "service1": network "invalid-network-name" is not defined in the top-level networks section
  ! service "service2": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "service2": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "service2": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "service3": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "service3": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "service3": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "service4": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "service4": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "service4": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "service4": network "private" is not defined in the top-level networks section
diff --git a/src/tests/platforms/compose.yaml.warnings b/src/tests/platforms/compose.yaml.warnings
@@ -1,2 +1,2 @@
  ! service "intel2": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "intel2": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "intel2": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
diff --git a/src/tests/postgres/compose.yaml.warnings b/src/tests/postgres/compose.yaml.warnings
@@ -1,8 +1,8 @@
  ! service "x": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "x": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "x": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "y": managed Postgres service should use a postgres image
  ! service "y": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "y": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "y": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "z": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "z": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "z": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "z": stateful service will lose data on restart; use a managed service instead
diff --git a/src/tests/profiles/compose.yaml.warnings b/src/tests/profiles/compose.yaml.warnings
@@ -1,4 +1,4 @@
  ! service "always": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "always": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "always": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "defangonly": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "defangonly": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "defangonly": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
diff --git a/src/tests/redis/compose.yaml.warnings b/src/tests/redis/compose.yaml.warnings
@@ -1,8 +1,8 @@
  ! service "x": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "x": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "x": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "y": managed Redis service should use a redis image
  ! service "y": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "y": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "y": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "z": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "z": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "z": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "z": stateful service will lose data on restart; use a managed service instead
diff --git a/src/tests/secretname/compose.yaml.warnings b/src/tests/secretname/compose.yaml.warnings
@@ -1,3 +1,3 @@
- ! service "app": missing memory reservation; 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 "app": secrets will be exposed as environment variables, not files (use 'environment' instead)
  * Compressing build context for app at .
diff --git a/src/tests/static-files/compose.yaml.warnings b/src/tests/static-files/compose.yaml.warnings
@@ -1,5 +1,5 @@
  ! service "x": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "x": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "x": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "y": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "y": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "y": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
  ! service "y": unsupported compose extension: "x-unsupported"
diff --git a/src/tests/toomany/compose.yaml.warnings b/src/tests/toomany/compose.yaml.warnings
@@ -1,2 +1,2 @@
  ! service "service1": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "service1": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "service1": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
diff --git a/src/tests/toomany/docker-compose.yml.warnings b/src/tests/toomany/docker-compose.yml.warnings
@@ -1,2 +1,2 @@
  ! service "service1": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)
- ! service "service1": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "service1": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`! service "service1": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)`
`2`		`- ! service "service1": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors`
	`2`	`+ ! service "service1": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`! service "intel2": missing compose directive: restart; assuming 'unless-stopped' (add 'restart' to silence)`
`2`		`- ! service "intel2": missing memory reservation; specify deploy.resources.reservations.memory to avoid out-of-memory errors`
	`2`	`+ ! service "intel2": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors`