Skip to content

Commit

Permalink
chore: trim the code
Browse files Browse the repository at this point in the history
  • Loading branch information
ldez committed Nov 6, 2024
1 parent 73a75a6 commit 94e3073
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 785 deletions.
100 changes: 8 additions & 92 deletions providers/dns/cloudxns/cloudxns.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,11 @@
package cloudxns

import (
"context"
"errors"
"fmt"
"net/http"
"time"

"github.com/go-acme/lego/v4/challenge/dns01"
"github.com/go-acme/lego/v4/platform/config/env"
"github.com/go-acme/lego/v4/providers/dns/cloudxns/internal"
)

// Environment variables names.
const (
envNamespace = "CLOUDXNS_"

EnvAPIKey = envNamespace + "API_KEY"
EnvSecretKey = envNamespace + "SECRET_KEY"

EnvTTL = envNamespace + "TTL"
EnvPropagationTimeout = envNamespace + "PROPAGATION_TIMEOUT"
EnvPollingInterval = envNamespace + "POLLING_INTERVAL"
EnvHTTPTimeout = envNamespace + "HTTP_TIMEOUT"
)

// Config is used to configure the creation of the DNSProvider.
Expand All @@ -38,101 +21,34 @@ type Config struct {

// NewDefaultConfig returns a default configuration for the DNSProvider.
func NewDefaultConfig() *Config {
return &Config{
PropagationTimeout: env.GetOrDefaultSecond(EnvPropagationTimeout, dns01.DefaultPropagationTimeout),
PollingInterval: env.GetOrDefaultSecond(EnvPollingInterval, dns01.DefaultPollingInterval),
TTL: env.GetOrDefaultInt(EnvTTL, dns01.DefaultTTL),
HTTPClient: &http.Client{
Timeout: env.GetOrDefaultSecond(EnvHTTPTimeout, 30*time.Second),
},
}
return &Config{}
}

// DNSProvider implements the challenge.Provider interface.
type DNSProvider struct {
config *Config
client *internal.Client
}
type DNSProvider struct{}

// NewDNSProvider returns a DNSProvider instance configured for CloudXNS.
// Credentials must be passed in the environment variables:
// CLOUDXNS_API_KEY and CLOUDXNS_SECRET_KEY.
func NewDNSProvider() (*DNSProvider, error) {
values, err := env.Get(EnvAPIKey, EnvSecretKey)
if err != nil {
return nil, fmt.Errorf("cloudxns: %w", err)
}

config := NewDefaultConfig()
config.APIKey = values[EnvAPIKey]
config.SecretKey = values[EnvSecretKey]

return NewDNSProviderConfig(config)
return NewDNSProviderConfig(&Config{})
}

// NewDNSProviderConfig return a DNSProvider instance configured for CloudXNS.
func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
if config == nil {
return nil, errors.New("cloudxns: the configuration of the DNS provider is nil")
}

client, err := internal.NewClient(config.APIKey, config.SecretKey)
if err != nil {
return nil, fmt.Errorf("cloudxns: %w", err)
}

if config.HTTPClient != nil {
client.HTTPClient = config.HTTPClient
}

return &DNSProvider{client: client, config: config}, nil
func NewDNSProviderConfig(_ *Config) (*DNSProvider, error) {
return nil, errors.New("cloudxns: provider has shut down")
}

// Present creates a TXT record to fulfill the dns-01 challenge.
func (d *DNSProvider) Present(domain, token, keyAuth string) error {
challengeInfo := dns01.GetChallengeInfo(domain, keyAuth)

ctx := context.Background()

info, err := d.client.GetDomainInformation(ctx, challengeInfo.EffectiveFQDN)
if err != nil {
return fmt.Errorf("cloudxns: %w", err)
}

err = d.client.AddTxtRecord(ctx, info, challengeInfo.EffectiveFQDN, challengeInfo.Value, d.config.TTL)
if err != nil {
return fmt.Errorf("cloudxns: %w", err)
}

func (d *DNSProvider) Present(_, _, _ string) error {
return nil
}

// CleanUp removes the TXT record matching the specified parameters.
func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
challengeInfo := dns01.GetChallengeInfo(domain, keyAuth)

ctx := context.Background()

info, err := d.client.GetDomainInformation(ctx, challengeInfo.EffectiveFQDN)
if err != nil {
return fmt.Errorf("cloudxns: %w", err)
}

record, err := d.client.FindTxtRecord(ctx, info.ID, challengeInfo.EffectiveFQDN)
if err != nil {
return fmt.Errorf("cloudxns: %w", err)
}

err = d.client.RemoveTxtRecord(ctx, record.RecordID, info.ID)
if err != nil {
return fmt.Errorf("cloudxns: %w", err)
}

func (d *DNSProvider) CleanUp(_, _, _ string) error {
return nil
}

// Timeout returns the timeout and interval to use when checking for DNS propagation.
// Adjusting here to cope with spikes in propagation times.
func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
return d.config.PropagationTimeout, d.config.PollingInterval
return dns01.DefaultPropagationTimeout, dns01.DefaultPollingInterval
}
152 changes: 0 additions & 152 deletions providers/dns/cloudxns/cloudxns_test.go

This file was deleted.

Loading

0 comments on commit 94e3073

Please sign in to comment.