Skip to content
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

azurerm_dns_cname_record: try normalize target_resource_id with RecordTypeID before set to state #24181

Merged
merged 5 commits into from
Jan 25, 2024
Merged

azurerm_dns_cname_record: try normalize target_resource_id with RecordTypeID before set to state #24181

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebdfa95
try normalize dns target resource id to fix case issue
wuxu92 Dec 11, 2023
3645b4e
use lowercase resource group name to fix acc tests
wuxu92 Dec 11, 2023
01a3f2d
inline normalize target resource id
wuxu92 Dec 12, 2023
5e65d42
add other possible resource id for target resource id
wuxu92 Dec 18, 2023
1af4cc2
add todo comment for updating the id parser logic once the recaser wo…
stephybun Jan 25, 2024
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
14 changes: 13 additions & 1 deletion internal/services/dns/dns_cname_record_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func resourceDnsCNameRecordRead(d *pluginsdk.ResourceData, meta interface{}) err
if props.TargetResource != nil && props.TargetResource.Id != nil {
targetResourceId = *props.TargetResource.Id
}
d.Set("target_resource_id", targetResourceId)
d.Set("target_resource_id", normalizeTargetResourceID(targetResourceId))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're only calling this once so it doesn't need to be a separate function. Can you please in-line the ID parsing above. We should also be raising the error from the parser instead of silently ignoring.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure! Updated.


if err := tags.FlattenAndSet(d, props.Metadata); err != nil {
return err
Expand All @@ -219,3 +219,15 @@ func resourceDnsCNameRecordDelete(d *pluginsdk.ResourceData, meta interface{}) e

return nil
}

func normalizeTargetResourceID(id string) string {
if id == "" {
return ""
}

if parsed, err := recordsets.ParseRecordTypeIDInsensitively(id); err == nil {
return parsed.ID()
}

return id
}
8 changes: 4 additions & 4 deletions internal/services/dns/dns_cname_record_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ provider "azurerm" {
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
name = "acctestrg-%d"
location = "%s"
}

Expand Down Expand Up @@ -392,7 +392,7 @@ provider "azurerm" {
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
name = "acctestrg-%d"
location = "%s"
}

Expand Down Expand Up @@ -426,7 +426,7 @@ provider "azurerm" {
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
name = "acctestrg-%d"
location = "%s"
}

Expand Down Expand Up @@ -460,7 +460,7 @@ provider "azurerm" {
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
name = "acctestrg-%d"
location = "%s"
}

Expand Down
Loading