feat: add valkey support (#1604)

Author: lionello

src/pkg/cli/compose/stateful.go

@@ -17,12 +17,14 @@ var statefulImages = []string{
 	"neo4j",
 	"oracle/database",
 	"percona",
+	"pgvector",
 	"postgres",
 	"rabbitmq",
 	"redis",
 	"rethinkdb",
 	"scylla",
 	"timescaledb",
+	"valkey",
 	"vault",
 	"zookeeper",
 }

src/pkg/cli/compose/validation.go

@@ -326,8 +326,8 @@ func validateService(svccfg *composeTypes.ServiceConfig, project *composeTypes.P
 	redisExtension, managedRedis := svccfg.Extensions["x-defang-redis"]
 	if managedRedis {
 		// Ensure the repo is a valid Redis repo
-		if !strings.HasSuffix(repo, "redis") {
-			term.Warnf("service %q: managed Redis service should use a redis image", svccfg.Name)
+		if !IsRedisRepo(repo) {
+			term.Warnf("service %q: managed Redis service should use a redis or valkey image", svccfg.Name)
 		}
 		if _, err = validateManagedStore(redisExtension); err != nil {
 			return fmt.Errorf("service %q: %w", svccfg.Name, err)
@@ -337,7 +337,7 @@ func validateService(svccfg *composeTypes.ServiceConfig, project *composeTypes.P
 	postgresExtension, managedPostgres := svccfg.Extensions["x-defang-postgres"]
 	if managedPostgres {
 		// Ensure the repo is a valid Postgres repo
-		if !strings.HasSuffix(repo, "postgres") && !strings.HasSuffix(repo, "pgvector") {
+		if !IsPostgresRepo(repo) {
 			term.Warnf("service %q: managed Postgres service should use a postgres image", svccfg.Name)
 		}
 		if _, err = validateManagedStore(postgresExtension); err != nil {
@@ -348,7 +348,7 @@ func validateService(svccfg *composeTypes.ServiceConfig, project *composeTypes.P
 	mongodbExtension, managedMongodb := svccfg.Extensions["x-defang-mongodb"]
 	if managedMongodb {
 		// Ensure the repo is a valid MongoDB repo
-		if !strings.HasSuffix(repo, "mongo") {
+		if !IsMongoRepo(repo) {
 			term.Warnf("service %q: managed MongoDB service should use a mongo image", svccfg.Name)
 		}
 		if _, err = validateManagedStore(mongodbExtension); err != nil {

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

@@ -355,6 +355,7 @@ enum ResourceType {
   RESOURCE_TYPE_AWS_ECS_EC2_SERVICE = 202;
   RESOURCE_TYPE_AWS_RDS_POSTGRES = 210;
   RESOURCE_TYPE_AWS_ELASTICACHE_REDIS = 220;
+  RESOURCE_TYPE_AWS_ELASTICACHE_VALKEY = 221;
   RESOURCE_TYPE_AWS_DOCUMENTDB = 230;
   RESOURCE_TYPE_AWS_CLOUDFRONT_S3 = 240;
   RESOURCE_TYPE_AWS_BEDROCK = 250;

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

@@ -33,3 +33,7 @@ services:
     image: redis
     x-defang-redis:
     command: ["--port", "6380"]
+
+  valkey-service:
+    image: valkey/valkey:latest
+    x-defang-redis: true

src/testdata/redis/compose.yaml

@@ -63,6 +63,21 @@
       }
     ]
   },
+  "valkey-service": {
+    "command": null,
+    "entrypoint": null,
+    "image": "valkey/valkey:latest",
+    "networks": {
+      "default": null
+    },
+    "ports": [
+      {
+        "mode": "host",
+        "target": 6379,
+        "protocol": "tcp"
+      }
+    ]
+  },
   "with-ext": {
     "command": null,
     "entrypoint": null,

src/testdata/redis/compose.yaml.fixup

@@ -31,6 +31,11 @@ services:
         published: "6379"
         protocol: tcp
     x-defang-redis: null
+  valkey-service:
+    image: valkey/valkey:latest
+    networks:
+      default: null
+    x-defang-redis: true
   with-ext:
     image: redis
     networks:

src/testdata/redis/compose.yaml.golden

@@ -3,6 +3,7 @@
  ! 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": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors
+ ! service "valkey-service": 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": managed Redis service should use a redis or valkey image
  ! service "wrong-image": missing memory reservation; using provider-specific defaults. Specify deploy.resources.reservations.memory to avoid out-of-memory errors