Skip to content

Commit 3a73bf4

Browse files
Removing length validation for DNS TXT record to ensure consistency (#22208)
* Removing length validation for DNS TXT record to ensure consistency * Removing json files corresponding to removed tests for length validation * Changelog for public and private Dns * Update src/Dns/Dns/ChangeLog.md Co-authored-by: Vincent Dai <[email protected]> * Update src/PrivateDns/PrivateDns/ChangeLog.md Co-authored-by: Vincent Dai <[email protected]> --------- Co-authored-by: Vincent Dai <[email protected]>
1 parent 46c64a4 commit 3a73bf4

File tree

18 files changed

+2
-4105
lines changed

18 files changed

+2
-4105
lines changed

src/Dns/Dns.Test/ScenarioTests/RecordsTests.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,21 +156,6 @@ public void TestRecordSetTXTNonEmpty()
156156
TestRunner.RunTestScript("Test-RecordSetTXTNonEmpty");
157157
}
158158

159-
[Fact]
160-
[Trait(Category.AcceptanceType, Category.CheckIn)]
161-
public void TestRecordSetTXTLengthValidation()
162-
{
163-
TestRunner.RunTestScript("Test-RecordSetTXTLengthValidation");
164-
}
165-
166-
[Fact]
167-
[Trait(Category.AcceptanceType, Category.CheckIn)]
168-
public void TestRecordSetTXTLegacyLengthValidation()
169-
{
170-
TestRunner.RunTestScript("Test-RecordSetTXTLegacyLengthValidation");
171-
}
172-
173-
174159
[Fact]
175160
[Trait(Category.AcceptanceType, Category.CheckIn)]
176161
public void TestRecordSetSRV()

src/Dns/Dns.Test/ScenarioTests/RecordsTests.ps1

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -682,55 +682,6 @@ function Test-RecordSetTXTNonEmpty
682682
Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
683683
}
684684

685-
function Test-RecordSetTXTLegacyLengthValidation
686-
{
687-
$zoneName = Get-RandomZoneName
688-
$recordName = getAssetname
689-
$resourceGroup = TestSetup-CreateResourceGroup
690-
$zone = $resourceGroup | New-AzDnsZone -Name $zoneName
691-
$longRecordTxt = Get-TxtOfSpecifiedLength 1025;
692-
$maxRecordTxt = Get-TxtOfSpecifiedLength 1024;
693-
694-
$recordSet = $zone | New-AzDnsRecordSet -Name $recordName -Ttl 100 -RecordType TXT ;
695-
696-
Assert-Throws {$recordSet | Add-AzDnsRecordConfig -Value $longRecordTxt }
697-
698-
$recordSet = $recordSet | Add-AzDnsRecordConfig -Value $maxRecordTxt
699-
$setResult = $recordSet | Set-AzDnsRecordSet ;
700-
701-
Assert-AreEqual $maxRecordTxt $setResult.Records[0].Value;
702-
703-
$getResult = Get-AzDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType TXT ;
704-
Assert-AreEqual $maxRecordTxt $getResult.Records[0].Value;
705-
706-
Remove-AzDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
707-
Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
708-
}
709-
710-
711-
function Test-RecordSetTXTLengthValidation
712-
{
713-
$zoneName = Get-RandomZoneName
714-
$recordName = getAssetname
715-
$resourceGroup = TestSetup-CreateResourceGroup
716-
$zone = $resourceGroup | New-AzDnsZone -Name $zoneName
717-
718-
$longRecordTxt = Get-TxtOfSpecifiedLength 1025;
719-
Assert-Throws {New-AzDnsRecordConfig -Value $longRecordTxt }
720-
721-
$maxRecordTxt = Get-TxtOfSpecifiedLength 1024;
722-
$maxRecord = New-AzDnsRecordConfig -Value $maxRecordTxt
723-
$record = $zone | New-AzDnsRecordSet -Name $recordName -Ttl 100 -RecordType TXT -DnsRecords $maxRecord ;
724-
Assert-AreEqual $maxRecordTxt $record.Records[0].Value;
725-
726-
$getResult = Get-AzDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType TXT ;
727-
Assert-AreEqual $maxRecordTxt $getResult.Records[0].Value;
728-
729-
Remove-AzDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
730-
Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
731-
}
732-
733-
734685
function Test-RecordSetPTR
735686
{
736687
$zoneName = Get-RandomZoneName

src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests/TestRecordSetTXTLegacyLengthValidation.json

Lines changed: 0 additions & 902 deletions
This file was deleted.

src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.RecordsTests/TestRecordSetTXTLengthValidation.json

Lines changed: 0 additions & 827 deletions
This file was deleted.

src/Dns/Dns/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Removed length validation for DNS TXT record to make it consistent with Azure CLI and Azure portal.
2122

2223
## Version 1.1.2
2324
* Update references in .psd1 to use relative path

src/Dns/Dns/Models/DnsClient.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ public class DnsClient
3333
{
3434
public const string DnsResourceLocation = "global";
3535

36-
public const int TxtRecordMaxLength = 1024;
37-
38-
public const int TxtRecordMinLength = 0;
39-
4036
private Dictionary<RecordType, Type> recordTypeValidationEntries = new Dictionary<RecordType, Type>()
4137
{
4238
{RecordType.A, typeof (ARecord)},

src/Dns/Dns/Models/DnsRecordSet.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ public abstract class DnsRecordBase : ICloneable
120120
{
121121
public abstract object Clone();
122122

123-
public const int TxtRecordMaxLength = 1024;
124-
125-
public const int TxtRecordMinLength = 0;
126-
127123
public const int TxtRecordChunkSize = 255;
128124

129125
public const int CaaRecordMaxLength = 1024;

src/Dns/Dns/Records/AddAzureDnsRecordConfig.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public class AddAzureDnsRecordConfig : DnsBaseCmdlet
5959

6060
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The text value for the TXT record to add.", ParameterSetName = "TXT")]
6161
[ValidateNotNullOrEmpty]
62-
[ValidateLength(DnsClient.TxtRecordMinLength, DnsClient.TxtRecordMaxLength)]
6362
public string Value { get; set; }
6463

6564
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The priority value SRV record to add.", ParameterSetName = "SRV")]

src/Dns/Dns/Records/NewAzureRmDnsRecordConfig.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public class NewAzureRmDnsRecordConfig : DnsBaseCmdlet
6666

6767
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The text value for the TXT record to add.", ParameterSetName = ParameterSetTxt)]
6868
[ValidateNotNullOrEmpty]
69-
[ValidateLength(DnsRecordBase.TxtRecordMinLength, DnsRecordBase.TxtRecordMaxLength)]
7069
public string Value { get; set; }
7170

7271
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The priority value SRV record to add.", ParameterSetName = ParameterSetSrv)]

src/PrivateDns/PrivateDns.Test/ScenarioTests/RecordsTests.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -128,21 +128,6 @@ public void TestRecordSetTXTNonEmpty()
128128
TestRunner.RunTestScript("Test-RecordSetTXTNonEmpty");
129129
}
130130

131-
[Fact]
132-
[Trait(Category.AcceptanceType, Category.CheckIn)]
133-
public void TestRecordSetTXTLengthValidation()
134-
{
135-
TestRunner.RunTestScript("Test-RecordSetTXTLengthValidation");
136-
}
137-
138-
[Fact]
139-
[Trait(Category.AcceptanceType, Category.CheckIn)]
140-
public void TestRecordSetTXTLegacyLengthValidation()
141-
{
142-
TestRunner.RunTestScript("Test-RecordSetTXTLegacyLengthValidation");
143-
}
144-
145-
146131
[Fact]
147132
[Trait(Category.AcceptanceType, Category.CheckIn)]
148133
public void TestRecordSetSRV()

0 commit comments

Comments
 (0)