beatzaplenty/terraform-provider-dynu
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow optional dns record content and omit when unset

Browse Source
This commit is contained in:
beatz174-bit
2026-04-24 17:46:22 +10:00
parent a53da220e2
commit 78814db51e
4 changed files with 172 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/dynuclient/client.go
+32 -28
View File
@@ -109,23 +109,23 @@ type DNSRecord struct {
}
type CreateDNSRecordRequest struct {
NodeName string `json:"nodeName,omitempty"`
RecordType string `json:"recordType"`
Content string `json:"content"`
TTL int64 `json:"ttl,omitempty"`
State *bool `json:"state,omitempty"`
Group string `json:"group,omitempty"`
Host string `json:"host,omitempty"`
NodeName string `json:"nodeName,omitempty"`
RecordType string `json:"recordType"`
Content *string `json:"content,omitempty"`
TTL int64 `json:"ttl,omitempty"`
State *bool `json:"state,omitempty"`
Group string `json:"group,omitempty"`
Host string `json:"host,omitempty"`
}
type UpdateDNSRecordRequest struct {
NodeName string `json:"nodeName,omitempty"`
RecordType string `json:"recordType"`
Content string `json:"content"`
TTL int64 `json:"ttl,omitempty"`
State *bool `json:"state,omitempty"`
Group string `json:"group,omitempty"`
Host string `json:"host,omitempty"`
NodeName string `json:"nodeName,omitempty"`
RecordType string `json:"recordType"`
Content *string `json:"content,omitempty"`
TTL int64 `json:"ttl,omitempty"`
State *bool `json:"state,omitempty"`
Group string `json:"group,omitempty"`
Host string `json:"host,omitempty"`
}
type listDomainsResponse struct {
@@ -310,18 +310,18 @@ func parseAPIException(payload []byte) error {
}
type dnsRecordUpsertPayload struct {
NodeName string `json:"nodeName,omitempty"`
RecordType string `json:"recordType"`
Content string `json:"content,omitempty"`
IPv4Address string `json:"ipv4Address,omitempty"`
IPv6Address string `json:"ipv6Address,omitempty"`
TTL int64 `json:"ttl,omitempty"`
State *bool `json:"state,omitempty"`
Group string `json:"group,omitempty"`
Host string `json:"host,omitempty"`
NodeName string `json:"nodeName,omitempty"`
RecordType string `json:"recordType"`
Content *string `json:"content,omitempty"`
IPv4Address string `json:"ipv4Address,omitempty"`
IPv6Address string `json:"ipv6Address,omitempty"`
TTL int64 `json:"ttl,omitempty"`
State *bool `json:"state,omitempty"`
Group string `json:"group,omitempty"`
Host string `json:"host,omitempty"`
}
func buildDNSRecordUpsertPayload(recordType string, nodeName string, content string, ttl int64, state *bool, group string, host string) dnsRecordUpsertPayload {
func buildDNSRecordUpsertPayload(recordType string, nodeName string, content *string, ttl int64, state *bool, group string, host string) dnsRecordUpsertPayload {
payload := dnsRecordUpsertPayload{
NodeName: nodeName,
RecordType: recordType,
@@ -334,12 +334,16 @@ func buildDNSRecordUpsertPayload(recordType string, nodeName string, content str
switch strings.ToUpper(strings.TrimSpace(recordType)) {
case "A":
payload.IPv4Address = content
if content != nil {
payload.IPv4Address = *content
}
case "AAAA":
payload.IPv6Address = content
if content != nil {
payload.IPv6Address = *content
}
case "CNAME":
if payload.Host == "" {
payload.Host = content
if payload.Host == "" && content != nil {
payload.Host = *content
}
}
internal/dynuclient/client_test.go
+50 -5
View File
@@ -95,7 +95,7 @@ func TestClientDNSRecordCRUD(t *testing.T) {
created, err := client.CreateDNSRecord(context.Background(), 1001, dynuclient.CreateDNSRecordRequest{
NodeName: "api",
RecordType: "TXT",
Content: "created",
Content: stringPointer("created"),
TTL: 120,
State: &state,
Group: "integration",
@@ -118,7 +118,7 @@ func TestClientDNSRecordCRUD(t *testing.T) {
updated, err := client.UpdateDNSRecord(context.Background(), 1001, created.ID, dynuclient.UpdateDNSRecordRequest{
NodeName: "api",
RecordType: "TXT",
Content: "updated",
Content: stringPointer("updated"),
TTL: 180,
State: &state,
})
@@ -145,7 +145,7 @@ func TestClientDNSRecordWriteAPIError(t *testing.T) {
fake.SetAPIError("/dns/1001/record", fakedynu.APIError{HTTPStatus: 400, StatusCode: 400, Type: "Validation Exception", Message: "recordType invalid"})
client := dynuclient.New("test-key", dynuclient.WithBaseURL(fake.BaseURL()), dynuclient.WithHTTPClient(fake.Client()))
_, err := client.CreateDNSRecord(context.Background(), 1001, dynuclient.CreateDNSRecordRequest{RecordType: "", Content: "x"})
_, err := client.CreateDNSRecord(context.Background(), 1001, dynuclient.CreateDNSRecordRequest{RecordType: "", Content: stringPointer("x")})
if err == nil || !strings.Contains(err.Error(), "Validation Exception") {
t.Fatalf("expected validation API error, got %v", err)
}
@@ -179,7 +179,7 @@ func TestClientCreateDNSRecordSendsIPv4AddressForARecord(t *testing.T) {
_, err := client.CreateDNSRecord(context.Background(), 1001, dynuclient.CreateDNSRecordRequest{
NodeName: "www",
RecordType: "A",
Content: "167.179.167.166",
Content: stringPointer("167.179.167.166"),
TTL: 300,
})
if err != nil {
@@ -216,7 +216,7 @@ func TestClientCreateDNSRecordNormalizesZoneStyleContent(t *testing.T) {
record, err := client.CreateDNSRecord(context.Background(), 1001, dynuclient.CreateDNSRecordRequest{
NodeName: "www",
RecordType: "A",
Content: "167.179.167.166",
Content: stringPointer("167.179.167.166"),
TTL: 300,
})
if err != nil {
@@ -239,3 +239,48 @@ func TestClientDoRequestTopLevelAPIExceptionPayload(t *testing.T) {
t.Fatalf("expected top-level API error, got %v", err)
}
}
func TestClientCreateDNSRecordOmitsContentWhenUnset(t *testing.T) {
var captured map[string]any
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost || r.URL.Path != "/dns/1001/record" {
t.Fatalf("unexpected request %s %s", r.Method, r.URL.Path)
}
if err := json.NewDecoder(r.Body).Decode(&captured); err != nil {
t.Fatalf("failed to decode payload: %v", err)
}
_ = json.NewEncoder(w).Encode(map[string]any{
"statusCode": 200,
"id": 10,
"domainId": 1001,
"domainName": "example.com",
"nodeName": "www",
"hostname": "www.example.com",
"recordType": "A",
"ttl": 300,
"state": true,
})
}))
defer server.Close()
client := dynuclient.New("test-key", dynuclient.WithBaseURL(server.URL), dynuclient.WithHTTPClient(server.Client()))
_, err := client.CreateDNSRecord(context.Background(), 1001, dynuclient.CreateDNSRecordRequest{
NodeName: "www",
RecordType: "A",
TTL: 300,
})
if err != nil {
t.Fatalf("CreateDNSRecord() error = %v", err)
}
if _, ok := captured["content"]; ok {
t.Fatalf("expected content to be omitted, got %#v", captured["content"])
}
if _, ok := captured["ipv4Address"]; ok {
t.Fatalf("expected ipv4Address to be omitted, got %#v", captured["ipv4Address"])
}
}
func stringPointer(value string) *string {
return &value
}