include redis

Author: jordanstephens

src/pkg/cli/compose/fixup.go

@@ -311,6 +311,14 @@ 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 {
+		for i, port := range svccfg.Ports {
+			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
+			}
+		}
 	}
 	return nil
 }

src/testdata/redis/compose.yaml

@@ -13,6 +13,12 @@ services:
       - target: 6379
         mode: host
 
+  short-ports:
+    image: redis
+    x-defang-redis:
+    ports:
+      - 6379:6379
+
   no-ext:
     image: redis
     ports:

src/testdata/redis/compose.yaml.fixup

@@ -47,6 +47,21 @@
       }
     ]
   },
+  "short-ports": {
+    "command": null,
+    "entrypoint": null,
+    "image": "redis",
+    "networks": {
+      "default": null
+    },
+    "ports": [
+      {
+        "mode": "host",
+        "target": 6379,
+        "protocol": "tcp"
+      }
+    ]
+  },
   "with-ext": {
     "command": null,
     "entrypoint": null,

src/testdata/redis/compose.yaml.golden

@@ -21,6 +21,16 @@ services:
     networks:
       default: null
     x-defang-redis: null
+  short-ports:
+    image: redis
+    networks:
+      default: null
+    ports:
+      - mode: ingress
+        target: 6379
+        published: "6379"
+        protocol: tcp
+    x-defang-redis: null
   with-ext:
     image: redis
     networks:

src/testdata/redis/compose.yaml.warnings

@@ -2,6 +2,8 @@
  ! 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
  ! service "wrong-image": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors