summaryrefslogtreecommitdiff
path: root/test/integration/container_test.go
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-08-14 11:54:52 -0600
committermo khan <mo@mokhan.ca>2025-08-14 11:54:52 -0600
commit9e55e65ac5eb6ff645880ee253a33f6ab138b615 (patch)
tree3a55344b8c589f52687200c0beb5cd92688014fa /test/integration/container_test.go
parent3f228b16c758d377566f11d2d328d1ccf658a2ad (diff)
Fix the broken build by running pg as a separate container.
Improve shell scripts and remove /sparkles/restore endpoint - Add error handling and debugging to shell scripts with `set -e` and `DEBUG` flag - Ensure scripts run from project root with `cd "$(dirname "$0")/.."` - Remove `/sparkles/restore` endpoint from public routes and Envoy config - Add Postgres test container support for integration tests - Update CI configuration with newer Runway version and improved test setup - Simplify Makefile by removing redundant commands ------- :robot: Commit message generated by GitLab Duo
Diffstat (limited to 'test/integration/container_test.go')
-rw-r--r--test/integration/container_test.go26
1 files changed, 18 insertions, 8 deletions
diff --git a/test/integration/container_test.go b/test/integration/container_test.go
index a3e7974..4273eff 100644
--- a/test/integration/container_test.go
+++ b/test/integration/container_test.go
@@ -16,28 +16,38 @@ import (
"gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/web"
)
-func environmentVariables(srv *web.OIDCServer) map[string]string {
+func environmentVariables(srv *web.OIDCServer, databaseURL string) map[string]string {
return map[string]string{
"APP_ENV": "test",
+ "AUTHZD_HOST": "",
+ "DATABASE_URL": databaseURL,
"DEBUG": env.Fetch("DEBUG", ""),
"HMAC_SESSION_SECRET": "secret",
- "LOG_LEVEL": "debug",
+ "LOG_LEVEL": "warn",
"OAUTH_CLIENT_ID": srv.MockOIDC.ClientID,
"OAUTH_CLIENT_SECRET": srv.MockOIDC.ClientSecret,
"OIDC_ISSUER": srv.Issuer(),
- "ZED_ENDPOINT": ":50051",
- "ZED_TOKEN": "secret",
+ "RUNWAY_PG_USER_POSTGRES_PASSWORD_SPARKLE": "secret",
+ "ZED_ENDPOINT": ":50051",
+ "ZED_TOKEN": "secret",
}
}
func TestContainer(t *testing.T) {
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- defer cancel()
-
srv := web.NewOIDCServer(t)
defer srv.Close()
- container := NewContainer(t, ctx, environmentVariables(srv))
+ ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
+ defer cancel()
+
+ pgContainer := NewPgContainer(ctx, t)
+ defer pgContainer.Terminate(ctx)
+
+ databaseURL, err := pgContainer.ConnectionString(ctx, "sslmode=disable")
+ require.NoError(t, err)
+
+ envVars := environmentVariables(srv, databaseURL)
+ container := NewContainer(t, ctx, envVars)
defer testcontainers.TerminateContainer(container)
require.True(t, container.IsRunning())