Point e2e and CI at step-ca trust center
Update generated test config, loopback HTTPS client, and workflow root CA wiring for the step-ca ACME directory and port-443 trust center listener introduced by the new compose stack. Signed-off-by: Bryan Frimin <bryan@probo.com>
This commit is contained in:
@@ -40,7 +40,7 @@ import (
|
||||
// trustCenterHTTPSAddr is the loopback address of the dedicated trust-center
|
||||
// HTTPS listener started by the e2e probod (see generateConfig). Compliance
|
||||
// pages are served here exclusively, routed by TLS SNI / Host header.
|
||||
const trustCenterHTTPSAddr = "127.0.0.1:10443"
|
||||
const trustCenterHTTPSAddr = "127.0.0.1:443"
|
||||
|
||||
type GraphQLRequest struct {
|
||||
Query string `json:"query"`
|
||||
@@ -216,8 +216,8 @@ func ConsoleGraphQLWithAccessToken(
|
||||
|
||||
// trustHTTPClient builds an HTTP client that always dials the dedicated
|
||||
// trust-center HTTPS listener on loopback while presenting the compliance
|
||||
// page's host as TLS SNI. Certificates are Pebble-issued for e2e, so
|
||||
// verification is skipped.
|
||||
// page's host as TLS SNI. Certificates are step-ca-issued for e2e, so
|
||||
// verification is skipped when the root is not installed in the test runner.
|
||||
func trustHTTPClient(serverName string) *http.Client {
|
||||
return trustHTTPClientWithJar(serverName, nil)
|
||||
}
|
||||
@@ -234,7 +234,7 @@ func trustHTTPClientWithJar(serverName string, jar http.CookieJar) *http.Client
|
||||
},
|
||||
TLSClientConfig: &tls.Config{
|
||||
ServerName: serverName,
|
||||
InsecureSkipVerify: true, //nolint:gosec // e2e talks to Pebble-issued certs on loopback.
|
||||
InsecureSkipVerify: true, //nolint:gosec // e2e talks to step-ca-issued certs on loopback.
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -298,11 +298,11 @@ func generateConfig() (string, error) {
|
||||
// yields {slug}.probopage.localhost subdomains for pages without a
|
||||
// customer custom domain.
|
||||
"PROBOD_TRUST_CENTER_HTTP_ADDR": ":10080",
|
||||
"PROBOD_TRUST_CENTER_HTTPS_ADDR": ":10443",
|
||||
"PROBOD_TRUST_CENTER_HTTPS_ADDR": ":443",
|
||||
"PROBOD_TRUST_CENTER_BASE_DOMAIN": "probopage.localhost",
|
||||
|
||||
// Keep certificate provisioning snappy so trust-center e2e flows do not
|
||||
// wait on the default 30s poll (Pebble runs with PEBBLE_VA_ALWAYS_VALID).
|
||||
// wait on the default 30s poll (step-ca validates HTTP-01 via port 80).
|
||||
"PROBOD_CUSTOM_DOMAINS_PROVISION_INTERVAL": "1",
|
||||
|
||||
// AWS / S3 (SeaweedFS).
|
||||
@@ -321,7 +321,7 @@ func generateConfig() (string, error) {
|
||||
|
||||
// Custom domains.
|
||||
"PROBOD_CUSTOM_DOMAINS_CNAME_TARGET": "custom.test.getprobo.com",
|
||||
"PROBOD_ACME_DIRECTORY": "https://localhost:14000/dir",
|
||||
"PROBOD_ACME_DIRECTORY": "https://localhost:9000/acme/acme/directory",
|
||||
"PROBOD_ACME_EMAIL": "admin@test.getprobo.com",
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user