Merge pull request #2986 from janik-cloudflare/dns-record-zone-name

Remove deprecated zone fields on DNS records
cloudflare · Sep 2, 2024 · 933dac0 · 933dac0
2 parents 5e55156 + fe15c7b
commit 933dac0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 38 deletions.
diff --git a/.changelog/2986.txt b/.changelog/2986.txt
@@ -0,0 +1,3 @@
+```release-note:breaking-change
+dns: removed deprecated `ZoneID` and `ZoneName` fields 
+```
diff --git a/dns.go b/dns.go
@@ -27,8 +27,6 @@ type DNSRecord struct {
 	Meta       interface{} `json:"meta,omitempty"`
 	Data       interface{} `json:"data,omitempty"` // data returned by: SRV, LOC
 	ID         string      `json:"id,omitempty"`
-	ZoneID     string      `json:"zone_id,omitempty"`
-	ZoneName   string      `json:"zone_name,omitempty"`
 	Priority   *uint16     `json:"priority,omitempty"`
 	TTL        int         `json:"ttl,omitempty"`
 	Proxied    *bool       `json:"proxied,omitempty"`
@@ -185,8 +183,6 @@ type CreateDNSRecordParams struct {
 	Meta       interface{} `json:"meta,omitempty"`
 	Data       interface{} `json:"data,omitempty"` // data returned by: SRV, LOC
 	ID         string      `json:"id,omitempty"`
-	ZoneID     string      `json:"zone_id,omitempty"`
-	ZoneName   string      `json:"zone_name,omitempty"`
 	Priority   *uint16     `json:"priority,omitempty"`
 	TTL        int         `json:"ttl,omitempty"`
 	Proxied    *bool       `json:"proxied,omitempty" url:"proxied,omitempty"`

diff --git a/dns_test.go b/dns_test.go
@@ -98,8 +98,6 @@ func TestCreateDNSRecord(t *testing.T) {
 				"proxiable": true,
 				"proxied": false,
 				"ttl": 120,
-				"zone_id": "d56084adb405e0b7e32c52321bf07be6",
-				"zone_name": "example.com",
 				"created_on": "2014-01-01T05:20:00Z",
 				"modified_on": "2014-01-01T05:20:00Z",
 				"data": {},
@@ -123,8 +121,6 @@ func TestCreateDNSRecord(t *testing.T) {
 		Proxiable:  true,
 		Proxied:    asciiInput.Proxied,
 		TTL:        asciiInput.TTL,
-		ZoneID:     testZoneID,
-		ZoneName:   "example.com",
 		CreatedOn:  createdOn,
 		ModifiedOn: modifiedOn,
 		Data:       map[string]interface{}{},
@@ -179,8 +175,6 @@ func TestListDNSRecords(t *testing.T) {
 					"proxiable": true,
 					"proxied": false,
 					"ttl": 120,
-					"zone_id": "d56084adb405e0b7e32c52321bf07be6",
-					"zone_name": "example.com",
 					"created_on": "2014-01-01T05:20:00Z",
 					"modified_on": "2014-01-01T05:20:00Z",
 					"data": {},
@@ -212,8 +206,6 @@ func TestListDNSRecords(t *testing.T) {
 		Proxiable:  true,
 		Proxied:    &proxied,
 		TTL:        120,
-		ZoneID:     testZoneID,
-		ZoneName:   "example.com",
 		CreatedOn:  createdOn,
 		ModifiedOn: modifiedOn,
 		Data:       map[string]interface{}{},
@@ -272,8 +264,6 @@ func TestListDNSRecordsSearch(t *testing.T) {
 					"proxiable": true,
 					"proxied": true,
 					"ttl": 120,
-					"zone_id": "d56084adb405e0b7e32c52321bf07be6",
-					"zone_name": "example.com",
 					"created_on": "2014-01-01T05:20:00Z",
 					"modified_on": "2014-01-01T05:20:00Z",
 					"data": {},
@@ -306,8 +296,6 @@ func TestListDNSRecordsSearch(t *testing.T) {
 		Proxiable:  true,
 		Proxied:    &proxied,
 		TTL:        120,
-		ZoneID:     testZoneID,
-		ZoneName:   "example.com",
 		CreatedOn:  createdOn,
 		ModifiedOn: modifiedOn,
 		Data:       map[string]interface{}{},
@@ -403,8 +391,6 @@ func TestListDNSRecordsPagination(t *testing.T) {
 		assert.Equal(t, expected["proxiable"].(bool), actualRecord.Proxiable)
 		assert.Equal(t, expected["proxied"].(bool), *actualRecord.Proxied)
 		assert.Equal(t, int(expected["ttl"].(float64)), actualRecord.TTL)
-		assert.Equal(t, expected["zone_id"].(string), actualRecord.ZoneID)
-		assert.Equal(t, expected["zone_name"].(string), actualRecord.ZoneName)
 		assert.Equal(t, expected["data"], actualRecord.Data)
 		assert.Equal(t, expected["meta"], actualRecord.Meta)
 	}
@@ -430,8 +416,6 @@ func TestGetDNSRecord(t *testing.T) {
 				"proxiable": true,
 				"proxied": false,
 				"ttl": 120,
-				"zone_id": "d56084adb405e0b7e32c52321bf07be6",
-				"zone_name": "example.com",
 				"created_on": "2014-01-01T05:20:00Z",
 				"modified_on": "2014-01-01T05:20:00Z",
 				"data": {},
@@ -460,8 +444,6 @@ func TestGetDNSRecord(t *testing.T) {
 		Proxiable:  true,
 		Proxied:    &proxied,
 		TTL:        120,
-		ZoneID:     testZoneID,
-		ZoneName:   "example.com",
 		CreatedOn:  createdOn,
 		ModifiedOn: modifiedOn,
 		Data:       map[string]interface{}{},
@@ -521,8 +503,6 @@ func TestUpdateDNSRecord(t *testing.T) {
 				"proxiable": true,
 				"proxied": false,
 				"ttl": 120,
-				"zone_id": "d56084adb405e0b7e32c52321bf07be6",
-				"zone_name": "example.com",
 				"created_on": "2014-01-01T05:20:00Z",
 				"modified_on": "2014-01-01T05:20:00Z",
 				"data": {},
@@ -586,8 +566,6 @@ func TestUpdateDNSRecord_ClearComment(t *testing.T) {
 				"proxiable": true,
 				"proxied": false,
 				"ttl": 120,
-				"zone_id": "d56084adb405e0b7e32c52321bf07be6",
-				"zone_name": "example.com",
 				"created_on": "2014-01-01T05:20:00Z",
 				"modified_on": "2014-01-01T05:20:00Z",
 				"comment":null,
@@ -642,8 +620,6 @@ func TestUpdateDNSRecord_KeepComment(t *testing.T) {
 				"proxiable": true,
 				"proxied": false,
 				"ttl": 120,
-				"zone_id": "d56084adb405e0b7e32c52321bf07be6",
-				"zone_name": "example.com",
 				"created_on": "2014-01-01T05:20:00Z",
 				"modified_on": "2014-01-01T05:20:00Z",
 				"comment":null,

diff --git a/testdata/fixtures/dns/list_page_1.json b/testdata/fixtures/dns/list_page_1.json
@@ -11,8 +11,6 @@
             "proxiable": true,
             "proxied": true,
             "ttl": 120,
-            "zone_id": "d56084adb405e0b7e32c52321bf07be6",
-            "zone_name": "example.com",
             "created_on": "2014-01-01T05:20:00Z",
             "modified_on": "2014-01-01T05:20:00Z",
             "data": {},
@@ -33,8 +31,6 @@
             "proxiable": true,
             "proxied": false,
             "ttl": 120,
-            "zone_id": "d56084adb405e0b7e32c52321bf07be6",
-            "zone_name": "example.com",
             "created_on": "2014-01-01T05:20:00Z",
             "modified_on": "2014-01-01T05:20:00Z",
             "data": {},
@@ -55,8 +51,6 @@
             "proxiable": true,
             "proxied": true,
             "ttl": 120,
-            "zone_id": "d56084adb405e0b7e32c52321bf07be6",
-            "zone_name": "example.com",
             "created_on": "2014-01-01T05:20:00Z",
             "modified_on": "2014-01-01T05:20:00Z",
             "data": {},

diff --git a/testdata/fixtures/dns/list_page_2.json b/testdata/fixtures/dns/list_page_2.json
@@ -11,8 +11,6 @@
             "proxiable": true,
             "proxied": false,
             "ttl": 120,
-            "zone_id": "d56084adb405e0b7e32c52321bf07be6",
-            "zone_name": "example.com",
             "created_on": "2014-01-01T05:20:00Z",
             "modified_on": "2014-01-01T05:20:00Z",
             "data": {},
@@ -33,8 +31,6 @@
             "proxiable": true,
             "proxied": false,
             "ttl": 120,
-            "zone_id": "d56084adb405e0b7e32c52321bf07be6",
-            "zone_name": "example.com",
             "created_on": "2014-01-01T05:20:00Z",
             "modified_on": "2014-01-01T05:20:00Z",
             "data": {},