chore(valkey): use Run function

This commit migrates the valkey module to use the new testcontainers.Run() API.

The main changes are:
- Use testcontainers.Run() instead of testcontainers.GenericContainer()
- Use entrypoint for valkey-server process and WithCmd/WithCmdArgs for arguments
- Simplify WithConfigFile to prepend config file as first argument
- Simplify WithLogLevel and WithSnapshotting to use WithCmdArgs directly
- Process custom options before building module options for TLS support
- Update option tests to reflect entrypoint-based approach

Ref: testcontainers#3174

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: mdelapenya

modules/valkey/options_test.go

@@ -17,17 +17,12 @@ func TestWithConfigFile(t *testing.T) {
 		{
 			name:         "no existing command",
 			cmds:         []string{},
-			expectedCmds: []string{valkeyServerProcess, "/usr/local/valkey.conf"},
+			expectedCmds: []string{"/usr/local/valkey.conf"},
 		},
 		{
-			name:         "existing redis-server command as first argument",
-			cmds:         []string{valkeyServerProcess, "a", "b", "c"},
-			expectedCmds: []string{valkeyServerProcess, "/usr/local/valkey.conf", "a", "b", "c"},
-		},
-		{
-			name:         "non existing redis-server command",
+			name:         "existing commands",
 			cmds:         []string{"a", "b", "c"},
-			expectedCmds: []string{valkeyServerProcess, "/usr/local/valkey.conf", "a", "b", "c"},
+			expectedCmds: []string{"/usr/local/valkey.conf", "a", "b", "c"},
 		},
 	}
 
@@ -39,7 +34,7 @@ func TestWithConfigFile(t *testing.T) {
 				},
 			}
 
-			err := WithConfigFile("redis.conf")(req)
+			err := WithConfigFile("valkey.conf")(req)
 			require.NoError(t, err)
 
 			require.Equal(t, tt.expectedCmds, req.Cmd)
@@ -56,17 +51,12 @@ func TestWithLogLevel(t *testing.T) {
 		{
 			name:         "no existing command",
 			cmds:         []string{},
-			expectedCmds: []string{valkeyServerProcess, "--loglevel", "debug"},
+			expectedCmds: []string{"--loglevel", "debug"},
 		},
 		{
-			name:         "existing redis-server command as first argument",
-			cmds:         []string{valkeyServerProcess, "a", "b", "c"},
-			expectedCmds: []string{valkeyServerProcess, "a", "b", "c", "--loglevel", "debug"},
-		},
-		{
-			name:         "non existing redis-server command",
+			name:         "existing commands",
 			cmds:         []string{"a", "b", "c"},
-			expectedCmds: []string{valkeyServerProcess, "a", "b", "c", "--loglevel", "debug"},
+			expectedCmds: []string{"a", "b", "c", "--loglevel", "debug"},
 		},
 	}
 
@@ -99,28 +89,21 @@ func TestWithSnapshotting(t *testing.T) {
 			cmds:         []string{},
 			seconds:      60,
 			changedKeys:  100,
-			expectedCmds: []string{valkeyServerProcess, "--save", "60", "100"},
+			expectedCmds: []string{"--save", "60", "100"},
 		},
 		{
-			name:         "existing redis-server command as first argument",
-			cmds:         []string{valkeyServerProcess, "a", "b", "c"},
-			seconds:      60,
-			changedKeys:  100,
-			expectedCmds: []string{valkeyServerProcess, "a", "b", "c", "--save", "60", "100"},
-		},
-		{
-			name:         "non existing redis-server command",
+			name:         "existing commands",
 			cmds:         []string{"a", "b", "c"},
 			seconds:      60,
 			changedKeys:  100,
-			expectedCmds: []string{valkeyServerProcess, "a", "b", "c", "--save", "60", "100"},
+			expectedCmds: []string{"a", "b", "c", "--save", "60", "100"},
 		},
 		{
-			name:         "existing redis-server command as first argument",
-			cmds:         []string{valkeyServerProcess, "a", "b", "c"},
+			name:         "zero values get normalized",
+			cmds:         []string{"a", "b", "c"},
 			seconds:      0,
 			changedKeys:  0,
-			expectedCmds: []string{valkeyServerProcess, "a", "b", "c", "--save", "1", "1"},
+			expectedCmds: []string{"a", "b", "c", "--save", "1", "1"},
 		},
 	}
 

modules/valkey/valkey.go

@@ -73,6 +73,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 
 	moduleOpts := []testcontainers.ContainerCustomizer{
 		testcontainers.WithExposedPorts(valkeyPort),
+		testcontainers.WithEntrypoint(valkeyServerProcess),
 	}
 
 	waitStrategies := []wait.Strategy{
@@ -145,8 +146,8 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 	return c, nil
 }
 
-// WithConfigFile sets the config file to be used for the valkey container, and sets the command to run the valkey server
-// using the passed config file
+// WithConfigFile sets the config file to be used for the valkey container.
+// The config file must be the first argument to valkey-server.
 func WithConfigFile(configFile string) testcontainers.CustomizeRequestOption {
 	const defaultConfigFile = "/usr/local/valkey.conf"
 
@@ -161,26 +162,16 @@ func WithConfigFile(configFile string) testcontainers.CustomizeRequestOption {
 			return err
 		}
 
-		if len(req.Cmd) == 0 {
-			return testcontainers.WithCmd(valkeyServerProcess, defaultConfigFile)(req)
-		}
-
-		// prepend the command to run the valkey server with the config file, which must be the first argument of the valkey server process
-		if req.Cmd[0] == valkeyServerProcess {
-			// just insert the config file, then the rest of the args
-			return testcontainers.WithCmd(append([]string{valkeyServerProcess, defaultConfigFile}, req.Cmd[1:]...)...)(req)
-		}
-
-		// prepend the valkey server and the config file, then the rest of the args
-		return testcontainers.WithCmd(append([]string{valkeyServerProcess, defaultConfigFile}, req.Cmd...)...)(req)
+		// Prepend the config file as the first argument
+		return testcontainers.WithCmd(append([]string{defaultConfigFile}, req.Cmd...)...)(req)
 	}
 }
 
 // WithLogLevel sets the log level for the valkey server process
 // See https://redis.io/docs/reference/modules/modules-api-ref/#redismodule_log for more information.
 func WithLogLevel(level LogLevel) testcontainers.CustomizeRequestOption {
 	return func(req *testcontainers.GenericContainerRequest) error {
-		return processValkeyServerArgs(req, []string{"--loglevel", string(level)})
+		return testcontainers.WithCmdArgs("--loglevel", string(level))(req)
 	}
 }
 
@@ -197,20 +188,6 @@ func WithSnapshotting(seconds int, changedKeys int) testcontainers.CustomizeRequ
 	}
 
 	return func(req *testcontainers.GenericContainerRequest) error {
-		return processValkeyServerArgs(req, []string{"--save", strconv.Itoa(seconds), strconv.Itoa(changedKeys)})
-	}
-}
-
-func processValkeyServerArgs(req *testcontainers.GenericContainerRequest, args []string) error {
-	if len(req.Cmd) == 0 {
-		return testcontainers.WithCmd(append([]string{valkeyServerProcess}, args...)...)(req)
+		return testcontainers.WithCmdArgs("--save", strconv.Itoa(seconds), strconv.Itoa(changedKeys))(req)
 	}
-
-	// If valkey server is already set as the first argument, just append the args
-	if req.Cmd[0] == valkeyServerProcess {
-		return testcontainers.WithCmdArgs(args...)(req)
-	}
-
-	// valkey server is not set as the first argument, so prepend it alongside the existing command and args
-	return testcontainers.WithCmd(append(append([]string{valkeyServerProcess}, req.Cmd...), args...)...)(req)
 }