mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-22 18:17:07 +00:00
Code Issues Releases Wiki Activity

make Batch Change AAAA record data flexible (#909)

Browse Source
This commit is contained in:
Britney Wright 2019-12-04 10:24:32 -05:00 committed by GitHub
parent 963407a0f4
commit 04420a6da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/api/functional_test/live_tests/batch/create_batch_change_test.py
View File

@ -1773,7 +1773,7 @@ def test_aaaa_recordtype_update_delete_checks(shared_zone_test_context):
rs_delete_name = generate_record_name()
rs_delete_fqdn = rs_delete_name + ".ok."
rs_delete_ok = get_recordset_json(ok_zone, rs_delete_name, "AAAA", [{"address": "1:2:3:4:5:6:7:8"}], 200)
rs_delete_ok = get_recordset_json(ok_zone, rs_delete_name, "AAAA", [{"address": "1::4:5:6:7:8"}], 200)
rs_update_name = generate_record_name()
rs_update_fqdn = rs_update_name + ".ok."
@ -1792,7 +1792,7 @@ def test_aaaa_recordtype_update_delete_checks(shared_zone_test_context):
"comments": "this is optional",
"changes": [
# valid changes
get_change_A_AAAA_json(rs_delete_fqdn, record_type="AAAA", change_type="DeleteRecordSet"),
get_change_A_AAAA_json(rs_delete_fqdn, record_type="AAAA", change_type="DeleteRecordSet", address="1:0::4:5:6:7:8"),
get_change_A_AAAA_json(rs_update_fqdn, record_type="AAAA", ttl=300, address="1:2:3:4:5:6:7:8"),
get_change_A_AAAA_json(rs_update_fqdn, record_type="AAAA", change_type="DeleteRecordSet"),

15
modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
View File

@ -16,6 +16,8 @@
package vinyldns.api.domain.batch
import java.net.InetAddress
import cats.data._
import cats.implicits._
import vinyldns.api.VinylDNSConfig
@ -295,6 +297,17 @@ class BatchChangeValidations(
else
().validNel
def matchRecordData(existingRecordSetData: List[RecordData], recordData: RecordData): Boolean =
existingRecordSetData.exists { rd =>
(rd, recordData) match {
case (AAAAData(rdAddress), AAAAData(proposedAddress)) =>
InetAddress.getByName(proposedAddress).getHostName == InetAddress
.getByName(rdAddress)
.getHostName
case _ => rd == recordData
}
}
def ensureRecordExists(
change: ChangeForValidation,
groupedChanges: ChangeForValidationMap
@ -308,7 +321,7 @@ class BatchChangeValidations(
)
if !groupedChanges
.getExistingRecordSet(change.recordKey)
.exists(_.records.contains(recordData)) =>
.exists(rs => matchRecordData(rs.records, recordData)) =>
DeleteRecordDataDoesNotExist(inputName, recordData).invalidNel
case _ =>
().validNel

17
modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala
View File

@ -16,6 +16,7 @@
package vinyldns.api.domain.batch
import java.net.InetAddress
import java.util.UUID
import vinyldns.api.VinylDNSConfig
@ -24,7 +25,7 @@ import vinyldns.api.domain.batch.BatchChangeInterfaces.ValidatedBatch
import vinyldns.api.domain.batch.BatchTransformations.LogicalChangeType.LogicalChangeType
import vinyldns.api.domain.dns.DnsConversions.getIPv6FullReverseName
import vinyldns.core.domain.batch._
import vinyldns.core.domain.record.{RecordData, RecordSet, RecordSetChange}
import vinyldns.core.domain.record.{AAAAData, RecordData, RecordSet, RecordSetChange}
import vinyldns.core.domain.record.RecordType._
import vinyldns.core.domain.zone.Zone
import vinyldns.core.domain.record.RecordType.RecordType
@ -182,6 +183,14 @@ object BatchTransformations {
}
object ValidationChanges {
def matchRecordData(existingRecord: RecordData, recordData: String): Boolean =
existingRecord match {
case AAAAData(address) =>
InetAddress.getByName(address).getHostName ==
InetAddress.getByName(recordData).getHostName
case _ => false
}
def apply(
changes: List[ChangeForValidation],
existingRecordSet: Option[RecordSet]
@ -197,6 +206,12 @@ object BatchTransformations {
// existing DNS entries in the event of DeleteRecordSet
val deleteChangeSet = changes
.collect {
case DeleteRRSetChangeForValidation(
_,
_,
DeleteRRSetChangeInput(_, AAAA, Some(AAAAData(address)))
) =>
existingRecords.filter(r => matchRecordData(r, address))
case DeleteRRSetChangeForValidation(
_,
_,

8
modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
View File

@ -138,6 +138,12 @@ class BatchChangeValidationsSpec
DeleteRRSetChangeInput("shared-update", RecordType.AAAA)
)
private val deleteSingleRecordChange = DeleteRRSetChangeForValidation(
sharedZone,
"shared-update",
DeleteRRSetChangeInput("shared-update", RecordType.AAAA, Some(AAAAData("1:0::1")))
)
private val deletePrivateChange = DeleteRRSetChangeForValidation(
okZone,
"private-delete",
@ -2279,7 +2285,7 @@ class BatchChangeValidationsSpec
ChangeForValidationMap(
List(
updateSharedAddChange.validNel,
updateSharedDeleteChange.validNel,
deleteSingleRecordChange.validNel,
deleteSharedChange.validNel,
updatePrivateAddChange.validNel,
updatePrivateDeleteChange.validNel,