review: 4

Author: ldez

providers/dns/nicru/internal/client.go

@@ -80,19 +80,12 @@ func NewClient(httpClient *http.Client, serviceName string) (*Client, error) {
 func (c *Client) GetZones() ([]*Zone, error) {
 	endpoint := c.baseURL.JoinPath("dns-master", "services", c.serviceName, "zones")
 
-	request, err := http.NewRequest(http.MethodGet, endpoint.String(), nil)
+	req, err := http.NewRequest(http.MethodGet, endpoint.String(), nil)
 	if err != nil {
 		return nil, err
 	}
 
-	response, err := c.httpClient.Do(request)
-	if err != nil {
-		return nil, err
-	}
-
-	apiResponse := &Response{}
-
-	err = xml.NewDecoder(response.Body).Decode(apiResponse)
+	apiResponse, err := c.do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -103,19 +96,12 @@ func (c *Client) GetZones() ([]*Zone, error) {
 func (c *Client) GetRecords(fqdn string) ([]*RR, error) {
 	endpoint := c.baseURL.JoinPath("dns-master", "services", c.serviceName, "zones", fqdn, "records")
 
-	request, err := http.NewRequest(http.MethodGet, endpoint.String(), nil)
+	req, err := http.NewRequest(http.MethodGet, endpoint.String(), nil)
 	if err != nil {
 		return nil, err
 	}
 
-	response, err := c.httpClient.Do(request)
-	if err != nil {
-		return nil, err
-	}
-
-	apiResponse := &Response{}
-
-	err = xml.NewDecoder(response.Body).Decode(apiResponse)
+	apiResponse, err := c.do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -128,22 +114,6 @@ func (c *Client) GetRecords(fqdn string) ([]*RR, error) {
 	return records, nil
 }
 
-func (c *Client) GetTXTRecords(fqdn string) ([]*Txt, error) {
-	records, err := c.GetRecords(fqdn)
-	if err != nil {
-		return nil, err
-	}
-
-	var txtRecords []*Txt
-	for _, record := range records {
-		if record.Txt != nil {
-			txtRecords = append(txtRecords, record.Txt)
-		}
-	}
-
-	return txtRecords, nil
-}
-
 func (c *Client) AddTxtRecord(zoneName string, name string, content string, ttl int) (*Response, error) {
 	request := &Request{RRList: &RrList{RR: []*RR{{
 		Name: name,
@@ -152,7 +122,7 @@ func (c *Client) AddTxtRecord(zoneName string, name string, content string, ttl
 		Txt:  &Txt{String: content},
 	}}}}
 
-	return c.add(zoneName, request)
+	return c.addRecords(zoneName, request)
 }
 
 func (c *Client) DeleteRecord(zoneName string, id string) (*Response, error) {
@@ -163,53 +133,21 @@ func (c *Client) DeleteRecord(zoneName string, id string) (*Response, error) {
 		return nil, err
 	}
 
-	response, err := c.httpClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	apiResponse := &Response{}
-
-	err = xml.NewDecoder(response.Body).Decode(apiResponse)
-	if err != nil {
-		return nil, err
-	}
-
-	if apiResponse.Status != successStatus {
-		return nil, err
-	}
-
-	return apiResponse, nil
+	return c.do(req)
 }
 
 func (c *Client) CommitZone(zoneName string) (*Response, error) {
 	endpoint := c.baseURL.JoinPath("dns-master", "services", c.serviceName, "zones", zoneName, "commit")
 
-	request, err := http.NewRequest(http.MethodPost, endpoint.String(), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	response, err := c.httpClient.Do(request)
+	req, err := http.NewRequest(http.MethodPost, endpoint.String(), nil)
 	if err != nil {
 		return nil, err
 	}
 
-	apiResponse := &Response{}
-
-	err = xml.NewDecoder(response.Body).Decode(apiResponse)
-	if err != nil {
-		return nil, err
-	}
-
-	if apiResponse.Status != successStatus {
-		return nil, err
-	}
-
-	return apiResponse, nil
+	return c.do(req)
 }
 
-func (c *Client) add(zoneName string, request *Request) (*Response, error) {
+func (c *Client) addRecords(zoneName string, request *Request) (*Response, error) {
 	endpoint := c.baseURL.JoinPath("dns-master", "services", c.serviceName, "zones", zoneName, "records")
 
 	body := &bytes.Buffer{}
@@ -222,14 +160,19 @@ func (c *Client) add(zoneName string, request *Request) (*Response, error) {
 		return nil, err
 	}
 
-	response, err := c.httpClient.Do(req)
+	return c.do(req)
+}
+
+func (c *Client) do(req *http.Request) (*Response, error) {
+	resp, err := c.httpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
+	defer func() { _ = resp.Body.Close() }()
 
 	apiResponse := &Response{}
 
-	err = xml.NewDecoder(response.Body).Decode(apiResponse)
+	err = xml.NewDecoder(resp.Body).Decode(apiResponse)
 	if err != nil {
 		return nil, err
 	}

providers/dns/nicru/nicru.go

@@ -121,13 +121,17 @@ func (p *DNSProvider) Present(domain, _, keyAuth string) error {
 		return fmt.Errorf("nicru: %w", err)
 	}
 
-	records, err := p.client.GetTXTRecords(authZone)
+	records, err := p.client.GetRecords(authZone)
 	if err != nil {
 		return fmt.Errorf("nicru: %w", err)
 	}
 
 	for _, record := range records {
-		if record.Text == subDomain && record.String == info.Value {
+		if record.Txt == nil {
+			continue
+		}
+
+		if record.Txt.Text == subDomain && record.Txt.String == info.Value {
 			return nil
 		}
 	}