Skip to content

fix: darwin contract tests #6747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fracasula wants to merge 2 commits into from
+99 −129
Closed

fix: darwin contract tests #6747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae4f90
chore: fix py contract tests on darwin
fracasula Mar 6, 2026
2ceead3
chore: fix data race
fracasula Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions integration_test/pytransformer_contract/backwards_compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import (
"github.com/ory/dockertest/v3"
"github.com/stretchr/testify/require"

kithelper "github.com/rudderlabs/rudder-go-kit/testhelper"

backendconfig "github.com/rudderlabs/rudder-server/backend-config"
"github.com/rudderlabs/rudder-server/processor/types"
utilstypes "github.com/rudderlabs/rudder-server/utils/types"
Expand Down Expand Up @@ -1729,21 +1727,15 @@ def transformEvent(event, metadata):
t.Cleanup(mockGateway.Close)

// Start shared rudder-transformer.
transformerPort, err := kithelper.GetFreePort()
require.NoError(t, err)
transformerURL := fmt.Sprintf("http://localhost:%d", transformerPort)
transformerContainer := startRudderTransformer(t, pool, transformerPort, configBackend.URL, mockGateway.URL)
transformerContainer, transformerURL := startRudderTransformer(t, pool, configBackend.URL, mockGateway.URL)
t.Cleanup(func() {
if err := pool.Purge(transformerContainer); err != nil {
t.Logf("Failed to purge rudder-transformer: %v", err)
}
})

// Start shared rudder-pytransformer.
pyTransformerPort, err := kithelper.GetFreePort()
require.NoError(t, err)
pyTransformerURL := fmt.Sprintf("http://localhost:%d", pyTransformerPort)
pyTransformerContainer := startRudderPytransformer(t, pool, pyTransformerPort, configBackend.URL)
pyTransformerContainer, pyTransformerURL := startRudderPytransformer(t, pool, configBackend.URL)
t.Cleanup(func() {
if err := pool.Purge(pyTransformerContainer); err != nil {
t.Logf("Failed to purge rudder-pytransformer: %v", err)
Expand All @@ -1765,12 +1757,8 @@ def transformEvent(event, metadata):
env := newBCTestEnv(t, transformerURL, pyTransformerURL)

if st.config.code != "" {
openFaasPort, err := kithelper.GetFreePort()
require.NoError(t, err)
openFaasURL := fmt.Sprintf("http://localhost:%d", openFaasPort)

t.Logf("Starting openfaas-flask-base for %s (versionID=%s)...", st.name, st.versionID)
container := startOpenFaasFlask(t, pool, openFaasPort, st.versionID, configBackend.URL)
container, openFaasURL := startOpenFaasFlask(t, pool, st.versionID, configBackend.URL)
t.Cleanup(func() {
if err := pool.Purge(container); err != nil {
t.Logf("Failed to purge openfaas-flask-base: %v", err)
Expand Down
20 changes: 3 additions & 17 deletions integration_test/pytransformer_contract/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package pytransformer_contract

import (
"context"
"fmt"
"testing"

"github.com/ory/dockertest/v3"
Expand All @@ -11,7 +10,6 @@ import (
"github.com/rudderlabs/rudder-go-kit/config"
"github.com/rudderlabs/rudder-go-kit/logger"
"github.com/rudderlabs/rudder-go-kit/stats"
kithelper "github.com/rudderlabs/rudder-go-kit/testhelper"

backendconfig "github.com/rudderlabs/rudder-server/backend-config"
"github.com/rudderlabs/rudder-server/processor/types"
Expand Down Expand Up @@ -98,20 +96,8 @@ def transformEvent(event, metadata):
defer configBackend.Close()
t.Logf("Config backend at %s", configBackend.URL)

t.Log("Allocating free ports...")
openFaasPort, err := kithelper.GetFreePort()
require.NoError(t, err)
transformerPort, err := kithelper.GetFreePort()
require.NoError(t, err)
pyTransformerPort, err := kithelper.GetFreePort()
require.NoError(t, err)

openFaasURL := fmt.Sprintf("http://localhost:%d", openFaasPort)
transformerURL := fmt.Sprintf("http://localhost:%d", transformerPort)
pyTransformerURL := fmt.Sprintf("http://localhost:%d", pyTransformerPort)

t.Log("Starting openfaas-flask-base container...")
openFaasContainer := startOpenFaasFlask(t, pool, openFaasPort, versionID, configBackend.URL)
openFaasContainer, openFaasURL := startOpenFaasFlask(t, pool, versionID, configBackend.URL)
defer func() {
if err := pool.Purge(openFaasContainer); err != nil {
t.Logf("Failed to purge openfaas-flask-base container: %v", err)
Expand All @@ -125,15 +111,15 @@ def transformEvent(event, metadata):
t.Logf("Mock OpenFaaS gateway at %s", mockGateway.URL)

t.Log("Starting rudder-transformer container...")
transformerContainer := startRudderTransformer(t, pool, transformerPort, configBackend.URL, mockGateway.URL)
transformerContainer, transformerURL := startRudderTransformer(t, pool, configBackend.URL, mockGateway.URL)
defer func() {
if err := pool.Purge(transformerContainer); err != nil {
t.Logf("Failed to purge rudder-transformer container: %v", err)
}
}()

t.Log("Starting rudder-pytransformer container...")
pyTransformerContainer := startRudderPytransformer(t, pool, pyTransformerPort, configBackend.URL)
pyTransformerContainer, pyTransformerURL := startRudderPytransformer(t, pool, configBackend.URL)
defer func() {
if err := pool.Purge(pyTransformerContainer); err != nil {
t.Logf("Failed to purge rudder-pytransformer container: %v", err)
Expand Down
106 changes: 64 additions & 42 deletions integration_test/pytransformer_contract/bc_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"io"
"net/http"
"net/http/httptest"
"strconv"
"strings"
"sync"
"sync/atomic"
Expand All @@ -23,7 +22,7 @@ import (
"github.com/rudderlabs/rudder-go-kit/jsonrs"
"github.com/rudderlabs/rudder-go-kit/logger"
"github.com/rudderlabs/rudder-go-kit/stats/memstats"
kithelper "github.com/rudderlabs/rudder-go-kit/testhelper"
dockertesthelper "github.com/rudderlabs/rudder-go-kit/testhelper/docker"
miniodocker "github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/minio"
"github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/registry"

Expand Down Expand Up @@ -309,78 +308,100 @@ func newMockOpenFaaSGateway(t *testing.T, getTarget func() string) (*httptest.Se
// startOpenFaasFlask starts an openfaas-flask-base container with transformation code
// loaded at startup via --vid and --config-backend-url. Optional extra environment
// variables can be passed (e.g. "geolocation_url=http://...").
// Returns the container and the host-accessible URL.
func startOpenFaasFlask(
t *testing.T, pool *dockertest.Pool,
port int, versionID, configBackendURL string,
versionID, configBackendURL string,
extraEnv ...string,
) *dockertest.Resource {
) (*dockertest.Resource, string) {
t.Helper()
const internalPort = "8080"
env := []string{
fmt.Sprintf("fprocess=python index.py --vid %s --config-backend-url %s", versionID, configBackendURL),
fmt.Sprintf("port=%d", port),
fmt.Sprintf("fprocess=python index.py --vid %s --config-backend-url %s", versionID, dockertesthelper.ToInternalDockerHost(configBackendURL)),
"port=" + internalPort,
}
for _, e := range extraEnv {
env = append(env, dockertesthelper.ToInternalDockerHost(e))
}
env = append(env, extraEnv...)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "422074288268.dkr.ecr.us-east-1.amazonaws.com/rudderstack/openfaas-flask",
Tag: "latest",
Auth: registry.AuthConfiguration(),
Env: env,
}, func(hc *docker.HostConfig) {
hc.NetworkMode = "host"
Repository: "422074288268.dkr.ecr.us-east-1.amazonaws.com/rudderstack/openfaas-flask",
Tag: "latest",
Auth: registry.AuthConfiguration(),
Env: env,
ExtraHosts: []string{"host.docker.internal:host-gateway"},
ExposedPorts: []string{internalPort},
PortBindings: map[docker.Port][]docker.PortBinding{
docker.Port(internalPort + "/tcp"): {{HostIP: "127.0.0.1", HostPort: "0"}},
},
})
require.NoError(t, err, "failed to start openfaas-flask-base container")
return container
url := fmt.Sprintf("http://localhost:%s", container.GetPort(internalPort+"/tcp"))
return container, url
}

// startRudderTransformer starts a rudder-transformer container configured to use
// the mock config backend and mock OpenFaaS gateway.
// Returns the container and the host-accessible URL.
func startRudderTransformer(
t *testing.T, pool *dockertest.Pool,
port int, configBackendURL, openfaasGatewayURL string,
) *dockertest.Resource {
configBackendURL, openfaasGatewayURL string,
) (*dockertest.Resource, string) {
t.Helper()
const internalPort = "9090"
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "rudderstack/rudder-transformer",
Tag: "latest",
Env: []string{
"CONFIG_BACKEND_URL=" + configBackendURL,
"OPENFAAS_GATEWAY_URL=" + openfaasGatewayURL,
"PORT=" + strconv.Itoa(port),
"CONFIG_BACKEND_URL=" + dockertesthelper.ToInternalDockerHost(configBackendURL),
"OPENFAAS_GATEWAY_URL=" + dockertesthelper.ToInternalDockerHost(openfaasGatewayURL),
"PORT=" + internalPort,
"NODE_OPTIONS=--no-node-snapshot",
},
}, func(hc *docker.HostConfig) {
hc.NetworkMode = "host"
ExtraHosts: []string{"host.docker.internal:host-gateway"},
ExposedPorts: []string{internalPort},
PortBindings: map[docker.Port][]docker.PortBinding{
docker.Port(internalPort + "/tcp"): {{HostIP: "127.0.0.1", HostPort: "0"}},
},
})
require.NoError(t, err, "failed to start rudder-transformer container")
return container
url := fmt.Sprintf("http://localhost:%s", container.GetPort(internalPort+"/tcp"))
return container, url
}

// startRudderPytransformer starts a rudder-pytransformer container configured
// to use the mock config backend. Optional extra environment variables can be
// passed (e.g. "GEOLOCATION_URL=http://...").
// Returns the container and the host-accessible URL.
func startRudderPytransformer(
t *testing.T, pool *dockertest.Pool,
port int, configBackendURL string,
configBackendURL string,
extraEnv ...string,
) *dockertest.Resource {
) (*dockertest.Resource, string) {
t.Helper()
const internalPort = "8080"
env := []string{
"CONFIG_BACKEND_URL=" + configBackendURL,
"CONFIG_BACKEND_URL=" + dockertesthelper.ToInternalDockerHost(configBackendURL),
"GUNICORN_WORKERS=1",
"GUNICORN_TIMEOUT=120",
"GUNICORN_BIND=0.0.0.0:" + strconv.Itoa(port),
"GUNICORN_BIND=0.0.0.0:" + internalPort,
}
for _, e := range extraEnv {
env = append(env, dockertesthelper.ToInternalDockerHost(e))
}
env = append(env, extraEnv...)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "422074288268.dkr.ecr.us-east-1.amazonaws.com/rudderstack/rudder-pytransformer",
Tag: "latest",
Auth: registry.AuthConfiguration(),
Env: env,
}, func(hc *docker.HostConfig) {
hc.NetworkMode = "host"
Repository: "422074288268.dkr.ecr.us-east-1.amazonaws.com/rudderstack/rudder-pytransformer",
Tag: "latest",
Auth: registry.AuthConfiguration(),
Env: env,
ExtraHosts: []string{"host.docker.internal:host-gateway"},
ExposedPorts: []string{internalPort},
PortBindings: map[docker.Port][]docker.PortBinding{
docker.Port(internalPort + "/tcp"): {{HostIP: "127.0.0.1", HostPort: "0"}},
},
})
require.NoError(t, err, "failed to start rudder-pytransformer container")
return container
url := fmt.Sprintf("http://localhost:%s", container.GetPort(internalPort+"/tcp"))
return container, url
}

// waitForHealthy polls a service's /health endpoint until it returns 200 OK.
Expand Down Expand Up @@ -475,30 +496,31 @@ func startRudderGeolocation(t *testing.T, pool *dockertest.Pool) (*dockertest.Re
)
require.NoError(t, err, "failed to upload city_test.mmdb to MinIO")

geoPort, err := kithelper.GetFreePort()
require.NoError(t, err, "failed to get free port for rudder-geolocation")

const internalPort = "8080"
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "422074288268.dkr.ecr.us-east-1.amazonaws.com/rudderstack/rudder-geolocation",
Tag: "main",
Auth: registry.AuthConfiguration(),
Env: []string{
"PORT=" + strconv.Itoa(geoPort),
"PORT=" + internalPort,
"BUCKET=" + minioResource.BucketName,
"KEY=city_test.mmdb",
"OUTPUT_PATH=/tmp/city.mmdb",
"REGION=us-east-1",
"S3_ENDPOINT=" + "http://" + minioResource.Endpoint,
"S3_ENDPOINT=" + dockertesthelper.ToInternalDockerHost("http://"+minioResource.Endpoint),
"S3_FORCE_PATH_STYLE=true",
"AWS_ACCESS_KEY_ID=" + minioResource.AccessKeyID,
"AWS_SECRET_ACCESS_KEY=" + minioResource.AccessKeySecret,
},
}, func(hc *docker.HostConfig) {
hc.NetworkMode = "host"
ExtraHosts: []string{"host.docker.internal:host-gateway"},
ExposedPorts: []string{internalPort},
PortBindings: map[docker.Port][]docker.PortBinding{
docker.Port(internalPort + "/tcp"): {{HostIP: "127.0.0.1", HostPort: "0"}},
},
})
require.NoError(t, err, "failed to start rudder-geolocation container")

geoURL := fmt.Sprintf("http://localhost:%d", geoPort)
geoURL := fmt.Sprintf("http://localhost:%s", container.GetPort(internalPort+"/tcp"))
return container, geoURL
}

Expand Down
Loading
Loading