Address feedback

Author: anisaoshafi

internal/config/containers.go

@@ -31,6 +31,10 @@ var emulatorHealthPaths = map[EmulatorType]string{
 	EmulatorAWS: "/_localstack/health",
 }
 
+var emulatorContainerPorts = map[EmulatorType]string{
+	EmulatorAWS: "4566/tcp",
+}
+
 type ContainerConfig struct {
 	Type EmulatorType `mapstructure:"type"`
 	Tag  string       `mapstructure:"tag"`
@@ -84,6 +88,14 @@ func (c *ContainerConfig) HealthPath() (string, error) {
 	return path, nil
 }
 
+func (c *ContainerConfig) ContainerPort() (string, error) {
+	port, ok := emulatorContainerPorts[c.Type]
+	if !ok {
+		return "", fmt.Errorf("%s emulator not supported yet by lstk", c.Type)
+	}
+	return port, nil
+}
+
 func (c *ContainerConfig) DisplayName() string {
 	name, ok := emulatorDisplayNames[c.Type]
 	if !ok {

internal/container/start.go

@@ -69,19 +69,25 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
 			return err
 		}
 
+		containerPort, err := c.ContainerPort()
+		if err != nil {
+			return err
+		}
+
 		resolvedEnv, err := c.ResolvedEnv(opts.Env)
 		if err != nil {
 			return err
 		}
 		env := append(resolvedEnv, "LOCALSTACK_AUTH_TOKEN="+token)
 		containers[i] = runtime.ContainerConfig{
-			Image:       image,
-			Name:        c.Name(),
-			Port:        c.Port,
-			HealthPath:  healthPath,
-			Env:         env,
-			Tag:         c.Tag,
-			ProductName: productName,
+			Image:         image,
+			Name:          c.Name(),
+			Port:          c.Port,
+			ContainerPort: containerPort,
+			HealthPath:    healthPath,
+			Env:           env,
+			Tag:           c.Tag,
+			ProductName:   productName,
 		}
 	}
 

internal/runtime/docker.go

@@ -107,10 +107,8 @@ func (d *DockerRuntime) PullImage(ctx context.Context, imageName string, progres
 	return nil
 }
 
-const emulatorContainerPort = nat.Port("4566/tcp")
-
 func (d *DockerRuntime) Start(ctx context.Context, config ContainerConfig) (string, error) {
-	containerPort := emulatorContainerPort
+	containerPort := nat.Port(config.ContainerPort)
 	exposedPorts := nat.PortSet{containerPort: struct{}{}}
 	portBindings := nat.PortMap{containerPort: []nat.PortBinding{{HostPort: config.Port}}}
 

internal/runtime/runtime.go

@@ -8,13 +8,14 @@ import (
 )
 
 type ContainerConfig struct {
-	Image       string
-	Name        string
-	Port        string
-	HealthPath  string
-	Env         []string // e.g., ["KEY=value", "FOO=bar"]
-	Tag         string
-	ProductName string
+	Image         string
+	Name          string
+	Port          string
+	ContainerPort string // internal port the emulator listens on inside the container (e.g. "4566/tcp")
+	HealthPath    string
+	Env           []string // e.g., ["KEY=value", "FOO=bar"]
+	Tag           string
+	ProductName   string
 }
 
 type PullProgress struct {