diff options
Diffstat (limited to 'test/integration/container.go')
| -rw-r--r-- | test/integration/container.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/integration/container.go b/test/integration/container.go index 2595025..c30e869 100644 --- a/test/integration/container.go +++ b/test/integration/container.go @@ -32,21 +32,19 @@ func normalizeIssuer(t *testing.T, issuer string) (string, int) { 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) - container, err := testcontainers.Run( ctx, env.Fetch("IMAGE_TAG", "sparkled:invalid"), - containerOptions(t, port, envVars)..., + containerOptions(t, envVars)..., ) require.NoError(t, err) return container } -func containerOptions(t *testing.T, port int, envVars map[string]string) []testcontainers.ContainerCustomizer { +func containerOptions(t *testing.T, envVars map[string]string) []testcontainers.ContainerCustomizer { + issuer, port := normalizeIssuer(t, envVars["OIDC_ISSUER"]) + envVars["OIDC_ISSUER"] = issuer + options := []testcontainers.ContainerCustomizer{ testcontainers.WithEnv(envVars), testcontainers.WithLogConsumers(&LogConsumer{t: t}), @@ -57,9 +55,9 @@ func containerOptions(t *testing.T, port int, envVars map[string]string) []testc options = append(options, testcontainers.WithHostConfigModifier(func(cfg *xcontainer.HostConfig) { cfg.NetworkMode = xcontainer.NetworkMode(network.NetworkHost) })) - options = append(options, testcontainers.WithHostPortAccess(port)) } else { options = append(options, testcontainers.WithExposedPorts("8080/tcp", "9901/tcp", "10000/tcp")) + options = append(options, testcontainers.WithHostPortAccess(port)) } return options |