Skip to content

[Network] Fix #21716: az network private-dns zone import: Allow hyphenated SRV records #21717

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

Merged
necusjz merged 1 commit into from
Mar 29, 2022
Merged

[Network] Fix #21716: az network private-dns zone import: Allow hyphenated SRV records #21717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/azure-cli/azure/cli/command_modules/network/tests/latest/test_dns_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,11 @@ def test_zone_file_1(self):
(7200, 7, 'foo bar')
])
self._check_txt(zone, 'mytxtrs.' + zn, [(3600, 2, 'hi')])
self._check_srv(zone, 'mysrv.' + zn, [(3600, 1, 2, 1234, 'target.contoso.com.')])
self._check_srv(zone, 'mysrv.' + zn, [
(3600, 1, 2, 1234, 'target-1.contoso.com.'),
(3600, 1, 2, 1234, 'target-2.contoso.com.'),
(3600, 1, 2, 1234, 'target-3.contoso.com.')
])
self._check_caa(zone, 'caa1.' + zn, [
(60, 0, 'issue', 'ca1.contoso.com'),
(60, 128, 'iodef', 'mailto:[email protected]')
Expand Down
6 changes: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/network/tests/latest/zone_files/zone1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ myname2 3600 TXT "manualtxt"
mytxt2 7200 TXT "abc def"
mytxt2 7200 TXT "foo bar"
mytxtrs 3600 TXT "hi"
mysrv 3600 SRV 1 2 1234 target.contoso.com.
mysrv 3600 SRV 1 2 1234 target-1.contoso.com.
mysrv 3600 SRV 1 2 1234 target-2.contoso.com.
mysrv 3600 SRV 1 2 1234 target-3.contoso.com.
_sip._tls.@ 3600 IN SRV 100 1 443 target.contoso.com.
caa1 60 IN CAA 0 issue "ca1.contoso.com"
60 IN CAA 128 iodef mailto:[email protected]
caa2 60 IN CAA 0 issue ca1.contoso.com
600 IN CAA 45 tag56 "test test test"
600 IN CAA 45 tag56 "test test test"
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/network/zone_file/parse_zone_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
'mx': r'(?P<name>[@\*\w\.-]*)\s+(?:(?P<ttl>\d+\w*)\s+)?(?:(?P<class>in)\s+)?(?P<delim>mx)\s+(?P<preference>\d+)\s+(?P<host>[@\w\.-]+)',
'txt': r'(?P<name>[@\*\w\.-]*)\s+(?:(?P<ttl>\d+\w*)\s+)?(?:(?P<class>in)\s+)?(?P<delim>txt)\s+(?P<txt>.+)',
'ptr': r'(?P<name>[@\*\w\.-]*)\s+(?:(?P<ttl>\d+\w*)\s+)?(?:(?P<class>in)\s+)?(?P<delim>ptr)\s+(?P<host>[\w\.-]+)',
'srv': r'(?P<name>[@\*\w\.-]*)\s+(?:(?P<ttl>\d+\w*)\s+)?(?:(?P<class>in)\s+)?(?P<delim>srv)\s+(?P<priority>\d+)\s+(?P<weight>\d+)\s+(?P<port>\d+)\s+(?P<target>[@\w\.]+)',
'srv': r'(?P<name>[@\*\w\.-]*)\s+(?:(?P<ttl>\d+\w*)\s+)?(?:(?P<class>in)\s+)?(?P<delim>srv)\s+(?P<priority>\d+)\s+(?P<weight>\d+)\s+(?P<port>\d+)\s+(?P<target>[@\w\.-]+)',
'spf': r'(?P<name>[@\*\w\.-]*)\s+(?:(?P<ttl>\d+\w*)\s+)?(?:(?P<class>in)\s+)?(?P<delim>spf)\s+(?P<txt>.+)',
'uri': r'(?P<name>[@\*\w\.-]*)\s+(?:(?P<ttl>\d+\w*)\s+)?(?:(?P<class>in)\s+)?(?P<delim>uri)\s+(?P<priority>\d+)\s+(?P<weight>\d+)\s+(?P<target>[\w\.]+)'
}
Expand Down