From d37f05766bce43028ef2a78d46a91db7722bde23 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Mon, 17 Jun 2024 14:48:02 +0000 Subject: [PATCH] chore(providers): change ttl type to uint32 --- internal/provider/providers/cloudflare/provider.go | 8 ++++---- internal/provider/providers/gandi/provider.go | 8 ++++---- internal/provider/providers/gcp/api.go | 2 +- internal/provider/providers/hetzner/create.go | 2 +- internal/provider/providers/hetzner/provider.go | 4 ++-- internal/provider/providers/hetzner/update.go | 2 +- internal/provider/providers/luadns/provider.go | 2 +- internal/provider/providers/porkbun/provider.go | 4 ++-- internal/provider/providers/servercow/provider.go | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/provider/providers/cloudflare/provider.go b/internal/provider/providers/cloudflare/provider.go index 46a3139b6..16436ad5a 100644 --- a/internal/provider/providers/cloudflare/provider.go +++ b/internal/provider/providers/cloudflare/provider.go @@ -31,7 +31,7 @@ type Provider struct { userServiceKey string zoneIdentifier string proxied bool - ttl uint + ttl uint32 } func New(data json.RawMessage, domain, host string, @@ -44,7 +44,7 @@ func New(data json.RawMessage, domain, host string, UserServiceKey string `json:"user_service_key"` ZoneIdentifier string `json:"zone_identifier"` Proxied bool `json:"proxied"` - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{} err = json.Unmarshal(data, &extraSettings) if err != nil { @@ -243,7 +243,7 @@ func (p *Provider) createRecord(ctx context.Context, client *http.Client, ip net Name string `json:"name"` // DNS record name i.e. example.com Content string `json:"content"` // ip address Proxied bool `json:"proxied"` // whether the record is receiving the performance and security benefits of Cloudflare - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{ Type: recordType, Name: utils.BuildURLQueryHostname(p.host, p.domain), @@ -335,7 +335,7 @@ func (p *Provider) Update(ctx context.Context, client *http.Client, ip netip.Add Name string `json:"name"` // DNS record name i.e. example.com Content string `json:"content"` // ip address Proxied bool `json:"proxied"` // whether the record is receiving the performance and security benefits of Cloudflare - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{ Type: recordType, Name: utils.BuildURLQueryHostname(p.host, p.domain), diff --git a/internal/provider/providers/gandi/provider.go b/internal/provider/providers/gandi/provider.go index 4d1b38f42..2d0673797 100644 --- a/internal/provider/providers/gandi/provider.go +++ b/internal/provider/providers/gandi/provider.go @@ -22,7 +22,7 @@ type Provider struct { host string ipVersion ipversion.IPVersion ipv6Suffix netip.Prefix - ttl int + ttl uint32 // Authentication, either use the personal access token // or the deprecated API key. // See https://api.gandi.net/docs/authentication/ @@ -38,7 +38,7 @@ func New(data json.RawMessage, domain, host string, extraSettings := struct { PersonalAccessToken string `json:"personal_access_token"` APIKey string `json:"key"` - TTL int `json:"ttl"` + TTL uint32 `json:"ttl"` }{} err = json.Unmarshal(data, &extraSettings) if err != nil { @@ -118,14 +118,14 @@ func (p *Provider) Update(ctx context.Context, client *http.Client, ip netip.Add buffer := bytes.NewBuffer(nil) encoder := json.NewEncoder(buffer) - const defaultTTL = 3600 + const defaultTTL uint32 = 3600 ttl := defaultTTL if p.ttl != 0 { ttl = p.ttl } requestData := struct { Values [1]string `json:"rrset_values"` - TTL int `json:"rrset_ttl"` + TTL uint32 `json:"rrset_ttl"` }{ Values: [1]string{ip.Unmap().String()}, TTL: ttl, diff --git a/internal/provider/providers/gcp/api.go b/internal/provider/providers/gcp/api.go index b3562355c..ef94e8fa7 100644 --- a/internal/provider/providers/gcp/api.go +++ b/internal/provider/providers/gcp/api.go @@ -19,7 +19,7 @@ type recordResourceSet struct { // Rrdatas, as defined in RFC 1035 (section 5) and RFC 1034 (section 3.6.1) Rrdatas []string `json:"rrdatas,omitempty"` // TTL is the number of seconds that this RRSet can be cached by resolvers. - TTL int64 `json:"ttl"` + TTL uint32 `json:"ttl"` // Type is the identifier of a record type. For example A or AAAA. Type string `json:"type"` } diff --git a/internal/provider/providers/hetzner/create.go b/internal/provider/providers/hetzner/create.go index f59d102be..63691e4dd 100644 --- a/internal/provider/providers/hetzner/create.go +++ b/internal/provider/providers/hetzner/create.go @@ -31,7 +31,7 @@ func (p *Provider) createRecord(ctx context.Context, client *http.Client, ip net Name string `json:"name"` Value string `json:"value"` ZoneIdentifier string `json:"zone_id"` - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{ Type: recordType, Name: p.host, diff --git a/internal/provider/providers/hetzner/provider.go b/internal/provider/providers/hetzner/provider.go index c64086f6a..742f82405 100644 --- a/internal/provider/providers/hetzner/provider.go +++ b/internal/provider/providers/hetzner/provider.go @@ -22,7 +22,7 @@ type Provider struct { ipv6Suffix netip.Prefix token string zoneIdentifier string - ttl uint + ttl uint32 } func New(data json.RawMessage, domain, host string, @@ -31,7 +31,7 @@ func New(data json.RawMessage, domain, host string, extraSettings := struct { Token string `json:"token"` ZoneIdentifier string `json:"zone_identifier"` - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{} err = json.Unmarshal(data, &extraSettings) if err != nil { diff --git a/internal/provider/providers/hetzner/update.go b/internal/provider/providers/hetzner/update.go index 90aa251e9..02d450694 100644 --- a/internal/provider/providers/hetzner/update.go +++ b/internal/provider/providers/hetzner/update.go @@ -32,7 +32,7 @@ func (p *Provider) updateRecord(ctx context.Context, client *http.Client, Name string `json:"name"` Value string `json:"value"` ZoneIdentifier string `json:"zone_id"` - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{ Type: recordType, Name: p.host, diff --git a/internal/provider/providers/luadns/provider.go b/internal/provider/providers/luadns/provider.go index a7c5071a7..eb3da698e 100644 --- a/internal/provider/providers/luadns/provider.go +++ b/internal/provider/providers/luadns/provider.go @@ -137,7 +137,7 @@ type luaDNSRecord struct { Name string `json:"name"` Type string `json:"type"` Content string `json:"content"` - TTL int `json:"ttl"` + TTL uint32 `json:"ttl"` } type luaDNSError struct { diff --git a/internal/provider/providers/porkbun/provider.go b/internal/provider/providers/porkbun/provider.go index 59bc7d5b8..34591f969 100644 --- a/internal/provider/providers/porkbun/provider.go +++ b/internal/provider/providers/porkbun/provider.go @@ -20,7 +20,7 @@ type Provider struct { host string ipVersion ipversion.IPVersion ipv6Suffix netip.Prefix - ttl uint + ttl uint32 apiKey string secretAPIKey string } @@ -31,7 +31,7 @@ func New(data json.RawMessage, domain, host string, extraSettings := struct { SecretAPIKey string `json:"secret_api_key"` APIKey string `json:"api_key"` - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{} err = json.Unmarshal(data, &extraSettings) if err != nil { diff --git a/internal/provider/providers/servercow/provider.go b/internal/provider/providers/servercow/provider.go index 84739a7e1..0fedff1fc 100644 --- a/internal/provider/providers/servercow/provider.go +++ b/internal/provider/providers/servercow/provider.go @@ -26,7 +26,7 @@ type Provider struct { username string password string useProviderIP bool - ttl uint + ttl uint32 } func New(data json.RawMessage, domain, host string, ipVersion ipversion.IPVersion, ipv6Suffix netip.Prefix) ( @@ -34,7 +34,7 @@ func New(data json.RawMessage, domain, host string, ipVersion ipversion.IPVersio extraSettings := struct { Username string `json:"username"` Password string `json:"password"` - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` UseProviderIP bool `json:"provider_ip"` }{} err = json.Unmarshal(data, &extraSettings) @@ -128,7 +128,7 @@ func (p *Provider) Update(ctx context.Context, client *http.Client, ip netip.Add Type string `json:"type"` // constants.A or constants.AAAA depending on ip address given Name string `json:"name"` // DNS record name (only the subdomain part) Content string `json:"content"` // ip address - TTL uint `json:"ttl"` + TTL uint32 `json:"ttl"` }{ Type: recordType, Name: updateHost,