StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-12-27 10:12:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

Allow more flexibility in configuring Route53 (#93)

Browse source 
* providers/route53/route53Provider.go

* fix fmt

* check credentials, add Route53 fetch zones in init section and add check if delegation set is present or nil
This commit is contained in:
Mathieu Herbert 2017-05-03 19:30:05 +02:00 committed by Craig Peterson
parent dc2743dd4a
commit 95705e7f2d
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
providers/route53/route53Provider.go
View file

@ -13,6 +13,7 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session"
r53 "github.com/aws/aws-sdk-go/service/route53"
"github.com/pkg/errors"
)
type route53Provider struct {
@ -22,15 +23,21 @@ type route53Provider struct {
func newRoute53(m map[string]string, metadata json.RawMessage) (providers.DNSServiceProvider, error) {
keyId, secretKey := m["KeyId"], m["SecretKey"]
if keyId == "" || secretKey == "" {
return nil, fmt.Errorf("Route53 KeyId and SecretKey must be provided.")
config := &aws.Config{
Region: aws.String("us-west-2"),
}
sess := session.New(&aws.Config{
Region: aws.String("us-west-2"),
Credentials: credentials.NewStaticCredentials(keyId, secretKey, ""),
})
if keyId != "" || secretKey != "" {
config.Credentials = credentials.NewStaticCredentials(keyId, secretKey, "")
}
sess := session.New(config)
api := &route53Provider{client: r53.New(sess)}
err := api.getZones()
if err != nil {
return nil, err
}
return api, nil
}
@ -42,9 +49,6 @@ func sPtr(s string) *string {
}
func (r *route53Provider) getZones() error {
if r.zones != nil {
return nil
}
var nextMarker *string
r.zones = make(map[string]*r53.HostedZone)
for {
@ -53,7 +57,9 @@ func (r *route53Provider) getZones() error {
}
inp := &r53.ListHostedZonesInput{Marker: nextMarker}
out, err := r.client.ListHostedZones(inp)
if err != nil {
if err != nil && strings.Contains(err.Error(), "is not authorized") {
return errors.New("Check your credentials, your not authorized to perform actions on Route 53 AWS Service")
} else if err != nil {
return err
}
for _, z := range out.HostedZones {
@ -87,9 +93,7 @@ func (e errNoExist) Error() string {
}
func (r *route53Provider) GetNameservers(domain string) ([]*models.Nameserver, error) {
if err := r.getZones(); err != nil {
return nil, err
}
zone, ok := r.zones[domain]
if !ok {
return nil, errNoExist{domain}
@ -99,17 +103,16 @@ func (r *route53Provider) GetNameservers(domain string) ([]*models.Nameserver, e
return nil, err
}
ns := []*models.Nameserver{}
for _, nsPtr := range z.DelegationSet.NameServers {
ns = append(ns, &models.Nameserver{Name: *nsPtr})
if z.DelegationSet != nil {
for _, nsPtr := range z.DelegationSet.NameServers {
ns = append(ns, &models.Nameserver{Name: *nsPtr})
}
}
return ns, nil
}
func (r *route53Provider) GetDomainCorrections(dc *models.DomainConfig) ([]*models.Correction, error) {
dc.Punycode()
if err := r.getZones(); err != nil {
return nil, err
}
var corrections = []*models.Correction{}
zone, ok := r.zones[dc.Name]
@ -287,10 +290,6 @@ func unescape(s *string) string {
}
func (r *route53Provider) EnsureDomainExists(domain string) error {
err := r.getZones()
if err != nil {
return err
}
if _, ok := r.zones[domain]; ok {
return nil
}
@ -299,7 +298,7 @@ func (r *route53Provider) EnsureDomainExists(domain string) error {
Name: &domain,
CallerReference: sPtr(fmt.Sprint(time.Now().UnixNano())),
}
_, err = r.client.CreateHostedZone(in)
_, err := r.client.CreateHostedZone(in)
return err
}