Update to libdns v1.1.0
This commit is contained in:
Alexandre Almeida
parent
b7b0ab2cab
commit
75a18cd47f
43
README.md
43
README.md
@ -21,6 +21,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/libdns/libdns"
|
||||
|
||||
"github.com/libdns/vultr"
|
||||
)
|
||||
|
||||
@ -35,8 +36,18 @@ func main() {
|
||||
fmt.Printf("ZONE not set\n")
|
||||
return
|
||||
}
|
||||
|
||||
provider := vultr.Provider{APIToken: token}
|
||||
|
||||
zones, err := provider.ListZones(context.TODO())
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
}
|
||||
|
||||
for _, zone := range zones {
|
||||
fmt.Printf("%s\n", zone.Name)
|
||||
}
|
||||
|
||||
records, err := provider.GetRecords(context.TODO(), zone)
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
@ -45,11 +56,16 @@ func main() {
|
||||
testName := "libdns-test"
|
||||
testId := ""
|
||||
for _, record := range records {
|
||||
fmt.Printf("%s (.%s): %s, %s\n", record.Name, zone, record.Value, record.Type)
|
||||
if record.Name == testName {
|
||||
testId = record.ID
|
||||
fmt.Printf("%s (.%s): %s, %s\n", record.RR().Name, zone, record.RR().Data, record.RR().Type)
|
||||
|
||||
recordId, err := vultr.GetRecordID(record)
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
}
|
||||
|
||||
if record.RR().Name == testName {
|
||||
testId = recordId
|
||||
}
|
||||
}
|
||||
|
||||
if testId != "" {
|
||||
@ -62,23 +78,22 @@ func main() {
|
||||
// }
|
||||
// Set only works if we have a record.ID
|
||||
fmt.Printf("Replacing entry for %s\n", testName)
|
||||
_, err = provider.SetRecords(context.TODO(), zone, []libdns.Record{libdns.Record{
|
||||
Type: "TXT",
|
||||
Name: testName,
|
||||
Value: fmt.Sprintf("\"Replacement test entry created by libdns %s\"", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
ID: testId,
|
||||
_, err = provider.SetRecords(context.TODO(), zone, []libdns.Record{libdns.TXT{
|
||||
Name: testName,
|
||||
Text: fmt.Sprintf("Replacement test entry created by libdns %s", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
ProviderData: testId,
|
||||
}})
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
}
|
||||
} else {
|
||||
fmt.Printf("Creating new entry for %s\n", testName)
|
||||
_, err = provider.AppendRecords(context.TODO(), zone, []libdns.Record{libdns.Record{
|
||||
Type: "TXT",
|
||||
Name: testName,
|
||||
Value: fmt.Sprintf("\"This is a test entry created by libdns %s\"", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
_, err = provider.AppendRecords(context.TODO(), zone, []libdns.Record{libdns.RR{
|
||||
Type: "TXT",
|
||||
Name: testName,
|
||||
Data: fmt.Sprintf("This is a test entry created by libdns %s", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
}})
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
|
||||
@ -42,9 +42,15 @@ func main() {
|
||||
testName := "libdns-test"
|
||||
testId := ""
|
||||
for _, record := range records {
|
||||
fmt.Printf("%s (.%s): %s, %s\n", record.Name, zone, record.Value, record.Type)
|
||||
if record.Name == testName {
|
||||
testId = record.ID
|
||||
fmt.Printf("%s (.%s): %s, %s\n", record.RR().Name, zone, record.RR().Data, record.RR().Type)
|
||||
|
||||
recordId, err := vultr.GetRecordID(record)
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
}
|
||||
|
||||
if record.RR().Name == testName {
|
||||
testId = recordId
|
||||
}
|
||||
}
|
||||
|
||||
@ -58,23 +64,22 @@ func main() {
|
||||
// }
|
||||
// Set only works if we have a record.ID
|
||||
fmt.Printf("Replacing entry for %s\n", testName)
|
||||
_, err = provider.SetRecords(context.TODO(), zone, []libdns.Record{libdns.Record{
|
||||
Type: "TXT",
|
||||
Name: testName,
|
||||
Value: fmt.Sprintf("Replacement test entry created by libdns %s", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
ID: testId,
|
||||
_, err = provider.SetRecords(context.TODO(), zone, []libdns.Record{libdns.TXT{
|
||||
Name: testName,
|
||||
Text: fmt.Sprintf("Replacement test entry created by libdns %s", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
ProviderData: testId,
|
||||
}})
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
}
|
||||
} else {
|
||||
fmt.Printf("Creating new entry for %s\n", testName)
|
||||
_, err = provider.AppendRecords(context.TODO(), zone, []libdns.Record{libdns.Record{
|
||||
Type: "TXT",
|
||||
Name: testName,
|
||||
Value: fmt.Sprintf("This is a test entry created by libdns %s", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
_, err = provider.AppendRecords(context.TODO(), zone, []libdns.Record{libdns.RR{
|
||||
Type: "TXT",
|
||||
Name: testName,
|
||||
Data: fmt.Sprintf("This is a test entry created by libdns %s", time.Now()),
|
||||
TTL: time.Duration(30) * time.Second,
|
||||
}})
|
||||
if err != nil {
|
||||
fmt.Printf("ERROR: %s\n", err.Error())
|
||||
|
||||
57
client.go
57
client.go
@ -2,9 +2,7 @@ package vultr
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strconv"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"golang.org/x/oauth2"
|
||||
|
||||
@ -44,13 +42,11 @@ func (p *Provider) getDNSEntries(ctx context.Context, domain string) ([]libdns.R
|
||||
}
|
||||
|
||||
for _, entry := range dns_entries {
|
||||
record := libdns.Record{
|
||||
Name: entry.Name,
|
||||
Value: entry.Data,
|
||||
Type: entry.Type,
|
||||
TTL: time.Duration(entry.TTL) * time.Second,
|
||||
ID: entry.ID,
|
||||
record, err := libdnsRecord(entry, domain)
|
||||
if err != nil {
|
||||
return records, err
|
||||
}
|
||||
|
||||
records = append(records, record)
|
||||
}
|
||||
|
||||
@ -64,25 +60,28 @@ func (p *Provider) getDNSEntries(ctx context.Context, domain string) ([]libdns.R
|
||||
return records, nil
|
||||
}
|
||||
|
||||
func (p *Provider) addDNSRecord(ctx context.Context, domain string, record libdns.Record) (libdns.Record, error) {
|
||||
func (p *Provider) addDNSRecord(ctx context.Context, domain string, r libdns.Record) (libdns.Record, error) {
|
||||
p.client.mutex.Lock()
|
||||
defer p.client.mutex.Unlock()
|
||||
|
||||
p.getClient()
|
||||
|
||||
domainRecordReq := &govultr.DomainRecordReq{
|
||||
Name: record.Name,
|
||||
Type: record.Type,
|
||||
Data: strconv.Quote(record.Value),
|
||||
TTL: int(record.TTL.Seconds()),
|
||||
}
|
||||
rr := r.RR()
|
||||
|
||||
rec, _, err := p.client.vultr.DomainRecord.Create(ctx, domain, domainRecordReq)
|
||||
domainRecordReq, err := vultrRecordReq(rr)
|
||||
if err != nil {
|
||||
return record, err
|
||||
return r, err
|
||||
}
|
||||
|
||||
record.ID = rec.ID
|
||||
rec, _, err := p.client.vultr.DomainRecord.Create(ctx, domain, &domainRecordReq)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
record, err := libdnsRecord(*rec, domain)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return record, nil
|
||||
}
|
||||
@ -93,7 +92,12 @@ func (p *Provider) removeDNSRecord(ctx context.Context, domain string, record li
|
||||
|
||||
p.getClient()
|
||||
|
||||
err := p.client.vultr.DomainRecord.Delete(ctx, domain, record.ID)
|
||||
recordId, err := GetRecordID(record)
|
||||
if err != nil {
|
||||
return record, err
|
||||
}
|
||||
|
||||
err = p.client.vultr.DomainRecord.Delete(ctx, domain, recordId)
|
||||
if err != nil {
|
||||
return record, err
|
||||
}
|
||||
@ -107,14 +111,17 @@ func (p *Provider) updateDNSRecord(ctx context.Context, domain string, record li
|
||||
|
||||
p.getClient()
|
||||
|
||||
domainRecordReq := &govultr.DomainRecordReq{
|
||||
Name: record.Name,
|
||||
Type: record.Type,
|
||||
Data: strconv.Quote(record.Value),
|
||||
TTL: int(record.TTL.Seconds()),
|
||||
recordId, err := GetRecordID(record)
|
||||
if err != nil {
|
||||
return record, err
|
||||
}
|
||||
|
||||
err := p.client.vultr.DomainRecord.Update(ctx, domain, record.ID, domainRecordReq)
|
||||
domainRecordReq, err := vultrRecordReq(record)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
err = p.client.vultr.DomainRecord.Update(ctx, domain, recordId, &domainRecordReq)
|
||||
if err != nil {
|
||||
return record, err
|
||||
}
|
||||
|
||||
20
go.mod
20
go.mod
@ -1,19 +1,21 @@
|
||||
module github.com/libdns/vultr
|
||||
|
||||
go 1.20
|
||||
go 1.23.0
|
||||
|
||||
toolchain go1.24.3
|
||||
|
||||
require (
|
||||
github.com/libdns/libdns v0.2.2-0.20230227175549-2dc480633939
|
||||
github.com/vultr/govultr/v3 v3.0.2
|
||||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
|
||||
github.com/libdns/libdns v1.1.0
|
||||
github.com/vultr/govultr/v3 v3.20.0
|
||||
golang.org/x/oauth2 v0.30.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/golang/protobuf v1.5.2 // indirect
|
||||
github.com/golang/protobuf v1.5.4 // indirect
|
||||
github.com/google/go-querystring v1.1.0 // indirect
|
||||
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
|
||||
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
|
||||
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
google.golang.org/protobuf v1.27.1 // indirect
|
||||
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
|
||||
golang.org/x/net v0.40.0 // indirect
|
||||
google.golang.org/appengine v1.6.8 // indirect
|
||||
google.golang.org/protobuf v1.36.6 // indirect
|
||||
)
|
||||
|
||||
31
go.sum
31
go.sum
@ -75,6 +75,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
|
||||
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||
@ -107,6 +109,8 @@ github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxC
|
||||
github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
|
||||
github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
|
||||
github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
|
||||
github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
|
||||
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
|
||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||
@ -118,6 +122,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/libdns/libdns v0.2.2-0.20230227175549-2dc480633939 h1:EvTiXkv78P20yfk4CUPmAkH3Cmumt3s/48WWiC2babY=
|
||||
github.com/libdns/libdns v0.2.2-0.20230227175549-2dc480633939/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
|
||||
github.com/libdns/libdns v1.1.0 h1:9ze/tWvt7Df6sbhOJRB8jT33GHEHpEQXdtkE3hPthbU=
|
||||
github.com/libdns/libdns v1.1.0/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
@ -126,9 +132,12 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/vultr/govultr/v3 v3.0.2 h1:rrYiuF9adB3rjnhp0ev+mkJXKEzuYa/AGfezYPr3EMs=
|
||||
github.com/vultr/govultr/v3 v3.0.2/go.mod h1:Pd3D6VKmQKyKWsdV1xLx4VKclEV23adMs3YoI7rh7gA=
|
||||
github.com/vultr/govultr/v3 v3.20.0 h1:O+Om6gXpN6ehwAIIKq5DyGuekpyHaoRlwrxTb44bDzA=
|
||||
github.com/vultr/govultr/v3 v3.20.0/go.mod h1:q34Wd76upKmf+vxFMgaNMH3A8BbsPBmSYZUGC8oZa5w=
|
||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
||||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
||||
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
@ -139,6 +148,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
|
||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||
@ -169,6 +179,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
|
||||
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
@ -195,8 +206,12 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
|
||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 h1:DZshvxDdVoeKIbudAdFEKi+f70l51luSy/7b76ibTY0=
|
||||
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
||||
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
@ -204,6 +219,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr
|
||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
|
||||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
||||
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
|
||||
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
@ -212,6 +229,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
@ -237,11 +255,19 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
@ -285,6 +311,7 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY
|
||||
golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
@ -313,6 +340,8 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
|
||||
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
|
||||
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
|
||||
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
|
||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
||||
@ -368,6 +397,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
|
||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
|
||||
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
|
||||
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
|
||||
168
helpers.go
Normal file
168
helpers.go
Normal file
@ -0,0 +1,168 @@
|
||||
package vultr
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/netip"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/libdns/libdns"
|
||||
"github.com/vultr/govultr/v3"
|
||||
)
|
||||
|
||||
// Converts `govultr.DomainRecord` to `libdns.Record“
|
||||
// Taken from libdns/cloudflare, adapted for Vultr's specific format
|
||||
func libdnsRecord(r govultr.DomainRecord, zone string) (libdns.Record, error) {
|
||||
name := libdns.RelativeName(r.Name, zone)
|
||||
ttl := time.Duration(r.TTL) * time.Second
|
||||
|
||||
switch r.Type {
|
||||
case "A", "AAAA":
|
||||
addr, err := netip.ParseAddr(r.Data)
|
||||
if err != nil {
|
||||
return libdns.Address{}, fmt.Errorf("invalid IP address %q: %v", r.Data, err)
|
||||
}
|
||||
|
||||
return libdns.Address{
|
||||
Name: name,
|
||||
TTL: ttl,
|
||||
IP: addr,
|
||||
ProviderData: r.ID,
|
||||
}, nil
|
||||
case "CAA":
|
||||
dataParts := strings.SplitN(r.Data, " ", 3)
|
||||
if len(dataParts) < 3 {
|
||||
return libdns.SRV{}, fmt.Errorf("record %v does not contain enough data fields; expected format: '<flags> <tag> <value>'", name)
|
||||
}
|
||||
|
||||
flags, err := strconv.Atoi(dataParts[0])
|
||||
if err != nil {
|
||||
return libdns.SRV{}, fmt.Errorf("record %v contains invalid value for flags: %v", name, err)
|
||||
}
|
||||
|
||||
return libdns.CAA{
|
||||
Name: name,
|
||||
TTL: ttl,
|
||||
Flags: uint8(flags),
|
||||
Tag: dataParts[1],
|
||||
Value: dataParts[2],
|
||||
ProviderData: r.ID,
|
||||
}, nil
|
||||
case "CNAME":
|
||||
return libdns.CNAME{
|
||||
Name: name,
|
||||
TTL: ttl,
|
||||
Target: r.Data,
|
||||
ProviderData: r.ID,
|
||||
}, nil
|
||||
case "MX":
|
||||
return libdns.MX{
|
||||
Name: name,
|
||||
TTL: ttl,
|
||||
Preference: uint16(r.Priority),
|
||||
Target: r.Data,
|
||||
ProviderData: r.ID,
|
||||
}, nil
|
||||
case "NS":
|
||||
return libdns.NS{
|
||||
Name: name,
|
||||
TTL: ttl,
|
||||
Target: r.Data,
|
||||
ProviderData: r.ID,
|
||||
}, nil
|
||||
case "SRV":
|
||||
// Vultr doesn't append the zone to the SRV record name, so we just need
|
||||
// to parse 2 parts
|
||||
parts := strings.SplitN(r.Name, ".", 2)
|
||||
if len(parts) < 2 {
|
||||
return libdns.SRV{}, fmt.Errorf("name %v does not contain enough fields; expected format: '_service._proto.name'", name)
|
||||
}
|
||||
|
||||
dataParts := strings.SplitN(r.Data, " ", 3)
|
||||
if len(dataParts) < 3 {
|
||||
return libdns.SRV{}, fmt.Errorf("record %v does not contain enough data fields; expected format: 'weight port target'", name)
|
||||
}
|
||||
|
||||
weight, err := strconv.Atoi(dataParts[0])
|
||||
if err != nil {
|
||||
return libdns.SRV{}, fmt.Errorf("record %v contains invalid value for weight: %v", name, err)
|
||||
}
|
||||
|
||||
port, err := strconv.Atoi(dataParts[1])
|
||||
if err != nil {
|
||||
return libdns.SRV{}, fmt.Errorf("record %v contains invalid value for port: %v", name, err)
|
||||
}
|
||||
|
||||
return libdns.SRV{
|
||||
Service: strings.TrimPrefix(parts[0], "_"),
|
||||
Transport: strings.TrimPrefix(parts[1], "_"),
|
||||
Name: zone,
|
||||
TTL: ttl,
|
||||
Priority: uint16(r.Priority),
|
||||
Weight: uint16(weight),
|
||||
Port: uint16(port),
|
||||
Target: dataParts[2],
|
||||
ProviderData: r.ID,
|
||||
}, nil
|
||||
case "TXT":
|
||||
return libdns.TXT{
|
||||
Name: name,
|
||||
TTL: ttl,
|
||||
Text: r.Data,
|
||||
ProviderData: r.ID,
|
||||
}, nil
|
||||
default:
|
||||
return libdns.RR{
|
||||
Name: name,
|
||||
TTL: ttl,
|
||||
Type: r.Type,
|
||||
Data: r.Data,
|
||||
}.Parse()
|
||||
}
|
||||
}
|
||||
|
||||
// Converts `libdns.Record` to `govultr.DomainRecordReq`, to be used with API
|
||||
// requests.
|
||||
func vultrRecordReq(r libdns.Record) (govultr.DomainRecordReq, error) {
|
||||
return govultr.DomainRecordReq{
|
||||
Name: r.RR().Name,
|
||||
Type: r.RR().Type,
|
||||
TTL: int(r.RR().TTL.Seconds()),
|
||||
Data: r.RR().Data,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func GetRecordID(r libdns.Record) (string, error) {
|
||||
var recordId string
|
||||
|
||||
switch r := r.(type) {
|
||||
case libdns.Address:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
case libdns.CAA:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
case libdns.CNAME:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
case libdns.MX:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
case libdns.NS:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
case libdns.SRV:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
case libdns.ServiceBinding:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
case libdns.TXT:
|
||||
recordId = r.ProviderData.(string)
|
||||
return recordId, nil
|
||||
default:
|
||||
}
|
||||
|
||||
return "", fmt.Errorf("libdns record has no provider record ID")
|
||||
}
|
||||
@ -3,7 +3,6 @@ package vultr
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/libdns/libdns"
|
||||
)
|
||||
@ -41,7 +40,6 @@ func (p *Provider) AppendRecords(ctx context.Context, zone string, records []lib
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
newRecord.TTL = time.Duration(newRecord.TTL) * time.Second
|
||||
appendedRecords = append(appendedRecords, newRecord)
|
||||
}
|
||||
|
||||
@ -57,7 +55,6 @@ func (p *Provider) DeleteRecords(ctx context.Context, zone string, records []lib
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
deletedRecord.TTL = time.Duration(deletedRecord.TTL) * time.Second
|
||||
deletedRecords = append(deletedRecords, deletedRecord)
|
||||
}
|
||||
|
||||
@ -76,7 +73,6 @@ func (p *Provider) SetRecords(ctx context.Context, zone string, records []libdns
|
||||
if err != nil {
|
||||
return setRecords, err
|
||||
}
|
||||
setRecord.TTL = time.Duration(setRecord.TTL) * time.Second
|
||||
setRecords = append(setRecords, setRecord)
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user