From 8013d0fba444d962e2f3314c8df03aabc82e5b48 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Wed, 21 Jan 2026 17:17:07 +0100 Subject: [PATCH] feat: add support for context (challenges) (#2805) --- challenge/dns01/dns_challenge.go | 6 ++--- challenge/dns01/dns_challenge_test.go | 12 +++++----- challenge/http01/http_challenge.go | 4 ++-- challenge/http01/http_challenge_server.go | 5 +++-- challenge/provider.go | 9 +++++--- challenge/resolver/prober.go | 14 ++++++------ challenge/tlsalpn01/tls_alpn_challenge.go | 4 ++-- .../tlsalpn01/tls_alpn_challenge_server.go | 5 +++-- providers/dns/acmedns/acmedns.go | 6 ++--- providers/dns/acmedns/acmedns_test.go | 4 ++-- providers/dns/acmedns/mock_test.go | 2 +- providers/dns/active24/active24.go | 9 ++++---- providers/dns/active24/active24_test.go | 4 ++-- providers/dns/alidns/alidns.go | 8 ++----- providers/dns/alidns/alidns_test.go | 4 ++-- providers/dns/aliesa/aliesa.go | 8 ++----- providers/dns/aliesa/aliesa_test.go | 2 +- providers/dns/allinkl/allinkl.go | 7 ++---- providers/dns/allinkl/allinkl_test.go | 4 ++-- providers/dns/alwaysdata/alwaysdata.go | 8 ++----- providers/dns/alwaysdata/alwaysdata_test.go | 8 +++---- providers/dns/anexia/anexia.go | 8 ++----- providers/dns/anexia/anexia_test.go | 8 +++---- providers/dns/arvancloud/arvancloud.go | 8 ++----- providers/dns/arvancloud/arvancloud_test.go | 4 ++-- providers/dns/auroradns/auroradns.go | 6 ++--- providers/dns/auroradns/auroradns_test.go | 6 ++--- providers/dns/autodns/autodns.go | 6 ++--- providers/dns/autodns/autodns_test.go | 4 ++-- providers/dns/axelname/axelname.go | 8 ++----- providers/dns/axelname/axelname_test.go | 4 ++-- providers/dns/azion/azion.go | 6 ++--- providers/dns/azion/azion_test.go | 9 ++++---- providers/dns/azure/azure.go | 9 ++++---- providers/dns/azure/azure_test.go | 4 ++-- providers/dns/azure/private.go | 6 ++--- providers/dns/azure/public.go | 6 ++--- providers/dns/azuredns/azuredns.go | 9 ++++---- providers/dns/azuredns/azuredns_test.go | 4 ++-- providers/dns/azuredns/oidc.go | 6 ++--- providers/dns/azuredns/private.go | 6 ++--- providers/dns/azuredns/public.go | 6 ++--- providers/dns/baiducloud/baiducloud.go | 10 ++++----- providers/dns/baiducloud/baiducloud_test.go | 4 ++-- providers/dns/beget/beget.go | 8 ++----- providers/dns/beget/beget_test.go | 10 ++++----- providers/dns/beget/internal/client_test.go | 11 +++++----- providers/dns/binarylane/binarylane.go | 8 ++----- providers/dns/binarylane/binarylane_test.go | 4 ++-- providers/dns/bindman/bindman.go | 6 ++--- providers/dns/bindman/bindman_test.go | 8 +++---- providers/dns/bluecat/bluecat.go | 6 ++--- providers/dns/bluecat/bluecat_test.go | 4 ++-- providers/dns/bookmyname/bookmyname.go | 6 ++--- providers/dns/bookmyname/bookmyname_test.go | 4 ++-- providers/dns/brandit/brandit.go | 8 ++----- providers/dns/brandit/brandit_test.go | 4 ++-- providers/dns/bunny/bunny.go | 6 ++--- providers/dns/bunny/bunny_test.go | 4 ++-- providers/dns/checkdomain/checkdomain.go | 8 ++----- providers/dns/checkdomain/checkdomain_test.go | 4 ++-- providers/dns/civo/civo.go | 6 ++--- providers/dns/civo/civo_test.go | 8 +++---- providers/dns/clouddns/clouddns.go | 8 ++----- providers/dns/clouddns/clouddns_test.go | 4 ++-- providers/dns/cloudflare/cloudflare.go | 8 ++----- providers/dns/cloudflare/cloudflare_test.go | 8 +++---- .../dns/cloudflare/internal/client_test.go | 9 ++++---- providers/dns/cloudns/cloudns.go | 6 ++--- providers/dns/cloudns/cloudns_test.go | 4 ++-- providers/dns/cloudru/cloudru.go | 7 ++---- providers/dns/cloudru/cloudru_test.go | 4 ++-- providers/dns/cloudxns/cloudxns.go | 5 +++-- providers/dns/com35/com35.go | 9 ++++---- providers/dns/com35/com35_test.go | 4 ++-- providers/dns/conoha/conoha.go | 8 ++----- providers/dns/conoha/conoha_test.go | 4 ++-- providers/dns/conohav3/conohav3.go | 8 ++----- providers/dns/conohav3/conohav3_test.go | 4 ++-- providers/dns/constellix/constellix.go | 8 ++----- providers/dns/constellix/constellix_test.go | 4 ++-- providers/dns/corenetworks/corenetworks.go | 6 ++--- .../dns/corenetworks/corenetworks_test.go | 4 ++-- providers/dns/cpanel/cpanel.go | 6 ++--- providers/dns/cpanel/cpanel_test.go | 4 ++-- providers/dns/ddnss/ddnss.go | 6 ++--- providers/dns/ddnss/ddnss_test.go | 8 +++---- providers/dns/derak/derak.go | 6 ++--- providers/dns/derak/derak_test.go | 4 ++-- providers/dns/desec/desec.go | 6 ++--- providers/dns/desec/desec_test.go | 4 ++-- providers/dns/designate/designate.go | 6 ++--- providers/dns/designate/designate_test.go | 4 ++-- providers/dns/digitalocean/digitalocean.go | 8 ++----- .../dns/digitalocean/digitalocean_test.go | 4 ++-- providers/dns/directadmin/directadmin.go | 8 ++----- providers/dns/directadmin/directadmin_test.go | 4 ++-- providers/dns/dnsexit/dnsexit.go | 8 ++----- providers/dns/dnsexit/dnsexit_test.go | 8 +++---- providers/dns/dnsexit/internal/client_test.go | 9 ++++---- providers/dns/dnshomede/dnshomede.go | 6 ++--- providers/dns/dnshomede/dnshomede_test.go | 4 ++-- providers/dns/dnsimple/dnsimple.go | 8 ++----- providers/dns/dnsimple/dnsimple_test.go | 4 ++-- providers/dns/dnsmadeeasy/dnsmadeeasy.go | 8 ++----- providers/dns/dnsmadeeasy/dnsmadeeasy_test.go | 4 ++-- providers/dns/dnspod/dnspod.go | 6 ++--- providers/dns/dnspod/dnspod_test.go | 4 ++-- providers/dns/dode/dode.go | 6 ++--- providers/dns/dode/dode_test.go | 4 ++-- providers/dns/domeneshop/domeneshop.go | 8 ++----- providers/dns/domeneshop/domeneshop_test.go | 4 ++-- providers/dns/dreamhost/dreamhost.go | 6 ++--- providers/dns/dreamhost/dreamhost_test.go | 10 ++++----- providers/dns/duckdns/duckdns.go | 6 ++--- providers/dns/duckdns/duckdns_test.go | 4 ++-- providers/dns/dyn/dyn.go | 8 ++----- providers/dns/dyn/dyn_test.go | 4 ++-- providers/dns/dyndnsfree/dyndnsfree.go | 6 ++--- providers/dns/dyndnsfree/dyndnsfree_test.go | 4 ++-- providers/dns/dynu/dynu.go | 6 ++--- providers/dns/dynu/dynu_test.go | 4 ++-- providers/dns/easydns/easydns.go | 8 ++----- providers/dns/easydns/easydns_test.go | 12 +++++----- providers/dns/edgecenter/edgecenter.go | 9 ++++---- providers/dns/edgecenter/edgecenter_test.go | 4 ++-- providers/dns/edgedns/edgedns.go | 8 ++----- .../dns/edgedns/edgedns_integration_test.go | 17 +++++++------- providers/dns/edgeone/edgeone.go | 6 ++--- providers/dns/edgeone/edgeone_test.go | 4 ++-- providers/dns/efficientip/efficientip.go | 6 ++--- providers/dns/efficientip/efficientip_test.go | 4 ++-- providers/dns/epik/epik.go | 8 ++----- providers/dns/epik/epik_test.go | 4 ++-- providers/dns/exec/exec.go | 8 +++---- providers/dns/exec/exec_test.go | 4 ++-- providers/dns/exoscale/exoscale.go | 8 ++----- providers/dns/exoscale/exoscale_test.go | 6 ++--- providers/dns/f5xc/f5xc.go | 8 ++----- providers/dns/f5xc/f5xc_test.go | 4 ++-- providers/dns/freemyip/freemyip.go | 6 ++--- providers/dns/freemyip/freemyip_test.go | 4 ++-- providers/dns/gandi/gandi.go | 7 ++---- providers/dns/gandi/gandi_test.go | 4 ++-- providers/dns/gandiv5/gandiv5.go | 7 ++---- providers/dns/gandiv5/gandiv5_test.go | 4 ++-- providers/dns/gcloud/googlecloud.go | 7 ++---- providers/dns/gcloud/googlecloud_test.go | 14 ++++++------ providers/dns/gcore/gcore.go | 9 ++++---- providers/dns/gcore/gcore_test.go | 4 ++-- providers/dns/gigahostno/gigahostno.go | 8 ++----- providers/dns/gigahostno/gigahostno_test.go | 12 +++++----- .../dns/gigahostno/internal/identity_test.go | 2 +- providers/dns/glesys/glesys.go | 7 ++---- providers/dns/glesys/glesys_test.go | 4 ++-- providers/dns/godaddy/godaddy.go | 8 ++----- providers/dns/godaddy/godaddy_test.go | 4 ++-- providers/dns/googledomains/googledomains.go | 5 +++-- providers/dns/gravity/gravity.go | 7 ++---- providers/dns/gravity/gravity_test.go | 8 +++---- providers/dns/hetzner/hetzner.go | 9 ++++---- .../hetzner/internal/hetznerv1/hetznerv1.go | 8 ++----- .../internal/hetznerv1/hetznerv1_test.go | 16 +++++++------- .../dns/hetzner/internal/legacy/hetzner.go | 8 ++----- .../hetzner/internal/legacy/hetzner_test.go | 4 ++-- providers/dns/hostingde/hostingde.go | 9 ++++---- providers/dns/hostingde/hostingde_test.go | 4 ++-- providers/dns/hostinger/hostinger.go | 8 ++----- providers/dns/hostinger/hostinger_test.go | 10 ++++----- providers/dns/hostingnl/hostingnl.go | 8 ++----- providers/dns/hostingnl/hostingnl_test.go | 8 +++---- .../dns/hostingnl/internal/client_test.go | 9 ++++---- providers/dns/hosttech/hosttech.go | 8 ++----- providers/dns/hosttech/hosttech_test.go | 4 ++-- providers/dns/httpnet/httpnet.go | 9 ++++---- providers/dns/httpnet/httpnet_test.go | 4 ++-- providers/dns/httpreq/httpreq.go | 8 ++----- providers/dns/httpreq/httpreq_test.go | 4 ++-- providers/dns/huaweicloud/huaweicloud.go | 7 ++---- providers/dns/huaweicloud/huaweicloud_test.go | 4 ++-- providers/dns/hurricane/hurricane.go | 6 ++--- providers/dns/hurricane/hurricane_test.go | 4 ++-- providers/dns/hyperone/hyperone.go | 6 ++--- providers/dns/hyperone/hyperone_test.go | 4 ++-- providers/dns/ibmcloud/ibmcloud.go | 6 ++--- providers/dns/ibmcloud/ibmcloud_test.go | 4 ++-- providers/dns/iij/iij.go | 6 ++--- providers/dns/iij/iij_test.go | 4 ++-- providers/dns/iijdpf/iijdpf.go | 8 ++----- providers/dns/iijdpf/iijdpf_test.go | 4 ++-- providers/dns/infoblox/infoblox.go | 7 ++---- providers/dns/infoblox/infoblox_test.go | 4 ++-- providers/dns/infomaniak/infomaniak.go | 6 ++--- providers/dns/infomaniak/infomaniak_test.go | 4 ++-- providers/dns/internal/active24/provider.go | 8 ++----- providers/dns/internal/gcore/provider.go | 6 ++--- providers/dns/internal/hostingde/provider.go | 8 ++----- providers/dns/internal/ionos/provider.go | 6 ++--- .../dns/internal/rimuhosting/provider.go | 6 ++--- providers/dns/internal/selectel/provider.go | 6 ++--- .../dns/internal/tecnocratica/provider.go | 7 ++---- .../internal/tecnocratica/provider_test.go | 4 ++-- providers/dns/internal/westcn/provider.go | 8 ++----- .../dns/internal/westcn/provider_test.go | 4 ++-- providers/dns/internetbs/internetbs.go | 6 ++--- providers/dns/internetbs/internetbs_test.go | 4 ++-- providers/dns/inwx/inwx.go | 6 ++--- providers/dns/inwx/inwx_test.go | 6 ++--- providers/dns/ionos/ionos.go | 9 ++++---- providers/dns/ionos/ionos_test.go | 4 ++-- providers/dns/ionoscloud/ionoscloud.go | 7 ++---- providers/dns/ionoscloud/ionoscloud_test.go | 8 +++---- providers/dns/ipv64/ipv64.go | 6 ++--- providers/dns/ipv64/ipv64_test.go | 4 ++-- providers/dns/ispconfig/ispconfig.go | 8 ++----- providers/dns/ispconfig/ispconfig_test.go | 4 ++-- providers/dns/ispconfigddns/ispconfigddns.go | 8 ++----- .../dns/ispconfigddns/ispconfigddns_test.go | 8 +++---- providers/dns/iwantmyname/iwantmyname.go | 5 +++-- providers/dns/jdcloud/jdcloud.go | 6 ++--- providers/dns/jdcloud/jdcloud_test.go | 8 +++---- providers/dns/joker/joker_test.go | 4 ++-- providers/dns/joker/provider_dmapi.go | 12 ++++------ providers/dns/joker/provider_svc.go | 12 ++++------ providers/dns/keyhelp/keyhelp.go | 8 ++----- providers/dns/keyhelp/keyhelp_test.go | 8 +++---- providers/dns/liara/liara.go | 8 ++----- providers/dns/liara/liara_test.go | 4 ++-- providers/dns/lightsail/lightsail.go | 6 ++--- .../lightsail/lightsail_integration_test.go | 4 ++-- providers/dns/lightsail/lightsail_test.go | 2 +- providers/dns/limacity/limacity.go | 8 ++----- providers/dns/limacity/limacity_test.go | 4 ++-- providers/dns/linode/linode.go | 8 ++----- providers/dns/linode/linode_test.go | 4 ++-- providers/dns/liquidweb/liquidweb.go | 5 ++--- providers/dns/liquidweb/liquidweb_test.go | 12 +++++----- providers/dns/loopia/loopia.go | 8 ++----- providers/dns/loopia/loopia_mock_test.go | 22 +++++++++---------- providers/dns/loopia/loopia_test.go | 4 ++-- providers/dns/luadns/luadns.go | 6 ++--- providers/dns/luadns/luadns_test.go | 4 ++-- providers/dns/mailinabox/mailinabox.go | 6 ++--- providers/dns/mailinabox/mailinabox_test.go | 4 ++-- providers/dns/manageengine/manageengine.go | 8 ++----- .../dns/manageengine/manageengine_test.go | 4 ++-- providers/dns/manual/manual.go | 6 ++--- providers/dns/manual/manual_test.go | 4 ++-- providers/dns/metaname/metaname.go | 8 ++----- providers/dns/metaname/metaname_test.go | 4 ++-- providers/dns/metaregistrar/metaregistrar.go | 8 ++----- .../dns/metaregistrar/metaregistrar_test.go | 4 ++-- providers/dns/mijnhost/mijnhost.go | 8 ++----- providers/dns/mijnhost/mijnhost_test.go | 4 ++-- providers/dns/mittwald/mittwald.go | 6 ++--- providers/dns/mittwald/mittwald_test.go | 4 ++-- providers/dns/myaddr/myaddr.go | 6 ++--- providers/dns/myaddr/myaddr_test.go | 4 ++-- providers/dns/mydnsjp/mydnsjp.go | 6 ++--- providers/dns/mydnsjp/mydnsjp_test.go | 4 ++-- providers/dns/mythicbeasts/mythicbeasts.go | 8 ++----- .../dns/mythicbeasts/mythicbeasts_test.go | 4 ++-- providers/dns/namecheap/namecheap.go | 8 ++----- providers/dns/namecheap/namecheap_test.go | 4 ++-- providers/dns/namedotcom/namedotcom.go | 6 ++--- providers/dns/namedotcom/namedotcom_test.go | 4 ++-- providers/dns/namesilo/namesilo.go | 8 ++----- providers/dns/namesilo/namesilo_test.go | 4 ++-- .../dns/nearlyfreespeech/nearlyfreespeech.go | 8 ++----- .../nearlyfreespeech/nearlyfreespeech_test.go | 4 ++-- providers/dns/neodigit/neodigit.go | 9 ++++---- providers/dns/neodigit/neodigit_test.go | 4 ++-- providers/dns/netcup/netcup.go | 8 ++----- providers/dns/netcup/netcup_test.go | 4 ++-- providers/dns/netlify/netlify.go | 8 ++----- providers/dns/netlify/netlify_test.go | 4 ++-- providers/dns/nicmanager/nicmanager.go | 8 ++----- providers/dns/nicmanager/nicmanager_test.go | 4 ++-- providers/dns/nicru/nicru.go | 8 ++----- providers/dns/nicru/nicru_test.go | 4 ++-- providers/dns/nifcloud/nifcloud.go | 8 ++----- providers/dns/nifcloud/nifcloud_test.go | 4 ++-- providers/dns/njalla/njalla.go | 6 ++--- providers/dns/njalla/njalla_test.go | 4 ++-- providers/dns/nodion/nodion.go | 8 ++----- providers/dns/nodion/nodion_test.go | 4 ++-- providers/dns/ns1/ns1.go | 6 ++--- providers/dns/ns1/ns1_test.go | 4 ++-- providers/dns/octenium/octenium.go | 8 ++----- providers/dns/octenium/octenium_test.go | 8 +++---- providers/dns/oraclecloud/oraclecloud.go | 8 ++----- providers/dns/oraclecloud/oraclecloud_test.go | 4 ++-- providers/dns/otc/internal/client_test.go | 15 ++++++------- providers/dns/otc/otc.go | 8 ++----- providers/dns/otc/otc_test.go | 16 +++++++------- providers/dns/ovh/ovh.go | 8 ++----- providers/dns/ovh/ovh_test.go | 4 ++-- providers/dns/pdns/pdns.go | 8 ++----- providers/dns/pdns/pdns_test.go | 8 +++---- providers/dns/plesk/plesk.go | 7 ++---- providers/dns/plesk/plesk_test.go | 4 ++-- providers/dns/porkbun/porkbun.go | 8 ++----- providers/dns/porkbun/porkbun_test.go | 4 ++-- providers/dns/rackspace/rackspace.go | 6 ++--- providers/dns/rackspace/rackspace_test.go | 8 +++---- providers/dns/rainyun/rainyun.go | 6 ++--- providers/dns/rainyun/rainyun_test.go | 4 ++-- providers/dns/rcodezero/rcodezero.go | 6 ++--- providers/dns/rcodezero/rcodezero_test.go | 4 ++-- providers/dns/regfish/regfish.go | 6 ++--- providers/dns/regfish/regfish_test.go | 4 ++-- providers/dns/regru/regru.go | 8 ++----- providers/dns/regru/regru_test.go | 4 ++-- providers/dns/rfc2136/rfc2136.go | 6 ++--- providers/dns/rfc2136/rfc2136_test.go | 10 ++++----- providers/dns/rimuhosting/rimuhosting.go | 9 ++++---- providers/dns/rimuhosting/rimuhosting_test.go | 4 ++-- providers/dns/route53/route53.go | 6 ++--- .../dns/route53/route53_integration_test.go | 4 ++-- providers/dns/route53/route53_test.go | 2 +- providers/dns/safedns/safedns.go | 8 ++----- providers/dns/safedns/safedns_test.go | 4 ++-- providers/dns/sakuracloud/sakuracloud.go | 6 ++--- providers/dns/sakuracloud/sakuracloud_test.go | 4 ++-- providers/dns/scaleway/scaleway.go | 10 ++++----- providers/dns/scaleway/scaleway_test.go | 4 ++-- providers/dns/selectel/selectel.go | 9 ++++---- providers/dns/selectel/selectel_test.go | 4 ++-- providers/dns/selectelv2/selectelv2.go | 8 ++----- providers/dns/selectelv2/selectelv2_test.go | 4 ++-- providers/dns/selfhostde/selfhostde.go | 6 ++--- providers/dns/selfhostde/selfhostde_test.go | 4 ++-- providers/dns/servercow/servercow.go | 8 ++----- providers/dns/servercow/servercow_test.go | 4 ++-- providers/dns/shellrent/shellrent.go | 6 ++--- providers/dns/shellrent/shellrent_test.go | 4 ++-- providers/dns/simply/simply.go | 8 ++----- providers/dns/simply/simply_test.go | 4 ++-- providers/dns/sonic/sonic.go | 6 ++--- providers/dns/sonic/sonic_test.go | 4 ++-- providers/dns/spaceship/spaceship.go | 8 ++----- providers/dns/spaceship/spaceship_test.go | 4 ++-- providers/dns/stackpath/stackpath.go | 6 ++--- providers/dns/stackpath/stackpath_test.go | 4 ++-- providers/dns/syse/syse.go | 8 ++----- providers/dns/syse/syse_test.go | 8 +++---- providers/dns/technitium/technitium.go | 6 ++--- providers/dns/technitium/technitium_test.go | 4 ++-- providers/dns/tencentcloud/tencentcloud.go | 6 ++--- .../dns/tencentcloud/tencentcloud_test.go | 4 ++-- providers/dns/timewebcloud/timewebcloud.go | 8 ++----- .../dns/timewebcloud/timewebcloud_test.go | 4 ++-- providers/dns/todaynic/todaynic.go | 7 ++---- providers/dns/todaynic/todaynic_test.go | 8 +++---- providers/dns/transip/transip.go | 6 ++--- providers/dns/transip/transip_test.go | 4 ++-- providers/dns/ultradns/ultradns.go | 6 ++--- providers/dns/ultradns/ultradns_test.go | 4 ++-- providers/dns/uniteddomains/uniteddomains.go | 9 ++++---- .../dns/uniteddomains/uniteddomains_test.go | 4 ++-- providers/dns/variomedia/variomedia.go | 7 ++---- providers/dns/variomedia/variomedia_test.go | 4 ++-- providers/dns/vegadns/vegadns.go | 8 ++----- providers/dns/vegadns/vegadns_test.go | 4 ++-- providers/dns/vercel/vercel.go | 8 ++----- providers/dns/vercel/vercel_test.go | 4 ++-- providers/dns/versio/versio.go | 8 ++----- providers/dns/versio/versio_test.go | 8 +++---- providers/dns/vinyldns/vinyldns.go | 8 ++----- providers/dns/vinyldns/vinyldns_test.go | 8 +++---- providers/dns/virtualname/virtualname.go | 9 ++++---- providers/dns/virtualname/virtualname_test.go | 4 ++-- providers/dns/vkcloud/vkcloud.go | 6 ++--- providers/dns/vkcloud/vkcloud_test.go | 4 ++-- providers/dns/volcengine/volcengine.go | 7 ++---- providers/dns/volcengine/volcengine_test.go | 4 ++-- providers/dns/vscale/vscale.go | 9 ++++---- providers/dns/vscale/vscale_test.go | 4 ++-- providers/dns/vultr/vultr.go | 8 ++----- providers/dns/vultr/vultr_test.go | 4 ++-- providers/dns/webnames/webnames.go | 8 ++----- providers/dns/webnames/webnames_test.go | 4 ++-- providers/dns/webnamesca/webnamesca.go | 8 ++----- providers/dns/webnamesca/webnamesca_test.go | 8 +++---- providers/dns/websupport/websupport.go | 9 ++++---- providers/dns/websupport/websupport_test.go | 4 ++-- providers/dns/wedos/wedos.go | 8 ++----- providers/dns/wedos/wedos_test.go | 4 ++-- providers/dns/westcn/westcn.go | 9 ++++---- providers/dns/westcn/westcn_test.go | 4 ++-- providers/dns/yandex/yandex.go | 6 ++--- providers/dns/yandex/yandex_test.go | 4 ++-- providers/dns/yandex360/yandex360.go | 8 ++----- providers/dns/yandex360/yandex360_test.go | 4 ++-- providers/dns/yandexcloud/yandexcloud.go | 8 ++----- providers/dns/yandexcloud/yandexcloud_test.go | 4 ++-- providers/dns/zoneedit/internal/client.go | 13 ++++++----- .../dns/zoneedit/internal/client_test.go | 8 +++---- providers/dns/zoneedit/zoneedit.go | 10 ++++----- providers/dns/zoneedit/zoneedit_test.go | 4 ++-- providers/dns/zoneee/zoneee.go | 8 ++----- providers/dns/zoneee/zoneee_test.go | 8 +++---- providers/dns/zonomi/zonomi.go | 9 ++++---- providers/dns/zonomi/zonomi_test.go | 4 ++-- providers/http/memcached/memcached.go | 5 +++-- providers/http/memcached/memcached_test.go | 8 +++---- providers/http/s3/s3.go | 8 ++----- providers/http/s3/s3_test.go | 4 ++-- providers/http/webroot/webroot.go | 5 +++-- providers/http/webroot/webroot_test.go | 4 ++-- 410 files changed, 1034 insertions(+), 1555 deletions(-) diff --git a/challenge/dns01/dns_challenge.go b/challenge/dns01/dns_challenge.go index d855eb4b7..9956562f0 100644 --- a/challenge/dns01/dns_challenge.go +++ b/challenge/dns01/dns_challenge.go @@ -77,7 +77,7 @@ func (c *Challenge) PreSolve(ctx context.Context, authz acme.Authorization) erro return err } - err = c.provider.Present(authz.Identifier.Value, chlng.Token, keyAuth) + err = c.provider.Present(ctx, authz.Identifier.Value, chlng.Token, keyAuth) if err != nil { return fmt.Errorf("[%s] acme: error presenting token: %w", domain, err) } @@ -134,7 +134,7 @@ func (c *Challenge) Solve(ctx context.Context, authz acme.Authorization) error { } // CleanUp cleans the challenge. -func (c *Challenge) CleanUp(authz acme.Authorization) error { +func (c *Challenge) CleanUp(ctx context.Context, authz acme.Authorization) error { log.Info("acme: Cleaning DNS-01 challenge.", "domain", challenge.GetTargetedDomain(authz)) chlng, err := challenge.FindChallenge(challenge.DNS01, authz) @@ -147,7 +147,7 @@ func (c *Challenge) CleanUp(authz acme.Authorization) error { return err } - return c.provider.CleanUp(authz.Identifier.Value, chlng.Token, keyAuth) + return c.provider.CleanUp(ctx, authz.Identifier.Value, chlng.Token, keyAuth) } func (c *Challenge) Sequential() (bool, time.Duration) { diff --git a/challenge/dns01/dns_challenge_test.go b/challenge/dns01/dns_challenge_test.go index 8fa26a506..7c8872e7f 100644 --- a/challenge/dns01/dns_challenge_test.go +++ b/challenge/dns01/dns_challenge_test.go @@ -21,17 +21,17 @@ type providerMock struct { present, cleanUp error } -func (p *providerMock) Present(domain, token, keyAuth string) error { return p.present } -func (p *providerMock) CleanUp(domain, token, keyAuth string) error { return p.cleanUp } +func (p *providerMock) Present(_ context.Context, _, _, _ string) error { return p.present } +func (p *providerMock) CleanUp(_ context.Context, _, _, _ string) error { return p.cleanUp } type providerTimeoutMock struct { present, cleanUp error timeout, interval time.Duration } -func (p *providerTimeoutMock) Present(domain, token, keyAuth string) error { return p.present } -func (p *providerTimeoutMock) CleanUp(domain, token, keyAuth string) error { return p.cleanUp } -func (p *providerTimeoutMock) Timeout() (time.Duration, time.Duration) { return p.timeout, p.interval } +func (p *providerTimeoutMock) Present(_ context.Context, _, _, _ string) error { return p.present } +func (p *providerTimeoutMock) CleanUp(_ context.Context, _, _, _ string) error { return p.cleanUp } +func (p *providerTimeoutMock) Timeout() (time.Duration, time.Duration) { return p.timeout, p.interval } func TestChallenge_PreSolve(t *testing.T) { server := tester.MockACMEServer().BuildHTTPS(t) @@ -285,7 +285,7 @@ func TestChallenge_CleanUp(t *testing.T) { }, } - err = chlg.CleanUp(authz) + err = chlg.CleanUp(t.Context(), authz) if test.expectError { require.Error(t, err) } else { diff --git a/challenge/http01/http_challenge.go b/challenge/http01/http_challenge.go index 57424490c..c27ae12b5 100644 --- a/challenge/http01/http_challenge.go +++ b/challenge/http01/http_challenge.go @@ -67,13 +67,13 @@ func (c *Challenge) Solve(ctx context.Context, authz acme.Authorization) error { return err } - err = c.provider.Present(authz.Identifier.Value, chlng.Token, keyAuth) + err = c.provider.Present(ctx, authz.Identifier.Value, chlng.Token, keyAuth) if err != nil { return fmt.Errorf("[%s] acme: error presenting token: %w", domain, err) } defer func() { - err := c.provider.CleanUp(authz.Identifier.Value, chlng.Token, keyAuth) + err := c.provider.CleanUp(ctx, authz.Identifier.Value, chlng.Token, keyAuth) if err != nil { log.Warn("acme: cleaning up failed.", "domain", domain, "error", err) } diff --git a/challenge/http01/http_challenge_server.go b/challenge/http01/http_challenge_server.go index 7960171ed..7350f6213 100644 --- a/challenge/http01/http_challenge_server.go +++ b/challenge/http01/http_challenge_server.go @@ -1,6 +1,7 @@ package http01 import ( + "context" "fmt" "io/fs" "net" @@ -75,7 +76,7 @@ func NewUnixProviderServer(socketPath string, socketMode fs.FileMode) *ProviderS } // Present starts a web server and makes the token available at `ChallengePath(token)` for web requests. -func (s *ProviderServer) Present(domain, token, keyAuth string) error { +func (s *ProviderServer) Present(ctx context.Context, domain, token, keyAuth string) error { var err error s.listener, err = net.Listen(s.network, s.GetAddress()) @@ -97,7 +98,7 @@ func (s *ProviderServer) Present(domain, token, keyAuth string) error { } // CleanUp closes the HTTP server and removes the token from `ChallengePath(token)`. -func (s *ProviderServer) CleanUp(domain, token, keyAuth string) error { +func (s *ProviderServer) CleanUp(ctx context.Context, domain, token, keyAuth string) error { if s.listener == nil { return nil } diff --git a/challenge/provider.go b/challenge/provider.go index d7cc213f7..396ab1bc6 100644 --- a/challenge/provider.go +++ b/challenge/provider.go @@ -1,14 +1,17 @@ package challenge -import "time" +import ( + "context" + "time" +) // Provider enables implementing a custom challenge // provider. Present presents the solution to a challenge available to // be solved. CleanUp will be called by the challenge if Present ends // in a non-error state. type Provider interface { - Present(domain, token, keyAuth string) error - CleanUp(domain, token, keyAuth string) error + Present(ctx context.Context, domain, token, keyAuth string) error + CleanUp(ctx context.Context, domain, token, keyAuth string) error } // ProviderTimeout allows for implementing a diff --git a/challenge/resolver/prober.go b/challenge/resolver/prober.go index ea8f9a512..f36f8e1f8 100644 --- a/challenge/resolver/prober.go +++ b/challenge/resolver/prober.go @@ -23,7 +23,7 @@ type preSolver interface { // Interface for challenges like dns, where we can solve all the challenges before to delete them. type cleanup interface { - CleanUp(authorization acme.Authorization) error + CleanUp(ctx context.Context, authorization acme.Authorization) error } type sequential interface { @@ -108,7 +108,7 @@ func sequentialSolve(ctx context.Context, authSolvers []*selectedAuthSolver, fai if err != nil { failures[domain] = err - cleanUp(authSolver.solver, authSolver.authz) + cleanUp(ctx, authSolver.solver, authSolver.authz) continue } @@ -119,13 +119,13 @@ func sequentialSolve(ctx context.Context, authSolvers []*selectedAuthSolver, fai if err != nil { failures[domain] = err - cleanUp(authSolver.solver, authSolver.authz) + cleanUp(ctx, authSolver.solver, authSolver.authz) continue } // Clean challenge - cleanUp(authSolver.solver, authSolver.authz) + cleanUp(ctx, authSolver.solver, authSolver.authz) if len(authSolvers)-1 > i { solvr := authSolver.solver.(sequential) @@ -151,7 +151,7 @@ func parallelSolve(ctx context.Context, authSolvers []*selectedAuthSolver, failu defer func() { // Clean all created TXT records for _, authSolver := range authSolvers { - cleanUp(authSolver.solver, authSolver.authz) + cleanUp(ctx, authSolver.solver, authSolver.authz) } }() @@ -172,11 +172,11 @@ func parallelSolve(ctx context.Context, authSolvers []*selectedAuthSolver, failu } } -func cleanUp(solvr solver, authz acme.Authorization) { +func cleanUp(ctx context.Context, solvr solver, authz acme.Authorization) { if solvr, ok := solvr.(cleanup); ok { domain := challenge.GetTargetedDomain(authz) - err := solvr.CleanUp(authz) + err := solvr.CleanUp(ctx, authz) if err != nil { log.Warn("acme: cleaning up failed.", "domain", domain, "error", err) } diff --git a/challenge/tlsalpn01/tls_alpn_challenge.go b/challenge/tlsalpn01/tls_alpn_challenge.go index 7fa133f2e..5c214567c 100644 --- a/challenge/tlsalpn01/tls_alpn_challenge.go +++ b/challenge/tlsalpn01/tls_alpn_challenge.go @@ -73,13 +73,13 @@ func (c *Challenge) Solve(ctx context.Context, authz acme.Authorization) error { return err } - err = c.provider.Present(domain, chlng.Token, keyAuth) + err = c.provider.Present(ctx, domain, chlng.Token, keyAuth) if err != nil { return fmt.Errorf("[%s] acme: error presenting token: %w", challenge.GetTargetedDomain(authz), err) } defer func() { - err := c.provider.CleanUp(domain, chlng.Token, keyAuth) + err := c.provider.CleanUp(ctx, domain, chlng.Token, keyAuth) if err != nil { log.Warn("acme: cleaning up failed.", "domain", challenge.GetTargetedDomain(authz), err) } diff --git a/challenge/tlsalpn01/tls_alpn_challenge_server.go b/challenge/tlsalpn01/tls_alpn_challenge_server.go index 4fdf2c810..583c977ee 100644 --- a/challenge/tlsalpn01/tls_alpn_challenge_server.go +++ b/challenge/tlsalpn01/tls_alpn_challenge_server.go @@ -1,6 +1,7 @@ package tlsalpn01 import ( + "context" "crypto/tls" "errors" "fmt" @@ -66,7 +67,7 @@ func NewProviderServer(host, port string) *ProviderServer { // Present generates a certificate with an SHA-256 digest of the keyAuth provided // as the acmeValidation-v1 extension value to conform to the ACME-TLS-ALPN spec. -func (s *ProviderServer) Present(domain, token, keyAuth string) error { +func (s *ProviderServer) Present(ctx context.Context, domain, token, keyAuth string) error { // Generate the challenge certificate using the provided keyAuth and domain. cert, err := ChallengeCert(domain, keyAuth) if err != nil { @@ -101,7 +102,7 @@ func (s *ProviderServer) Present(domain, token, keyAuth string) error { } // CleanUp closes the HTTPS server. -func (s *ProviderServer) CleanUp(domain, token, keyAuth string) error { +func (s *ProviderServer) CleanUp(ctx context.Context, domain, token, keyAuth string) error { if s.listener == nil { return nil } diff --git a/providers/dns/acmedns/acmedns.go b/providers/dns/acmedns/acmedns.go index e4e5508a1..8154e4b1a 100644 --- a/providers/dns/acmedns/acmedns.go +++ b/providers/dns/acmedns/acmedns.go @@ -164,9 +164,7 @@ func (e ErrCNAMERequired) Error() string { // If there is not an account for the given domain present in the DNSProvider storage // one will be created and registered with the ACME DNS server and an ErrCNAMERequired error is returned. // This will halt issuance and indicate to the user that a one-time manual setup is required for the domain. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { // Compute the challenge response FQDN and TXT value for the domain based on the keyAuth. info := dns01.GetChallengeInfo(ctx, domain, keyAuth) @@ -191,7 +189,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { // CleanUp removes the record matching the specified parameters. It is not // implemented for the ACME-DNS provider. -func (d *DNSProvider) CleanUp(_, _, _ string) error { +func (d *DNSProvider) CleanUp(_ context.Context, _, _, _ string) error { // ACME-DNS doesn't support the notion of removing a record. // For users of ACME-DNS it is expected the stale records remain in-place. return nil diff --git a/providers/dns/acmedns/acmedns_test.go b/providers/dns/acmedns/acmedns_test.go index 2bcb49034..6a8d9fe25 100644 --- a/providers/dns/acmedns/acmedns_test.go +++ b/providers/dns/acmedns/acmedns_test.go @@ -70,7 +70,7 @@ func TestPresent(t *testing.T) { p.storage = test.Storage } - err := p.Present(egDomain, "foo", egKeyAuth) + err := p.Present(t.Context(), egDomain, "foo", egKeyAuth) if test.ExpectedError != nil { assert.Equal(t, test.ExpectedError, err) } else { @@ -182,7 +182,7 @@ func TestPresent_httpStorage(t *testing.T) { client := newMockClient().WithRegisterAccount(egTestAccount) provider.client = client - err := provider.Present(egDomain, "foo", egKeyAuth) + err := provider.Present(t.Context(), egDomain, "foo", egKeyAuth) if test.ExpectedError != nil { assert.EqualError(t, err, test.ExpectedError.Error()) assert.True(t, client.registerAccountCalled) diff --git a/providers/dns/acmedns/mock_test.go b/providers/dns/acmedns/mock_test.go index a09a3ca91..5d1103a4d 100644 --- a/providers/dns/acmedns/mock_test.go +++ b/providers/dns/acmedns/mock_test.go @@ -153,7 +153,7 @@ func (m *mockStorage) WithPutError(err error) *mockStorage { } func (m *mockStorage) WithSaveError(err error) *mockStorage { - m.save = func(ctx context.Context) error { + m.save = func(_ context.Context) error { return err } diff --git a/providers/dns/active24/active24.go b/providers/dns/active24/active24.go index 2244b1054..0aad62d90 100644 --- a/providers/dns/active24/active24.go +++ b/providers/dns/active24/active24.go @@ -2,6 +2,7 @@ package active24 import ( + "context" "errors" "fmt" "net/http" @@ -77,8 +78,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("active24: %w", err) } @@ -87,8 +88,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("active24: %w", err) } diff --git a/providers/dns/active24/active24_test.go b/providers/dns/active24/active24_test.go index 8d151f7c2..130b90cd4 100644 --- a/providers/dns/active24/active24_test.go +++ b/providers/dns/active24/active24_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/alidns/alidns.go b/providers/dns/alidns/alidns.go index 69367e9ba..738bd79fa 100644 --- a/providers/dns/alidns/alidns.go +++ b/providers/dns/alidns/alidns.go @@ -151,9 +151,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneName, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -175,9 +173,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records, err := d.findTxtRecords(ctx, info.EffectiveFQDN) diff --git a/providers/dns/alidns/alidns_test.go b/providers/dns/alidns/alidns_test.go index 27c965866..be1a3a7e6 100644 --- a/providers/dns/alidns/alidns_test.go +++ b/providers/dns/alidns/alidns_test.go @@ -147,7 +147,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -163,6 +163,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/aliesa/aliesa.go b/providers/dns/aliesa/aliesa.go index a11f6f5ab..e895cfca9 100644 --- a/providers/dns/aliesa/aliesa.go +++ b/providers/dns/aliesa/aliesa.go @@ -158,9 +158,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) siteID, err := d.getSiteID(ctx, info.EffectiveFQDN) @@ -189,9 +187,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // gets the record's unique ID diff --git a/providers/dns/aliesa/aliesa_test.go b/providers/dns/aliesa/aliesa_test.go index 556e1490b..b5c53de0a 100644 --- a/providers/dns/aliesa/aliesa_test.go +++ b/providers/dns/aliesa/aliesa_test.go @@ -146,6 +146,6 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/allinkl/allinkl.go b/providers/dns/allinkl/allinkl.go index 06e51446a..32eab39a0 100644 --- a/providers/dns/allinkl/allinkl.go +++ b/providers/dns/allinkl/allinkl.go @@ -118,9 +118,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -160,8 +158,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) credential, err := d.identifier.Authentication(ctx, 60, true) diff --git a/providers/dns/allinkl/allinkl_test.go b/providers/dns/allinkl/allinkl_test.go index 0f1c73b1c..d0604c03a 100644 --- a/providers/dns/allinkl/allinkl_test.go +++ b/providers/dns/allinkl/allinkl_test.go @@ -126,7 +126,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -140,6 +140,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/alwaysdata/alwaysdata.go b/providers/dns/alwaysdata/alwaysdata.go index fb1cd96ca..d9c7ccc9a 100644 --- a/providers/dns/alwaysdata/alwaysdata.go +++ b/providers/dns/alwaysdata/alwaysdata.go @@ -94,9 +94,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.findZone(ctx, info.EffectiveFQDN) @@ -127,9 +125,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.findZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/alwaysdata/alwaysdata_test.go b/providers/dns/alwaysdata/alwaysdata_test.go index e5b9c9d36..f3fe220ac 100644 --- a/providers/dns/alwaysdata/alwaysdata_test.go +++ b/providers/dns/alwaysdata/alwaysdata_test.go @@ -115,7 +115,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -129,7 +129,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -164,7 +164,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("record_add-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -182,6 +182,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { servermock.Noop()). Build(t) - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/anexia/anexia.go b/providers/dns/anexia/anexia.go index 49062dede..af15d7cb4 100644 --- a/providers/dns/anexia/anexia.go +++ b/providers/dns/anexia/anexia.go @@ -122,9 +122,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -157,9 +155,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/anexia/anexia_test.go b/providers/dns/anexia/anexia_test.go index b823885df..5af52af55 100644 --- a/providers/dns/anexia/anexia_test.go +++ b/providers/dns/anexia/anexia_test.go @@ -107,7 +107,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -123,7 +123,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -151,7 +151,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("create_record-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -163,6 +163,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { servermock.Noop()). Build(t) - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/arvancloud/arvancloud.go b/providers/dns/arvancloud/arvancloud.go index 5238e35f9..d3e76ae05 100644 --- a/providers/dns/arvancloud/arvancloud.go +++ b/providers/dns/arvancloud/arvancloud.go @@ -112,9 +112,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -155,9 +153,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/arvancloud/arvancloud_test.go b/providers/dns/arvancloud/arvancloud_test.go index 1f5e22348..6285fe87d 100644 --- a/providers/dns/arvancloud/arvancloud_test.go +++ b/providers/dns/arvancloud/arvancloud_test.go @@ -109,7 +109,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -123,6 +123,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/auroradns/auroradns.go b/providers/dns/auroradns/auroradns.go index f5b9dcffc..ecaee31bc 100644 --- a/providers/dns/auroradns/auroradns.go +++ b/providers/dns/auroradns/auroradns.go @@ -110,8 +110,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -155,8 +154,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes a given record that was generated by Present. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/auroradns/auroradns_test.go b/providers/dns/auroradns/auroradns_test.go index 2496f3ed0..f61c400a7 100644 --- a/providers/dns/auroradns/auroradns_test.go +++ b/providers/dns/auroradns/auroradns_test.go @@ -160,7 +160,7 @@ func TestDNSProvider_Present(t *testing.T) { WithStatusCode(http.StatusCreated)). Build(t) - err := provider.Present("example.com", "", "foobar") + err := provider.Present(t.Context(), "example.com", "", "foobar") require.NoError(t, err) } @@ -185,9 +185,9 @@ func TestDNSProvider_CleanUp(t *testing.T) { WithStatusCode(http.StatusCreated)). Build(t) - err := provider.Present("example.com", "", "foobar") + err := provider.Present(t.Context(), "example.com", "", "foobar") require.NoError(t, err) - err = provider.CleanUp("example.com", "", "foobar") + err = provider.CleanUp(t.Context(), "example.com", "", "foobar") require.NoError(t, err) } diff --git a/providers/dns/autodns/autodns.go b/providers/dns/autodns/autodns.go index 3295ca4fa..0de765a38 100644 --- a/providers/dns/autodns/autodns.go +++ b/providers/dns/autodns/autodns.go @@ -118,8 +118,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records := []*internal.ResourceRecord{{ @@ -138,8 +137,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record previously created. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records := []*internal.ResourceRecord{{ diff --git a/providers/dns/autodns/autodns_test.go b/providers/dns/autodns/autodns_test.go index c6e8d7341..4fa7d442d 100644 --- a/providers/dns/autodns/autodns_test.go +++ b/providers/dns/autodns/autodns_test.go @@ -136,7 +136,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -150,6 +150,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/axelname/axelname.go b/providers/dns/axelname/axelname.go index 9da89535e..a1359fd53 100644 --- a/providers/dns/axelname/axelname.go +++ b/providers/dns/axelname/axelname.go @@ -94,9 +94,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -124,9 +122,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/axelname/axelname_test.go b/providers/dns/axelname/axelname_test.go index bb5f38f70..14c29ab75 100644 --- a/providers/dns/axelname/axelname_test.go +++ b/providers/dns/axelname/axelname_test.go @@ -125,7 +125,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -139,6 +139,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/azion/azion.go b/providers/dns/azion/azion.go index e306cb750..8eabb96d7 100644 --- a/providers/dns/azion/azion.go +++ b/providers/dns/azion/azion.go @@ -105,8 +105,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) ctxAuth := authContext(ctx, d.config.PersonalToken) @@ -161,8 +160,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) ctxAuth := authContext(ctx, d.config.PersonalToken) diff --git a/providers/dns/azion/azion_test.go b/providers/dns/azion/azion_test.go index 04eec330f..3b8cbdb6b 100644 --- a/providers/dns/azion/azion_test.go +++ b/providers/dns/azion/azion_test.go @@ -1,7 +1,6 @@ package azion import ( - "context" "net/http/httptest" "testing" @@ -104,7 +103,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -118,7 +117,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -168,7 +167,7 @@ func TestDNSProvider_findZone(t *testing.T) { for _, test := range testCases { t.Run(test.desc, func(t *testing.T) { - zone, err := provider.findZone(context.Background(), test.fqdn) + zone, err := provider.findZone(t.Context(), test.fqdn) require.NoError(t, err) assert.Equal(t, test.expected, zone) @@ -203,7 +202,7 @@ func TestDNSProvider_findZone_error(t *testing.T) { Route("GET /intelligent_dns", servermock.ResponseFromFixture(test.response)). Build(t) - zone, err := provider.findZone(context.Background(), test.fqdn) + zone, err := provider.findZone(t.Context(), test.fqdn) require.EqualError(t, err, test.expected) assert.Nil(t, zone) diff --git a/providers/dns/azure/azure.go b/providers/dns/azure/azure.go index c0a6a09e4..bc85fd108 100644 --- a/providers/dns/azure/azure.go +++ b/providers/dns/azure/azure.go @@ -3,6 +3,7 @@ package azure import ( + "context" "errors" "fmt" "io" @@ -197,13 +198,13 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - return d.provider.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + return d.provider.Present(ctx, domain, token, keyAuth) } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - return d.provider.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + return d.provider.CleanUp(ctx, domain, token, keyAuth) } func getAuthorizer(config *Config) (autorest.Authorizer, error) { diff --git a/providers/dns/azure/azure_test.go b/providers/dns/azure/azure_test.go index f82a9f3b9..1b05b662e 100644 --- a/providers/dns/azure/azure_test.go +++ b/providers/dns/azure/azure_test.go @@ -200,7 +200,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -216,6 +216,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/azure/private.go b/providers/dns/azure/private.go index c56dc5f28..78d50a05e 100644 --- a/providers/dns/azure/private.go +++ b/providers/dns/azure/private.go @@ -26,8 +26,7 @@ func (d *dnsProviderPrivate) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *dnsProviderPrivate) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *dnsProviderPrivate) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) @@ -87,8 +86,7 @@ func (d *dnsProviderPrivate) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *dnsProviderPrivate) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *dnsProviderPrivate) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) diff --git a/providers/dns/azure/public.go b/providers/dns/azure/public.go index 512c69a1d..68e5bc67d 100644 --- a/providers/dns/azure/public.go +++ b/providers/dns/azure/public.go @@ -26,8 +26,7 @@ func (d *dnsProviderPublic) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *dnsProviderPublic) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *dnsProviderPublic) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) @@ -87,8 +86,7 @@ func (d *dnsProviderPublic) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *dnsProviderPublic) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *dnsProviderPublic) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) diff --git a/providers/dns/azuredns/azuredns.go b/providers/dns/azuredns/azuredns.go index ada72acae..5a9487b06 100644 --- a/providers/dns/azuredns/azuredns.go +++ b/providers/dns/azuredns/azuredns.go @@ -3,6 +3,7 @@ package azuredns import ( + "context" "errors" "fmt" "net/http" @@ -202,11 +203,11 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - return d.provider.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + return d.provider.Present(ctx, domain, token, keyAuth) } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - return d.provider.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + return d.provider.CleanUp(ctx, domain, token, keyAuth) } diff --git a/providers/dns/azuredns/azuredns_test.go b/providers/dns/azuredns/azuredns_test.go index ae515c27c..a176bb258 100644 --- a/providers/dns/azuredns/azuredns_test.go +++ b/providers/dns/azuredns/azuredns_test.go @@ -66,7 +66,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -82,6 +82,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/azuredns/oidc.go b/providers/dns/azuredns/oidc.go index aa98d55e7..0cd3e0082 100644 --- a/providers/dns/azuredns/oidc.go +++ b/providers/dns/azuredns/oidc.go @@ -50,15 +50,15 @@ func getOIDCAssertion(config *Config) func(ctx context.Context) (string, error) } if token == "" && config.OIDCRequestURL != "" && config.OIDCRequestToken != "" { - return getOIDCToken(config) + return getOIDCToken(ctx, config) } return token, nil } } -func getOIDCToken(config *Config) (string, error) { - req, err := http.NewRequest(http.MethodGet, config.OIDCRequestURL, http.NoBody) +func getOIDCToken(ctx context.Context, config *Config) (string, error) { + req, err := http.NewRequestWithContext(ctx, http.MethodGet, config.OIDCRequestURL, http.NoBody) if err != nil { return "", fmt.Errorf("azuredns: failed to build OIDC request: %w", err) } diff --git a/providers/dns/azuredns/private.go b/providers/dns/azuredns/private.go index 9b69c6481..2c990f0ed 100644 --- a/providers/dns/azuredns/private.go +++ b/providers/dns/azuredns/private.go @@ -47,8 +47,7 @@ func (d *DNSProviderPrivate) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProviderPrivate) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProviderPrivate) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -100,8 +99,7 @@ func (d *DNSProviderPrivate) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProviderPrivate) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProviderPrivate) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/azuredns/public.go b/providers/dns/azuredns/public.go index 4f562e8e9..05e2ff319 100644 --- a/providers/dns/azuredns/public.go +++ b/providers/dns/azuredns/public.go @@ -47,8 +47,7 @@ func (d *DNSProviderPublic) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProviderPublic) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProviderPublic) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -99,8 +98,7 @@ func (d *DNSProviderPublic) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProviderPublic) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProviderPublic) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/baiducloud/baiducloud.go b/providers/dns/baiducloud/baiducloud.go index d5bee6a4a..bf51f1f7f 100644 --- a/providers/dns/baiducloud/baiducloud.go +++ b/providers/dns/baiducloud/baiducloud.go @@ -89,11 +89,10 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) - authZone, err := dns01.DefaultClient().FindZoneByFqdn(context.Background(), info.EffectiveFQDN) + authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) if err != nil { return fmt.Errorf("baiducloud: could not find zone for domain %q: %w", domain, err) } @@ -120,11 +119,10 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) - authZone, err := dns01.DefaultClient().FindZoneByFqdn(context.Background(), info.EffectiveFQDN) + authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) if err != nil { return fmt.Errorf("baiducloud: could not find zone for domain %q: %w", domain, err) } diff --git a/providers/dns/baiducloud/baiducloud_test.go b/providers/dns/baiducloud/baiducloud_test.go index d94a27382..b9e3fcf9a 100644 --- a/providers/dns/baiducloud/baiducloud_test.go +++ b/providers/dns/baiducloud/baiducloud_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/beget/beget.go b/providers/dns/beget/beget.go index 23c181307..41eda8f54 100644 --- a/providers/dns/beget/beget.go +++ b/providers/dns/beget/beget.go @@ -103,9 +103,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records, err := d.client.GetTXTRecords(ctx, dns01.UnFqdn(info.EffectiveFQDN)) @@ -130,9 +128,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records, err := d.client.GetTXTRecords(ctx, dns01.UnFqdn(info.EffectiveFQDN)) diff --git a/providers/dns/beget/beget_test.go b/providers/dns/beget/beget_test.go index f577f76f3..d9542bb20 100644 --- a/providers/dns/beget/beget_test.go +++ b/providers/dns/beget/beget_test.go @@ -137,7 +137,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() assert.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") assert.NoError(t, err) } @@ -151,7 +151,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() assert.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") assert.NoError(t, err) } @@ -194,7 +194,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "", "123d==") + err := provider.Present(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -212,7 +212,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { ). Build(t) - err := provider.CleanUp("example.com", "", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -227,6 +227,6 @@ func TestDNSProvider_CleanUp_empty(t *testing.T) { servermock.Noop().WithStatusCode(http.StatusInternalServerError)). Build(t) - err := provider.CleanUp("example.com", "", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/beget/internal/client_test.go b/providers/dns/beget/internal/client_test.go index 5956b934c..034c2c41d 100644 --- a/providers/dns/beget/internal/client_test.go +++ b/providers/dns/beget/internal/client_test.go @@ -1,7 +1,6 @@ package internal import ( - "context" "net/http/httptest" "net/url" "testing" @@ -38,7 +37,7 @@ func TestClient_GetTXTRecords(t *testing.T) { ). Build(t) - data, err := client.GetTXTRecords(context.Background(), "example.com") + data, err := client.GetTXTRecords(t.Context(), "example.com") require.NoError(t, err) expected := []Record{{Data: "v=spf1 redirect=beget.com", TTL: 300}} @@ -57,7 +56,7 @@ func TestClient_ChangeTXTRecord(t *testing.T) { records := []Record{{Value: "txtTXTtxt", TTL: 300, Priority: 10}} - err := client.ChangeTXTRecord(context.Background(), "sub.example.com", records) + err := client.ChangeTXTRecord(t.Context(), "sub.example.com", records) require.NoError(t, err) } @@ -69,7 +68,7 @@ func TestClient_ChangeTXTRecord_error(t *testing.T) { records := []Record{{Data: "txtTXTtxt", TTL: 300}} - err := client.ChangeTXTRecord(context.Background(), "sub.example.com", records) + err := client.ChangeTXTRecord(t.Context(), "sub.example.com", records) require.Error(t, err) require.EqualError(t, err, "API error: NO_SUCH_METHOD: No such method") @@ -83,7 +82,7 @@ func TestClient_ChangeTXTRecord_answer_error(t *testing.T) { records := []Record{{Data: "txtTXTtxt", TTL: 300}} - err := client.ChangeTXTRecord(context.Background(), "sub.example.com", records) + err := client.ChangeTXTRecord(t.Context(), "sub.example.com", records) require.Error(t, err) require.EqualError(t, err, "API answer error: INVALID_DATA: Login length cannot be greater than 12 characters") @@ -98,6 +97,6 @@ func TestClient_ChangeTXTRecord_remove(t *testing.T) { ). Build(t) - err := client.ChangeTXTRecord(context.Background(), "sub.example.com", nil) + err := client.ChangeTXTRecord(t.Context(), "sub.example.com", nil) require.NoError(t, err) } diff --git a/providers/dns/binarylane/binarylane.go b/providers/dns/binarylane/binarylane.go index 96f9063ea..439625d72 100644 --- a/providers/dns/binarylane/binarylane.go +++ b/providers/dns/binarylane/binarylane.go @@ -96,9 +96,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -131,9 +129,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/binarylane/binarylane_test.go b/providers/dns/binarylane/binarylane_test.go index 52e2884d0..cf055f5f0 100644 --- a/providers/dns/binarylane/binarylane_test.go +++ b/providers/dns/binarylane/binarylane_test.go @@ -99,7 +99,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -113,6 +113,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/bindman/bindman.go b/providers/dns/bindman/bindman.go index ffad038eb..e2737c078 100644 --- a/providers/dns/bindman/bindman.go +++ b/providers/dns/bindman/bindman.go @@ -93,8 +93,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { // Present creates a TXT record using the specified parameters. // This will *not* create a subzone to contain the TXT record, // so make sure the FQDN specified is within an extant zone. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) if err := d.client.AddRecord(info.EffectiveFQDN, "TXT", info.Value); err != nil { @@ -105,8 +104,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) if err := d.client.RemoveRecord(info.EffectiveFQDN, "TXT"); err != nil { diff --git a/providers/dns/bindman/bindman_test.go b/providers/dns/bindman/bindman_test.go index eb907cdad..cbcfadf90 100644 --- a/providers/dns/bindman/bindman_test.go +++ b/providers/dns/bindman/bindman_test.go @@ -155,7 +155,7 @@ func TestDNSProvider_Present(t *testing.T) { t.Run(test.name, func(t *testing.T) { provider := test.mock.Build(t) - err := provider.Present(test.domain, test.token, test.keyAuth) + err := provider.Present(t.Context(), test.domain, test.token, test.keyAuth) if test.expectError { require.Error(t, err) } else { @@ -200,7 +200,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { t.Run(test.name, func(t *testing.T) { provider := test.mock.Build(t) - err := provider.CleanUp(test.domain, test.token, test.keyAuth) + err := provider.CleanUp(t.Context(), test.domain, test.token, test.keyAuth) if test.expectError { require.ErrorContains(t, err, "bindman: ERROR (400): bar; ") } else { @@ -220,7 +220,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -236,6 +236,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/bluecat/bluecat.go b/providers/dns/bluecat/bluecat.go index c9b10777a..6a9af0869 100644 --- a/providers/dns/bluecat/bluecat.go +++ b/providers/dns/bluecat/bluecat.go @@ -119,8 +119,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { // Present creates a TXT record using the specified parameters // This will *not* create a sub-zone to contain the TXT record, // so make sure the FQDN specified is within an existent zone. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) ctxAuth, err := d.client.CreateAuthenticatedContext(ctx) @@ -169,8 +168,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) ctxAuth, err := d.client.CreateAuthenticatedContext(ctx) diff --git a/providers/dns/bluecat/bluecat_test.go b/providers/dns/bluecat/bluecat_test.go index 8af449a27..60b628df7 100644 --- a/providers/dns/bluecat/bluecat_test.go +++ b/providers/dns/bluecat/bluecat_test.go @@ -224,7 +224,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -240,6 +240,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(time.Second * 1) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/bookmyname/bookmyname.go b/providers/dns/bookmyname/bookmyname.go index 8786aab4f..41aa69a01 100644 --- a/providers/dns/bookmyname/bookmyname.go +++ b/providers/dns/bookmyname/bookmyname.go @@ -97,8 +97,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) record := internal.Record{ @@ -117,8 +116,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) record := internal.Record{ diff --git a/providers/dns/bookmyname/bookmyname_test.go b/providers/dns/bookmyname/bookmyname_test.go index 1156c1ed7..8ad1dd074 100644 --- a/providers/dns/bookmyname/bookmyname_test.go +++ b/providers/dns/bookmyname/bookmyname_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/brandit/brandit.go b/providers/dns/brandit/brandit.go index 4b3b03564..087504d17 100644 --- a/providers/dns/brandit/brandit.go +++ b/providers/dns/brandit/brandit.go @@ -109,9 +109,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -156,9 +154,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/brandit/brandit_test.go b/providers/dns/brandit/brandit_test.go index a7d131675..d95e7cbb5 100644 --- a/providers/dns/brandit/brandit_test.go +++ b/providers/dns/brandit/brandit_test.go @@ -125,7 +125,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -139,6 +139,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/bunny/bunny.go b/providers/dns/bunny/bunny.go index a2d596f31..76e50613f 100644 --- a/providers/dns/bunny/bunny.go +++ b/providers/dns/bunny/bunny.go @@ -113,8 +113,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.findZone(ctx, dns01.UnFqdn(info.EffectiveFQDN)) @@ -142,8 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.findZone(ctx, dns01.UnFqdn(info.EffectiveFQDN)) diff --git a/providers/dns/bunny/bunny_test.go b/providers/dns/bunny/bunny_test.go index 390b83775..6b10a9e39 100644 --- a/providers/dns/bunny/bunny_test.go +++ b/providers/dns/bunny/bunny_test.go @@ -112,7 +112,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -126,7 +126,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/checkdomain/checkdomain.go b/providers/dns/checkdomain/checkdomain.go index 2ee816586..d0bb1517d 100644 --- a/providers/dns/checkdomain/checkdomain.go +++ b/providers/dns/checkdomain/checkdomain.go @@ -102,9 +102,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { // TODO(ldez) replace domain by FQDN to follow CNAME. domainID, err := d.client.GetDomainIDByName(ctx, domain) if err != nil { @@ -132,9 +130,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record previously created. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { // TODO(ldez) replace domain by FQDN to follow CNAME. domainID, err := d.client.GetDomainIDByName(ctx, domain) if err != nil { diff --git a/providers/dns/checkdomain/checkdomain_test.go b/providers/dns/checkdomain/checkdomain_test.go index f4224ccd9..a746df495 100644 --- a/providers/dns/checkdomain/checkdomain_test.go +++ b/providers/dns/checkdomain/checkdomain_test.go @@ -113,7 +113,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -127,6 +127,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/civo/civo.go b/providers/dns/civo/civo.go index aa0835ca4..2d47eb1af 100644 --- a/providers/dns/civo/civo.go +++ b/providers/dns/civo/civo.go @@ -105,8 +105,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -140,8 +139,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/civo/civo_test.go b/providers/dns/civo/civo_test.go index a084eff47..ce6015aef 100644 --- a/providers/dns/civo/civo_test.go +++ b/providers/dns/civo/civo_test.go @@ -111,7 +111,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -127,7 +127,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -167,7 +167,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("create_dns_record-request.json")). Build(t) - err := provider.Present("example.com", "abd", "123d==") + err := provider.Present(t.Context(), "example.com", "abd", "123d==") require.NoError(t, err) } @@ -190,6 +190,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { With("region", "LON1")). Build(t) - err := provider.CleanUp("example.com", "abd", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abd", "123d==") require.NoError(t, err) } diff --git a/providers/dns/clouddns/clouddns.go b/providers/dns/clouddns/clouddns.go index e81f72d7a..2503db4a4 100644 --- a/providers/dns/clouddns/clouddns.go +++ b/providers/dns/clouddns/clouddns.go @@ -106,9 +106,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -130,9 +128,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/clouddns/clouddns_test.go b/providers/dns/clouddns/clouddns_test.go index 16a9a3109..1b1cc697d 100644 --- a/providers/dns/clouddns/clouddns_test.go +++ b/providers/dns/clouddns/clouddns_test.go @@ -153,7 +153,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -169,6 +169,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/cloudflare/cloudflare.go b/providers/dns/cloudflare/cloudflare.go index 857e8bd17..c91403323 100644 --- a/providers/dns/cloudflare/cloudflare.go +++ b/providers/dns/cloudflare/cloudflare.go @@ -153,9 +153,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -188,9 +186,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/cloudflare/cloudflare_test.go b/providers/dns/cloudflare/cloudflare_test.go index 0189f2797..2d33cff94 100644 --- a/providers/dns/cloudflare/cloudflare_test.go +++ b/providers/dns/cloudflare/cloudflare_test.go @@ -284,7 +284,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -300,7 +300,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -338,7 +338,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("create_record-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -361,6 +361,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs["abc"] = "xxx" provider.recordIDsMu.Unlock() - err := provider.CleanUp("example.com", token, "123d==") + err := provider.CleanUp(t.Context(), "example.com", token, "123d==") require.NoError(t, err) } diff --git a/providers/dns/cloudflare/internal/client_test.go b/providers/dns/cloudflare/internal/client_test.go index 8cf0813bc..8a3323d66 100644 --- a/providers/dns/cloudflare/internal/client_test.go +++ b/providers/dns/cloudflare/internal/client_test.go @@ -1,7 +1,6 @@ package internal import ( - "context" "net/http" "net/http/httptest" "testing" @@ -88,7 +87,7 @@ func TestClient_DeleteDNSRecord(t *testing.T) { servermock.ResponseFromFixture("delete_record.json")). Build(t) - err := client.DeleteDNSRecord(context.Background(), "023e105f4ecef8ad9ca31a8372d0c353", "xxx") + err := client.DeleteDNSRecord(t.Context(), "023e105f4ecef8ad9ca31a8372d0c353", "xxx") require.NoError(t, err) } @@ -99,7 +98,7 @@ func TestClient_DeleteDNSRecord_error(t *testing.T) { WithStatusCode(http.StatusBadRequest)). Build(t) - err := client.DeleteDNSRecord(context.Background(), "023e105f4ecef8ad9ca31a8372d0c353", "xxx") + err := client.DeleteDNSRecord(t.Context(), "023e105f4ecef8ad9ca31a8372d0c353", "xxx") require.EqualError(t, err, "[status code 400] 6003: Invalid request headers; 6103: Invalid format for X-Auth-Key header") } @@ -112,7 +111,7 @@ func TestClient_ZonesByName(t *testing.T) { With("per_page", "50")). Build(t) - zones, err := client.ZonesByName(context.Background(), "example.com") + zones, err := client.ZonesByName(t.Context(), "example.com") require.NoError(t, err) expected := []Zone{ @@ -171,6 +170,6 @@ func TestClient_ZonesByName_error(t *testing.T) { WithStatusCode(http.StatusBadRequest)). Build(t) - _, err := client.ZonesByName(context.Background(), "example.com") + _, err := client.ZonesByName(t.Context(), "example.com") require.EqualError(t, err, "[status code 400] 6003: Invalid request headers; 6103: Invalid format for X-Auth-Key header") } diff --git a/providers/dns/cloudns/cloudns.go b/providers/dns/cloudns/cloudns.go index 12499ee59..f603d048d 100644 --- a/providers/dns/cloudns/cloudns.go +++ b/providers/dns/cloudns/cloudns.go @@ -112,8 +112,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.client.GetZone(ctx, info.EffectiveFQDN) @@ -130,8 +129,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT records matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.client.GetZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/cloudns/cloudns_test.go b/providers/dns/cloudns/cloudns_test.go index 679632b12..fb03d36d3 100644 --- a/providers/dns/cloudns/cloudns_test.go +++ b/providers/dns/cloudns/cloudns_test.go @@ -174,7 +174,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -190,6 +190,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/cloudru/cloudru.go b/providers/dns/cloudru/cloudru.go index 84adbded2..39420f367 100644 --- a/providers/dns/cloudru/cloudru.go +++ b/providers/dns/cloudru/cloudru.go @@ -111,9 +111,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -153,8 +151,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes a given record that was generated by Present. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordsMu.Lock() diff --git a/providers/dns/cloudru/cloudru_test.go b/providers/dns/cloudru/cloudru_test.go index b0de0978e..98f2a022c 100644 --- a/providers/dns/cloudru/cloudru_test.go +++ b/providers/dns/cloudru/cloudru_test.go @@ -158,7 +158,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -174,6 +174,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/cloudxns/cloudxns.go b/providers/dns/cloudxns/cloudxns.go index e4cbd61ad..9a253f85d 100644 --- a/providers/dns/cloudxns/cloudxns.go +++ b/providers/dns/cloudxns/cloudxns.go @@ -2,6 +2,7 @@ package cloudxns import ( + "context" "errors" "net/http" "time" @@ -51,12 +52,12 @@ func NewDNSProviderConfig(_ *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(_, _, _ string) error { +func (d *DNSProvider) Present(ctx context.Context, _, _, _ string) error { return nil } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(_, _, _ string) error { +func (d *DNSProvider) CleanUp(ctx context.Context, _, _, _ string) error { return nil } diff --git a/providers/dns/com35/com35.go b/providers/dns/com35/com35.go index 31595dd90..c3c63bd91 100644 --- a/providers/dns/com35/com35.go +++ b/providers/dns/com35/com35.go @@ -2,6 +2,7 @@ package com35 import ( + "context" "errors" "fmt" "net/http" @@ -78,8 +79,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("35com: %w", err) } @@ -88,8 +89,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("35com: %w", err) } diff --git a/providers/dns/com35/com35_test.go b/providers/dns/com35/com35_test.go index a020d4f11..ed711f8eb 100644 --- a/providers/dns/com35/com35_test.go +++ b/providers/dns/com35/com35_test.go @@ -125,7 +125,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -139,6 +139,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/conoha/conoha.go b/providers/dns/conoha/conoha.go index deb928495..2bf481c00 100644 --- a/providers/dns/conoha/conoha.go +++ b/providers/dns/conoha/conoha.go @@ -129,9 +129,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -160,9 +158,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp clears ConoHa DNS TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/conoha/conoha_test.go b/providers/dns/conoha/conoha_test.go index 3f0b3514f..047d47ffc 100644 --- a/providers/dns/conoha/conoha_test.go +++ b/providers/dns/conoha/conoha_test.go @@ -160,7 +160,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -176,6 +176,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/conohav3/conohav3.go b/providers/dns/conohav3/conohav3.go index a500782b3..35f951b59 100644 --- a/providers/dns/conohav3/conohav3.go +++ b/providers/dns/conohav3/conohav3.go @@ -138,9 +138,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -169,9 +167,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp clears ConoHa DNS TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/conohav3/conohav3_test.go b/providers/dns/conohav3/conohav3_test.go index 5d7354765..4da3a102b 100644 --- a/providers/dns/conohav3/conohav3_test.go +++ b/providers/dns/conohav3/conohav3_test.go @@ -160,7 +160,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -176,6 +176,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/constellix/constellix.go b/providers/dns/constellix/constellix.go index 1a34b8939..f5cb54133 100644 --- a/providers/dns/constellix/constellix.go +++ b/providers/dns/constellix/constellix.go @@ -109,9 +109,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -152,9 +150,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/constellix/constellix_test.go b/providers/dns/constellix/constellix_test.go index 7799aef8c..ca9e56f53 100644 --- a/providers/dns/constellix/constellix_test.go +++ b/providers/dns/constellix/constellix_test.go @@ -134,7 +134,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -150,6 +150,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/corenetworks/corenetworks.go b/providers/dns/corenetworks/corenetworks.go index c38d68b40..d0bd7ef44 100644 --- a/providers/dns/corenetworks/corenetworks.go +++ b/providers/dns/corenetworks/corenetworks.go @@ -109,8 +109,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) ctxAuth, err := d.client.CreateAuthenticatedContext(ctx) @@ -149,8 +148,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) ctxAuth, err := d.client.CreateAuthenticatedContext(ctx) diff --git a/providers/dns/corenetworks/corenetworks_test.go b/providers/dns/corenetworks/corenetworks_test.go index 978275fdb..1cd9f3331 100644 --- a/providers/dns/corenetworks/corenetworks_test.go +++ b/providers/dns/corenetworks/corenetworks_test.go @@ -116,7 +116,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -130,6 +130,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/cpanel/cpanel.go b/providers/dns/cpanel/cpanel.go index 4bd77ccee..61384cf9b 100644 --- a/providers/dns/cpanel/cpanel.go +++ b/providers/dns/cpanel/cpanel.go @@ -124,8 +124,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -202,8 +201,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/cpanel/cpanel_test.go b/providers/dns/cpanel/cpanel_test.go index 43ff1b803..1251cb4a2 100644 --- a/providers/dns/cpanel/cpanel_test.go +++ b/providers/dns/cpanel/cpanel_test.go @@ -287,7 +287,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -303,6 +303,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ddnss/ddnss.go b/providers/dns/ddnss/ddnss.go index 430cf04de..a1f57347e 100644 --- a/providers/dns/ddnss/ddnss.go +++ b/providers/dns/ddnss/ddnss.go @@ -94,8 +94,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.AddTXTRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) @@ -107,8 +106,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.RemoveTXTRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN)) diff --git a/providers/dns/ddnss/ddnss_test.go b/providers/dns/ddnss/ddnss_test.go index 043528cb7..8f0b91707 100644 --- a/providers/dns/ddnss/ddnss_test.go +++ b/providers/dns/ddnss/ddnss_test.go @@ -99,7 +99,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -113,7 +113,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -148,7 +148,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -163,6 +163,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { ). Build(t) - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/derak/derak.go b/providers/dns/derak/derak.go index 2ef3549f5..e973b2833 100644 --- a/providers/dns/derak/derak.go +++ b/providers/dns/derak/derak.go @@ -111,8 +111,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -150,8 +149,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, err := d.getZoneID(ctx, info) diff --git a/providers/dns/derak/derak_test.go b/providers/dns/derak/derak_test.go index 1079fee40..92684002a 100644 --- a/providers/dns/derak/derak_test.go +++ b/providers/dns/derak/derak_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/desec/desec.go b/providers/dns/desec/desec.go index 2dbba480a..c39171ed6 100644 --- a/providers/dns/desec/desec.go +++ b/providers/dns/desec/desec.go @@ -106,8 +106,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -158,8 +157,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/desec/desec_test.go b/providers/dns/desec/desec_test.go index 2866b5574..d75760531 100644 --- a/providers/dns/desec/desec_test.go +++ b/providers/dns/desec/desec_test.go @@ -98,7 +98,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -114,6 +114,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/designate/designate.go b/providers/dns/designate/designate.go index 80ef655cb..e9222fc33 100644 --- a/providers/dns/designate/designate.go +++ b/providers/dns/designate/designate.go @@ -132,8 +132,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getZoneName(ctx, info.EffectiveFQDN) @@ -173,8 +172,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getZoneName(ctx, info.EffectiveFQDN) diff --git a/providers/dns/designate/designate_test.go b/providers/dns/designate/designate_test.go index 4af08105b..293af9def 100644 --- a/providers/dns/designate/designate_test.go +++ b/providers/dns/designate/designate_test.go @@ -337,7 +337,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -353,6 +353,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/digitalocean/digitalocean.go b/providers/dns/digitalocean/digitalocean.go index ce338aa60..82d868a4e 100644 --- a/providers/dns/digitalocean/digitalocean.go +++ b/providers/dns/digitalocean/digitalocean.go @@ -118,9 +118,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -143,9 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/digitalocean/digitalocean_test.go b/providers/dns/digitalocean/digitalocean_test.go index 4bba5d070..5f0a82116 100644 --- a/providers/dns/digitalocean/digitalocean_test.go +++ b/providers/dns/digitalocean/digitalocean_test.go @@ -123,7 +123,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBody(`{"type":"TXT","name":"_acme-challenge.example.com.","data":"w6uP8Tcg6K2QR905Rms8iXTlksL6OD1KOWBxTK7wxPI","ttl":30}`)). Build(t) - err := provider.Present("example.com", "", "foobar") + err := provider.Present(t.Context(), "example.com", "", "foobar") require.NoError(t, err) } @@ -138,6 +138,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs["token"] = 1234567 provider.recordIDsMu.Unlock() - err := provider.CleanUp("example.com", "token", "") + err := provider.CleanUp(t.Context(), "example.com", "token", "") require.NoError(t, err) } diff --git a/providers/dns/directadmin/directadmin.go b/providers/dns/directadmin/directadmin.go index 6e4f3df46..c09d73190 100644 --- a/providers/dns/directadmin/directadmin.go +++ b/providers/dns/directadmin/directadmin.go @@ -112,9 +112,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := d.getZoneName(ctx, info.EffectiveFQDN) @@ -143,9 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := d.getZoneName(ctx, info.EffectiveFQDN) diff --git a/providers/dns/directadmin/directadmin_test.go b/providers/dns/directadmin/directadmin_test.go index 89c2d542b..c5532f772 100644 --- a/providers/dns/directadmin/directadmin_test.go +++ b/providers/dns/directadmin/directadmin_test.go @@ -140,7 +140,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -154,6 +154,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dnsexit/dnsexit.go b/providers/dns/dnsexit/dnsexit.go index 114eac173..d243064f0 100644 --- a/providers/dns/dnsexit/dnsexit.go +++ b/providers/dns/dnsexit/dnsexit.go @@ -91,9 +91,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -122,9 +120,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/dnsexit/dnsexit_test.go b/providers/dns/dnsexit/dnsexit_test.go index 973ac4a73..ea2a8ea65 100644 --- a/providers/dns/dnsexit/dnsexit_test.go +++ b/providers/dns/dnsexit/dnsexit_test.go @@ -100,7 +100,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -114,7 +114,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -148,7 +148,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -160,6 +160,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { ). Build(t) - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dnsexit/internal/client_test.go b/providers/dns/dnsexit/internal/client_test.go index 3c07d126f..3e6e8db1a 100644 --- a/providers/dns/dnsexit/internal/client_test.go +++ b/providers/dns/dnsexit/internal/client_test.go @@ -1,7 +1,6 @@ package internal import ( - "context" "net/http" "net/http/httptest" "net/url" @@ -45,7 +44,7 @@ func TestClient_AddRecord(t *testing.T) { TTL: 2, } - err := client.AddRecord(context.Background(), "example.com", record) + err := client.AddRecord(t.Context(), "example.com", record) require.NoError(t, err) } @@ -65,7 +64,7 @@ func TestClient_AddRecord_error(t *testing.T) { Overwrite: true, } - err := client.AddRecord(context.Background(), "example.com", record) + err := client.AddRecord(t.Context(), "example.com", record) require.Error(t, err) require.EqualError(t, err, "JSON Defined Record Type not Supported (code=6)") @@ -85,7 +84,7 @@ func TestClient_DeleteRecord(t *testing.T) { Content: "ADw2sEd82DUgXcQ9hNBZThJs7zVJkR5v9JeSbAb9mZY", } - err := client.DeleteRecord(context.Background(), "example.com", record) + err := client.DeleteRecord(t.Context(), "example.com", record) require.NoError(t, err) } @@ -103,7 +102,7 @@ func TestClient_DeleteRecord_error(t *testing.T) { Content: "txtTXTtxt", } - err := client.DeleteRecord(context.Background(), "example.com", record) + err := client.DeleteRecord(t.Context(), "example.com", record) require.Error(t, err) diff --git a/providers/dns/dnshomede/dnshomede.go b/providers/dns/dnshomede/dnshomede.go index 2cbfdb517..dce9d9f22 100644 --- a/providers/dns/dnshomede/dnshomede.go +++ b/providers/dns/dnshomede/dnshomede.go @@ -104,8 +104,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present updates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.Add(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) @@ -117,8 +116,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp updates the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.Remove(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) diff --git a/providers/dns/dnshomede/dnshomede_test.go b/providers/dns/dnshomede/dnshomede_test.go index 350a130ab..fd539c570 100644 --- a/providers/dns/dnshomede/dnshomede_test.go +++ b/providers/dns/dnshomede/dnshomede_test.go @@ -149,7 +149,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -163,6 +163,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dnsimple/dnsimple.go b/providers/dns/dnsimple/dnsimple.go index add97e86c..b78f4315d 100644 --- a/providers/dns/dnsimple/dnsimple.go +++ b/providers/dns/dnsimple/dnsimple.go @@ -100,9 +100,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneName, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -129,9 +127,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records, err := d.findTxtRecords(ctx, info.EffectiveFQDN) diff --git a/providers/dns/dnsimple/dnsimple_test.go b/providers/dns/dnsimple/dnsimple_test.go index ab335afed..f0ab028a3 100644 --- a/providers/dns/dnsimple/dnsimple_test.go +++ b/providers/dns/dnsimple/dnsimple_test.go @@ -136,7 +136,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -156,6 +156,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dnsmadeeasy/dnsmadeeasy.go b/providers/dns/dnsmadeeasy/dnsmadeeasy.go index c2d376c85..a76f5fad7 100644 --- a/providers/dns/dnsmadeeasy/dnsmadeeasy.go +++ b/providers/dns/dnsmadeeasy/dnsmadeeasy.go @@ -131,9 +131,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domainName, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domainName, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domainName, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -160,9 +158,7 @@ func (d *DNSProvider) Present(domainName, token, keyAuth string) error { } // CleanUp removes the TXT records matching the specified parameters. -func (d *DNSProvider) CleanUp(domainName, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domainName, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domainName, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/dnsmadeeasy/dnsmadeeasy_test.go b/providers/dns/dnsmadeeasy/dnsmadeeasy_test.go index 180ee639b..196bea26f 100644 --- a/providers/dns/dnsmadeeasy/dnsmadeeasy_test.go +++ b/providers/dns/dnsmadeeasy/dnsmadeeasy_test.go @@ -140,9 +140,9 @@ func TestLivePresentAndCleanup(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dnspod/dnspod.go b/providers/dns/dnspod/dnspod.go index 915cb7454..c2c18710b 100644 --- a/providers/dns/dnspod/dnspod.go +++ b/providers/dns/dnspod/dnspod.go @@ -95,8 +95,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, zoneName, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -118,8 +117,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, zoneName, err := d.getHostedZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/dnspod/dnspod_test.go b/providers/dns/dnspod/dnspod_test.go index 28fff1e99..aaece1972 100644 --- a/providers/dns/dnspod/dnspod_test.go +++ b/providers/dns/dnspod/dnspod_test.go @@ -101,7 +101,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -117,6 +117,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dode/dode.go b/providers/dns/dode/dode.go index 15ecd4bfe..f116c67b2 100644 --- a/providers/dns/dode/dode.go +++ b/providers/dns/dode/dode.go @@ -92,16 +92,14 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) return d.client.UpdateTxtRecord(ctx, info.EffectiveFQDN, info.Value, false) } // CleanUp clears TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) return d.client.UpdateTxtRecord(ctx, info.EffectiveFQDN, "", true) diff --git a/providers/dns/dode/dode_test.go b/providers/dns/dode/dode_test.go index d1991c558..a20e18b1b 100644 --- a/providers/dns/dode/dode_test.go +++ b/providers/dns/dode/dode_test.go @@ -98,7 +98,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -114,6 +114,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/domeneshop/domeneshop.go b/providers/dns/domeneshop/domeneshop.go index 4bcc902b3..6dc28808a 100644 --- a/providers/dns/domeneshop/domeneshop.go +++ b/providers/dns/domeneshop/domeneshop.go @@ -99,9 +99,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, host, err := d.splitDomain(ctx, info.EffectiveFQDN) @@ -123,9 +121,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, host, err := d.splitDomain(ctx, info.EffectiveFQDN) diff --git a/providers/dns/domeneshop/domeneshop_test.go b/providers/dns/domeneshop/domeneshop_test.go index a73bb9ef4..59b97c687 100644 --- a/providers/dns/domeneshop/domeneshop_test.go +++ b/providers/dns/domeneshop/domeneshop_test.go @@ -135,7 +135,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -151,6 +151,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dreamhost/dreamhost.go b/providers/dns/dreamhost/dreamhost.go index 0c984aec3..831240e87 100644 --- a/providers/dns/dreamhost/dreamhost.go +++ b/providers/dns/dreamhost/dreamhost.go @@ -97,8 +97,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.AddRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) @@ -110,8 +109,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.RemoveRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) diff --git a/providers/dns/dreamhost/dreamhost_test.go b/providers/dns/dreamhost/dreamhost_test.go index 2b0226546..261b5d879 100644 --- a/providers/dns/dreamhost/dreamhost_test.go +++ b/providers/dns/dreamhost/dreamhost_test.go @@ -122,7 +122,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "", fakeChallengeToken) + err := provider.Present(t.Context(), "example.com", "", fakeChallengeToken) require.NoError(t, err) } @@ -132,7 +132,7 @@ func TestDNSProvider_PresentFailed(t *testing.T) { servermock.RawStringResponse(`{"data":"record_already_exists_remove_first","result":"error"}`)). Build(t) - err := provider.Present("example.com", "", fakeChallengeToken) + err := provider.Present(t.Context(), "example.com", "", fakeChallengeToken) require.EqualError(t, err, "dreamhost: add TXT record failed: record_already_exists_remove_first") } @@ -151,7 +151,7 @@ func TestDNSProvider_Cleanup(t *testing.T) { ). Build(t) - err := provider.CleanUp("example.com", "", fakeChallengeToken) + err := provider.CleanUp(t.Context(), "example.com", "", fakeChallengeToken) require.NoError(t, err) } @@ -165,11 +165,11 @@ func TestLivePresentAndCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/duckdns/duckdns.go b/providers/dns/duckdns/duckdns.go index 1097ecbff..8987763f6 100644 --- a/providers/dns/duckdns/duckdns.go +++ b/providers/dns/duckdns/duckdns.go @@ -93,16 +93,14 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) return d.client.AddTXTRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) } // CleanUp clears DuckDNS TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) return d.client.RemoveTXTRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN)) diff --git a/providers/dns/duckdns/duckdns_test.go b/providers/dns/duckdns/duckdns_test.go index 0265f9ee6..84d3c4e51 100644 --- a/providers/dns/duckdns/duckdns_test.go +++ b/providers/dns/duckdns/duckdns_test.go @@ -99,7 +99,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -115,6 +115,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dyn/dyn.go b/providers/dns/dyn/dyn.go index e599f92bb..7387f7c29 100644 --- a/providers/dns/dyn/dyn.go +++ b/providers/dns/dyn/dyn.go @@ -99,9 +99,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -128,9 +126,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/dyn/dyn_test.go b/providers/dns/dyn/dyn_test.go index 240953008..3ba13e8f1 100644 --- a/providers/dns/dyn/dyn_test.go +++ b/providers/dns/dyn/dyn_test.go @@ -160,7 +160,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -176,6 +176,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dyndnsfree/dyndnsfree.go b/providers/dns/dyndnsfree/dyndnsfree.go index fd35e2922..fb6a59ed8 100644 --- a/providers/dns/dyndnsfree/dyndnsfree.go +++ b/providers/dns/dyndnsfree/dyndnsfree.go @@ -91,9 +91,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -110,7 +108,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { // Records are deleted automatically. return nil } diff --git a/providers/dns/dyndnsfree/dyndnsfree_test.go b/providers/dns/dyndnsfree/dyndnsfree_test.go index 846c013e8..82f113a0b 100644 --- a/providers/dns/dyndnsfree/dyndnsfree_test.go +++ b/providers/dns/dyndnsfree/dyndnsfree_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/dynu/dynu.go b/providers/dns/dynu/dynu.go index 04f8446f9..da661df1c 100644 --- a/providers/dns/dynu/dynu.go +++ b/providers/dns/dynu/dynu.go @@ -100,8 +100,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, err := d.client.GetRootDomain(ctx, dns01.UnFqdn(info.EffectiveFQDN)) @@ -145,8 +144,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, err := d.client.GetRootDomain(ctx, dns01.UnFqdn(info.EffectiveFQDN)) diff --git a/providers/dns/dynu/dynu_test.go b/providers/dns/dynu/dynu_test.go index 713964c2d..19969de4f 100644 --- a/providers/dns/dynu/dynu_test.go +++ b/providers/dns/dynu/dynu_test.go @@ -101,7 +101,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -117,6 +117,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/easydns/easydns.go b/providers/dns/easydns/easydns.go index a2b547273..2dade6aba 100644 --- a/providers/dns/easydns/easydns.go +++ b/providers/dns/easydns/easydns.go @@ -122,9 +122,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := d.findZone(ctx, dns01.UnFqdn(info.EffectiveFQDN)) @@ -165,9 +163,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) key := getMapKey(info.EffectiveFQDN, info.Value) diff --git a/providers/dns/easydns/easydns_test.go b/providers/dns/easydns/easydns_test.go index 2b79cddd3..ba44c6288 100644 --- a/providers/dns/easydns/easydns_test.go +++ b/providers/dns/easydns/easydns_test.go @@ -189,7 +189,7 @@ func TestDNSProvider_Present(t *testing.T) { `)). Build(t) - err := provider.Present("example.com", "token", "keyAuth") + err := provider.Present(t.Context(), "example.com", "token", "keyAuth") require.NoError(t, err) require.Contains(t, provider.recordIDs, "_acme-challenge.example.com.|pW9ZKG0xz_PCriK-nCMOjADy9eJcgGWIzkkj2fN4uZM") } @@ -220,7 +220,7 @@ func TestDNSProvider_Cleanup_WhenRecordIdNotSet_NoOp(t *testing.T) { `)). Build(t) - err := provider.CleanUp("example.com", "token", "keyAuth") + err := provider.CleanUp(t.Context(), "example.com", "token", "keyAuth") require.NoError(t, err) } @@ -261,7 +261,7 @@ func TestDNSProvider_Cleanup_WhenRecordIdSet_DeletesTxtRecord(t *testing.T) { provider.recordIDs["_acme-challenge.example.com.|pW9ZKG0xz_PCriK-nCMOjADy9eJcgGWIzkkj2fN4uZM"] = "123456" - err := provider.CleanUp("example.com", "token", "keyAuth") + err := provider.CleanUp(t.Context(), "example.com", "token", "keyAuth") require.NoError(t, err) } @@ -303,7 +303,7 @@ func TestDNSProvider_Cleanup_WhenHttpError_ReturnsError(t *testing.T) { provider.recordIDs["_acme-challenge.example.com.|pW9ZKG0xz_PCriK-nCMOjADy9eJcgGWIzkkj2fN4uZM"] = "123456" - err := provider.CleanUp("example.com", "token", "keyAuth") + err := provider.CleanUp(t.Context(), "example.com", "token", "keyAuth") expectedError := fmt.Sprintf("easydns: unexpected status code: [status code: 406] body: %v", errorMessage) require.EqualError(t, err, expectedError) @@ -319,7 +319,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -335,6 +335,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/edgecenter/edgecenter.go b/providers/dns/edgecenter/edgecenter.go index 997912840..b5562ee2c 100644 --- a/providers/dns/edgecenter/edgecenter.go +++ b/providers/dns/edgecenter/edgecenter.go @@ -2,6 +2,7 @@ package edgecenter import ( + "context" "errors" "fmt" "net/http" @@ -77,8 +78,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("edgecenter: %w", err) } @@ -87,8 +88,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("edgecenter: %w", err) } diff --git a/providers/dns/edgecenter/edgecenter_test.go b/providers/dns/edgecenter/edgecenter_test.go index 058a08d79..d6a4312b7 100644 --- a/providers/dns/edgecenter/edgecenter_test.go +++ b/providers/dns/edgecenter/edgecenter_test.go @@ -95,7 +95,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -109,6 +109,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/edgedns/edgedns.go b/providers/dns/edgedns/edgedns.go index 23504dedb..43a55b588 100644 --- a/providers/dns/edgedns/edgedns.go +++ b/providers/dns/edgedns/edgedns.go @@ -126,9 +126,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) sess, err := session.New(session.WithSigner(d.config)) @@ -200,9 +198,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) sess, err := session.New(session.WithSigner(d.config)) diff --git a/providers/dns/edgedns/edgedns_integration_test.go b/providers/dns/edgedns/edgedns_integration_test.go index 5345597a2..81c0e249c 100644 --- a/providers/dns/edgedns/edgedns_integration_test.go +++ b/providers/dns/edgedns/edgedns_integration_test.go @@ -1,7 +1,6 @@ package edgedns import ( - "context" "fmt" "testing" "time" @@ -23,11 +22,11 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) // Present Twice to handle create / update - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -43,7 +42,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -59,22 +58,22 @@ func TestLiveTTL(t *testing.T) { domain := envTest.GetDomain() - err = provider.Present(domain, "foo", "bar") + ctx := t.Context() + + err = provider.Present(ctx, domain, "foo", "bar") require.NoError(t, err) defer func() { - e := provider.CleanUp(domain, "foo", "bar") + e := provider.CleanUp(ctx, domain, "foo", "bar") if e != nil { t.Log(e) } }() fqdn := "_acme-challenge." + domain + "." - zone, err := getZone(t.Context(), fqdn) + zone, err := getZone(ctx, fqdn) require.NoError(t, err) - ctx := context.Background() - sess, err := session.New(session.WithSigner(provider.config)) require.NoError(t, err) diff --git a/providers/dns/edgeone/edgeone.go b/providers/dns/edgeone/edgeone.go index 3fcf51cc2..fd90ec97e 100644 --- a/providers/dns/edgeone/edgeone.go +++ b/providers/dns/edgeone/edgeone.go @@ -126,8 +126,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) @@ -160,8 +159,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) diff --git a/providers/dns/edgeone/edgeone_test.go b/providers/dns/edgeone/edgeone_test.go index 0af86d1e4..751d57e47 100644 --- a/providers/dns/edgeone/edgeone_test.go +++ b/providers/dns/edgeone/edgeone_test.go @@ -151,7 +151,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -165,6 +165,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/efficientip/efficientip.go b/providers/dns/efficientip/efficientip.go index ca5556637..19aec36ad 100644 --- a/providers/dns/efficientip/efficientip.go +++ b/providers/dns/efficientip/efficientip.go @@ -122,8 +122,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { return &DNSProvider{config: config, client: client}, nil } -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) r := internal.ResourceRecord{ @@ -142,8 +141,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { return nil } -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) params := internal.DeleteInputParameters{ diff --git a/providers/dns/efficientip/efficientip_test.go b/providers/dns/efficientip/efficientip_test.go index d0e8e3903..7c24de5b5 100644 --- a/providers/dns/efficientip/efficientip_test.go +++ b/providers/dns/efficientip/efficientip_test.go @@ -183,7 +183,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -199,6 +199,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/epik/epik.go b/providers/dns/epik/epik.go index ab150a792..261dd25b5 100644 --- a/providers/dns/epik/epik.go +++ b/providers/dns/epik/epik.go @@ -99,9 +99,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // find authZone @@ -131,9 +129,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // find authZone diff --git a/providers/dns/epik/epik_test.go b/providers/dns/epik/epik_test.go index d91a3db9a..50e0de275 100644 --- a/providers/dns/epik/epik_test.go +++ b/providers/dns/epik/epik_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/exec/exec.go b/providers/dns/exec/exec.go index aa3ea9ee9..9cb355a56 100644 --- a/providers/dns/exec/exec.go +++ b/providers/dns/exec/exec.go @@ -79,8 +79,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.run(context.Background(), "present", domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.run(ctx, "present", domain, token, keyAuth) if err != nil { return fmt.Errorf("exec: %w", err) } @@ -89,8 +89,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.run(context.Background(), "cleanup", domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.run(ctx, "cleanup", domain, token, keyAuth) if err != nil { return fmt.Errorf("exec: %w", err) } diff --git a/providers/dns/exec/exec_test.go b/providers/dns/exec/exec_test.go index 12f12b3e9..c1459030f 100644 --- a/providers/dns/exec/exec_test.go +++ b/providers/dns/exec/exec_test.go @@ -77,7 +77,7 @@ func TestDNSProvider_Present(t *testing.T) { provider, err := NewDNSProviderConfig(test.config) require.NoError(t, err) - err = provider.Present("domain", "token", "keyAuth") + err = provider.Present(t.Context(), "domain", "token", "keyAuth") if test.expected.error { require.Error(t, err) } else { @@ -152,7 +152,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider, err := NewDNSProviderConfig(test.config) require.NoError(t, err) - err = provider.CleanUp("domain", "token", "keyAuth") + err = provider.CleanUp(t.Context(), "domain", "token", "keyAuth") if test.expected.error { require.Error(t, err) } else { diff --git a/providers/dns/exoscale/exoscale.go b/providers/dns/exoscale/exoscale.go index 0f2450479..f4f706285 100644 --- a/providers/dns/exoscale/exoscale.go +++ b/providers/dns/exoscale/exoscale.go @@ -104,9 +104,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneName, recordName, err := d.findZoneAndRecordName(ctx, info.EffectiveFQDN) @@ -144,9 +142,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneName, recordName, err := d.findZoneAndRecordName(ctx, info.EffectiveFQDN) diff --git a/providers/dns/exoscale/exoscale_test.go b/providers/dns/exoscale/exoscale_test.go index c35134ac9..3f8568fa1 100644 --- a/providers/dns/exoscale/exoscale_test.go +++ b/providers/dns/exoscale/exoscale_test.go @@ -183,11 +183,11 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) // Present Twice to handle create / update - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -203,6 +203,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/f5xc/f5xc.go b/providers/dns/f5xc/f5xc.go index d2ce9077d..86e6a8300 100644 --- a/providers/dns/f5xc/f5xc.go +++ b/providers/dns/f5xc/f5xc.go @@ -106,9 +106,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -173,9 +171,7 @@ func (d *DNSProvider) waitFor(ctx context.Context, operation func() error) error } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/f5xc/f5xc_test.go b/providers/dns/f5xc/f5xc_test.go index 4cf5eb76d..45cd29700 100644 --- a/providers/dns/f5xc/f5xc_test.go +++ b/providers/dns/f5xc/f5xc_test.go @@ -155,7 +155,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -169,6 +169,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/freemyip/freemyip.go b/providers/dns/freemyip/freemyip.go index b071ff9c9..3e81d9eea 100644 --- a/providers/dns/freemyip/freemyip.go +++ b/providers/dns/freemyip/freemyip.go @@ -110,8 +110,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) subDomain, err := dns01.ExtractSubDomain(info.EffectiveFQDN, freemyip.RootDomain) @@ -128,8 +127,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) subDomain, err := dns01.ExtractSubDomain(info.EffectiveFQDN, freemyip.RootDomain) diff --git a/providers/dns/freemyip/freemyip_test.go b/providers/dns/freemyip/freemyip_test.go index e8292191f..546acd152 100644 --- a/providers/dns/freemyip/freemyip_test.go +++ b/providers/dns/freemyip/freemyip_test.go @@ -99,7 +99,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -115,6 +115,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/gandi/gandi.go b/providers/dns/gandi/gandi.go index 6f7cfea63..183bb1395 100644 --- a/providers/dns/gandi/gandi.go +++ b/providers/dns/gandi/gandi.go @@ -124,9 +124,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { // Present creates a TXT record using the specified parameters. It // does this by creating and activating a new temporary Gandi DNS // zone. This new zone contains the TXT record. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) if d.config.TTL < minTTL { @@ -202,8 +200,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { // CleanUp removes the TXT record matching the specified // parameters. It does this by restoring the old Gandi DNS zone and // removing the temporary one created by Present. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // acquire lock and retrieve zoneID, newZoneID and authZone diff --git a/providers/dns/gandi/gandi_test.go b/providers/dns/gandi/gandi_test.go index 63f9969ca..ddd7d3690 100644 --- a/providers/dns/gandi/gandi_test.go +++ b/providers/dns/gandi/gandi_test.go @@ -167,10 +167,10 @@ func TestDNSProvider(t *testing.T) { provider.findZoneByFqdn = fakeFindZoneByFqdn // run Present - err := provider.Present("abc.def.example.com", "", fakeKeyAuth) + err := provider.Present(t.Context(), "abc.def.example.com", "", fakeKeyAuth) require.NoError(t, err) // run CleanUp - err = provider.CleanUp("abc.def.example.com", "", fakeKeyAuth) + err = provider.CleanUp(t.Context(), "abc.def.example.com", "", fakeKeyAuth) require.NoError(t, err) } diff --git a/providers/dns/gandiv5/gandiv5.go b/providers/dns/gandiv5/gandiv5.go index 895b57b55..ebd8e5342 100644 --- a/providers/dns/gandiv5/gandiv5.go +++ b/providers/dns/gandiv5/gandiv5.go @@ -133,9 +133,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // find authZone @@ -171,8 +169,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // acquire lock and retrieve authZone diff --git a/providers/dns/gandiv5/gandiv5_test.go b/providers/dns/gandiv5/gandiv5_test.go index 80f022cd8..3514d6239 100644 --- a/providers/dns/gandiv5/gandiv5_test.go +++ b/providers/dns/gandiv5/gandiv5_test.go @@ -130,10 +130,10 @@ func TestDNSProvider(t *testing.T) { provider.findZoneByFqdn = fakeFindZoneByFqdn // run Present - err := provider.Present("abc.def.example.com", "", fakeKeyAuth) + err := provider.Present(t.Context(), "abc.def.example.com", "", fakeKeyAuth) require.NoError(t, err) // run CleanUp - err = provider.CleanUp("abc.def.example.com", "", fakeKeyAuth) + err = provider.CleanUp(t.Context(), "abc.def.example.com", "", fakeKeyAuth) require.NoError(t, err) } diff --git a/providers/dns/gcloud/googlecloud.go b/providers/dns/gcloud/googlecloud.go index 85cf6d41d..4aae86d94 100644 --- a/providers/dns/gcloud/googlecloud.go +++ b/providers/dns/gcloud/googlecloud.go @@ -188,9 +188,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -303,8 +301,7 @@ func (d *DNSProvider) applyChanges(ctx context.Context, zone string, change *gdn } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/gcloud/googlecloud_test.go b/providers/dns/gcloud/googlecloud_test.go index c9bf2308f..b24ace73d 100644 --- a/providers/dns/gcloud/googlecloud_test.go +++ b/providers/dns/gcloud/googlecloud_test.go @@ -193,7 +193,7 @@ func TestPresentNoExistingRR(t *testing.T) { domain := "example.com" - err := provider.Present(domain, "", "") + err := provider.Present(t.Context(), domain, "", "") require.NoError(t, err) } @@ -266,7 +266,7 @@ func TestPresentWithExistingRR(t *testing.T) { domain := "example.com" - err := provider.Present(domain, "", "") + err := provider.Present(t.Context(), domain, "", "") require.NoError(t, err) } @@ -302,7 +302,7 @@ func TestPresentSkipExistingRR(t *testing.T) { domain := "example.com" - err := provider.Present(domain, "", "") + err := provider.Present(t.Context(), domain, "", "") require.NoError(t, err) } @@ -315,7 +315,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProviderCredentials(envTest.GetValue(EnvProject)) require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -330,10 +330,10 @@ func TestLivePresentMultiple(t *testing.T) { require.NoError(t, err) // Check that we're able to create multiple entries - err = provider.Present(envTest.GetDomain(), "1", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "1", "123d==") require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "2", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "2", "123d==") require.NoError(t, err) } @@ -349,7 +349,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/gcore/gcore.go b/providers/dns/gcore/gcore.go index be07a5107..cecc6ec5f 100644 --- a/providers/dns/gcore/gcore.go +++ b/providers/dns/gcore/gcore.go @@ -2,6 +2,7 @@ package gcore import ( + "context" "errors" "fmt" "net/http" @@ -75,8 +76,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("gcore: %w", err) } @@ -85,8 +86,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("gcore: %w", err) } diff --git a/providers/dns/gcore/gcore_test.go b/providers/dns/gcore/gcore_test.go index 02f20bb0c..56745bf1f 100644 --- a/providers/dns/gcore/gcore_test.go +++ b/providers/dns/gcore/gcore_test.go @@ -95,7 +95,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -109,6 +109,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/gigahostno/gigahostno.go b/providers/dns/gigahostno/gigahostno.go index 711a2f29f..5be60b241 100644 --- a/providers/dns/gigahostno/gigahostno.go +++ b/providers/dns/gigahostno/gigahostno.go @@ -112,9 +112,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.authenticate(ctx) @@ -150,9 +148,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.authenticate(ctx) diff --git a/providers/dns/gigahostno/gigahostno_test.go b/providers/dns/gigahostno/gigahostno_test.go index 846a1ef45..51f44320b 100644 --- a/providers/dns/gigahostno/gigahostno_test.go +++ b/providers/dns/gigahostno/gigahostno_test.go @@ -137,7 +137,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -151,7 +151,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -195,7 +195,7 @@ func TestDNSProvider_Present(t *testing.T) { WithAuthorization("Bearer secrettoken")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -218,7 +218,7 @@ func TestDNSProvider_Present_token_not_expired(t *testing.T) { CustomerID: "123", } - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -243,7 +243,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { WithAuthorization("Bearer secrettoken")). Build(t) - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -272,6 +272,6 @@ func TestDNSProvider_CleanUp_token_not_expired(t *testing.T) { CustomerID: "123", } - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/gigahostno/internal/identity_test.go b/providers/dns/gigahostno/internal/identity_test.go index 14798861c..ca9639fcf 100644 --- a/providers/dns/gigahostno/internal/identity_test.go +++ b/providers/dns/gigahostno/internal/identity_test.go @@ -37,7 +37,7 @@ func TestIdentifier_Authenticate(t *testing.T) { servermock.CheckRequestJSONBodyFromFixture("authenticate-request.json")). Build(t) - token, err := identifier.Authenticate(context.Background()) + token, err := identifier.Authenticate(t.Context()) require.NoError(t, err) expected := &Token{ diff --git a/providers/dns/glesys/glesys.go b/providers/dns/glesys/glesys.go index c06677fc2..0ca17ffa3 100644 --- a/providers/dns/glesys/glesys.go +++ b/providers/dns/glesys/glesys.go @@ -110,9 +110,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // find authZone @@ -143,8 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // acquire lock and retrieve authZone diff --git a/providers/dns/glesys/glesys_test.go b/providers/dns/glesys/glesys_test.go index 93c854122..c5dd9a932 100644 --- a/providers/dns/glesys/glesys_test.go +++ b/providers/dns/glesys/glesys_test.go @@ -135,7 +135,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -149,6 +149,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/godaddy/godaddy.go b/providers/dns/godaddy/godaddy.go index f514e85c9..b55be2fdd 100644 --- a/providers/dns/godaddy/godaddy.go +++ b/providers/dns/godaddy/godaddy.go @@ -108,9 +108,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -155,9 +153,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/godaddy/godaddy_test.go b/providers/dns/godaddy/godaddy_test.go index a98b21d88..2cfa2c957 100644 --- a/providers/dns/godaddy/godaddy_test.go +++ b/providers/dns/godaddy/godaddy_test.go @@ -131,7 +131,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -145,6 +145,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/googledomains/googledomains.go b/providers/dns/googledomains/googledomains.go index 2813f4ea6..783799887 100644 --- a/providers/dns/googledomains/googledomains.go +++ b/providers/dns/googledomains/googledomains.go @@ -2,6 +2,7 @@ package googledomains import ( + "context" "errors" "net/http" "time" @@ -47,11 +48,11 @@ func NewDNSProviderConfig(_ *Config) (*DNSProvider, error) { return nil, errors.New("googledomains: provider has shut down") } -func (d *DNSProvider) Present(_, _, _ string) error { +func (d *DNSProvider) Present(_ context.Context, _, _, _ string) error { return nil } -func (d *DNSProvider) CleanUp(_, _, _ string) error { +func (d *DNSProvider) CleanUp(_ context.Context, _, _, _ string) error { return nil } diff --git a/providers/dns/gravity/gravity.go b/providers/dns/gravity/gravity.go index 12978dbcf..c5be59e71 100644 --- a/providers/dns/gravity/gravity.go +++ b/providers/dns/gravity/gravity.go @@ -103,9 +103,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) _, err := d.client.Login(ctx) @@ -147,8 +145,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordsMu.Lock() diff --git a/providers/dns/gravity/gravity_test.go b/providers/dns/gravity/gravity_test.go index c2ad80cd1..55d6c0803 100644 --- a/providers/dns/gravity/gravity_test.go +++ b/providers/dns/gravity/gravity_test.go @@ -161,7 +161,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -175,7 +175,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -226,7 +226,7 @@ func TestDNSProvider_Present(t *testing.T) { With("hostname", "_acme-challenge")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -249,6 +249,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { UID: "123", } - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/hetzner/hetzner.go b/providers/dns/hetzner/hetzner.go index c3410c1c9..3d9d232de 100644 --- a/providers/dns/hetzner/hetzner.go +++ b/providers/dns/hetzner/hetzner.go @@ -2,6 +2,7 @@ package hetzner import ( + "context" "errors" "net/http" "time" @@ -146,11 +147,11 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - return d.provider.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + return d.provider.Present(ctx, domain, token, keyAuth) } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - return d.provider.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + return d.provider.CleanUp(ctx, domain, token, keyAuth) } diff --git a/providers/dns/hetzner/internal/hetznerv1/hetznerv1.go b/providers/dns/hetzner/internal/hetznerv1/hetznerv1.go index 1a95011ad..d97440e12 100644 --- a/providers/dns/hetzner/internal/hetznerv1/hetznerv1.go +++ b/providers/dns/hetzner/internal/hetznerv1/hetznerv1.go @@ -97,9 +97,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -138,9 +136,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/hetzner/internal/hetznerv1/hetznerv1_test.go b/providers/dns/hetzner/internal/hetznerv1/hetznerv1_test.go index 075bee9e9..83d69d7a4 100644 --- a/providers/dns/hetzner/internal/hetznerv1/hetznerv1_test.go +++ b/providers/dns/hetzner/internal/hetznerv1/hetznerv1_test.go @@ -101,7 +101,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -115,7 +115,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -150,7 +150,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.ResponseFromFixture("get_action_success.json")). Build(t) - err := provider.Present("example.com", "", "foobar") + err := provider.Present(t.Context(), "example.com", "", "foobar") require.NoError(t, err) } @@ -166,7 +166,7 @@ func TestDNSProvider_Present_error(t *testing.T) { provider.config.PollingInterval = 20 * time.Millisecond provider.config.PropagationTimeout = 1 * time.Second - err := provider.Present("example.com", "", "foobar") + err := provider.Present(t.Context(), "example.com", "", "foobar") require.EqualError(t, err, "hetzner: wait (add RRSet records): action 1: error: action_failed: Action failed") } @@ -182,7 +182,7 @@ func TestDNSProvider_Present_running(t *testing.T) { provider.config.PollingInterval = 20 * time.Millisecond provider.config.PropagationTimeout = 1 * time.Second - err := provider.Present("example.com", "", "foobar") + err := provider.Present(t.Context(), "example.com", "", "foobar") require.EqualError(t, err, "hetzner: wait (add RRSet records): action 1 is running") } @@ -195,7 +195,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { servermock.ResponseFromFixture("get_action_success.json")). Build(t) - err := provider.CleanUp("example.com", "", "foobar") + err := provider.CleanUp(t.Context(), "example.com", "", "foobar") require.NoError(t, err) } @@ -211,7 +211,7 @@ func TestDNSProvider_CleanUp_error(t *testing.T) { provider.config.PollingInterval = 20 * time.Millisecond provider.config.PropagationTimeout = 1 * time.Second - err := provider.CleanUp("example.com", "", "foobar") + err := provider.CleanUp(t.Context(), "example.com", "", "foobar") require.EqualError(t, err, "hetzner: wait (remove RRSet records): action 1: error: action_failed: Action failed") } @@ -227,6 +227,6 @@ func TestDNSProvider_CleanUp_running(t *testing.T) { provider.config.PollingInterval = 20 * time.Millisecond provider.config.PropagationTimeout = 1 * time.Second - err := provider.CleanUp("example.com", "", "foobar") + err := provider.CleanUp(t.Context(), "example.com", "", "foobar") require.EqualError(t, err, "hetzner: wait (remove RRSet records): action 1 is running") } diff --git a/providers/dns/hetzner/internal/legacy/hetzner.go b/providers/dns/hetzner/internal/legacy/hetzner.go index f1289f8e1..790fd0923 100644 --- a/providers/dns/hetzner/internal/legacy/hetzner.go +++ b/providers/dns/hetzner/internal/legacy/hetzner.go @@ -104,9 +104,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -142,9 +140,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/hetzner/internal/legacy/hetzner_test.go b/providers/dns/hetzner/internal/legacy/hetzner_test.go index a12a3e22c..2aa211252 100644 --- a/providers/dns/hetzner/internal/legacy/hetzner_test.go +++ b/providers/dns/hetzner/internal/legacy/hetzner_test.go @@ -109,7 +109,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -123,6 +123,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/hostingde/hostingde.go b/providers/dns/hostingde/hostingde.go index a03e32a8a..5ae9ba3de 100644 --- a/providers/dns/hostingde/hostingde.go +++ b/providers/dns/hostingde/hostingde.go @@ -2,6 +2,7 @@ package hostingde import ( + "context" "errors" "fmt" "net/http" @@ -79,8 +80,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("hostingde: %w", err) } @@ -89,8 +90,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("hostingde: %w", err) } diff --git a/providers/dns/hostingde/hostingde_test.go b/providers/dns/hostingde/hostingde_test.go index 6c183a0ec..079d8a9ba 100644 --- a/providers/dns/hostingde/hostingde_test.go +++ b/providers/dns/hostingde/hostingde_test.go @@ -119,7 +119,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -135,6 +135,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/hostinger/hostinger.go b/providers/dns/hostinger/hostinger.go index 77d80fbad..85f96e9f2 100644 --- a/providers/dns/hostinger/hostinger.go +++ b/providers/dns/hostinger/hostinger.go @@ -92,9 +92,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -128,9 +126,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/hostinger/hostinger_test.go b/providers/dns/hostinger/hostinger_test.go index 51920bd87..80bebfce7 100644 --- a/providers/dns/hostinger/hostinger_test.go +++ b/providers/dns/hostinger/hostinger_test.go @@ -121,7 +121,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("update_dns_records-request.json")). Build(t) - err := provider.Present("example.com", "", "123d==") + err := provider.Present(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -134,7 +134,7 @@ func TestDNSProvider_CleanUp_update(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("update_dns_records_base-request.json")). Build(t) - err := provider.CleanUp("example.com", "", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -147,7 +147,7 @@ func TestDNSProvider_CleanUp_delete(t *testing.T) { servermock.CheckRequestJSONBody(`{"filters":[{"name":"_acme-challenge","type":"TXT"}]}`)). Build(t) - err := provider.CleanUp("example.com", "", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -161,7 +161,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -175,6 +175,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/hostingnl/hostingnl.go b/providers/dns/hostingnl/hostingnl.go index b40161f54..51472aa14 100644 --- a/providers/dns/hostingnl/hostingnl.go +++ b/providers/dns/hostingnl/hostingnl.go @@ -102,9 +102,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -133,9 +131,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT records matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/hostingnl/hostingnl_test.go b/providers/dns/hostingnl/hostingnl_test.go index f4ab47f96..445d6cdaa 100644 --- a/providers/dns/hostingnl/hostingnl_test.go +++ b/providers/dns/hostingnl/hostingnl_test.go @@ -100,7 +100,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -114,7 +114,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -148,7 +148,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("add_record-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -162,6 +162,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs["abc"] = "12345" - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/hostingnl/internal/client_test.go b/providers/dns/hostingnl/internal/client_test.go index b9b6851ad..374513cd0 100644 --- a/providers/dns/hostingnl/internal/client_test.go +++ b/providers/dns/hostingnl/internal/client_test.go @@ -1,7 +1,6 @@ package internal import ( - "context" "net/http" "net/http/httptest" "net/url" @@ -43,7 +42,7 @@ func TestClient_AddRecord(t *testing.T) { TTL: 120, } - newRecord, err := client.AddRecord(context.Background(), "example.com", record) + newRecord, err := client.AddRecord(t.Context(), "example.com", record) require.NoError(t, err) expected := &Record{ @@ -65,7 +64,7 @@ func TestClient_DeleteRecord(t *testing.T) { servermock.CheckRequestJSONBodyFromFixture("delete_record-request.json")). Build(t) - err := client.DeleteRecord(context.Background(), "example.com", "12345") + err := client.DeleteRecord(t.Context(), "example.com", "12345") require.NoError(t, err) } @@ -76,7 +75,7 @@ func TestClient_DeleteRecord_error(t *testing.T) { WithStatusCode(http.StatusUnauthorized)). Build(t) - err := client.DeleteRecord(context.Background(), "example.com", "12345") + err := client.DeleteRecord(t.Context(), "example.com", "12345") require.EqualError(t, err, "[status code: 401] Something went wrong") } @@ -87,6 +86,6 @@ func TestClient_DeleteRecord_error_other(t *testing.T) { WithStatusCode(http.StatusNotFound)). Build(t) - err := client.DeleteRecord(context.Background(), "example.com", "12345") + err := client.DeleteRecord(t.Context(), "example.com", "12345") require.EqualError(t, err, "[status code: 404] Resource not found") } diff --git a/providers/dns/hosttech/hosttech.go b/providers/dns/hosttech/hosttech.go index bcfa7e017..19ae890c1 100644 --- a/providers/dns/hosttech/hosttech.go +++ b/providers/dns/hosttech/hosttech.go @@ -105,9 +105,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -145,9 +143,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/hosttech/hosttech_test.go b/providers/dns/hosttech/hosttech_test.go index 2d41c3e4d..b5ecf1fea 100644 --- a/providers/dns/hosttech/hosttech_test.go +++ b/providers/dns/hosttech/hosttech_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -113,6 +113,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/httpnet/httpnet.go b/providers/dns/httpnet/httpnet.go index a2ab0450f..e132aee2e 100644 --- a/providers/dns/httpnet/httpnet.go +++ b/providers/dns/httpnet/httpnet.go @@ -2,6 +2,7 @@ package httpnet import ( + "context" "errors" "fmt" "net/http" @@ -81,8 +82,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("httpnet: %w", err) } @@ -91,8 +92,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("httpnet: %w", err) } diff --git a/providers/dns/httpnet/httpnet_test.go b/providers/dns/httpnet/httpnet_test.go index 0a758a727..4a2cce834 100644 --- a/providers/dns/httpnet/httpnet_test.go +++ b/providers/dns/httpnet/httpnet_test.go @@ -119,7 +119,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -135,6 +135,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/httpreq/httpreq.go b/providers/dns/httpreq/httpreq.go index 23a8cf82b..0df2ba7a2 100644 --- a/providers/dns/httpreq/httpreq.go +++ b/providers/dns/httpreq/httpreq.go @@ -115,9 +115,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { if d.config.Mode == "RAW" { msg := &messageRaw{ Domain: domain, @@ -148,9 +146,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { if d.config.Mode == "RAW" { msg := &messageRaw{ Domain: domain, diff --git a/providers/dns/httpreq/httpreq_test.go b/providers/dns/httpreq/httpreq_test.go index 2dc624375..62b8cf7f8 100644 --- a/providers/dns/httpreq/httpreq_test.go +++ b/providers/dns/httpreq/httpreq_test.go @@ -153,7 +153,7 @@ func TestNewDNSProvider_Present(t *testing.T) { t.Run(test.desc, func(t *testing.T) { p := test.builder.Build(t) - err := p.Present("domain", "token", "key") + err := p.Present(t.Context(), "domain", "token", "key") if test.expectedError == "" { require.NoError(t, err) } else { @@ -214,7 +214,7 @@ func TestNewDNSProvider_Cleanup(t *testing.T) { t.Run(test.desc, func(t *testing.T) { p := test.builder.Build(t) - err := p.CleanUp("domain", "token", "key") + err := p.CleanUp(t.Context(), "domain", "token", "key") if test.expectedError == "" { require.NoError(t, err) } else { diff --git a/providers/dns/huaweicloud/huaweicloud.go b/providers/dns/huaweicloud/huaweicloud.go index 990daf191..22d669c6c 100644 --- a/providers/dns/huaweicloud/huaweicloud.go +++ b/providers/dns/huaweicloud/huaweicloud.go @@ -128,9 +128,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -179,8 +177,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // gets the record's unique ID from when we created it diff --git a/providers/dns/huaweicloud/huaweicloud_test.go b/providers/dns/huaweicloud/huaweicloud_test.go index 7259abe04..bbd1f4d54 100644 --- a/providers/dns/huaweicloud/huaweicloud_test.go +++ b/providers/dns/huaweicloud/huaweicloud_test.go @@ -145,7 +145,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -161,6 +161,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/hurricane/hurricane.go b/providers/dns/hurricane/hurricane.go index 6539637a6..aeee4c82c 100644 --- a/providers/dns/hurricane/hurricane.go +++ b/providers/dns/hurricane/hurricane.go @@ -95,8 +95,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present updates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.UpdateTxtRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) @@ -108,8 +107,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp updates the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.UpdateTxtRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), ".") diff --git a/providers/dns/hurricane/hurricane_test.go b/providers/dns/hurricane/hurricane_test.go index 9da2d9ed1..2c40b8eca 100644 --- a/providers/dns/hurricane/hurricane_test.go +++ b/providers/dns/hurricane/hurricane_test.go @@ -125,7 +125,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -139,6 +139,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/hyperone/hyperone.go b/providers/dns/hyperone/hyperone.go index 113f691ce..3815df0ef 100644 --- a/providers/dns/hyperone/hyperone.go +++ b/providers/dns/hyperone/hyperone.go @@ -110,8 +110,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -143,8 +142,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { // CleanUp removes the TXT record matching the specified parameters and recordset if no other records are remaining. // There is a small possibility that race will cause to delete recordset with records for other DNS Challenges. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/hyperone/hyperone_test.go b/providers/dns/hyperone/hyperone_test.go index 4dc92f5db..b89e2f270 100644 --- a/providers/dns/hyperone/hyperone_test.go +++ b/providers/dns/hyperone/hyperone_test.go @@ -129,7 +129,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -143,6 +143,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ibmcloud/ibmcloud.go b/providers/dns/ibmcloud/ibmcloud.go index 32a6499cf..e0c6b105b 100644 --- a/providers/dns/ibmcloud/ibmcloud.go +++ b/providers/dns/ibmcloud/ibmcloud.go @@ -109,8 +109,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. @@ -123,8 +122,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. diff --git a/providers/dns/ibmcloud/ibmcloud_test.go b/providers/dns/ibmcloud/ibmcloud_test.go index 0ba7d2d07..6532cf7d4 100644 --- a/providers/dns/ibmcloud/ibmcloud_test.go +++ b/providers/dns/ibmcloud/ibmcloud_test.go @@ -132,7 +132,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -148,6 +148,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/iij/iij.go b/providers/dns/iij/iij.go index 9ecd799df..194475595 100644 --- a/providers/dns/iij/iij.go +++ b/providers/dns/iij/iij.go @@ -91,8 +91,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. @@ -105,8 +104,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. diff --git a/providers/dns/iij/iij_test.go b/providers/dns/iij/iij_test.go index f5f887159..1cc958f36 100644 --- a/providers/dns/iij/iij_test.go +++ b/providers/dns/iij/iij_test.go @@ -243,7 +243,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -257,6 +257,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/iijdpf/iijdpf.go b/providers/dns/iijdpf/iijdpf.go index 5c241701a..17b4b0fa7 100644 --- a/providers/dns/iijdpf/iijdpf.go +++ b/providers/dns/iijdpf/iijdpf.go @@ -95,9 +95,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, err := dpfapiutils.GetZoneIdFromServiceCode(ctx, d.client, d.config.ServiceCode) @@ -119,9 +117,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, err := dpfapiutils.GetZoneIdFromServiceCode(ctx, d.client, d.config.ServiceCode) diff --git a/providers/dns/iijdpf/iijdpf_test.go b/providers/dns/iijdpf/iijdpf_test.go index 95a354cf5..00eb7ad36 100644 --- a/providers/dns/iijdpf/iijdpf_test.go +++ b/providers/dns/iijdpf/iijdpf_test.go @@ -120,7 +120,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -134,6 +134,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/infoblox/infoblox.go b/providers/dns/infoblox/infoblox.go index 9ddefe099..303a2c969 100644 --- a/providers/dns/infoblox/infoblox.go +++ b/providers/dns/infoblox/infoblox.go @@ -158,9 +158,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) connector, err := infoblox.NewConnector(d.ibConfig, d.ibAuth, d.transportConfig, &infoblox.WapiRequestBuilder{}, &infoblox.WapiHttpRequestor{}) @@ -185,8 +183,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) connector, err := infoblox.NewConnector(d.ibConfig, d.ibAuth, d.transportConfig, &infoblox.WapiRequestBuilder{}, &infoblox.WapiHttpRequestor{}) diff --git a/providers/dns/infoblox/infoblox_test.go b/providers/dns/infoblox/infoblox_test.go index a45a3ba65..55cdcde2d 100644 --- a/providers/dns/infoblox/infoblox_test.go +++ b/providers/dns/infoblox/infoblox_test.go @@ -154,7 +154,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -170,6 +170,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/infomaniak/infomaniak.go b/providers/dns/infomaniak/infomaniak.go index 83eb813a4..f631c1e62 100644 --- a/providers/dns/infomaniak/infomaniak.go +++ b/providers/dns/infomaniak/infomaniak.go @@ -115,8 +115,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) ikDomain, err := d.client.GetDomainByName(ctx, dns01.UnFqdn(info.EffectiveFQDN)) @@ -153,8 +152,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/infomaniak/infomaniak_test.go b/providers/dns/infomaniak/infomaniak_test.go index 36b736ba4..dba41c90b 100644 --- a/providers/dns/infomaniak/infomaniak_test.go +++ b/providers/dns/infomaniak/infomaniak_test.go @@ -106,7 +106,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -122,6 +122,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/internal/active24/provider.go b/providers/dns/internal/active24/provider.go index eb44ffb0a..c6212a164 100644 --- a/providers/dns/internal/active24/provider.go +++ b/providers/dns/internal/active24/provider.go @@ -55,9 +55,7 @@ func NewDNSProviderConfig(config *Config, baseAPIDomain string) (*DNSProvider, e } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -91,9 +89,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/internal/gcore/provider.go b/providers/dns/internal/gcore/provider.go index dd14a8459..8215a4a61 100644 --- a/providers/dns/internal/gcore/provider.go +++ b/providers/dns/internal/gcore/provider.go @@ -66,8 +66,7 @@ func NewDNSProviderConfig(config *Config, baseURL string) (*DNSProvider, error) } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.guessZone(ctx, info.EffectiveFQDN) @@ -84,8 +83,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.guessZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/internal/hostingde/provider.go b/providers/dns/internal/hostingde/provider.go index 0df1eeebd..0eded12dd 100644 --- a/providers/dns/internal/hostingde/provider.go +++ b/providers/dns/internal/hostingde/provider.go @@ -73,9 +73,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneName, err := d.getZoneName(ctx, info.EffectiveFQDN) @@ -130,9 +128,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneName, err := d.getZoneName(ctx, info.EffectiveFQDN) diff --git a/providers/dns/internal/ionos/provider.go b/providers/dns/internal/ionos/provider.go index 655533b99..f86af30df 100644 --- a/providers/dns/internal/ionos/provider.go +++ b/providers/dns/internal/ionos/provider.go @@ -74,8 +74,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zones, err := d.client.ListZones(ctx) @@ -116,8 +115,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zones, err := d.client.ListZones(ctx) diff --git a/providers/dns/internal/rimuhosting/provider.go b/providers/dns/internal/rimuhosting/provider.go index 20067be60..360e15702 100644 --- a/providers/dns/internal/rimuhosting/provider.go +++ b/providers/dns/internal/rimuhosting/provider.go @@ -66,8 +66,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records, err := d.client.FindTXTRecords(ctx, dns01.UnFqdn(info.EffectiveFQDN)) @@ -92,8 +91,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) action := internal.NewDeleteRecordAction(dns01.UnFqdn(info.EffectiveFQDN), info.Value) diff --git a/providers/dns/internal/selectel/provider.go b/providers/dns/internal/selectel/provider.go index 6c7d5558e..6a51252b2 100644 --- a/providers/dns/internal/selectel/provider.go +++ b/providers/dns/internal/selectel/provider.go @@ -76,8 +76,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill DNS-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. @@ -102,8 +101,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes a TXT record used for DNS-01 challenge. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) recordName := dns01.UnFqdn(info.EffectiveFQDN) diff --git a/providers/dns/internal/tecnocratica/provider.go b/providers/dns/internal/tecnocratica/provider.go index b0ce8f456..e01b4e94b 100644 --- a/providers/dns/internal/tecnocratica/provider.go +++ b/providers/dns/internal/tecnocratica/provider.go @@ -80,9 +80,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -123,8 +121,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/internal/tecnocratica/provider_test.go b/providers/dns/internal/tecnocratica/provider_test.go index 221cd99bc..a46695580 100644 --- a/providers/dns/internal/tecnocratica/provider_test.go +++ b/providers/dns/internal/tecnocratica/provider_test.go @@ -78,7 +78,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("create_record-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -94,6 +94,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs[token] = 123 provider.zoneIDs[token] = 456 - err := provider.CleanUp("example.com", token, "123d==") + err := provider.CleanUp(t.Context(), "example.com", token, "123d==") require.NoError(t, err) } diff --git a/providers/dns/internal/westcn/provider.go b/providers/dns/internal/westcn/provider.go index 717908cb2..910bf2a0c 100644 --- a/providers/dns/internal/westcn/provider.go +++ b/providers/dns/internal/westcn/provider.go @@ -69,9 +69,7 @@ func NewDNSProviderConfig(config *Config, baseURL string) (*DNSProvider, error) } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -105,9 +103,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/internal/westcn/provider_test.go b/providers/dns/internal/westcn/provider_test.go index 312b029d2..fa3a42c7d 100644 --- a/providers/dns/internal/westcn/provider_test.go +++ b/providers/dns/internal/westcn/provider_test.go @@ -100,7 +100,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -122,6 +122,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs["abc"] = 123 - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/internetbs/internetbs.go b/providers/dns/internetbs/internetbs.go index a9fee14b4..2b29a56de 100644 --- a/providers/dns/internetbs/internetbs.go +++ b/providers/dns/internetbs/internetbs.go @@ -104,8 +104,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) query := internal.RecordQuery{ @@ -124,8 +123,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) query := internal.RecordQuery{ diff --git a/providers/dns/internetbs/internetbs_test.go b/providers/dns/internetbs/internetbs_test.go index c397743fd..b8311b92f 100644 --- a/providers/dns/internetbs/internetbs_test.go +++ b/providers/dns/internetbs/internetbs_test.go @@ -126,7 +126,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -142,6 +142,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/inwx/inwx.go b/providers/dns/inwx/inwx.go index faf063823..5906dbeef 100644 --- a/providers/dns/inwx/inwx.go +++ b/providers/dns/inwx/inwx.go @@ -97,8 +97,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -145,8 +144,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/inwx/inwx_test.go b/providers/dns/inwx/inwx_test.go index 709510077..adbbcbeb5 100644 --- a/providers/dns/inwx/inwx_test.go +++ b/providers/dns/inwx/inwx_test.go @@ -135,14 +135,14 @@ func TestLivePresentAndCleanup(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) // Verify that no error is thrown if record already exists - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ionos/ionos.go b/providers/dns/ionos/ionos.go index ad53f8a8c..5d1b812ad 100644 --- a/providers/dns/ionos/ionos.go +++ b/providers/dns/ionos/ionos.go @@ -2,6 +2,7 @@ package ionos import ( + "context" "errors" "fmt" "net/http" @@ -84,8 +85,8 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("ionos: %w", err) } @@ -94,8 +95,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("ionos: %w", err) } diff --git a/providers/dns/ionos/ionos_test.go b/providers/dns/ionos/ionos_test.go index b3d9f3322..d83fd7539 100644 --- a/providers/dns/ionos/ionos_test.go +++ b/providers/dns/ionos/ionos_test.go @@ -107,7 +107,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -121,6 +121,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ionoscloud/ionoscloud.go b/providers/dns/ionoscloud/ionoscloud.go index 36f812ce5..1bbfe0eff 100644 --- a/providers/dns/ionoscloud/ionoscloud.go +++ b/providers/dns/ionoscloud/ionoscloud.go @@ -98,9 +98,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -145,8 +143,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/ionoscloud/ionoscloud_test.go b/providers/dns/ionoscloud/ionoscloud_test.go index 239c862a5..bd5fb88c3 100644 --- a/providers/dns/ionoscloud/ionoscloud_test.go +++ b/providers/dns/ionoscloud/ionoscloud_test.go @@ -101,7 +101,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -115,7 +115,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -152,7 +152,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("create_record-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -168,6 +168,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.zoneIDs[token] = "e74d0d15-f567-4b7b-9069-26ee1f93bae3" provider.recordIDs[token] = "90d81ac0-3a30-44d4-95a5-12959effa6ee" - err := provider.CleanUp("example.com", token, "123d==") + err := provider.CleanUp(t.Context(), "example.com", token, "123d==") require.NoError(t, err) } diff --git a/providers/dns/ipv64/ipv64.go b/providers/dns/ipv64/ipv64.go index 53559e9b7..9ee8c071a 100644 --- a/providers/dns/ipv64/ipv64.go +++ b/providers/dns/ipv64/ipv64.go @@ -92,8 +92,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) sub, root, err := splitDomain(dns01.UnFqdn(info.EffectiveFQDN)) @@ -110,8 +109,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp clears IPv64 TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) sub, root, err := splitDomain(dns01.UnFqdn(info.EffectiveFQDN)) diff --git a/providers/dns/ipv64/ipv64_test.go b/providers/dns/ipv64/ipv64_test.go index b198f74b1..0c2251b09 100644 --- a/providers/dns/ipv64/ipv64_test.go +++ b/providers/dns/ipv64/ipv64_test.go @@ -176,7 +176,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -192,6 +192,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ispconfig/ispconfig.go b/providers/dns/ispconfig/ispconfig.go index cb2cc4e19..95c868592 100644 --- a/providers/dns/ispconfig/ispconfig.go +++ b/providers/dns/ispconfig/ispconfig.go @@ -121,9 +121,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) sessionID, err := d.client.Login(ctx, d.config.Username, d.config.Password) @@ -171,9 +169,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // gets the record's unique ID diff --git a/providers/dns/ispconfig/ispconfig_test.go b/providers/dns/ispconfig/ispconfig_test.go index 92c8536f8..80bdc0c44 100644 --- a/providers/dns/ispconfig/ispconfig_test.go +++ b/providers/dns/ispconfig/ispconfig_test.go @@ -154,7 +154,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -168,6 +168,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ispconfigddns/ispconfigddns.go b/providers/dns/ispconfigddns/ispconfigddns.go index 81579d690..c23a53c8c 100644 --- a/providers/dns/ispconfigddns/ispconfigddns.go +++ b/providers/dns/ispconfigddns/ispconfigddns.go @@ -111,9 +111,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -130,9 +128,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/ispconfigddns/ispconfigddns_test.go b/providers/dns/ispconfigddns/ispconfigddns_test.go index a905357dc..523066152 100644 --- a/providers/dns/ispconfigddns/ispconfigddns_test.go +++ b/providers/dns/ispconfigddns/ispconfigddns_test.go @@ -126,7 +126,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -140,7 +140,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -171,7 +171,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -188,6 +188,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { ). Build(t) - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/iwantmyname/iwantmyname.go b/providers/dns/iwantmyname/iwantmyname.go index 742f83d9c..e6b3c040c 100644 --- a/providers/dns/iwantmyname/iwantmyname.go +++ b/providers/dns/iwantmyname/iwantmyname.go @@ -2,6 +2,7 @@ package iwantmyname import ( + "context" "errors" "fmt" "net/http" @@ -73,11 +74,11 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { return nil } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { return nil } diff --git a/providers/dns/jdcloud/jdcloud.go b/providers/dns/jdcloud/jdcloud.go index e35a0d3d5..b296dc7d2 100644 --- a/providers/dns/jdcloud/jdcloud.go +++ b/providers/dns/jdcloud/jdcloud.go @@ -105,8 +105,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -151,8 +150,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/jdcloud/jdcloud_test.go b/providers/dns/jdcloud/jdcloud_test.go index 299a5c57d..ae7953748 100644 --- a/providers/dns/jdcloud/jdcloud_test.go +++ b/providers/dns/jdcloud/jdcloud_test.go @@ -139,7 +139,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -153,7 +153,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -212,7 +212,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) require.Len(t, provider.domainIDs, 1) @@ -237,6 +237,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.domainIDs["abc"] = 20 provider.recordIDs["abc"] = 123 - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/joker/joker_test.go b/providers/dns/joker/joker_test.go index 55a890045..759871f47 100644 --- a/providers/dns/joker/joker_test.go +++ b/providers/dns/joker/joker_test.go @@ -117,7 +117,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -133,6 +133,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/joker/provider_dmapi.go b/providers/dns/joker/provider_dmapi.go index 4e1609239..fdafa64fd 100644 --- a/providers/dns/joker/provider_dmapi.go +++ b/providers/dns/joker/provider_dmapi.go @@ -77,9 +77,7 @@ func (d *dmapiProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *dmapiProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *dmapiProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -92,7 +90,7 @@ func (d *dmapiProvider) Present(domain, token, keyAuth string) error { return fmt.Errorf("joker: %w", err) } - ctxAuth, err := d.client.CreateAuthenticatedContext(context.Background()) + ctxAuth, err := d.client.CreateAuthenticatedContext(ctx) if err != nil { return fmt.Errorf("joker: create authenticated context: %w", err) } @@ -113,9 +111,7 @@ func (d *dmapiProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *dmapiProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *dmapiProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -128,7 +124,7 @@ func (d *dmapiProvider) CleanUp(domain, token, keyAuth string) error { return fmt.Errorf("joker: %w", err) } - ctxAuth, err := d.client.CreateAuthenticatedContext(context.Background()) + ctxAuth, err := d.client.CreateAuthenticatedContext(ctx) if err != nil { return fmt.Errorf("joker: create authenticated context: %w", err) } diff --git a/providers/dns/joker/provider_svc.go b/providers/dns/joker/provider_svc.go index eae59809f..c3ce36c2a 100644 --- a/providers/dns/joker/provider_svc.go +++ b/providers/dns/joker/provider_svc.go @@ -60,9 +60,7 @@ func (d *svcProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *svcProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *svcProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -75,7 +73,7 @@ func (d *svcProvider) Present(domain, token, keyAuth string) error { return fmt.Errorf("joker: %w", err) } - err = d.client.SendRequest(context.Background(), dns01.UnFqdn(zone), subDomain, info.Value) + err = d.client.SendRequest(ctx, dns01.UnFqdn(zone), subDomain, info.Value) if err != nil { return fmt.Errorf("joker: send request: %w", err) } @@ -84,9 +82,7 @@ func (d *svcProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *svcProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *svcProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -99,7 +95,7 @@ func (d *svcProvider) CleanUp(domain, token, keyAuth string) error { return fmt.Errorf("joker: %w", err) } - err = d.client.SendRequest(context.Background(), dns01.UnFqdn(zone), subDomain, "") + err = d.client.SendRequest(ctx, dns01.UnFqdn(zone), subDomain, "") if err != nil { return fmt.Errorf("joker: send request: %w", err) } diff --git a/providers/dns/keyhelp/keyhelp.go b/providers/dns/keyhelp/keyhelp.go index 9f4df71d3..f10630985 100644 --- a/providers/dns/keyhelp/keyhelp.go +++ b/providers/dns/keyhelp/keyhelp.go @@ -99,9 +99,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -153,9 +151,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // get the domain's unique ID from when we created it diff --git a/providers/dns/keyhelp/keyhelp_test.go b/providers/dns/keyhelp/keyhelp_test.go index 1d4e29b56..2dab45e2e 100644 --- a/providers/dns/keyhelp/keyhelp_test.go +++ b/providers/dns/keyhelp/keyhelp_test.go @@ -130,7 +130,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -144,7 +144,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -176,7 +176,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("update_domain_records-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) assert.Equal(t, 8, provider.domainIDs["abc"]) @@ -193,6 +193,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.domainIDs["abc"] = 8 - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/liara/liara.go b/providers/dns/liara/liara.go index 08fc447b2..534dc87f3 100644 --- a/providers/dns/liara/liara.go +++ b/providers/dns/liara/liara.go @@ -128,9 +128,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -163,9 +161,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/liara/liara_test.go b/providers/dns/liara/liara_test.go index 127655cda..1039952ab 100644 --- a/providers/dns/liara/liara_test.go +++ b/providers/dns/liara/liara_test.go @@ -118,7 +118,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -132,6 +132,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/lightsail/lightsail.go b/providers/dns/lightsail/lightsail.go index 0b43e3f8a..c5ad46e8b 100644 --- a/providers/dns/lightsail/lightsail.go +++ b/providers/dns/lightsail/lightsail.go @@ -116,8 +116,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) params := &lightsail.CreateDomainEntryInput{ @@ -138,8 +137,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) params := &lightsail.DeleteDomainEntryInput{ diff --git a/providers/dns/lightsail/lightsail_integration_test.go b/providers/dns/lightsail/lightsail_integration_test.go index 849bce6c7..6247a3cc9 100644 --- a/providers/dns/lightsail/lightsail_integration_test.go +++ b/providers/dns/lightsail/lightsail_integration_test.go @@ -22,7 +22,7 @@ func TestLiveTTL(t *testing.T) { domain := envTest.GetDomain() - err = provider.Present(domain, "foo", "bar") + err = provider.Present(t.Context(), domain, "foo", "bar") require.NoError(t, err) // we need a separate Lightsail client here as the one in the DNS provider is unexported. @@ -38,7 +38,7 @@ func TestLiveTTL(t *testing.T) { require.NoError(t, err) defer func() { - errC := provider.CleanUp(domain, "foo", "bar") + errC := provider.CleanUp(t.Context(), domain, "foo", "bar") if errC != nil { t.Log(errC) } diff --git a/providers/dns/lightsail/lightsail_test.go b/providers/dns/lightsail/lightsail_test.go index e3f849d6f..8ae97d5b6 100644 --- a/providers/dns/lightsail/lightsail_test.go +++ b/providers/dns/lightsail/lightsail_test.go @@ -76,6 +76,6 @@ func TestDNSProvider_Present(t *testing.T) { domain := "example.com" keyAuth := "123456d==" - err := provider.Present(domain, "", keyAuth) + err := provider.Present(t.Context(), domain, "", keyAuth) require.NoError(t, err) } diff --git a/providers/dns/limacity/limacity.go b/providers/dns/limacity/limacity.go index 441b587cc..dc8a9b4a8 100644 --- a/providers/dns/limacity/limacity.go +++ b/providers/dns/limacity/limacity.go @@ -116,9 +116,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) domains, err := d.client.GetDomains(ctx) @@ -156,9 +154,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // gets the domain's unique ID diff --git a/providers/dns/limacity/limacity_test.go b/providers/dns/limacity/limacity_test.go index fb7d398c1..8c18ac019 100644 --- a/providers/dns/limacity/limacity_test.go +++ b/providers/dns/limacity/limacity_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/linode/linode.go b/providers/dns/linode/linode.go index fb43263b0..0eef258ea 100644 --- a/providers/dns/linode/linode.go +++ b/providers/dns/linode/linode.go @@ -130,9 +130,7 @@ func (d *DNSProvider) Timeout() (time.Duration, time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZoneInfo(ctx, info.EffectiveFQDN) @@ -153,9 +151,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZoneInfo(ctx, info.EffectiveFQDN) diff --git a/providers/dns/linode/linode_test.go b/providers/dns/linode/linode_test.go index dce9a7c41..f85d8df94 100644 --- a/providers/dns/linode/linode_test.go +++ b/providers/dns/linode/linode_test.go @@ -168,7 +168,7 @@ func TestDNSProvider_Present(t *testing.T) { t.Run(test.desc, func(t *testing.T) { provider := test.builder.Build(t) - err := provider.Present(domain, "", keyAuth) + err := provider.Present(t.Context(), domain, "", keyAuth) if test.expectedError == "" { assert.NoError(t, err) } else { @@ -287,7 +287,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { t.Run(test.desc, func(t *testing.T) { provider := test.builder.Build(t) - err := provider.CleanUp(domain, "", keyAuth) + err := provider.CleanUp(t.Context(), domain, "", keyAuth) if test.expectedError == "" { assert.NoError(t, err) } else { diff --git a/providers/dns/liquidweb/liquidweb.go b/providers/dns/liquidweb/liquidweb.go index f6ffb68e9..f2734f25b 100644 --- a/providers/dns/liquidweb/liquidweb.go +++ b/providers/dns/liquidweb/liquidweb.go @@ -118,8 +118,7 @@ func (d *DNSProvider) Timeout() (time.Duration, time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) params := &network.DNSRecordParams{ @@ -152,7 +151,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { d.recordIDsMu.Lock() recordID, ok := d.recordIDs[token] d.recordIDsMu.Unlock() diff --git a/providers/dns/liquidweb/liquidweb_test.go b/providers/dns/liquidweb/liquidweb_test.go index 6bc3eb26d..870e59656 100644 --- a/providers/dns/liquidweb/liquidweb_test.go +++ b/providers/dns/liquidweb/liquidweb_test.go @@ -148,7 +148,7 @@ func TestNewDNSProviderConfig(t *testing.T) { func TestDNSProvider_Present(t *testing.T) { provider := mockProvider(t) - err := provider.Present("tacoman.example", "", "") + err := provider.Present(t.Context(), "tacoman.example", "", "") require.NoError(t, err) } @@ -164,7 +164,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs["123d=="] = 1234567 - err := provider.CleanUp("tacoman.example.", "123d==", "") + err := provider.CleanUp(t.Context(), "tacoman.example.", "123d==", "") require.NoError(t, err) } @@ -227,7 +227,7 @@ func TestDNSProvider(t *testing.T) { provider := mockProvider(t, test.initRecs...) if test.present { - err := provider.Present(test.domain, test.token, test.keyAuth) + err := provider.Present(t.Context(), test.domain, test.token, test.keyAuth) if test.expPresentErr == "" { require.NoError(t, err) } else { @@ -236,7 +236,7 @@ func TestDNSProvider(t *testing.T) { } if test.cleanup { - err := provider.CleanUp(test.domain, test.token, test.keyAuth) + err := provider.CleanUp(t.Context(), test.domain, test.token, test.keyAuth) require.NoError(t, err) } }) @@ -253,7 +253,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -269,6 +269,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/loopia/loopia.go b/providers/dns/loopia/loopia.go index da401dbfb..ffcf2ef5d 100644 --- a/providers/dns/loopia/loopia.go +++ b/providers/dns/loopia/loopia.go @@ -135,9 +135,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) subDomain, authZone, err := d.splitDomain(ctx, info.EffectiveFQDN) @@ -169,9 +167,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) subDomain, authZone, err := d.splitDomain(ctx, info.EffectiveFQDN) diff --git a/providers/dns/loopia/loopia_mock_test.go b/providers/dns/loopia/loopia_mock_test.go index bbb42a22e..7ca573d16 100644 --- a/providers/dns/loopia/loopia_mock_test.go +++ b/providers/dns/loopia/loopia_mock_test.go @@ -85,14 +85,14 @@ func TestDNSProvider_Present(t *testing.T) { provider.client = client if test.callAddTXTRecord { - client.On("AddTXTRecord", exampleDomain, exampleSubDomain, config.TTL, exampleRdata).Return(test.addTXTRecordError) + client.On("AddTXTRecord", mock.Anything, exampleDomain, exampleSubDomain, config.TTL, exampleRdata).Return(test.addTXTRecordError) } if test.callGetTXTRecords { - client.On("GetTXTRecords", exampleDomain, exampleSubDomain).Return(test.getTXTRecordsReturn, test.getTXTRecordsError) + client.On("GetTXTRecords", mock.Anything, exampleDomain, exampleSubDomain).Return(test.getTXTRecordsReturn, test.getTXTRecordsError) } - err = provider.Present(exampleDomain, "token", "key") + err = provider.Present(t.Context(), exampleDomain, "token", "key") client.AssertExpectations(t) @@ -186,18 +186,18 @@ func TestDNSProvider_Cleanup(t *testing.T) { provider.inProgressInfo["token"] = 12345678 if test.callAddTXTRecord { - client.On("RemoveTXTRecord", "example.com", "_acme-challenge", 12345678).Return(test.removeTXTRecordError) + client.On("RemoveTXTRecord", mock.Anything, "example.com", "_acme-challenge", 12345678).Return(test.removeTXTRecordError) } if test.callGetTXTRecords { - client.On("GetTXTRecords", "example.com", "_acme-challenge").Return(test.getTXTRecordsReturn, test.getTXTRecordsError) + client.On("GetTXTRecords", mock.Anything, "example.com", "_acme-challenge").Return(test.getTXTRecordsReturn, test.getTXTRecordsError) } if test.callRemoveSubdomain { - client.On("RemoveSubdomain", "example.com", "_acme-challenge").Return(test.removeSubdomainError) + client.On("RemoveSubdomain", mock.Anything, "example.com", "_acme-challenge").Return(test.removeSubdomainError) } - err = provider.CleanUp("example.com", "token", "key") + err = provider.CleanUp(t.Context(), "example.com", "token", "key") client.AssertExpectations(t) @@ -216,21 +216,21 @@ type mockedClient struct { } func (c *mockedClient) RemoveTXTRecord(ctx context.Context, domain, subdomain string, recordID int) error { - args := c.Called(domain, subdomain, recordID) + args := c.Called(ctx, domain, subdomain, recordID) return args.Error(0) } func (c *mockedClient) AddTXTRecord(ctx context.Context, domain, subdomain string, ttl int, value string) error { - args := c.Called(domain, subdomain, ttl, value) + args := c.Called(ctx, domain, subdomain, ttl, value) return args.Error(0) } func (c *mockedClient) GetTXTRecords(ctx context.Context, domain, subdomain string) ([]internal.RecordObj, error) { - args := c.Called(domain, subdomain) + args := c.Called(ctx, domain, subdomain) return args.Get(0).([]internal.RecordObj), args.Error(1) } func (c *mockedClient) RemoveSubdomain(ctx context.Context, domain, subdomain string) error { - args := c.Called(domain, subdomain) + args := c.Called(ctx, domain, subdomain) return args.Error(0) } diff --git a/providers/dns/loopia/loopia_test.go b/providers/dns/loopia/loopia_test.go index eb04747db..68af4ccc5 100644 --- a/providers/dns/loopia/loopia_test.go +++ b/providers/dns/loopia/loopia_test.go @@ -198,7 +198,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -214,6 +214,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/luadns/luadns.go b/providers/dns/luadns/luadns.go index 1f1505b0e..6e37888e2 100644 --- a/providers/dns/luadns/luadns.go +++ b/providers/dns/luadns/luadns.go @@ -117,8 +117,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zones, err := d.client.ListZones(ctx) @@ -156,8 +155,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordsMu.Lock() diff --git a/providers/dns/luadns/luadns_test.go b/providers/dns/luadns/luadns_test.go index 00365de28..c06e77ca0 100644 --- a/providers/dns/luadns/luadns_test.go +++ b/providers/dns/luadns/luadns_test.go @@ -204,7 +204,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -218,6 +218,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/mailinabox/mailinabox.go b/providers/dns/mailinabox/mailinabox.go index 30d207078..9a5ad2d23 100644 --- a/providers/dns/mailinabox/mailinabox.go +++ b/providers/dns/mailinabox/mailinabox.go @@ -109,8 +109,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) record := mailinabox.Record{ @@ -128,8 +127,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) record := mailinabox.Record{ diff --git a/providers/dns/mailinabox/mailinabox_test.go b/providers/dns/mailinabox/mailinabox_test.go index 19c14202d..57181823d 100644 --- a/providers/dns/mailinabox/mailinabox_test.go +++ b/providers/dns/mailinabox/mailinabox_test.go @@ -141,7 +141,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -157,6 +157,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/manageengine/manageengine.go b/providers/dns/manageengine/manageengine.go index b238db8b2..96547622a 100644 --- a/providers/dns/manageengine/manageengine.go +++ b/providers/dns/manageengine/manageengine.go @@ -87,9 +87,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -158,9 +156,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/manageengine/manageengine_test.go b/providers/dns/manageengine/manageengine_test.go index 308e6da24..89c5b4efb 100644 --- a/providers/dns/manageengine/manageengine_test.go +++ b/providers/dns/manageengine/manageengine_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/manual/manual.go b/providers/dns/manual/manual.go index 2d3087d63..945346703 100644 --- a/providers/dns/manual/manual.go +++ b/providers/dns/manual/manual.go @@ -23,8 +23,7 @@ func NewDNSProvider() (*DNSProvider, error) { } // Present prints instructions for manually creating the TXT record. -func (*DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (*DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -45,8 +44,7 @@ func (*DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp prints instructions for manually removing the TXT record. -func (*DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (*DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/manual/manual_test.go b/providers/dns/manual/manual_test.go index 7badd4b8b..a83438bfb 100644 --- a/providers/dns/manual/manual_test.go +++ b/providers/dns/manual/manual_test.go @@ -47,13 +47,13 @@ func TestDNSProviderManual(t *testing.T) { manualProvider, err := NewDNSProvider() require.NoError(t, err) - err = manualProvider.Present("example.com", "", "") + err = manualProvider.Present(t.Context(), "example.com", "", "") if test.expectError { require.Error(t, err) } else { require.NoError(t, err) - err = manualProvider.CleanUp("example.com", "", "") + err = manualProvider.CleanUp(t.Context(), "example.com", "", "") require.NoError(t, err) } }) diff --git a/providers/dns/metaname/metaname.go b/providers/dns/metaname/metaname.go index e50a2d22f..92836f2ea 100644 --- a/providers/dns/metaname/metaname.go +++ b/providers/dns/metaname/metaname.go @@ -91,9 +91,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { }, nil } -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -128,9 +126,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { return nil } -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/metaname/metaname_test.go b/providers/dns/metaname/metaname_test.go index efbf704b8..0eac43426 100644 --- a/providers/dns/metaname/metaname_test.go +++ b/providers/dns/metaname/metaname_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -143,6 +143,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/metaregistrar/metaregistrar.go b/providers/dns/metaregistrar/metaregistrar.go index a0daed876..eada3e3bd 100644 --- a/providers/dns/metaregistrar/metaregistrar.go +++ b/providers/dns/metaregistrar/metaregistrar.go @@ -92,9 +92,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -120,9 +118,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/metaregistrar/metaregistrar_test.go b/providers/dns/metaregistrar/metaregistrar_test.go index 24678032b..3800eaddd 100644 --- a/providers/dns/metaregistrar/metaregistrar_test.go +++ b/providers/dns/metaregistrar/metaregistrar_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/mijnhost/mijnhost.go b/providers/dns/mijnhost/mijnhost.go index dee79ddd1..09353bb96 100644 --- a/providers/dns/mijnhost/mijnhost.go +++ b/providers/dns/mijnhost/mijnhost.go @@ -112,9 +112,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) domains, err := d.client.ListDomains(ctx) @@ -161,9 +159,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) domains, err := d.client.ListDomains(ctx) diff --git a/providers/dns/mijnhost/mijnhost_test.go b/providers/dns/mijnhost/mijnhost_test.go index ddc9d4dea..d56d6a650 100644 --- a/providers/dns/mijnhost/mijnhost_test.go +++ b/providers/dns/mijnhost/mijnhost_test.go @@ -99,7 +99,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -113,6 +113,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/mittwald/mittwald.go b/providers/dns/mittwald/mittwald.go index f12a8cc4c..31ed55787 100644 --- a/providers/dns/mittwald/mittwald.go +++ b/providers/dns/mittwald/mittwald.go @@ -121,8 +121,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getOrCreateZone(ctx, info.EffectiveFQDN) @@ -150,8 +149,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // get the record's unique ID from when we created it diff --git a/providers/dns/mittwald/mittwald_test.go b/providers/dns/mittwald/mittwald_test.go index d66fa929c..2fa4d654f 100644 --- a/providers/dns/mittwald/mittwald_test.go +++ b/providers/dns/mittwald/mittwald_test.go @@ -109,7 +109,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -125,7 +125,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/myaddr/myaddr.go b/providers/dns/myaddr/myaddr.go index 7bb99fa0f..7c36afb36 100644 --- a/providers/dns/myaddr/myaddr.go +++ b/providers/dns/myaddr/myaddr.go @@ -101,9 +101,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -130,7 +128,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { // There is no API endpoint to delete a TXT record: // TXT records are automatically removed after a few minutes. return nil diff --git a/providers/dns/myaddr/myaddr_test.go b/providers/dns/myaddr/myaddr_test.go index 45398fdb6..103e9a976 100644 --- a/providers/dns/myaddr/myaddr_test.go +++ b/providers/dns/myaddr/myaddr_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/mydnsjp/mydnsjp.go b/providers/dns/mydnsjp/mydnsjp.go index 3c4f0e410..f5b864916 100644 --- a/providers/dns/mydnsjp/mydnsjp.go +++ b/providers/dns/mydnsjp/mydnsjp.go @@ -101,8 +101,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. @@ -115,8 +114,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. diff --git a/providers/dns/mydnsjp/mydnsjp_test.go b/providers/dns/mydnsjp/mydnsjp_test.go index a661fd4db..95eeb7047 100644 --- a/providers/dns/mydnsjp/mydnsjp_test.go +++ b/providers/dns/mydnsjp/mydnsjp_test.go @@ -129,7 +129,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -145,6 +145,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/mythicbeasts/mythicbeasts.go b/providers/dns/mythicbeasts/mythicbeasts.go index 498d8dc5f..d77b4a2c7 100644 --- a/providers/dns/mythicbeasts/mythicbeasts.go +++ b/providers/dns/mythicbeasts/mythicbeasts.go @@ -125,9 +125,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -156,9 +154,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/mythicbeasts/mythicbeasts_test.go b/providers/dns/mythicbeasts/mythicbeasts_test.go index 8858913cb..1b7bf8d63 100644 --- a/providers/dns/mythicbeasts/mythicbeasts_test.go +++ b/providers/dns/mythicbeasts/mythicbeasts_test.go @@ -136,7 +136,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -152,6 +152,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/namecheap/namecheap.go b/providers/dns/namecheap/namecheap.go index 630b2200f..45a5c1d82 100644 --- a/providers/dns/namecheap/namecheap.go +++ b/providers/dns/namecheap/namecheap.go @@ -139,9 +139,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present installs a TXT record for the DNS challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { // TODO(ldez) replace domain by FQDN to follow CNAME. pr, err := newPseudoRecord(ctx, domain, keyAuth) if err != nil { @@ -176,9 +174,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes a TXT record used for a previous DNS challenge. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { // TODO(ldez) replace domain by FQDN to follow CNAME. pr, err := newPseudoRecord(ctx, domain, keyAuth) if err != nil { diff --git a/providers/dns/namecheap/namecheap_test.go b/providers/dns/namecheap/namecheap_test.go index f92ac1418..65329b029 100644 --- a/providers/dns/namecheap/namecheap_test.go +++ b/providers/dns/namecheap/namecheap_test.go @@ -74,7 +74,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present(test.domain, "", "dummyKey") + err := provider.Present(t.Context(), test.domain, "", "dummyKey") if test.errString != "" { assert.EqualError(t, err, "namecheap: "+test.errString) } else { @@ -114,7 +114,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { ). Build(t) - err := provider.CleanUp(test.domain, "", "dummyKey") + err := provider.CleanUp(t.Context(), test.domain, "", "dummyKey") if test.errString != "" { assert.EqualError(t, err, "namecheap: "+test.errString) } else { diff --git a/providers/dns/namedotcom/namedotcom.go b/providers/dns/namedotcom/namedotcom.go index 3b7ef2124..177947fc2 100644 --- a/providers/dns/namedotcom/namedotcom.go +++ b/providers/dns/namedotcom/namedotcom.go @@ -114,8 +114,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) if info.EffectiveFQDN != info.FQDN { @@ -149,8 +148,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) if info.EffectiveFQDN != info.FQDN { diff --git a/providers/dns/namedotcom/namedotcom_test.go b/providers/dns/namedotcom/namedotcom_test.go index 6b1a11b4d..8130550b6 100644 --- a/providers/dns/namedotcom/namedotcom_test.go +++ b/providers/dns/namedotcom/namedotcom_test.go @@ -136,7 +136,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -152,6 +152,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/namesilo/namesilo.go b/providers/dns/namesilo/namesilo.go index 80b4868b1..59fd4c1ac 100644 --- a/providers/dns/namesilo/namesilo.go +++ b/providers/dns/namesilo/namesilo.go @@ -93,9 +93,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -125,9 +123,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/namesilo/namesilo_test.go b/providers/dns/namesilo/namesilo_test.go index fad5737d3..b43130aef 100644 --- a/providers/dns/namesilo/namesilo_test.go +++ b/providers/dns/namesilo/namesilo_test.go @@ -117,7 +117,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -133,6 +133,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/nearlyfreespeech/nearlyfreespeech.go b/providers/dns/nearlyfreespeech/nearlyfreespeech.go index 30e375500..91e05092e 100644 --- a/providers/dns/nearlyfreespeech/nearlyfreespeech.go +++ b/providers/dns/nearlyfreespeech/nearlyfreespeech.go @@ -114,9 +114,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -145,9 +143,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/nearlyfreespeech/nearlyfreespeech_test.go b/providers/dns/nearlyfreespeech/nearlyfreespeech_test.go index b9d07480c..a7e37b81a 100644 --- a/providers/dns/nearlyfreespeech/nearlyfreespeech_test.go +++ b/providers/dns/nearlyfreespeech/nearlyfreespeech_test.go @@ -131,7 +131,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -147,6 +147,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/neodigit/neodigit.go b/providers/dns/neodigit/neodigit.go index 7eed26361..3d9af1312 100644 --- a/providers/dns/neodigit/neodigit.go +++ b/providers/dns/neodigit/neodigit.go @@ -2,6 +2,7 @@ package neodigit import ( + "context" "errors" "fmt" "net/http" @@ -77,8 +78,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("neodigit: %w", err) } @@ -87,8 +88,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("neodigit: %w", err) } diff --git a/providers/dns/neodigit/neodigit_test.go b/providers/dns/neodigit/neodigit_test.go index 7d0cdb76b..86f415762 100644 --- a/providers/dns/neodigit/neodigit_test.go +++ b/providers/dns/neodigit/neodigit_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/netcup/netcup.go b/providers/dns/netcup/netcup.go index d58cf0808..403d05b2a 100644 --- a/providers/dns/netcup/netcup.go +++ b/providers/dns/netcup/netcup.go @@ -103,9 +103,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -151,9 +149,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/netcup/netcup_test.go b/providers/dns/netcup/netcup_test.go index c972a0162..63ea6f07d 100644 --- a/providers/dns/netcup/netcup_test.go +++ b/providers/dns/netcup/netcup_test.go @@ -181,10 +181,10 @@ func TestLivePresentAndCleanup(t *testing.T) { for _, test := range testCases { t.Run(fmt.Sprintf("domain(%s)", test), func(t *testing.T) { - err = p.Present(test, "987d", "123d==") + err = p.Present(t.Context(), test, "987d", "123d==") require.NoError(t, err) - err = p.CleanUp(test, "987d", "123d==") + err = p.CleanUp(t.Context(), test, "987d", "123d==") require.NoError(t, err) }) } diff --git a/providers/dns/netlify/netlify.go b/providers/dns/netlify/netlify.go index 72ef52278..eb66a41ec 100644 --- a/providers/dns/netlify/netlify.go +++ b/providers/dns/netlify/netlify.go @@ -105,9 +105,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -137,9 +135,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/netlify/netlify_test.go b/providers/dns/netlify/netlify_test.go index cd8214c35..48b403875 100644 --- a/providers/dns/netlify/netlify_test.go +++ b/providers/dns/netlify/netlify_test.go @@ -98,7 +98,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -114,6 +114,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/nicmanager/nicmanager.go b/providers/dns/nicmanager/nicmanager.go index d7f10a4e5..9db045fdd 100644 --- a/providers/dns/nicmanager/nicmanager.go +++ b/providers/dns/nicmanager/nicmanager.go @@ -141,9 +141,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -174,9 +172,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/nicmanager/nicmanager_test.go b/providers/dns/nicmanager/nicmanager_test.go index a0290ec0b..e6c89dfb0 100644 --- a/providers/dns/nicmanager/nicmanager_test.go +++ b/providers/dns/nicmanager/nicmanager_test.go @@ -164,7 +164,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -180,6 +180,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/nicru/nicru.go b/providers/dns/nicru/nicru.go index 75d59ab53..1019580c0 100644 --- a/providers/dns/nicru/nicru.go +++ b/providers/dns/nicru/nicru.go @@ -103,9 +103,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -161,9 +159,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/nicru/nicru_test.go b/providers/dns/nicru/nicru_test.go index 6c56f3216..8f1018958 100644 --- a/providers/dns/nicru/nicru_test.go +++ b/providers/dns/nicru/nicru_test.go @@ -176,7 +176,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -190,6 +190,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/nifcloud/nifcloud.go b/providers/dns/nifcloud/nifcloud.go index 203cae24d..43db3fa4e 100644 --- a/providers/dns/nifcloud/nifcloud.go +++ b/providers/dns/nifcloud/nifcloud.go @@ -110,9 +110,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.changeRecord(ctx, "CREATE", info.EffectiveFQDN, info.Value, d.config.TTL) @@ -124,9 +122,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.changeRecord(ctx, "DELETE", info.EffectiveFQDN, info.Value, d.config.TTL) diff --git a/providers/dns/nifcloud/nifcloud_test.go b/providers/dns/nifcloud/nifcloud_test.go index ea687cc74..863c98e94 100644 --- a/providers/dns/nifcloud/nifcloud_test.go +++ b/providers/dns/nifcloud/nifcloud_test.go @@ -134,7 +134,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -150,6 +150,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/njalla/njalla.go b/providers/dns/njalla/njalla.go index b04b4300b..2c76ebe64 100644 --- a/providers/dns/njalla/njalla.go +++ b/providers/dns/njalla/njalla.go @@ -107,8 +107,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, subDomain, err := splitDomain(info.EffectiveFQDN) @@ -137,8 +136,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, _, err := splitDomain(info.EffectiveFQDN) diff --git a/providers/dns/njalla/njalla_test.go b/providers/dns/njalla/njalla_test.go index aa1a68e26..354636174 100644 --- a/providers/dns/njalla/njalla_test.go +++ b/providers/dns/njalla/njalla_test.go @@ -100,7 +100,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -116,6 +116,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/nodion/nodion.go b/providers/dns/nodion/nodion.go index aa7a31e4a..835d08365 100644 --- a/providers/dns/nodion/nodion.go +++ b/providers/dns/nodion/nodion.go @@ -110,9 +110,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -161,9 +159,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/nodion/nodion_test.go b/providers/dns/nodion/nodion_test.go index a08f22eb8..cff793b57 100644 --- a/providers/dns/nodion/nodion_test.go +++ b/providers/dns/nodion/nodion_test.go @@ -96,7 +96,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -112,6 +112,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ns1/ns1.go b/providers/dns/ns1/ns1.go index 685098eac..381b464b2 100644 --- a/providers/dns/ns1/ns1.go +++ b/providers/dns/ns1/ns1.go @@ -92,8 +92,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -135,8 +134,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/ns1/ns1_test.go b/providers/dns/ns1/ns1_test.go index 384413b81..b8f2678ab 100644 --- a/providers/dns/ns1/ns1_test.go +++ b/providers/dns/ns1/ns1_test.go @@ -101,7 +101,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -117,6 +117,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/octenium/octenium.go b/providers/dns/octenium/octenium.go index 211f49f6c..be88deddd 100644 --- a/providers/dns/octenium/octenium.go +++ b/providers/dns/octenium/octenium.go @@ -103,9 +103,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -138,9 +136,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.domainIDsMu.Lock() diff --git a/providers/dns/octenium/octenium_test.go b/providers/dns/octenium/octenium_test.go index f26eaf67d..56355dc44 100644 --- a/providers/dns/octenium/octenium_test.go +++ b/providers/dns/octenium/octenium_test.go @@ -111,7 +111,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -125,7 +125,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -169,7 +169,7 @@ func TestDNSProvider_Present(t *testing.T) { With("value", "w6uP8Tcg6K2QR905Rms8iXTlksL6OD1KOWBxTK7wxPI")). Build(t) - err := provider.Present("example.com", "", "foobar") + err := provider.Present(t.Context(), "example.com", "", "foobar") require.NoError(t, err) } @@ -193,6 +193,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.domainIDs["token"] = "2976" - err := provider.CleanUp("example.com", "token", "foobar") + err := provider.CleanUp(t.Context(), "example.com", "token", "foobar") require.NoError(t, err) } diff --git a/providers/dns/oraclecloud/oraclecloud.go b/providers/dns/oraclecloud/oraclecloud.go index 195373c34..39d3599f7 100644 --- a/providers/dns/oraclecloud/oraclecloud.go +++ b/providers/dns/oraclecloud/oraclecloud.go @@ -155,9 +155,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneNameOrID, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -192,9 +190,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneNameOrID, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/oraclecloud/oraclecloud_test.go b/providers/dns/oraclecloud/oraclecloud_test.go index aa5914853..ad14f2991 100644 --- a/providers/dns/oraclecloud/oraclecloud_test.go +++ b/providers/dns/oraclecloud/oraclecloud_test.go @@ -337,7 +337,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -353,7 +353,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/otc/internal/client_test.go b/providers/dns/otc/internal/client_test.go index a6b0d7c95..1db00826f 100644 --- a/providers/dns/otc/internal/client_test.go +++ b/providers/dns/otc/internal/client_test.go @@ -1,7 +1,6 @@ package internal import ( - "context" "net/http/httptest" "net/url" "strconv" @@ -33,7 +32,7 @@ func TestClient_GetZoneID(t *testing.T) { With("name", "example.com.")). Build(t) - zoneID, err := client.GetZoneID(context.Background(), "example.com.", false) + zoneID, err := client.GetZoneID(t.Context(), "example.com.", false) require.NoError(t, err) assert.Equal(t, "123123", zoneID) @@ -48,7 +47,7 @@ func TestClient_GetZoneID_private(t *testing.T) { With("type", "private")). Build(t) - zoneID, err := client.GetZoneID(context.Background(), "example.com.", true) + zoneID, err := client.GetZoneID(t.Context(), "example.com.", true) require.NoError(t, err) assert.Equal(t, "123123", zoneID) @@ -62,7 +61,7 @@ func TestClient_GetZoneID_error(t *testing.T) { With("name", "example.com.")). Build(t) - _, err := client.GetZoneID(context.Background(), "example.com.", false) + _, err := client.GetZoneID(t.Context(), "example.com.", false) require.EqualError(t, err, "zone example.com. not found") } @@ -76,7 +75,7 @@ func TestClient_GetRecordSetID(t *testing.T) { ). Build(t) - recordSetID, err := client.GetRecordSetID(context.Background(), "123123", "example.com.") + recordSetID, err := client.GetRecordSetID(t.Context(), "123123", "example.com.") require.NoError(t, err) assert.Equal(t, "321321", recordSetID) @@ -92,7 +91,7 @@ func TestClient_GetRecordSetID_error(t *testing.T) { ). Build(t) - _, err := client.GetRecordSetID(context.Background(), "123123", "example.com.") + _, err := client.GetRecordSetID(t.Context(), "123123", "example.com.") require.EqualError(t, err, "record not found") } @@ -110,7 +109,7 @@ func TestClient_CreateRecordSet(t *testing.T) { TTL: 300, Records: []string{strconv.Quote("ADw2sEd82DUgXcQ9hNBZThJs7zVJkR5v9JeSbAb9mZY")}, } - err := client.CreateRecordSet(context.Background(), "123123", rs) + err := client.CreateRecordSet(t.Context(), "123123", rs) require.NoError(t, err) } @@ -120,6 +119,6 @@ func TestClient_DeleteRecordSet(t *testing.T) { servermock.ResponseFromFixture("zones-recordsets_DELETE.json")). Build(t) - err := client.DeleteRecordSet(context.Background(), "123123", "321321") + err := client.DeleteRecordSet(t.Context(), "123123", "321321") require.NoError(t, err) } diff --git a/providers/dns/otc/otc.go b/providers/dns/otc/otc.go index b53105582..36a6be318 100644 --- a/providers/dns/otc/otc.go +++ b/providers/dns/otc/otc.go @@ -137,9 +137,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -174,9 +172,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/otc/otc_test.go b/providers/dns/otc/otc_test.go index 47850dae6..d9f283df3 100644 --- a/providers/dns/otc/otc_test.go +++ b/providers/dns/otc/otc_test.go @@ -196,7 +196,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -212,7 +212,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -227,7 +227,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("zones-recordsets_POST-request.json")). Build(t) - err := provider.Present("example.com", "", "123d==") + err := provider.Present(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -243,7 +243,7 @@ func TestDNSProvider_Present_private(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("zones-recordsets_POST-request.json")). Build(t) - err := provider.Present("example.com", "", "123d==") + err := provider.Present(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -255,7 +255,7 @@ func TestDNSProvider_Present_emptyZone(t *testing.T) { With("name", "example.com.")). Build(t) - err := provider.Present("example.com", "", "123d==") + err := provider.Present(t.Context(), "example.com", "", "123d==") require.EqualError(t, err, "otc: unable to get zone: zone example.com. not found") } @@ -274,7 +274,7 @@ func TestDNSProvider_Cleanup(t *testing.T) { servermock.ResponseFromInternal("zones-recordsets_DELETE.json")). Build(t) - err := provider.CleanUp("example.com", "", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -294,7 +294,7 @@ func TestDNSProvider_Cleanup_private(t *testing.T) { servermock.ResponseFromInternal("zones-recordsets_DELETE.json")). Build(t) - err := provider.CleanUp("example.com", "", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "", "123d==") require.NoError(t, err) } @@ -311,7 +311,7 @@ func TestDNSProvider_Cleanup_emptyRecordset(t *testing.T) { With("type", "TXT")). Build(t) - err := provider.CleanUp("example.com", "", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "", "123d==") require.EqualError(t, err, "otc: unable to get record _acme-challenge.example.com. for zone example.com: record not found") } diff --git a/providers/dns/ovh/ovh.go b/providers/dns/ovh/ovh.go index a7b52844a..f9b177786 100644 --- a/providers/dns/ovh/ovh.go +++ b/providers/dns/ovh/ovh.go @@ -173,9 +173,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -217,9 +215,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // get the record's unique ID from when we created it diff --git a/providers/dns/ovh/ovh_test.go b/providers/dns/ovh/ovh_test.go index 6513caf5e..9fa0e1136 100644 --- a/providers/dns/ovh/ovh_test.go +++ b/providers/dns/ovh/ovh_test.go @@ -360,7 +360,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -376,6 +376,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/pdns/pdns.go b/providers/dns/pdns/pdns.go index 8c58a6f3f..a5b7f04e5 100644 --- a/providers/dns/pdns/pdns.go +++ b/providers/dns/pdns/pdns.go @@ -127,9 +127,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -191,9 +189,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/pdns/pdns_test.go b/providers/dns/pdns/pdns_test.go index 017dc3ce4..30c6de08c 100644 --- a/providers/dns/pdns/pdns_test.go +++ b/providers/dns/pdns/pdns_test.go @@ -141,14 +141,14 @@ func TestLivePresentAndCleanup(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123e==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123e==") require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123e==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123e==") require.NoError(t, err) } diff --git a/providers/dns/plesk/plesk.go b/providers/dns/plesk/plesk.go index d49e182a2..730400eb4 100644 --- a/providers/dns/plesk/plesk.go +++ b/providers/dns/plesk/plesk.go @@ -124,9 +124,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -157,8 +155,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/plesk/plesk_test.go b/providers/dns/plesk/plesk_test.go index 92a5acd16..5031e76f6 100644 --- a/providers/dns/plesk/plesk_test.go +++ b/providers/dns/plesk/plesk_test.go @@ -154,7 +154,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -170,6 +170,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/porkbun/porkbun.go b/providers/dns/porkbun/porkbun.go index 58cc36c07..2a85ca9b0 100644 --- a/providers/dns/porkbun/porkbun.go +++ b/providers/dns/porkbun/porkbun.go @@ -117,9 +117,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneName, hostName, err := splitDomain(ctx, info.EffectiveFQDN) @@ -147,9 +145,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // gets the record's unique ID from when we created it diff --git a/providers/dns/porkbun/porkbun_test.go b/providers/dns/porkbun/porkbun_test.go index a7bd4658b..29e9b1f14 100644 --- a/providers/dns/porkbun/porkbun_test.go +++ b/providers/dns/porkbun/porkbun_test.go @@ -129,7 +129,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -143,6 +143,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/rackspace/rackspace.go b/providers/dns/rackspace/rackspace.go index ff11e2c24..a5cf0921f 100644 --- a/providers/dns/rackspace/rackspace.go +++ b/providers/dns/rackspace/rackspace.go @@ -131,8 +131,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, err := d.client.GetHostedZoneID(ctx, info.EffectiveFQDN) @@ -156,8 +155,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zoneID, err := d.client.GetHostedZoneID(ctx, info.EffectiveFQDN) diff --git a/providers/dns/rackspace/rackspace_test.go b/providers/dns/rackspace/rackspace_test.go index d428a6263..14bed21b2 100644 --- a/providers/dns/rackspace/rackspace_test.go +++ b/providers/dns/rackspace/rackspace_test.go @@ -44,7 +44,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBody(`{"records":[{"name":"_acme-challenge.example.com","type":"TXT","data":"pW9ZKG0xz_PCriK-nCMOjADy9eJcgGWIzkkj2fN4uZM","ttl":300}]}`)). Build(t) - err := provider.Present("example.com", "token", "keyAuth") + err := provider.Present(t.Context(), "example.com", "token", "keyAuth") require.NoError(t, err) } @@ -65,7 +65,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { With("id", "TXT-654321")). Build(t) - err := provider.CleanUp("example.com", "token", "keyAuth") + err := provider.CleanUp(t.Context(), "example.com", "token", "keyAuth") require.NoError(t, err) } @@ -92,7 +92,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "112233445566==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "112233445566==") require.NoError(t, err) } @@ -108,7 +108,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(15 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "112233445566==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "112233445566==") require.NoError(t, err) } diff --git a/providers/dns/rainyun/rainyun.go b/providers/dns/rainyun/rainyun.go index f2d305aee..d8e25c643 100644 --- a/providers/dns/rainyun/rainyun.go +++ b/providers/dns/rainyun/rainyun.go @@ -95,8 +95,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -132,8 +131,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/rainyun/rainyun_test.go b/providers/dns/rainyun/rainyun_test.go index 74111dfdb..dee5809b9 100644 --- a/providers/dns/rainyun/rainyun_test.go +++ b/providers/dns/rainyun/rainyun_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/rcodezero/rcodezero.go b/providers/dns/rcodezero/rcodezero.go index 04c406922..f5e04d3ca 100644 --- a/providers/dns/rcodezero/rcodezero.go +++ b/providers/dns/rcodezero/rcodezero.go @@ -99,8 +99,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -125,8 +124,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/rcodezero/rcodezero_test.go b/providers/dns/rcodezero/rcodezero_test.go index b97e65fd0..372a9e4b3 100644 --- a/providers/dns/rcodezero/rcodezero_test.go +++ b/providers/dns/rcodezero/rcodezero_test.go @@ -99,9 +99,9 @@ func TestLivePresentAndCleanup(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/regfish/regfish.go b/providers/dns/regfish/regfish.go index e6c59dfe9..b29e81f57 100644 --- a/providers/dns/regfish/regfish.go +++ b/providers/dns/regfish/regfish.go @@ -103,8 +103,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) record := regfishapi.Record{ @@ -127,8 +126,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // get the record's unique ID from when we created it diff --git a/providers/dns/regfish/regfish_test.go b/providers/dns/regfish/regfish_test.go index 374e0ea00..71a5d28f3 100644 --- a/providers/dns/regfish/regfish_test.go +++ b/providers/dns/regfish/regfish_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/regru/regru.go b/providers/dns/regru/regru.go index 9d03d3d76..1d7aa977b 100644 --- a/providers/dns/regru/regru.go +++ b/providers/dns/regru/regru.go @@ -131,9 +131,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -156,9 +154,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/regru/regru_test.go b/providers/dns/regru/regru_test.go index 6fe6eaab3..acfc4de79 100644 --- a/providers/dns/regru/regru_test.go +++ b/providers/dns/regru/regru_test.go @@ -134,7 +134,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -150,6 +150,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/rfc2136/rfc2136.go b/providers/dns/rfc2136/rfc2136.go index c1dc3647c..d9a1a2b86 100644 --- a/providers/dns/rfc2136/rfc2136.go +++ b/providers/dns/rfc2136/rfc2136.go @@ -165,8 +165,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.changeRecord(ctx, "INSERT", info.EffectiveFQDN, info.Value, d.config.TTL) @@ -178,8 +177,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.changeRecord(ctx, "REMOVE", info.EffectiveFQDN, info.Value, d.config.TTL) diff --git a/providers/dns/rfc2136/rfc2136_test.go b/providers/dns/rfc2136/rfc2136_test.go index 5c1495f7b..1f4a2a5f6 100644 --- a/providers/dns/rfc2136/rfc2136_test.go +++ b/providers/dns/rfc2136/rfc2136_test.go @@ -175,7 +175,7 @@ func TestDNSProvider_Present_success(t *testing.T) { provider, err := NewDNSProviderConfig(config) require.NoError(t, err) - err = provider.Present(fakeDomain, "", fakeKeyAuth) + err = provider.Present(t.Context(), fakeDomain, "", fakeKeyAuth) require.NoError(t, err) } @@ -200,7 +200,7 @@ func TestDNSProvider_Present_success_updatePacket(t *testing.T) { provider, err := NewDNSProviderConfig(config) require.NoError(t, err) - err = provider.Present(fakeDomain, "", fakeKeyAuth) + err = provider.Present(t.Context(), fakeDomain, "", fakeKeyAuth) require.NoError(t, err) select { @@ -249,7 +249,7 @@ func TestDNSProvider_Present_error(t *testing.T) { provider, err := NewDNSProviderConfig(config) require.NoError(t, err) - err = provider.Present(fakeDomain, "", fakeKeyAuth) + err = provider.Present(t.Context(), fakeDomain, "", fakeKeyAuth) require.Error(t, err) if !strings.Contains(err.Error(), "NOTZONE") { @@ -277,7 +277,7 @@ func TestDNSProvider_Present_tsig_success(t *testing.T) { provider, err := NewDNSProviderConfig(config) require.NoError(t, err) - err = provider.Present(fakeDomain, "", fakeKeyAuth) + err = provider.Present(t.Context(), fakeDomain, "", fakeKeyAuth) require.NoError(t, err) } @@ -301,7 +301,7 @@ func TestDNSProvider_Present_tsig_error(t *testing.T) { provider, err := NewDNSProviderConfig(config) require.NoError(t, err) - err = provider.Present(fakeDomain, "", fakeKeyAuth) + err = provider.Present(t.Context(), fakeDomain, "", fakeKeyAuth) require.Error(t, err) require.EqualError(t, err, "rfc2136: failed to insert: DNS update failed: server replied: NOTZONE") } diff --git a/providers/dns/rimuhosting/rimuhosting.go b/providers/dns/rimuhosting/rimuhosting.go index 6466a5eb4..2a4a79266 100644 --- a/providers/dns/rimuhosting/rimuhosting.go +++ b/providers/dns/rimuhosting/rimuhosting.go @@ -2,6 +2,7 @@ package rimuhosting import ( + "context" "errors" "fmt" "net/http" @@ -76,8 +77,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("rimuhosting: %w", err) } @@ -86,8 +87,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("rimuhosting: %w", err) } diff --git a/providers/dns/rimuhosting/rimuhosting_test.go b/providers/dns/rimuhosting/rimuhosting_test.go index 2f8379f35..d7cca93e7 100644 --- a/providers/dns/rimuhosting/rimuhosting_test.go +++ b/providers/dns/rimuhosting/rimuhosting_test.go @@ -102,7 +102,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -118,6 +118,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/route53/route53.go b/providers/dns/route53/route53.go index f3fb81ec2..86603c554 100644 --- a/providers/dns/route53/route53.go +++ b/providers/dns/route53/route53.go @@ -138,8 +138,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) hostedZoneID, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) @@ -182,8 +181,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) hostedZoneID, err := d.getHostedZoneID(ctx, info.EffectiveFQDN) diff --git a/providers/dns/route53/route53_integration_test.go b/providers/dns/route53/route53_integration_test.go index 24c63260e..5b955e0f7 100644 --- a/providers/dns/route53/route53_integration_test.go +++ b/providers/dns/route53/route53_integration_test.go @@ -22,7 +22,7 @@ func TestLiveTTL(t *testing.T) { domain := envTest.GetDomain() - err = provider.Present(domain, "foo", "bar") + err = provider.Present(t.Context(), domain, "foo", "bar") require.NoError(t, err) // we need a separate R53 client here as the one in the DNS provider is unexported. @@ -36,7 +36,7 @@ func TestLiveTTL(t *testing.T) { svc := route53.NewFromConfig(cfg) defer func() { - errC := provider.CleanUp(domain, "foo", "bar") + errC := provider.CleanUp(t.Context(), domain, "foo", "bar") if errC != nil { t.Log(errC) } diff --git a/providers/dns/route53/route53_test.go b/providers/dns/route53/route53_test.go index 1ce837660..29a4e2713 100644 --- a/providers/dns/route53/route53_test.go +++ b/providers/dns/route53/route53_test.go @@ -186,7 +186,7 @@ func TestDNSProvider_Present(t *testing.T) { domain := "example.com" keyAuth := "123456d==" - err := provider.Present(domain, "", keyAuth) + err := provider.Present(t.Context(), domain, "", keyAuth) require.NoError(t, err) } diff --git a/providers/dns/safedns/safedns.go b/providers/dns/safedns/safedns.go index ce0f1055a..faa909e7e 100644 --- a/providers/dns/safedns/safedns.go +++ b/providers/dns/safedns/safedns.go @@ -107,9 +107,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, dns.Fqdn(info.EffectiveFQDN)) @@ -137,9 +135,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record previously created. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/safedns/safedns_test.go b/providers/dns/safedns/safedns_test.go index dee61a3c2..a69b9752a 100644 --- a/providers/dns/safedns/safedns_test.go +++ b/providers/dns/safedns/safedns_test.go @@ -100,7 +100,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -116,6 +116,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/sakuracloud/sakuracloud.go b/providers/dns/sakuracloud/sakuracloud.go index 24082e624..4ff015b1c 100644 --- a/providers/dns/sakuracloud/sakuracloud.go +++ b/providers/dns/sakuracloud/sakuracloud.go @@ -114,8 +114,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.addTXTRecord(ctx, info.EffectiveFQDN, info.Value, d.config.TTL) @@ -127,8 +126,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.cleanupTXTRecord(ctx, info.EffectiveFQDN, info.Value) diff --git a/providers/dns/sakuracloud/sakuracloud_test.go b/providers/dns/sakuracloud/sakuracloud_test.go index 4b0a9e5d5..811cddc54 100644 --- a/providers/dns/sakuracloud/sakuracloud_test.go +++ b/providers/dns/sakuracloud/sakuracloud_test.go @@ -134,7 +134,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -150,6 +150,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/scaleway/scaleway.go b/providers/dns/scaleway/scaleway.go index a9880a1e3..1a81a5317 100644 --- a/providers/dns/scaleway/scaleway.go +++ b/providers/dns/scaleway/scaleway.go @@ -140,8 +140,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill DNS-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) records := []*scwdomain.Record{{ @@ -161,7 +160,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { DisallowNewZoneCreation: true, } - _, err := d.client.UpdateDNSZoneRecords(req) + _, err := d.client.UpdateDNSZoneRecords(req, scw.WithContext(ctx)) if err != nil { return fmt.Errorf("scaleway: %w", err) } @@ -170,8 +169,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes a TXT record used for DNS-01 challenge. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) recordIdentifier := &scwdomain.RecordIdentifier{ @@ -189,7 +187,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { DisallowNewZoneCreation: true, } - _, err := d.client.UpdateDNSZoneRecords(req) + _, err := d.client.UpdateDNSZoneRecords(req, scw.WithContext(ctx)) if err != nil { return fmt.Errorf("scaleway: %w", err) } diff --git a/providers/dns/scaleway/scaleway_test.go b/providers/dns/scaleway/scaleway_test.go index b155a6685..af5f28e49 100644 --- a/providers/dns/scaleway/scaleway_test.go +++ b/providers/dns/scaleway/scaleway_test.go @@ -110,7 +110,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -126,6 +126,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/selectel/selectel.go b/providers/dns/selectel/selectel.go index 9af361ef6..457762454 100644 --- a/providers/dns/selectel/selectel.go +++ b/providers/dns/selectel/selectel.go @@ -4,6 +4,7 @@ package selectel import ( + "context" "errors" "fmt" "net/http" @@ -80,8 +81,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("selectel: %w", err) } @@ -90,8 +91,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("selectel: %w", err) } diff --git a/providers/dns/selectel/selectel_test.go b/providers/dns/selectel/selectel_test.go index e31709bbd..db5ab70a7 100644 --- a/providers/dns/selectel/selectel_test.go +++ b/providers/dns/selectel/selectel_test.go @@ -110,7 +110,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -126,6 +126,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/selectelv2/selectelv2.go b/providers/dns/selectelv2/selectelv2.go index aba8d647b..f6901da38 100644 --- a/providers/dns/selectelv2/selectelv2.go +++ b/providers/dns/selectelv2/selectelv2.go @@ -147,9 +147,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill DNS-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { client, err := d.authorize(ctx) if err != nil { return fmt.Errorf("selectelv2: authorize: %w", err) @@ -194,9 +192,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes a TXT record used for DNS-01 challenge. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { client, err := d.authorize(ctx) if err != nil { return fmt.Errorf("selectelv2: authorize: %w", err) diff --git a/providers/dns/selectelv2/selectelv2_test.go b/providers/dns/selectelv2/selectelv2_test.go index c1cd1043f..ef50c20b4 100644 --- a/providers/dns/selectelv2/selectelv2_test.go +++ b/providers/dns/selectelv2/selectelv2_test.go @@ -175,7 +175,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -191,6 +191,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/selfhostde/selfhostde.go b/providers/dns/selfhostde/selfhostde.go index c562355ca..49db7c907 100644 --- a/providers/dns/selfhostde/selfhostde.go +++ b/providers/dns/selfhostde/selfhostde.go @@ -149,8 +149,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) recordID, err := d.config.getSeqNext(dns01.UnFqdn(info.EffectiveFQDN)) @@ -171,8 +170,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record previously created. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/selfhostde/selfhostde_test.go b/providers/dns/selfhostde/selfhostde_test.go index 5406b4832..10a5369fd 100644 --- a/providers/dns/selfhostde/selfhostde_test.go +++ b/providers/dns/selfhostde/selfhostde_test.go @@ -190,7 +190,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -206,6 +206,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/servercow/servercow.go b/providers/dns/servercow/servercow.go index 09c8279c0..d45c63402 100644 --- a/providers/dns/servercow/servercow.go +++ b/providers/dns/servercow/servercow.go @@ -101,9 +101,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := getAuthZone(ctx, info.EffectiveFQDN) @@ -160,9 +158,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record previously created. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := getAuthZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/servercow/servercow_test.go b/providers/dns/servercow/servercow_test.go index 426223365..20f1e2c73 100644 --- a/providers/dns/servercow/servercow_test.go +++ b/providers/dns/servercow/servercow_test.go @@ -134,7 +134,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -150,6 +150,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/shellrent/shellrent.go b/providers/dns/shellrent/shellrent.go index 90e2b8699..8ba6a39ad 100644 --- a/providers/dns/shellrent/shellrent.go +++ b/providers/dns/shellrent/shellrent.go @@ -120,8 +120,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.findZone(ctx, dns01.UnFqdn(info.EffectiveFQDN)) @@ -154,8 +153,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // gets the record's unique ID from when we created it diff --git a/providers/dns/shellrent/shellrent_test.go b/providers/dns/shellrent/shellrent_test.go index ff3ef71d4..8971dc962 100644 --- a/providers/dns/shellrent/shellrent_test.go +++ b/providers/dns/shellrent/shellrent_test.go @@ -122,7 +122,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -138,6 +138,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/simply/simply.go b/providers/dns/simply/simply.go index 896376abd..f268befc7 100644 --- a/providers/dns/simply/simply.go +++ b/providers/dns/simply/simply.go @@ -116,9 +116,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -153,9 +151,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/simply/simply_test.go b/providers/dns/simply/simply_test.go index 4b1aa8613..aba2c6bd1 100644 --- a/providers/dns/simply/simply_test.go +++ b/providers/dns/simply/simply_test.go @@ -126,7 +126,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -140,6 +140,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/sonic/sonic.go b/providers/dns/sonic/sonic.go index 8c57748f4..b12bf6581 100644 --- a/providers/dns/sonic/sonic.go +++ b/providers/dns/sonic/sonic.go @@ -98,8 +98,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.SetRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value, d.config.TTL) @@ -111,8 +110,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT records matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) err := d.client.SetRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), "_", d.config.TTL) diff --git a/providers/dns/sonic/sonic_test.go b/providers/dns/sonic/sonic_test.go index a5a12eb34..5f4fa21d7 100644 --- a/providers/dns/sonic/sonic_test.go +++ b/providers/dns/sonic/sonic_test.go @@ -124,7 +124,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -138,6 +138,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/spaceship/spaceship.go b/providers/dns/spaceship/spaceship.go index 2daa9a341..f678ad3b1 100644 --- a/providers/dns/spaceship/spaceship.go +++ b/providers/dns/spaceship/spaceship.go @@ -94,9 +94,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -125,9 +123,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/spaceship/spaceship_test.go b/providers/dns/spaceship/spaceship_test.go index 9dfa5894d..5dac4a9cf 100644 --- a/providers/dns/spaceship/spaceship_test.go +++ b/providers/dns/spaceship/spaceship_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/stackpath/stackpath.go b/providers/dns/stackpath/stackpath.go index 1a21e6568..fce1ea232 100644 --- a/providers/dns/stackpath/stackpath.go +++ b/providers/dns/stackpath/stackpath.go @@ -97,8 +97,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.client.GetZones(ctx, info.EffectiveFQDN) @@ -127,8 +126,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.client.GetZones(ctx, info.EffectiveFQDN) diff --git a/providers/dns/stackpath/stackpath_test.go b/providers/dns/stackpath/stackpath_test.go index e28f6628a..4a6533ee9 100644 --- a/providers/dns/stackpath/stackpath_test.go +++ b/providers/dns/stackpath/stackpath_test.go @@ -142,7 +142,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -158,6 +158,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/syse/syse.go b/providers/dns/syse/syse.go index da0fff0a4..89c34e856 100644 --- a/providers/dns/syse/syse.go +++ b/providers/dns/syse/syse.go @@ -116,9 +116,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -152,9 +150,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/syse/syse_test.go b/providers/dns/syse/syse_test.go index 45b9e782a..1d256d88b 100644 --- a/providers/dns/syse/syse_test.go +++ b/providers/dns/syse/syse_test.go @@ -154,7 +154,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -168,7 +168,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -203,7 +203,7 @@ func TestDNSProvider_Present(t *testing.T) { servermock.CheckRequestJSONBodyFromInternal("create_record-request.json")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -215,6 +215,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs["abc"] = "1234" - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/technitium/technitium.go b/providers/dns/technitium/technitium.go index c88085182..e43e2cfd5 100644 --- a/providers/dns/technitium/technitium.go +++ b/providers/dns/technitium/technitium.go @@ -97,8 +97,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) record := internal.Record{ @@ -116,8 +115,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) record := internal.Record{ diff --git a/providers/dns/technitium/technitium_test.go b/providers/dns/technitium/technitium_test.go index 4d93eb5e9..5cef51913 100644 --- a/providers/dns/technitium/technitium_test.go +++ b/providers/dns/technitium/technitium_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/tencentcloud/tencentcloud.go b/providers/dns/tencentcloud/tencentcloud.go index 1b80441e4..4c49f89f0 100644 --- a/providers/dns/tencentcloud/tencentcloud.go +++ b/providers/dns/tencentcloud/tencentcloud.go @@ -115,8 +115,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) @@ -147,8 +146,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getHostedZone(ctx, info.EffectiveFQDN) diff --git a/providers/dns/tencentcloud/tencentcloud_test.go b/providers/dns/tencentcloud/tencentcloud_test.go index 4e6712e03..e87e8c1a4 100644 --- a/providers/dns/tencentcloud/tencentcloud_test.go +++ b/providers/dns/tencentcloud/tencentcloud_test.go @@ -132,7 +132,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -148,6 +148,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/timewebcloud/timewebcloud.go b/providers/dns/timewebcloud/timewebcloud.go index 2d52ec17e..7279b1c8c 100644 --- a/providers/dns/timewebcloud/timewebcloud.go +++ b/providers/dns/timewebcloud/timewebcloud.go @@ -102,9 +102,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -136,9 +134,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/timewebcloud/timewebcloud_test.go b/providers/dns/timewebcloud/timewebcloud_test.go index 1480f95f8..a7315a9bf 100644 --- a/providers/dns/timewebcloud/timewebcloud_test.go +++ b/providers/dns/timewebcloud/timewebcloud_test.go @@ -102,7 +102,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -118,6 +118,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/todaynic/todaynic.go b/providers/dns/todaynic/todaynic.go index 46b483101..4e47f7431 100644 --- a/providers/dns/todaynic/todaynic.go +++ b/providers/dns/todaynic/todaynic.go @@ -100,9 +100,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -136,8 +134,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) d.recordIDsMu.Lock() diff --git a/providers/dns/todaynic/todaynic_test.go b/providers/dns/todaynic/todaynic_test.go index 68a66dd08..f3fff0c3c 100644 --- a/providers/dns/todaynic/todaynic_test.go +++ b/providers/dns/todaynic/todaynic_test.go @@ -130,7 +130,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -144,7 +144,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -185,7 +185,7 @@ func TestDNSProvider_Present(t *testing.T) { ). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -202,6 +202,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider.recordIDs["abc"] = 123 - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/transip/transip.go b/providers/dns/transip/transip.go index b5204b2fa..a50e8a49a 100644 --- a/providers/dns/transip/transip.go +++ b/providers/dns/transip/transip.go @@ -109,8 +109,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -142,8 +141,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/transip/transip_test.go b/providers/dns/transip/transip_test.go index 926e39ca2..c0056a357 100644 --- a/providers/dns/transip/transip_test.go +++ b/providers/dns/transip/transip_test.go @@ -162,7 +162,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -178,6 +178,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/ultradns/ultradns.go b/providers/dns/ultradns/ultradns.go index 747e8bfb9..5afc2ca58 100644 --- a/providers/dns/ultradns/ultradns.go +++ b/providers/dns/ultradns/ultradns.go @@ -104,8 +104,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -147,8 +146,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/ultradns/ultradns_test.go b/providers/dns/ultradns/ultradns_test.go index 2a6b50752..a716af100 100644 --- a/providers/dns/ultradns/ultradns_test.go +++ b/providers/dns/ultradns/ultradns_test.go @@ -181,7 +181,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -195,6 +195,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/uniteddomains/uniteddomains.go b/providers/dns/uniteddomains/uniteddomains.go index a90c5821c..54db4f63e 100644 --- a/providers/dns/uniteddomains/uniteddomains.go +++ b/providers/dns/uniteddomains/uniteddomains.go @@ -2,6 +2,7 @@ package uniteddomains import ( + "context" "errors" "fmt" "net/http" @@ -85,8 +86,8 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("uniteddomains: %w", err) } @@ -95,8 +96,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("uniteddomains: %w", err) } diff --git a/providers/dns/uniteddomains/uniteddomains_test.go b/providers/dns/uniteddomains/uniteddomains_test.go index 845c99277..b8212b8e4 100644 --- a/providers/dns/uniteddomains/uniteddomains_test.go +++ b/providers/dns/uniteddomains/uniteddomains_test.go @@ -107,7 +107,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -121,6 +121,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/variomedia/variomedia.go b/providers/dns/variomedia/variomedia.go index f0a5ad19b..2379ea23b 100644 --- a/providers/dns/variomedia/variomedia.go +++ b/providers/dns/variomedia/variomedia.go @@ -114,9 +114,7 @@ func (d *DNSProvider) Sequential() time.Duration { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -155,8 +153,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record previously created. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // get the record's unique ID from when we created it diff --git a/providers/dns/variomedia/variomedia_test.go b/providers/dns/variomedia/variomedia_test.go index d39c6c539..968dda327 100644 --- a/providers/dns/variomedia/variomedia_test.go +++ b/providers/dns/variomedia/variomedia_test.go @@ -96,7 +96,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -112,6 +112,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/vegadns/vegadns.go b/providers/dns/vegadns/vegadns.go index b94d16ce6..640c1f903 100644 --- a/providers/dns/vegadns/vegadns.go +++ b/providers/dns/vegadns/vegadns.go @@ -108,9 +108,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) domainID, err := d.findDomainID(ctx, info.EffectiveFQDN) @@ -127,9 +125,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) domainID, err := d.findDomainID(ctx, info.EffectiveFQDN) diff --git a/providers/dns/vegadns/vegadns_test.go b/providers/dns/vegadns/vegadns_test.go index 67bfa8288..140c9cb37 100644 --- a/providers/dns/vegadns/vegadns_test.go +++ b/providers/dns/vegadns/vegadns_test.go @@ -86,7 +86,7 @@ func TestDNSProvider_Present(t *testing.T) { provider := test.builder.Build(t) - err := provider.Present(testDomain, "token", "keyAuth") + err := provider.Present(t.Context(), testDomain, "token", "keyAuth") if test.expectedError == "" { assert.NoError(t, err) } else { @@ -146,7 +146,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider := test.builder.Build(t) - err := provider.CleanUp(testDomain, "token", "keyAuth") + err := provider.CleanUp(t.Context(), testDomain, "token", "keyAuth") if test.expectedError == "" { assert.NoError(t, err) } else { diff --git a/providers/dns/vercel/vercel.go b/providers/dns/vercel/vercel.go index 5de0d0d90..55048002e 100644 --- a/providers/dns/vercel/vercel.go +++ b/providers/dns/vercel/vercel.go @@ -108,9 +108,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -138,9 +136,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/vercel/vercel_test.go b/providers/dns/vercel/vercel_test.go index a95ffa89f..18ea3bce9 100644 --- a/providers/dns/vercel/vercel_test.go +++ b/providers/dns/vercel/vercel_test.go @@ -100,7 +100,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -116,6 +116,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/versio/versio.go b/providers/dns/versio/versio.go index 93db84c5b..53feec416 100644 --- a/providers/dns/versio/versio.go +++ b/providers/dns/versio/versio.go @@ -123,9 +123,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -165,9 +163,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/versio/versio_test.go b/providers/dns/versio/versio_test.go index 9370dd797..07ec2a696 100644 --- a/providers/dns/versio/versio_test.go +++ b/providers/dns/versio/versio_test.go @@ -167,7 +167,7 @@ func TestDNSProvider_Present(t *testing.T) { provider := test.builder.Build(t) - err := provider.Present(testDomain, "token", "keyAuth") + err := provider.Present(t.Context(), testDomain, "token", "keyAuth") if test.expectedError == "" { require.NoError(t, err) } else { @@ -211,7 +211,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { provider := test.builder.Build(t) - err := provider.CleanUp(testDomain, "token", "keyAuth") + err := provider.CleanUp(t.Context(), testDomain, "token", "keyAuth") if test.expectedError == "" { require.NoError(t, err) } else { @@ -231,7 +231,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -245,7 +245,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/vinyldns/vinyldns.go b/providers/dns/vinyldns/vinyldns.go index 0b0838732..b2fefc0c9 100644 --- a/providers/dns/vinyldns/vinyldns.go +++ b/providers/dns/vinyldns/vinyldns.go @@ -117,9 +117,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) existingRecord, err := d.getRecordSet(ctx, info.EffectiveFQDN) @@ -158,9 +156,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) existingRecord, err := d.getRecordSet(ctx, info.EffectiveFQDN) diff --git a/providers/dns/vinyldns/vinyldns_test.go b/providers/dns/vinyldns/vinyldns_test.go index 64f325742..44fff54c5 100644 --- a/providers/dns/vinyldns/vinyldns_test.go +++ b/providers/dns/vinyldns/vinyldns_test.go @@ -218,7 +218,7 @@ func TestDNSProvider_Present(t *testing.T) { t.Run(test.desc, func(t *testing.T) { provider := test.builder.Build(t) - err := provider.Present(targetDomain, "token"+test.keyAuth, test.keyAuth) + err := provider.Present(t.Context(), targetDomain, "token"+test.keyAuth, test.keyAuth) require.NoError(t, err) }) } @@ -237,7 +237,7 @@ func TestDNSProvider_CleanUp(t *testing.T) { servermock.ResponseFromFixture("recordSetChange-delete.json")). Build(t) - err := provider.CleanUp(targetDomain, "123456d==", "123456d==") + err := provider.CleanUp(t.Context(), targetDomain, "123456d==", "123456d==") require.NoError(t, err) } @@ -251,7 +251,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -267,6 +267,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/virtualname/virtualname.go b/providers/dns/virtualname/virtualname.go index 55668947a..b906842fc 100644 --- a/providers/dns/virtualname/virtualname.go +++ b/providers/dns/virtualname/virtualname.go @@ -2,6 +2,7 @@ package virtualname import ( + "context" "errors" "fmt" "net/http" @@ -77,8 +78,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("virtualname: %w", err) } @@ -87,8 +88,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("virtualname: %w", err) } diff --git a/providers/dns/virtualname/virtualname_test.go b/providers/dns/virtualname/virtualname_test.go index 508835a18..8089b4980 100644 --- a/providers/dns/virtualname/virtualname_test.go +++ b/providers/dns/virtualname/virtualname_test.go @@ -97,7 +97,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -111,6 +111,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/vkcloud/vkcloud.go b/providers/dns/vkcloud/vkcloud.go index b1fbb5deb..62bd1eee3 100644 --- a/providers/dns/vkcloud/vkcloud.go +++ b/providers/dns/vkcloud/vkcloud.go @@ -120,8 +120,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -162,8 +161,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/vkcloud/vkcloud_test.go b/providers/dns/vkcloud/vkcloud_test.go index 104221faa..d6aac9029 100644 --- a/providers/dns/vkcloud/vkcloud_test.go +++ b/providers/dns/vkcloud/vkcloud_test.go @@ -193,7 +193,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -207,6 +207,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/volcengine/volcengine.go b/providers/dns/volcengine/volcengine.go index b322a99fa..e4bce7c8c 100644 --- a/providers/dns/volcengine/volcengine.go +++ b/providers/dns/volcengine/volcengine.go @@ -116,9 +116,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) zone, err := d.getZone(ctx, info.EffectiveFQDN) @@ -152,8 +150,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // gets the record's unique ID diff --git a/providers/dns/volcengine/volcengine_test.go b/providers/dns/volcengine/volcengine_test.go index 9c6fc0082..f23ecba53 100644 --- a/providers/dns/volcengine/volcengine_test.go +++ b/providers/dns/volcengine/volcengine_test.go @@ -130,7 +130,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -146,6 +146,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/vscale/vscale.go b/providers/dns/vscale/vscale.go index 69f48d7b2..71d77fa57 100644 --- a/providers/dns/vscale/vscale.go +++ b/providers/dns/vscale/vscale.go @@ -4,6 +4,7 @@ package vscale import ( + "context" "errors" "fmt" "net/http" @@ -86,8 +87,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("vscale: %w", err) } @@ -96,8 +97,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("vscale: %w", err) } diff --git a/providers/dns/vscale/vscale_test.go b/providers/dns/vscale/vscale_test.go index e545fb2a9..91ff528dc 100644 --- a/providers/dns/vscale/vscale_test.go +++ b/providers/dns/vscale/vscale_test.go @@ -110,7 +110,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -126,6 +126,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/vultr/vultr.go b/providers/dns/vultr/vultr.go index 86434fe2b..87c15d2e4 100644 --- a/providers/dns/vultr/vultr.go +++ b/providers/dns/vultr/vultr.go @@ -91,9 +91,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the DNS-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. @@ -124,9 +122,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) // TODO(ldez) replace domain by FQDN to follow CNAME. diff --git a/providers/dns/vultr/vultr_test.go b/providers/dns/vultr/vultr_test.go index 1bb7c37de..ef5a6c923 100644 --- a/providers/dns/vultr/vultr_test.go +++ b/providers/dns/vultr/vultr_test.go @@ -226,7 +226,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -242,6 +242,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/webnames/webnames.go b/providers/dns/webnames/webnames.go index ea8b8d8c4..15adfc79e 100644 --- a/providers/dns/webnames/webnames.go +++ b/providers/dns/webnames/webnames.go @@ -92,9 +92,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -117,9 +115,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp clears Webnames TXT record. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/webnames/webnames_test.go b/providers/dns/webnames/webnames_test.go index b61c0ae41..85a2ac7ce 100644 --- a/providers/dns/webnames/webnames_test.go +++ b/providers/dns/webnames/webnames_test.go @@ -98,7 +98,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -114,6 +114,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/webnamesca/webnamesca.go b/providers/dns/webnamesca/webnamesca.go index e057ded99..ee6abb7fc 100644 --- a/providers/dns/webnamesca/webnamesca.go +++ b/providers/dns/webnamesca/webnamesca.go @@ -94,9 +94,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -113,9 +111,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/webnamesca/webnamesca_test.go b/providers/dns/webnamesca/webnamesca_test.go index 8bc356e77..f902ba3ef 100644 --- a/providers/dns/webnamesca/webnamesca_test.go +++ b/providers/dns/webnamesca/webnamesca_test.go @@ -130,7 +130,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -144,7 +144,7 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -181,7 +181,7 @@ func TestDNSProvider_Present(t *testing.T) { With("txt", "ADw2sEd82DUgXcQ9hNBZThJs7zVJkR5v9JeSbAb9mZY")). Build(t) - err := provider.Present("example.com", "abc", "123d==") + err := provider.Present(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } @@ -194,6 +194,6 @@ func TestDNSProvider_CleanUp(t *testing.T) { With("txt", "ADw2sEd82DUgXcQ9hNBZThJs7zVJkR5v9JeSbAb9mZY")). Build(t) - err := provider.CleanUp("example.com", "abc", "123d==") + err := provider.CleanUp(t.Context(), "example.com", "abc", "123d==") require.NoError(t, err) } diff --git a/providers/dns/websupport/websupport.go b/providers/dns/websupport/websupport.go index b61f85caf..835973bcd 100644 --- a/providers/dns/websupport/websupport.go +++ b/providers/dns/websupport/websupport.go @@ -2,6 +2,7 @@ package websupport import ( + "context" "errors" "fmt" "net/http" @@ -78,8 +79,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("websupport: %w", err) } @@ -88,8 +89,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("websupport: %w", err) } diff --git a/providers/dns/websupport/websupport_test.go b/providers/dns/websupport/websupport_test.go index 4b33817fb..55165da3a 100644 --- a/providers/dns/websupport/websupport_test.go +++ b/providers/dns/websupport/websupport_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/wedos/wedos.go b/providers/dns/wedos/wedos.go index 11d7b58be..6e7888ffe 100644 --- a/providers/dns/wedos/wedos.go +++ b/providers/dns/wedos/wedos.go @@ -107,9 +107,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -155,9 +153,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/wedos/wedos_test.go b/providers/dns/wedos/wedos_test.go index cb7be403a..d87baf9e3 100644 --- a/providers/dns/wedos/wedos_test.go +++ b/providers/dns/wedos/wedos_test.go @@ -125,7 +125,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -139,6 +139,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/westcn/westcn.go b/providers/dns/westcn/westcn.go index c365f46a0..b399ced5f 100644 --- a/providers/dns/westcn/westcn.go +++ b/providers/dns/westcn/westcn.go @@ -2,6 +2,7 @@ package westcn import ( + "context" "errors" "fmt" "net/http" @@ -78,8 +79,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("westcn: %w", err) } @@ -88,8 +89,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("westcn: %w", err) } diff --git a/providers/dns/westcn/westcn_test.go b/providers/dns/westcn/westcn_test.go index 6f618d89b..ac9df2cde 100644 --- a/providers/dns/westcn/westcn_test.go +++ b/providers/dns/westcn/westcn_test.go @@ -125,7 +125,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -139,6 +139,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/yandex/yandex.go b/providers/dns/yandex/yandex.go index 7a6380f42..f1c051646 100644 --- a/providers/dns/yandex/yandex.go +++ b/providers/dns/yandex/yandex.go @@ -95,8 +95,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, subDomain, err := splitDomain(info.EffectiveFQDN) @@ -121,8 +120,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) rootDomain, subDomain, err := splitDomain(info.EffectiveFQDN) diff --git a/providers/dns/yandex/yandex_test.go b/providers/dns/yandex/yandex_test.go index 7b14fbbac..b14d5f4ab 100644 --- a/providers/dns/yandex/yandex_test.go +++ b/providers/dns/yandex/yandex_test.go @@ -100,7 +100,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -114,6 +114,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/yandex360/yandex360.go b/providers/dns/yandex360/yandex360.go index 2e799a4ff..b54b3d07f 100644 --- a/providers/dns/yandex360/yandex360.go +++ b/providers/dns/yandex360/yandex360.go @@ -109,9 +109,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, dns.Fqdn(info.EffectiveFQDN)) @@ -146,9 +144,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, dns.Fqdn(info.EffectiveFQDN)) diff --git a/providers/dns/yandex360/yandex360_test.go b/providers/dns/yandex360/yandex360_test.go index 3bac91fb1..b0f7c38c3 100644 --- a/providers/dns/yandex360/yandex360_test.go +++ b/providers/dns/yandex360/yandex360_test.go @@ -114,7 +114,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -128,6 +128,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/yandexcloud/yandexcloud.go b/providers/dns/yandexcloud/yandexcloud.go index 364d6c654..4d9b5a236 100644 --- a/providers/dns/yandexcloud/yandexcloud.go +++ b/providers/dns/yandexcloud/yandexcloud.go @@ -106,9 +106,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -147,9 +145,7 @@ func (d *DNSProvider) Present(domain, _, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, _, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, _, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/yandexcloud/yandexcloud_test.go b/providers/dns/yandexcloud/yandexcloud_test.go index 09fd62c3c..4eac6acf0 100644 --- a/providers/dns/yandexcloud/yandexcloud_test.go +++ b/providers/dns/yandexcloud/yandexcloud_test.go @@ -148,7 +148,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -162,6 +162,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/zoneedit/internal/client.go b/providers/dns/zoneedit/internal/client.go index bd80e83e4..829341643 100644 --- a/providers/dns/zoneedit/internal/client.go +++ b/providers/dns/zoneedit/internal/client.go @@ -2,6 +2,7 @@ package internal import ( "bytes" + "context" "encoding/xml" "errors" "fmt" @@ -41,15 +42,15 @@ func NewClient(user, authToken string) (*Client, error) { }, nil } -func (c *Client) CreateTXTRecord(domain, rdata string) error { - return c.perform("txt-create.php", domain, rdata) +func (c *Client) CreateTXTRecord(ctx context.Context, domain, rdata string) error { + return c.perform(ctx, "txt-create.php", domain, rdata) } -func (c *Client) DeleteTXTRecord(domain, rdata string) error { - return c.perform("txt-delete.php", domain, rdata) +func (c *Client) DeleteTXTRecord(ctx context.Context, domain, rdata string) error { + return c.perform(ctx, "txt-delete.php", domain, rdata) } -func (c *Client) perform(actionPath, domain, rdata string) error { +func (c *Client) perform(ctx context.Context, actionPath, domain, rdata string) error { endpoint := c.baseURL.JoinPath(actionPath) query := endpoint.Query() @@ -57,7 +58,7 @@ func (c *Client) perform(actionPath, domain, rdata string) error { query.Set("rdata", rdata) endpoint.RawQuery = query.Encode() - req, err := http.NewRequest(http.MethodGet, endpoint.String(), http.NoBody) + req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint.String(), http.NoBody) if err != nil { return err } diff --git a/providers/dns/zoneedit/internal/client_test.go b/providers/dns/zoneedit/internal/client_test.go index 34b1a6fff..ef6e9e470 100644 --- a/providers/dns/zoneedit/internal/client_test.go +++ b/providers/dns/zoneedit/internal/client_test.go @@ -29,7 +29,7 @@ func TestClient_CreateTXTRecord(t *testing.T) { servermock.ResponseFromFixture("success.xml")). Build(t) - err := client.CreateTXTRecord("_acme-challenge.example.com", "value") + err := client.CreateTXTRecord(t.Context(), "_acme-challenge.example.com", "value") require.NoError(t, err) } @@ -39,7 +39,7 @@ func TestClient_CreateTXTRecord_error(t *testing.T) { servermock.ResponseFromFixture("error.xml")). Build(t) - err := client.CreateTXTRecord("_acme-challenge.example.com", "value") + err := client.CreateTXTRecord(t.Context(), "_acme-challenge.example.com", "value") require.EqualError(t, err, "[status code: 200] 708: Failed Login: user (_acme-challenge.example.com)") } @@ -49,7 +49,7 @@ func TestClient_DeleteTXTRecord(t *testing.T) { servermock.ResponseFromFixture("success.xml")). Build(t) - err := client.DeleteTXTRecord("_acme-challenge.example.com", "value") + err := client.DeleteTXTRecord(t.Context(), "_acme-challenge.example.com", "value") require.NoError(t, err) } @@ -59,6 +59,6 @@ func TestClient_DeleteTXTRecord_error(t *testing.T) { servermock.ResponseFromFixture("error.xml")). Build(t) - err := client.DeleteTXTRecord("_acme-challenge.example.com", "value") + err := client.DeleteTXTRecord(t.Context(), "_acme-challenge.example.com", "value") require.EqualError(t, err, "[status code: 200] 708: Failed Login: user (_acme-challenge.example.com)") } diff --git a/providers/dns/zoneedit/zoneedit.go b/providers/dns/zoneedit/zoneedit.go index bd718e1a5..4a9003a8e 100644 --- a/providers/dns/zoneedit/zoneedit.go +++ b/providers/dns/zoneedit/zoneedit.go @@ -91,11 +91,10 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) - err := d.client.CreateTXTRecord(dns01.UnFqdn(info.EffectiveFQDN), info.Value) + err := d.client.CreateTXTRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) if err != nil { return fmt.Errorf("zoneedit: create TXT record: %w", err) } @@ -107,11 +106,10 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) - err := d.client.DeleteTXTRecord(dns01.UnFqdn(info.EffectiveFQDN), info.Value) + err := d.client.DeleteTXTRecord(ctx, dns01.UnFqdn(info.EffectiveFQDN), info.Value) if err != nil { return fmt.Errorf("zoneedit: delete TXT record: %w", err) } diff --git a/providers/dns/zoneedit/zoneedit_test.go b/providers/dns/zoneedit/zoneedit_test.go index d8bc7907d..04d403fee 100644 --- a/providers/dns/zoneedit/zoneedit_test.go +++ b/providers/dns/zoneedit/zoneedit_test.go @@ -127,7 +127,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -141,6 +141,6 @@ func TestLiveCleanUp(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/zoneee/zoneee.go b/providers/dns/zoneee/zoneee.go index b6b8e84f2..80f6f146b 100644 --- a/providers/dns/zoneee/zoneee.go +++ b/providers/dns/zoneee/zoneee.go @@ -124,9 +124,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) { } // Present creates a TXT record to fulfill the dns-01 challenge. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) @@ -150,9 +148,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record previously created. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { info := dns01.GetChallengeInfo(ctx, domain, keyAuth) authZone, err := dns01.DefaultClient().FindZoneByFqdn(ctx, info.EffectiveFQDN) diff --git a/providers/dns/zoneee/zoneee_test.go b/providers/dns/zoneee/zoneee_test.go index 3e2560068..37dae6403 100644 --- a/providers/dns/zoneee/zoneee_test.go +++ b/providers/dns/zoneee/zoneee_test.go @@ -174,7 +174,7 @@ func TestDNSProvider_Present(t *testing.T) { t.Run(test.desc, func(t *testing.T) { provider := test.builder.Build(t) - err := provider.Present(domain, "token", "key") + err := provider.Present(t.Context(), domain, "token", "key") if test.expectedError == "" { require.NoError(t, err) } else { @@ -232,7 +232,7 @@ func TestDNSProvider_Cleanup(t *testing.T) { t.Run(test.desc, func(t *testing.T) { provider := test.builder.Build(t) - err := provider.CleanUp(domain, "token", "key") + err := provider.CleanUp(t.Context(), domain, "token", "key") if test.expectedError == "" { require.NoError(t, err) } else { @@ -252,7 +252,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -268,7 +268,7 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(2 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/dns/zonomi/zonomi.go b/providers/dns/zonomi/zonomi.go index 4d546d30e..511756efc 100644 --- a/providers/dns/zonomi/zonomi.go +++ b/providers/dns/zonomi/zonomi.go @@ -2,6 +2,7 @@ package zonomi import ( + "context" "errors" "fmt" "net/http" @@ -78,8 +79,8 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) { } // Present creates a TXT record using the specified parameters. -func (d *DNSProvider) Present(domain, token, keyAuth string) error { - err := d.prv.Present(domain, token, keyAuth) +func (d *DNSProvider) Present(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.Present(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("zonomi: %w", err) } @@ -88,8 +89,8 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the TXT record matching the specified parameters. -func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { - err := d.prv.CleanUp(domain, token, keyAuth) +func (d *DNSProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { + err := d.prv.CleanUp(ctx, domain, token, keyAuth) if err != nil { return fmt.Errorf("zonomi: %w", err) } diff --git a/providers/dns/zonomi/zonomi_test.go b/providers/dns/zonomi/zonomi_test.go index a2947a914..53b58e7dd 100644 --- a/providers/dns/zonomi/zonomi_test.go +++ b/providers/dns/zonomi/zonomi_test.go @@ -102,7 +102,7 @@ func TestLivePresent(t *testing.T) { provider, err := NewDNSProvider() require.NoError(t, err) - err = provider.Present(envTest.GetDomain(), "", "123d==") + err = provider.Present(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } @@ -118,6 +118,6 @@ func TestLiveCleanUp(t *testing.T) { time.Sleep(1 * time.Second) - err = provider.CleanUp(envTest.GetDomain(), "", "123d==") + err = provider.CleanUp(t.Context(), envTest.GetDomain(), "", "123d==") require.NoError(t, err) } diff --git a/providers/http/memcached/memcached.go b/providers/http/memcached/memcached.go index 55c4e4455..b7657df03 100644 --- a/providers/http/memcached/memcached.go +++ b/providers/http/memcached/memcached.go @@ -2,6 +2,7 @@ package memcached import ( + "context" "errors" "fmt" "path" @@ -29,7 +30,7 @@ func NewMemcachedProvider(hosts []string) (*HTTPProvider, error) { } // Present makes the token available at `HTTP01ChallengePath(token)` by creating a file in the given webroot path. -func (w *HTTPProvider) Present(domain, token, keyAuth string) error { +func (w *HTTPProvider) Present(ctx context.Context, domain, token, keyAuth string) error { var errs []error challengePath := path.Join("/", http01.ChallengePath(token)) @@ -56,7 +57,7 @@ func (w *HTTPProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the file created for the challenge. -func (w *HTTPProvider) CleanUp(domain, token, keyAuth string) error { +func (w *HTTPProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { // Memcached will clean up itself, that's what expiration is for. return nil } diff --git a/providers/http/memcached/memcached_test.go b/providers/http/memcached/memcached_test.go index a92dc0928..c96e7efc9 100644 --- a/providers/http/memcached/memcached_test.go +++ b/providers/http/memcached/memcached_test.go @@ -54,7 +54,7 @@ func TestMemcachedPresentSingleHost(t *testing.T) { challengePath := path.Join("/", http01.ChallengePath(token)) - err = p.Present(domain, token, keyAuth) + err = p.Present(t.Context(), domain, token, keyAuth) require.NoError(t, err) mc, err := memcache.New(memcachedHosts[0]) require.NoError(t, err) @@ -73,7 +73,7 @@ func TestMemcachedPresentMultiHost(t *testing.T) { challengePath := path.Join("/", http01.ChallengePath(token)) - err = p.Present(domain, token, keyAuth) + err = p.Present(t.Context(), domain, token, keyAuth) require.NoError(t, err) for _, host := range memcachedHosts { @@ -96,7 +96,7 @@ func TestMemcachedPresentPartialFailureMultiHost(t *testing.T) { challengePath := path.Join("/", http01.ChallengePath(token)) - err = p.Present(domain, token, keyAuth) + err = p.Present(t.Context(), domain, token, keyAuth) require.NoError(t, err) for _, host := range memcachedHosts { @@ -115,5 +115,5 @@ func TestMemcachedCleanup(t *testing.T) { p, err := NewMemcachedProvider(memcachedHosts) require.NoError(t, err) - require.NoError(t, p.CleanUp(domain, token, keyAuth)) + require.NoError(t, p.CleanUp(t.Context(), domain, token, keyAuth)) } diff --git a/providers/http/s3/s3.go b/providers/http/s3/s3.go index c16569f4f..10f5dbc3c 100644 --- a/providers/http/s3/s3.go +++ b/providers/http/s3/s3.go @@ -43,9 +43,7 @@ func NewHTTPProvider(bucket string) (*HTTPProvider, error) { } // Present makes the token available at `HTTP01ChallengePath(token)` by creating a file in the given s3 bucket. -func (s *HTTPProvider) Present(domain, token, keyAuth string) error { - ctx := context.Background() - +func (s *HTTPProvider) Present(ctx context.Context, domain, token, keyAuth string) error { params := &s3.PutObjectInput{ ACL: "public-read", Bucket: aws.String(s.bucket), @@ -62,9 +60,7 @@ func (s *HTTPProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the file created for the challenge. -func (s *HTTPProvider) CleanUp(domain, token, keyAuth string) error { - ctx := context.Background() - +func (s *HTTPProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { params := &s3.DeleteObjectInput{ Bucket: aws.String(s.bucket), Key: aws.String(strings.Trim(http01.ChallengePath(token), "/")), diff --git a/providers/http/s3/s3_test.go b/providers/http/s3/s3_test.go index 02760e2e8..c4a6717f8 100644 --- a/providers/http/s3/s3_test.go +++ b/providers/http/s3/s3_test.go @@ -50,7 +50,7 @@ func TestLiveNewHTTPProvider(t *testing.T) { // Present - err = provider.Present(domain, token, keyAuth) + err = provider.Present(t.Context(), domain, token, keyAuth) require.NoError(t, err) chlgPath := fmt.Sprintf("http://%s.s3.%s.amazonaws.com%s", @@ -68,7 +68,7 @@ func TestLiveNewHTTPProvider(t *testing.T) { // CleanUp - err = provider.CleanUp(domain, token, keyAuth) + err = provider.CleanUp(t.Context(), domain, token, keyAuth) require.NoError(t, err) cleanupResp, err := http.Get(chlgPath) diff --git a/providers/http/webroot/webroot.go b/providers/http/webroot/webroot.go index f4c689b46..a7bf5df46 100644 --- a/providers/http/webroot/webroot.go +++ b/providers/http/webroot/webroot.go @@ -2,6 +2,7 @@ package webroot import ( + "context" "errors" "fmt" "os" @@ -25,7 +26,7 @@ func NewHTTPProvider(path string) (*HTTPProvider, error) { } // Present makes the token available at `HTTP01ChallengePath(token)` by creating a file in the given webroot path. -func (w *HTTPProvider) Present(domain, token, keyAuth string) error { +func (w *HTTPProvider) Present(ctx context.Context, domain, token, keyAuth string) error { var err error challengeFilePath := filepath.Join(w.path, http01.ChallengePath(token)) @@ -44,7 +45,7 @@ func (w *HTTPProvider) Present(domain, token, keyAuth string) error { } // CleanUp removes the file created for the challenge. -func (w *HTTPProvider) CleanUp(domain, token, keyAuth string) error { +func (w *HTTPProvider) CleanUp(ctx context.Context, domain, token, keyAuth string) error { err := os.Remove(filepath.Join(w.path, http01.ChallengePath(token))) if err != nil { return fmt.Errorf("could not remove file in webroot after HTTP challenge: %w", err) diff --git a/providers/http/webroot/webroot_test.go b/providers/http/webroot/webroot_test.go index 4c55e2b90..13ea22a9e 100644 --- a/providers/http/webroot/webroot_test.go +++ b/providers/http/webroot/webroot_test.go @@ -21,7 +21,7 @@ func TestHTTPProvider(t *testing.T) { provider, err := NewHTTPProvider(webroot) require.NoError(t, err) - err = provider.Present(domain, token, keyAuth) + err = provider.Present(t.Context(), domain, token, keyAuth) require.NoError(t, err) if _, err = os.Stat(challengeFilePath); os.IsNotExist(err) { @@ -36,6 +36,6 @@ func TestHTTPProvider(t *testing.T) { dataStr := string(data) assert.Equal(t, keyAuth, dataStr) - err = provider.CleanUp(domain, token, keyAuth) + err = provider.CleanUp(t.Context(), domain, token, keyAuth) require.NoError(t, err) }