Add some minor code cleanup/error handling and set different version from upstream

This commit is contained in:
Morten Lied Johansen 2024-10-02 20:23:45 +02:00
parent ce2eeeba32
commit 7d472cf51d
No known key found for this signature in database
GPG key ID: 8DC6DECB15005221
3 changed files with 15 additions and 12 deletions

20
main.go
View file

@ -11,8 +11,6 @@ import (
extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/klog"
//"k8s.io/client-go/kubernetes"
"github.com/cert-manager/cert-manager/pkg/acme/webhook/apis/acme/v1alpha1"
"github.com/cert-manager/cert-manager/pkg/acme/webhook/cmd"
"github.com/cert-manager/cert-manager/pkg/issuer/acme/dns/util"
@ -132,15 +130,18 @@ func (c *domeneshopDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) err
client, err := c.getClient(ch)
if err != nil {
return err
return fmt.Errorf("failed to get domeneshop client: %w", err)
}
domain, err := client.GetDomainByName(util.UnFqdn(ch.ResolvedZone))
if err != nil {
return err
return fmt.Errorf("failed to get domain by name: %w", err)
}
client.CreateTXTRecord(domain, util.UnFqdn(strings.TrimSuffix(ch.ResolvedFQDN, ch.ResolvedZone)), ch.Key)
err = client.CreateTXTRecord(domain, util.UnFqdn(strings.TrimSuffix(ch.ResolvedFQDN, ch.ResolvedZone)), ch.Key)
if err != nil {
return fmt.Errorf("failed to create TXT record: %w", err)
}
return nil
}
@ -154,16 +155,17 @@ func (c *domeneshopDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) err
func (c *domeneshopDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error {
client, err := c.getClient(ch)
if err != nil {
return err
return fmt.Errorf("failed to get domeneshop client: %w", err)
}
domain, err := client.GetDomainByName(util.UnFqdn(ch.ResolvedZone))
if err != nil {
return err
return fmt.Errorf("failed to get domain by name: %w", err)
}
if err := client.DeleteTXTRecord(domain, util.UnFqdn(strings.TrimSuffix(ch.ResolvedFQDN, ch.ResolvedZone)), ch.Key); err != nil {
return err
err = client.DeleteTXTRecord(domain, util.UnFqdn(strings.TrimSuffix(ch.ResolvedFQDN, ch.ResolvedZone)), ch.Key)
if err != nil {
return fmt.Errorf("failed to delete TXT record: %w", err)
}
return nil

View file

@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
)
@ -82,7 +82,8 @@ func (c *Client) Request(method string, endpoint string, reqBody []byte, v inter
return err
}
defer resp.Body.Close()
respBody, err := ioutil.ReadAll(resp.Body)
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return err
}

View file

@ -8,7 +8,7 @@ import (
// Version information fetched from environment variables in docker build process
var (
version = "1.0.0"
version = "1.1.0+mortenlj"
gitCommit = os.Getenv("GIT_COMMIT")
buildDate = os.Getenv("BUILD_DATE")
)