mirror of
https://github.com/mulgadc/spinifex.git
synced 2026-10-15 09:01:31 +00:00
fix(e2e): don't require CA cert when SPINIFEX_AWS_INSECURE=1
The storagegrowth gate called ResolveCACert unconditionally before building the AWS client, even though newAWSClient itself skips CA resolution entirely when SPINIFEX_AWS_INSECURE=1. That blocked the documented runner-resident remote path (env12 and similar clusters with no local CA cert on disk) and the skip message falsely claimed no node was running when the real cause was a missing CA. Skip the CA check under SPINIFEX_AWS_INSECURE=1 and state the actual cause plus the escape hatch in the skip message.
This commit is contained in:
@@ -117,11 +117,20 @@ func requireStorageGrowthFixture(t *testing.T) *Fixture {
|
||||
}
|
||||
// Guard against harness.NewAWSClient calling t.Fatal (which exits via
|
||||
// runtime.Goexit and corrupts the Once state for subsequent tests) when
|
||||
// no Spinifex node is running. ResolveCACert uses the same candidate
|
||||
// paths, so a failure here gives a clean skip with an actionable message.
|
||||
if _, err := harness.ResolveCACert(env); err != nil {
|
||||
pkgSkipReason = "no Spinifex node running — provision first: ansible-playbook ansible/playbooks/dev-reset.yml"
|
||||
return
|
||||
// no CA cert is resolvable. ResolveCACert uses the same candidate
|
||||
// paths NewAWSClient falls back to, so a failure here gives a clean
|
||||
// skip with an actionable message — but only when NewAWSClient would
|
||||
// actually take that path: SPINIFEX_AWS_INSECURE=1 makes it skip CA
|
||||
// resolution entirely (see harness/aws.go), which is how a
|
||||
// runner-resident scenario reaches a remote cluster that doesn't
|
||||
// have the spinifex cert on disk.
|
||||
if os.Getenv("SPINIFEX_AWS_INSECURE") != "1" {
|
||||
if _, err := harness.ResolveCACert(env); err != nil {
|
||||
pkgSkipReason = "no Spinifex CA cert found: " + err.Error() +
|
||||
" — provision a local node first (ansible-playbook ansible/playbooks/dev-reset.yml), " +
|
||||
"or target a remote cluster with SPINIFEX_AWS_INSECURE=1 (skips CA verification; see harness/aws.go)"
|
||||
return
|
||||
}
|
||||
}
|
||||
awsCli := harness.NewAWSClient(t, env)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user