deblan-mirror/lego
1
0
Fork 0
mirror of https://github.com/go-acme/lego synced 2026-03-14 14:35:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

chore: minor changes (#2776)

Browse source
This commit is contained in:
Ludovic Fernandez 2026-01-05 00:05:16 +01:00 • committed by GitHub
commit 4783c128fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 64 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
providers/dns/allinkl/allinkl.go
View file

@ -130,7 +130,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
credential, err := d.identifier.Authentication(ctx, 60, true)
if err != nil {
return fmt.Errorf("allinkl: %w", err)
return fmt.Errorf("allinkl: authentication: %w", err)
}
ctx = internal.WithContext(ctx, credential)
@ -149,7 +149,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
recordID, err := d.client.AddDNSSettings(ctx, record)
if err != nil {
return fmt.Errorf("allinkl: %w", err)
return fmt.Errorf("allinkl: add DNS settings: %w", err)
}
d.recordIDsMu.Lock()
@ -167,7 +167,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
credential, err := d.identifier.Authentication(ctx, 60, true)
if err != nil {
return fmt.Errorf("allinkl: %w", err)
return fmt.Errorf("allinkl: authentication: %w", err)
}
ctx = internal.WithContext(ctx, credential)
@ -183,7 +183,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
_, err = d.client.DeleteDNSSettings(ctx, recordID)
if err != nil {
return fmt.Errorf("allinkl: %w", err)
return fmt.Errorf("allinkl: delete DNS settings: %w", err)
}
d.recordIDsMu.Lock()

4
providers/dns/autodns/autodns.go
View file

@ -130,7 +130,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
_, err := d.client.AddRecords(context.Background(), info.EffectiveFQDN, records)
if err != nil {
return fmt.Errorf("autodns: %w", err)
return fmt.Errorf("autodns: add record: %w", err)
}
return nil
@ -149,7 +149,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
_, err := d.client.RemoveRecords(context.Background(), info.EffectiveFQDN, records)
if err != nil {
return fmt.Errorf("autodns: %w", err)
return fmt.Errorf("autodns: remove record: %w", err)
}
return nil

36
providers/dns/liquidweb/liquidweb_test.go
View file

@ -27,16 +27,16 @@ func TestNewDNSProvider(t *testing.T) {
{
desc: "minimum-success",
envVars: map[string]string{
EnvUsername: "blars",
EnvPassword: "tacoman",
EnvUsername: "user",
EnvPassword: "secret",
},
},
{
desc: "set-everything",
envVars: map[string]string{
EnvURL: "https://storm.com",
EnvUsername: "blars",
EnvPassword: "tacoman",
EnvURL: "https://storm.example",
EnvUsername: "user",
EnvPassword: "secret",
EnvZone: "blars.com",
},
},
@ -48,16 +48,16 @@ func TestNewDNSProvider(t *testing.T) {
{
desc: "missing username",
envVars: map[string]string{
EnvPassword: "tacoman",
EnvZone: "blars.com",
EnvPassword: "secret",
EnvZone: "blars.example",
},
expected: "liquidweb: some credentials information are missing: LIQUID_WEB_USERNAME",
},
{
desc: "missing password",
envVars: map[string]string{
EnvUsername: "blars",
EnvZone: "blars.com",
EnvUsername: "user",
EnvZone: "blars.example",
},
expected: "liquidweb: some credentials information are missing: LIQUID_WEB_PASSWORD",
},
@ -148,13 +148,13 @@ func TestNewDNSProviderConfig(t *testing.T) {
func TestDNSProvider_Present(t *testing.T) {
provider := mockProvider(t)
err := provider.Present("tacoman.com", "", "")
err := provider.Present("tacoman.example", "", "")
require.NoError(t, err)
}
func TestDNSProvider_CleanUp(t *testing.T) {
provider := mockProvider(t, network.DNSRecord{
Name: "_acme-challenge.tacoman.com",
Name: "_acme-challenge.tacoman.example",
RData: "123d==",
Type: "TXT",
TTL: 300,
@ -164,7 +164,7 @@ func TestDNSProvider_CleanUp(t *testing.T) {
provider.recordIDs["123d=="] = 1234567
err := provider.CleanUp("tacoman.com.", "123d==", "")
err := provider.CleanUp("tacoman.example.", "123d==", "")
require.NoError(t, err)
}
@ -181,7 +181,7 @@ func TestDNSProvider(t *testing.T) {
}{
{
desc: "expected successful",
domain: "tacoman.com",
domain: "tacoman.example",
token: "123",
keyAuth: "456",
present: true,
@ -189,7 +189,7 @@ func TestDNSProvider(t *testing.T) {
},
{
desc: "other successful",
domain: "banana.com",
domain: "banana.example",
token: "123",
keyAuth: "456",
present: true,
@ -197,16 +197,16 @@ func TestDNSProvider(t *testing.T) {
},
{
desc: "zone not on account",
domain: "huckleberry.com",
domain: "huckleberry.example",
token: "123",
keyAuth: "456",
present: true,
expPresentErr: "no valid zone in account for certificate '_acme-challenge.huckleberry.com'",
expPresentErr: "no valid zone in account for certificate '_acme-challenge.huckleberry.example'",
cleanup: false,
},
{
desc: "ssl for domain",
domain: "sundae.cherry.com",
domain: "sundae.cherry.example",
token: "5847953",
keyAuth: "34872934",
present: true,
@ -214,7 +214,7 @@ func TestDNSProvider(t *testing.T) {
},
{
desc: "complicated domain",
domain: "always.money.stand.banana.com",
domain: "always.money.stand.banana.example",
token: "5847953",
keyAuth: "there is always money in the banana stand",
present: true,

60
providers/dns/liquidweb/servermock_test.go
View file

@ -26,14 +26,14 @@ func mockProvider(t *testing.T, initRecs ...network.DNSRecord) *DNSProvider {
return servermock.NewBuilder(
func(server *httptest.Server) (*DNSProvider, error) {
config := NewDefaultConfig()
config.Username = "blars"
config.Password = "tacoman"
config.Username = "user"
config.Password = "secret"
config.BaseURL = server.URL
return NewDNSProviderConfig(config)
},
servermock.CheckHeader().
WithBasicAuth("blars", "tacoman"),
WithBasicAuth("user", "secret"),
).
Route("/v1/Network/DNS/Record/delete", mockAPIDelete(recs)).
Route("/v1/Network/DNS/Record/create", mockAPICreate(recs)).
@ -172,38 +172,38 @@ func makeMockZones() (map[int]network.DNSZoneList, map[string]int) {
Items: []network.DNSZone{
{
ID: 1,
Name: "blars.com",
Name: "blars.example",
Active: 1,
DelegationStatus: "CORRECT",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 2,
Name: "tacoman.com",
Name: "tacoman.example",
Active: 1,
DelegationStatus: "CORRECT",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 3,
Name: "storm.com",
Name: "storm.example",
Active: 1,
DelegationStatus: "CORRECT",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 4,
Name: "not-apple.com",
Name: "not-apple.example",
Active: 1,
DelegationStatus: "BAD_NAMESERVERS",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 5,
Name: "example.com",
Active: 1,
DelegationStatus: "BAD_NAMESERVERS",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
},
},
@ -211,38 +211,38 @@ func makeMockZones() (map[int]network.DNSZoneList, map[string]int) {
Items: []network.DNSZone{
{
ID: 6,
Name: "banana.com",
Name: "banana.example",
Active: 1,
DelegationStatus: "NXDOMAIN",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 7,
Name: "cherry.com",
Name: "cherry.example",
Active: 1,
DelegationStatus: "SERVFAIL",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 8,
Name: "dates.com",
Name: "dates.example",
Active: 1,
DelegationStatus: "SERVFAIL",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 9,
Name: "eggplant.com",
Name: "eggplant.example",
Active: 1,
DelegationStatus: "SERVFAIL",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 10,
Name: "fig.com",
Name: "fig.example",
Active: 1,
DelegationStatus: "UNKNOWN",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
},
},
@ -250,31 +250,31 @@ func makeMockZones() (map[int]network.DNSZoneList, map[string]int) {
Items: []network.DNSZone{
{
ID: 11,
Name: "grapes.com",
Name: "grapes.example",
Active: 1,
DelegationStatus: "UNKNOWN",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 12,
Name: "money.banana.com",
Name: "money.banana.example",
Active: 1,
DelegationStatus: "UNKNOWN",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 13,
Name: "money.stand.banana.com",
Name: "money.stand.banana.example",
Active: 1,
DelegationStatus: "UNKNOWN",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
{
ID: 14,
Name: "stand.banana.com",
Name: "stand.banana.example",
Active: 1,
DelegationStatus: "UNKNOWN",
PrimaryNameserver: "ns.liquidweb.com",
PrimaryNameserver: "ns.example.org",
},
},
},

4
providers/dns/neodigit/neodigit.go
View file

@ -25,6 +25,8 @@ const (
EnvHTTPTimeout = envNamespace + "HTTP_TIMEOUT"
)
const defaultBaseURL = "https://api.neodigit.net/v1"
var _ challenge.ProviderTimeout = (*DNSProvider)(nil)
// Config is used to configure the creation of the DNSProvider.
@ -66,7 +68,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
return nil, errors.New("neodigit: the configuration of the DNS provider is nil")
}
provider, err := tecnocratica.NewDNSProviderConfig(config, "")
provider, err := tecnocratica.NewDNSProviderConfig(config, defaultBaseURL)
if err != nil {
return nil, fmt.Errorf("neodigit: %w", err)
}

4
providers/dns/virtualname/virtualname.go
View file

@ -25,6 +25,8 @@ const (
EnvHTTPTimeout = envNamespace + "HTTP_TIMEOUT"
)
const defaultBaseURL = "https://api.virtualname.net/v1"
var _ challenge.ProviderTimeout = (*DNSProvider)(nil)
// Config is used to configure the creation of the DNSProvider.
@ -66,7 +68,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
return nil, errors.New("virtualname: the configuration of the DNS provider is nil")
}
provider, err := tecnocratica.NewDNSProviderConfig(config, "https://api.virtualname.net/v1")
provider, err := tecnocratica.NewDNSProviderConfig(config, defaultBaseURL)
if err != nil {
return nil, fmt.Errorf("virtualname: %w", err)
}