summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/integration/container.go15
1 files changed, 9 insertions, 6 deletions
diff --git a/test/integration/container.go b/test/integration/container.go
index fe14529..53fe9f2 100644
--- a/test/integration/container.go
+++ b/test/integration/container.go
@@ -14,18 +14,21 @@ import (
"github.com/xlgmokha/x/pkg/env"
)
-func NewContainer(t *testing.T, ctx context.Context, envVars map[string]string) *testcontainers.DockerContainer {
- t.Logf("testcontainers: %v\n", testcontainers.HostInternal)
-
- originalIssuer := envVars["OIDC_ISSUER"]
+func normalizeIssuer(t *testing.T, originalIssuer string) (string, int) {
issuer := strings.Replace(originalIssuer, "[::]", testcontainers.HostInternal, 1)
- envVars["OIDC_ISSUER"] = issuer
u, err := url.Parse(issuer)
require.NoError(t, err)
port, err := strconv.Atoi(u.Port())
require.NoError(t, err)
- t.Logf("original: %v, issuer: %v, port: %v\n", originalIssuer, issuer, port)
+
+ return issuer, port
+}
+
+func NewContainer(t *testing.T, ctx context.Context, envVars map[string]string) *testcontainers.DockerContainer {
+ 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,