1 files changed, 8 insertions, 40 deletions
diff --git a/test/integration/container.go b/test/integration/container.go
index 794702d..651fcf5 100644
--- a/test/integration/container.go
+++ b/test/integration/container.go
@@ -3,9 +3,6 @@ package test
 import (
 	"context"
 	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
 	"testing"
 
 	xcontainer "github.com/docker/docker/api/types/container"
@@ -18,32 +15,11 @@ import (
 	"github.com/xlgmokha/x/pkg/x"
 )
 
-func normalizeIssuer(t *testing.T, issuer string) (string, int) {
-	for _, loopback := range []string{"0.0.0.0", "127.0.0.1", "[::]", "localhost"} {
-		issuer = strings.Replace(issuer, loopback, testcontainers.HostInternal, 1)
-	}
-
-	u, err := url.Parse(issuer)
-	require.NoError(t, err)
-	port, err := strconv.Atoi(u.Port())
-	require.NoError(t, err)
-
-	return issuer, port
-}
-
 func NewContainer(t *testing.T, ctx context.Context, envVars map[string]string) *testcontainers.DockerContainer {
 	require.Equal(t, http.StatusOK, HttpGet(t, ctx, envVars["OIDC_ISSUER"]+"/.well-known/openid-configuration").StatusCode)
 	container, err := testcontainers.Run(
 		ctx,
 		env.Fetch("IMAGE_TAG", "sparkled:invalid"),
-		containerOptions(t, envVars)...,
-	)
-	require.NoError(t, err)
-	return container
-}
-
-func containerOptions(t *testing.T, envVars map[string]string) []testcontainers.ContainerCustomizer {
-	options := []testcontainers.ContainerCustomizer{
 		testcontainers.WithEnv(envVars),
 		testcontainers.WithLogConsumers(&LogConsumer{t: t}),
 		testcontainers.WithWaitStrategy(
@@ -52,20 +28,12 @@ func containerOptions(t *testing.T, envVars map[string]string) []testcontainers.
 			wait.ForListeningPort(x.Must(nat.NewPort("tcp", "8080"))),
 			wait.ForListeningPort(x.Must(nat.NewPort("tcp", "9901"))),
 		),
-	}
-
-	// if isGitlabCI(t) {
-	options = append(options, testcontainers.WithHostConfigModifier(func(cfg *xcontainer.HostConfig) {
-		cfg.NetworkMode = xcontainer.NetworkMode(network.NetworkHost)
-	}))
-	// } else {
-	// 	issuer, port := normalizeIssuer(t, envVars["OIDC_ISSUER"])
-	// 	// envVars["OIDC_ISSUER"] = issuer
-	// 	t.Logf("issuer: %v, port: %v\n", issuer, port)
-
-	// 	options = append(options, testcontainers.WithExposedPorts("8080/tcp", "9901/tcp", "10000/tcp"))
-	// 	options = append(options, testcontainers.WithHostPortAccess(port))
-	// }
-
-	return options
+		testcontainers.WithHostConfigModifier(func(cfg *xcontainer.HostConfig) {
+			cfg.NetworkMode = xcontainer.NetworkMode(network.NetworkHost)
+		}),
+		// testcontainers.WithExposedPorts("8080/tcp", "9901/tcp", "10000/tcp"),
+		// testcontainers.WithHostPortAccess(port),
+	)
+	require.NoError(t, err)
+	return container
 }