From ffd887f8ccd4d6f15e82f4a2ea47ac6e149cf549 Mon Sep 17 00:00:00 2001 From: Herman Slatman Date: Wed, 10 Jan 2024 20:23:01 +0100 Subject: [PATCH] Fix tests for ACME Wire provisioner --- acme/api/order_test.go | 2 +- ...gration_test.go => wire_integration_test.go} | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) rename acme/api/{im_integration_test.go => wire_integration_test.go} (96%) diff --git a/acme/api/order_test.go b/acme/api/order_test.go index 79539eb3..6a282ace 100644 --- a/acme/api/order_test.go +++ b/acme/api/order_test.go @@ -1695,7 +1695,7 @@ func TestHandler_NewOrder(t *testing.T) { } }, "ok/default-naf-nbf-wireapp": func(t *testing.T) test { - acmeWireProv := newACMEProvWithOptions(t, &provisioner.Options{ + acmeWireProv := newWireProvisionerWithOptions(t, &provisioner.Options{ OIDC: &provisioner.OIDCOptions{ Provider: provisioner.ProviderJSON{ IssuerURL: "", diff --git a/acme/api/im_integration_test.go b/acme/api/wire_integration_test.go similarity index 96% rename from acme/api/im_integration_test.go rename to acme/api/wire_integration_test.go index 8b009468..45f28d2d 100644 --- a/acme/api/im_integration_test.go +++ b/acme/api/wire_integration_test.go @@ -36,8 +36,21 @@ const ( linkerPrefix = "acme" ) -func TestIMIntegration(t *testing.T) { - prov := newACMEProvWithOptions(t, &provisioner.Options{ +func newWireProvisionerWithOptions(t *testing.T, options *provisioner.Options) *provisioner.ACME { + p := newProvWithOptions(options) + a, ok := p.(*provisioner.ACME) + if !ok { + t.Fatal("not a valid ACME provisioner") + } + a.Challenges = []provisioner.ACMEChallenge{ + provisioner.WIREOIDC_01, + provisioner.WIREDPOP_01, + } + return a +} + +func TestWireIntegration(t *testing.T) { + prov := newWireProvisionerWithOptions(t, &provisioner.Options{ OIDC: &provisioner.OIDCOptions{ Provider: provisioner.ProviderJSON{ IssuerURL: "",