Use utils.ToString for all providers

qdm12 · Aug 7, 2023 · becdbc8 · becdbc8
1 parent fc8e3f9
commit becdbc8
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/internal/provider/providers/desec/provider.go b/internal/provider/providers/desec/provider.go
@@ -61,7 +61,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: deSEC]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.DeSEC, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/dyn/provider.go b/internal/provider/providers/dyn/provider.go
@@ -73,7 +73,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: Dyn]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.Dyn, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/dynv6/provider.go b/internal/provider/providers/dynv6/provider.go
@@ -9,6 +9,7 @@ import (
 	"net/url"
 
 	"github.com/qdm12/ddns-updater/internal/models"
+	"github.com/qdm12/ddns-updater/internal/provider/constants"
 	"github.com/qdm12/ddns-updater/internal/provider/errors"
 	"github.com/qdm12/ddns-updater/internal/provider/headers"
 	"github.com/qdm12/ddns-updater/internal/provider/utils"
@@ -58,7 +59,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: DynV6]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.DynV6, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/inwx/provider.go b/internal/provider/providers/inwx/provider.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/qdm12/ddns-updater/internal/models"
+	"github.com/qdm12/ddns-updater/internal/provider/constants"
 	"github.com/qdm12/ddns-updater/internal/provider/errors"
 	"github.com/qdm12/ddns-updater/internal/provider/headers"
 	"github.com/qdm12/ddns-updater/internal/provider/utils"
@@ -62,7 +63,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: INWX]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.INWX, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/opendns/provider.go b/internal/provider/providers/opendns/provider.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/qdm12/ddns-updater/internal/models"
+	"github.com/qdm12/ddns-updater/internal/provider/constants"
 	"github.com/qdm12/ddns-updater/internal/provider/errors"
 	"github.com/qdm12/ddns-updater/internal/provider/headers"
 	"github.com/qdm12/ddns-updater/internal/provider/utils"
@@ -65,7 +66,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: Opendns]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.OpenDNS, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/ovh/provider.go b/internal/provider/providers/ovh/provider.go
@@ -102,7 +102,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: OVH]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.OVH, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/porkbun/provider.go b/internal/provider/providers/porkbun/provider.go
@@ -63,7 +63,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: Porkbun]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.Porkbun, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/selfhostde/provider.go b/internal/provider/providers/selfhostde/provider.go
@@ -66,7 +66,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: Selfhost.de]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.SelfhostDe, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/spdyn/provider.go b/internal/provider/providers/spdyn/provider.go
@@ -72,7 +72,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: Spdyn]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.Spdyn, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {

diff --git a/internal/provider/providers/variomedia/provider.go b/internal/provider/providers/variomedia/provider.go
@@ -66,7 +66,7 @@ func (p *Provider) isValid() error {
 }
 
 func (p *Provider) String() string {
-	return fmt.Sprintf("[domain: %s | host: %s | provider: Variomedia]", p.domain, p.host)
+	return utils.ToString(p.domain, p.host, constants.Variomedia, p.ipVersion)
 }
 
 func (p *Provider) Domain() string {