Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support GoDaddy domains with PENDING_DNS_ACTIVE status #3889

Merged
merged 2 commits into from
Sep 15, 2023
Merged

Support GoDaddy domains with PENDING_DNS_ACTIVE status #3889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e312a36
Support GoDaddy PENDING_DNS_ACTIVE domains
m-adawi Aug 22, 2023
e7f383c
Update provider/godaddy/godaddy.go
m-adawi Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion provider/godaddy/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ func (c *Client) UnmarshalResponse(response *http.Response, resType interface{})
func (c *Client) validate() error {
var response interface{}

if err := c.Get("/v1/domains?statuses=ACTIVE", response); err != nil {
if err := c.Get(domainsURI, response); err != nil {
return err
}

Expand Down
4 changes: 3 additions & 1 deletion provider/godaddy/godaddy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ var actionNames = []string{
"delete",
}

const domainsURI = "/v1/domains?statuses=ACTIVE,PENDING_DNS_ACTIVE"

// ErrRecordToMutateNotFound when ApplyChange has to update/delete and didn't found the record in the existing zone (Change with no record ID)
var ErrRecordToMutateNotFound = errors.New("record to mutate not found in current zone")

Expand Down Expand Up @@ -154,7 +156,7 @@ func (p *GDProvider) zones() ([]string, error) {
zones := []gdZone{}
filteredZones := []string{}

if err := p.client.Get("/v1/domains?statuses=ACTIVE", &zones); err != nil {
if err := p.client.Get(domainsURI, &zones); err != nil {
return nil, err
}

Expand Down
20 changes: 10 additions & 10 deletions provider/godaddy/godaddy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestGoDaddyZones(t *testing.T) {
}

// Basic zones
client.On("Get", "/v1/domains?statuses=ACTIVE").Return([]gdZone{
client.On("Get", domainsURI).Return([]gdZone{
{
Domain: "example.com",
},
Expand All @@ -113,7 +113,7 @@ func TestGoDaddyZones(t *testing.T) {
client.AssertExpectations(t)

// Error on getting zones
client.On("Get", "/v1/domains?statuses=ACTIVE").Return(nil, ErrAPIDown).Once()
client.On("Get", domainsURI).Return(nil, ErrAPIDown).Once()
domains, err = provider.zones()
assert.Error(err)
assert.Nil(domains)
Expand All @@ -128,7 +128,7 @@ func TestGoDaddyZoneRecords(t *testing.T) {
}

// Basic zones records
client.On("Get", "/v1/domains?statuses=ACTIVE").Return([]gdZone{
client.On("Get", domainsURI).Return([]gdZone{
{
Domain: zoneNameExampleNet,
},
Expand Down Expand Up @@ -180,15 +180,15 @@ func TestGoDaddyZoneRecords(t *testing.T) {
client.AssertExpectations(t)

// Error on getting zones list
client.On("Get", "/v1/domains?statuses=ACTIVE").Return(nil, ErrAPIDown).Once()
client.On("Get", domainsURI).Return(nil, ErrAPIDown).Once()
zones, records, err = provider.zonesRecords(context.TODO(), false)
assert.Error(err)
assert.Nil(zones)
assert.Nil(records)
client.AssertExpectations(t)

// Error on getting zone records
client.On("Get", "/v1/domains?statuses=ACTIVE").Return([]gdZone{
client.On("Get", domainsURI).Return([]gdZone{
{
Domain: zoneNameExampleNet,
},
Expand All @@ -204,7 +204,7 @@ func TestGoDaddyZoneRecords(t *testing.T) {
client.AssertExpectations(t)

// Error on getting zone record detail
client.On("Get", "/v1/domains?statuses=ACTIVE").Return([]gdZone{
client.On("Get", domainsURI).Return([]gdZone{
{
Domain: zoneNameExampleNet,
},
Expand All @@ -227,7 +227,7 @@ func TestGoDaddyRecords(t *testing.T) {
}

// Basic zones records
client.On("Get", "/v1/domains?statuses=ACTIVE").Return([]gdZone{
client.On("Get", domainsURI).Return([]gdZone{
{
Domain: zoneNameExampleOrg,
},
Expand Down Expand Up @@ -308,7 +308,7 @@ func TestGoDaddyRecords(t *testing.T) {
client.AssertExpectations(t)

// Error getting zone
client.On("Get", "/v1/domains?statuses=ACTIVE").Return(nil, ErrAPIDown).Once()
client.On("Get", domainsURI).Return(nil, ErrAPIDown).Once()
endpoints, err = provider.Records(context.TODO())
assert.Error(err)
assert.Nil(endpoints)
Expand Down Expand Up @@ -345,7 +345,7 @@ func TestGoDaddyChange(t *testing.T) {
}

// Fetch domains
client.On("Get", "/v1/domains?statuses=ACTIVE").Return([]gdZone{
client.On("Get", domainsURI).Return([]gdZone{
{
Domain: zoneNameExampleNet,
},
Expand Down Expand Up @@ -416,7 +416,7 @@ func TestGoDaddyErrorResponse(t *testing.T) {
}

// Fetch domains
client.On("Get", "/v1/domains?statuses=ACTIVE").Return([]gdZone{
client.On("Get", domainsURI).Return([]gdZone{
{
Domain: zoneNameExampleNet,
},
Expand Down