Merge pull request #583 from DefangLabs/eric-add-postgres-support

add Postgres support

Author: lionello

src/pkg/cli/compose/convert.go

@@ -213,7 +213,12 @@ func ConvertServices(ctx context.Context, c client.Client, serviceConfigs compos
 			redis = &defangv1.Redis{}
 		}
 
-		if redis == nil && isStatefulImage(svccfg.Image) {
+		var postgres *defangv1.Postgres
+		if _, ok := svccfg.Extensions["x-defang-postgres"]; ok {
+			postgres = &defangv1.Postgres{}
+		}
+
+		if redis == nil && postgres == nil && isStatefulImage(svccfg.Image) {
 			term.Warnf("service %q: stateful service will lose data on restart; use a managed service instead", svccfg.Name)
 		}
 
@@ -237,6 +242,7 @@ func ConvertServices(ctx context.Context, c client.Client, serviceConfigs compos
 			DnsRole:     dnsRole,
 			StaticFiles: staticFiles,
 			Redis:       redis,
+			Postgres:    postgres,
 		})
 	}
 	return services, nil

src/pkg/cli/compose/validation.go

@@ -262,9 +262,17 @@ func ValidateProject(project *compose.Project) error {
 			}
 		}
 
+		if _, ok := svccfg.Extensions["x-defang-postgres"]; ok {
+			// Ensure the image is a valid Postgres image
+			repo := strings.SplitN(svccfg.Image, ":", 2)[0]
+			if !strings.HasSuffix(repo, "postgres") {
+				term.Warnf("service %q: managed Postgres service should use a postgres image", svccfg.Name)
+			}
+		}
+
 		for k := range svccfg.Extensions {
 			switch k {
-			case "x-defang-dns-role", "x-defang-static-files", "x-defang-redis":
+			case "x-defang-dns-role", "x-defang-static-files", "x-defang-redis", "x-defang-postgres":
 				continue
 			default:
 				term.Warnf("service %q: unsupported compose extension: %q", svccfg.Name, k)

src/protos/io/defang/v1/fabric.pb.go

@@ -402,6 +402,7 @@ message Service {
   StaticFiles static_files = 15; // x-defang-static-files: use a managed CDN
   Network networks = 16;         // currently only 1 network is supported
   Redis redis = 18; // x-defang-redis: use a managed redis
+  Postgres postgres = 19; // x-defang-postgres: use a managed
 }
 
 message StaticFiles {
@@ -410,6 +411,7 @@ message StaticFiles {
 }
 
 message Redis {}
+message Postgres {}
 
 message Event {
   string specversion = 1; // required (but we don't care)

src/protos/io/defang/v1/fabric.proto

@@ -0,0 +1,11 @@
+services:
+  x:
+    image: postgres
+    x-defang-postgres:
+
+  y:
+    image: example
+    x-defang-postgres:
+
+  z:
+    image: postgres

src/tests/postgres/compose.yaml

@@ -0,0 +1,25 @@
+[
+  {
+    "name": "x",
+    "image": "postgres",
+    "platform": 2,
+    "internal": true,
+    "networks": 1,
+    "postgres": {}
+  },
+  {
+    "name": "y",
+    "image": "example",
+    "platform": 2,
+    "internal": true,
+    "networks": 1,
+    "postgres": {}
+  },
+  {
+    "name": "z",
+    "image": "postgres",
+    "platform": 2,
+    "internal": true,
+    "networks": 1
+  }
+]

src/tests/postgres/compose.yaml.convert

@@ -0,0 +1,19 @@
+name: postgres
+services:
+  x:
+    image: postgres
+    networks:
+      default: null
+    x-defang-postgres: null
+  "y":
+    image: example
+    networks:
+      default: null
+    x-defang-postgres: null
+  z:
+    image: postgres
+    networks:
+      default: null
+networks:
+  default:
+    name: postgres_default

src/tests/postgres/compose.yaml.golden

@@ -0,0 +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 "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 "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": stateful service will lose data on restart; use a managed service instead