makes the http request async

Author: jonfriesen

pkg/e2e/babel/babel.go

@@ -1,6 +1,7 @@
 package babel
 
 import (
+	"context"
 	"os"
 	"strings"
 
@@ -179,6 +180,20 @@ func AllImages() []HTTPRequestImage {
 	return images
 }
 
+type Container struct {
+	testcontainers.Container
+	resultCh chan ContainerResult
+}
+
+func (c *Container) WaitForExit(ctx context.Context) (*ContainerResult, error) {
+	select {
+	case result := <-c.resultCh:
+		return &result, nil
+	case <-ctx.Done():
+		return nil, ctx.Err()
+	}
+}
+
 type ContainerResult struct {
 	ExitCode int
 	Logs     string

pkg/e2e/babel/request.go

@@ -321,9 +321,11 @@ func BuildHTTPRequest() *HTTPRequestBuilder {
 	}
 }
 
-func (m *HTTPRequest) Run(ctx context.Context, l *zap.Logger) *ContainerResult {
-	result := &ContainerResult{}
-	var err error
+func (m *HTTPRequest) Run(ctx context.Context, l *zap.Logger) *Container {
+	result := ContainerResult{}
+	c := &Container{
+		resultCh: make(chan ContainerResult),
+	}
 
 	envVars := m.toEnvVars()
 
@@ -337,7 +339,7 @@ func (m *HTTPRequest) Run(ctx context.Context, l *zap.Logger) *ContainerResult {
 			},
 			LogConsumerCfg: &testcontainers.LogConsumerConfig{
 				Opts:      []testcontainers.LogProductionOption{testcontainers.WithLogProductionTimeout(10 * time.Second)},
-				Consumers: []testcontainers.LogConsumer{result},
+				Consumers: []testcontainers.LogConsumer{&result},
 			},
 			WaitingFor: wait.ForExit().WithPollInterval(10 * time.Millisecond),
 			AutoRemove: true, // Clean up container when it exits
@@ -355,29 +357,35 @@ func (m *HTTPRequest) Run(ctx context.Context, l *zap.Logger) *ContainerResult {
 	// 	}
 	// }
 
-	// Start the container
-	l.Info("🕹️ starting container", zap.String("image", m.ImageURL))
-	container, err := testcontainers.GenericContainer(ctx, req)
-	if err != nil {
-		l.Error("start container error", zap.Error(err))
-		result.Error = fmt.Errorf("starting container %s: %w", m.ImageURL, err)
-		result.ExitCode = -1
-		return result
-	}
+	go func() {
+		// Start the container
+		l.Info("🕹️ starting container", zap.String("image", m.ImageURL))
+		container, err := testcontainers.GenericContainer(ctx, req)
+		if err != nil {
+			l.Error("start container error", zap.Error(err))
+			result.Error = fmt.Errorf("starting container %s: %w", m.ImageURL, err)
+			result.ExitCode = -1
+			c.resultCh <- result
+			return
+		}
 
-	state, err := container.State(ctx)
-	if err != nil {
-		l.Error("get container state error", zap.Error(err))
-		result.Error = fmt.Errorf("getting container state: %w", err)
-		result.ExitCode = -1
-		return result
-	}
+		state, err := container.State(ctx)
+		if err != nil {
+			l.Error("get container state error", zap.Error(err))
+			result.Error = fmt.Errorf("getting container state: %w", err)
+			result.ExitCode = -1
+			c.resultCh <- result
+			return
+		}
 
-	l.Debug("container state", zap.Any("state", state))
-	result.ExitCode = state.ExitCode
-	if state.Error != "" {
-		result.Error = fmt.Errorf("container error: %s", state.Error)
-	}
+		l.Debug("container state", zap.Any("state", state))
+		result.ExitCode = state.ExitCode
+		if state.Error != "" {
+			result.Error = fmt.Errorf("container error: %s", state.Error)
+		}
+
+		c.resultCh <- result
+	}()
 
-	return result
+	return c
 }

pkg/e2e/e2e.go

@@ -196,9 +196,13 @@ func (c *TestContext) Do(request *babel.HTTPRequest) ExecResult {
 	request.WithExtraEnvVar("QPOINT_TAGS", fmt.Sprintf("ctxid:%s,ctxid:%s", c.ID, id))
 	c.L.Info("🕹️ executing babel http request", zap.String("image", request.ImageURL))
 
-	result := request.Run(c.T.Context(), c.L)
+	c.L.Debug("✅ babel http request starting", zap.String("image", request.ImageURL))
+	container := request.Run(c.T.Context(), c.L)
 
-	c.L.Debug("✅ babel http request executed", zap.String("image", request.ImageURL), zap.String("result", result.Logs))
+	c.L.Debug("⏱️ Waiting for babel http container to exit", zap.String("image", request.ImageURL))
+	result, err := container.WaitForExit(c.T.Context())
+	require.NoError(c.T, err)
+	c.L.Debug("✅ babel http request finished", zap.String("image", request.ImageURL), zap.String("result", result.Logs))
 
 	return ExecResult{
 		Output: result.Logs,