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

pdns: reconstruct zone URLs to enable non-root folder API endpoints #2141

Merged
merged 2 commits into from
May 27, 2024
Merged

pdns: reconstruct zone URLs to enable non-root folder API endpoints #2141

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
2f30982
pdns: reconstruct zone URLs to enable non-root folder API endpoints
Mar 15, 2024
1805ea5
review: tests
ldez May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions providers/dns/pdns/internal/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (c *Client) GetHostedZone(ctx context.Context, authZone string) (*HostedZon
}

func (c *Client) UpdateRecords(ctx context.Context, zone *HostedZone, sets RRSets) error {
endpoint := c.joinPath("/", zone.URL)
endpoint := c.joinPath("/", "servers", c.serverName, "zones", zone.ID)

req, err := newJSONRequest(ctx, http.MethodPatch, endpoint, sets)
if err != nil {
Expand All @@ -137,7 +137,7 @@ func (c *Client) Notify(ctx context.Context, zone *HostedZone) error {
return nil
}

endpoint := c.joinPath("/", zone.URL, "/notify")
endpoint := c.joinPath("/", "servers", c.serverName, "zones", zone.ID, "notify")

req, err := newJSONRequest(ctx, http.MethodPut, endpoint, nil)
if err != nil {
Expand Down
52 changes: 52 additions & 0 deletions providers/dns/pdns/internal/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ func TestClient_GetHostedZone_v0(t *testing.T) {
func TestClient_UpdateRecords(t *testing.T) {
client := setupTest(t, http.MethodPatch, "/api/v1/servers/localhost/zones/example.org.", http.StatusOK, "zone.json")
client.apiVersion = 1
client.serverName = "localhost"

zone := &HostedZone{
ID: "example.org.",
Expand All @@ -282,9 +283,41 @@ func TestClient_UpdateRecords(t *testing.T) {
require.NoError(t, err)
}

func TestClient_UpdateRecords_NonRootApi(t *testing.T) {
client := setupTest(t, http.MethodPatch, "/some/path/api/v1/servers/localhost/zones/example.org.", http.StatusOK, "zone.json")
client.Host = client.Host.JoinPath("some", "path")
client.apiVersion = 1
client.serverName = "localhost"

zone := &HostedZone{
ID: "example.org.",
Name: "example.org.",
URL: "some/path/api/v1/servers/server/zones/example.org.",
Kind: "Master",
}

rrSets := RRSets{
RRSets: []RRSet{{
Name: "example.org.",
Type: "NS",
ChangeType: "REPLACE",
Records: []Record{{
Content: "192.0.2.5",
Name: "ns1.example.org.",
TTL: 86400,
Type: "A",
}},
}},
}

err := client.UpdateRecords(context.Background(), zone, rrSets)
require.NoError(t, err)
}

func TestClient_UpdateRecords_v0(t *testing.T) {
client := setupTest(t, http.MethodPatch, "/servers/localhost/zones/example.org.", http.StatusOK, "zone.json")
client.apiVersion = 0
client.serverName = "localhost"

zone := &HostedZone{
ID: "example.org.",
Expand Down Expand Up @@ -314,6 +347,7 @@ func TestClient_UpdateRecords_v0(t *testing.T) {
func TestClient_Notify(t *testing.T) {
client := setupTest(t, http.MethodPut, "/api/v1/servers/localhost/zones/example.org./notify", http.StatusOK, "")
client.apiVersion = 1
client.serverName = "localhost"

zone := &HostedZone{
ID: "example.org.",
Expand All @@ -326,8 +360,26 @@ func TestClient_Notify(t *testing.T) {
require.NoError(t, err)
}

func TestClient_Notify_NonRootApi(t *testing.T) {
client := setupTest(t, http.MethodPut, "/some/path/api/v1/servers/localhost/zones/example.org./notify", http.StatusOK, "")
client.Host = client.Host.JoinPath("some", "path")
client.apiVersion = 1
client.serverName = "localhost"

zone := &HostedZone{
ID: "example.org.",
Name: "example.org.",
URL: "/some/path/api/v1/servers/server/zones/example.org.",
Kind: "Master",
}

err := client.Notify(context.Background(), zone)
require.NoError(t, err)
}

func TestClient_Notify_v0(t *testing.T) {
client := setupTest(t, http.MethodPut, "/api/v1/servers/localhost/zones/example.org./notify", http.StatusOK, "")
client.apiVersion = 0

zone := &HostedZone{
ID: "example.org.",
Expand Down