diff options
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/container.go | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/test/integration/container.go b/test/integration/container.go index 9240b84..c9284dc 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" "time" @@ -17,25 +14,25 @@ import ( "github.com/xlgmokha/x/pkg/env" ) -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) - } +// 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) +// u, err := url.Parse(issuer) +// require.NoError(t, err) +// port, err := strconv.Atoi(u.Port()) +// require.NoError(t, err) - return issuer, port -} +// 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) - issuer, port := normalizeIssuer(t, envVars["OIDC_ISSUER"]) - envVars["OIDC_ISSUER"] = issuer - t.Logf("issuer: %v, port: %v\n", issuer, port) + // issuer, port := normalizeIssuer(t, envVars["OIDC_ISSUER"]) + // envVars["OIDC_ISSUER"] = issuer + // t.Logf("issuer: %v, port: %v\n", issuer, port) container, err := testcontainers.Run( ctx, @@ -45,7 +42,6 @@ func NewContainer(t *testing.T, ctx context.Context, envVars map[string]string) testcontainers.WithHostConfigModifier(func(cfg *xcontainer.HostConfig) { cfg.NetworkMode = xcontainer.NetworkMode(network.NetworkHost) }), - // testcontainers.WithHostPortAccess(port), testcontainers.WithLogConsumers(&LogConsumer{t: t}), testcontainers.WithWaitStrategy(wait.ForLog("Listening on").WithStartupTimeout(10*time.Second)), ) |