Skip to content

Fix/storage tables missing identity #147

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

Open
antonp-semperis wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix/storage tables missing identity #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0255b17
fix: handle missing 'id' in tfstate for Storage Tables and nested res…
antonp-semperis Jan 23, 2026
20ac1ae
fix: downgrade terraform-provider-azapi to v2.7.0 to fix ResourceWith…
antonp-semperis Jan 23, 2026
d1a1642
cleanup
antonp-semperis Jan 23, 2026
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
19 changes: 19 additions & 0 deletions config/external_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,25 @@ func azapiResource() config.ExternalName {
}
return xpprovider.NewResourceID(name, parentId, resourceType)
}
// Override GetExternalNameFn to handle resources where Azure API doesn't return
// the standard 'id' field (e.g., Storage Tables). Falls back to constructing
// the ID from parent_id and name when id is missing.
e.GetExternalNameFn = func(tfstate map[string]any) (string, error) {
// First try standard id field
if id, ok := tfstate["id"].(string); ok && id != "" {
return id, nil
}
// Fallback: construct from parent_id + name
// This handles Azure resources where the API response doesn't include
// the full ARM resource ID (e.g., Storage Tables, some nested resources)
parentId, hasParentId := tfstate["parent_id"].(string)
name, hasName := tfstate["name"].(string)
if hasParentId && hasName && parentId != "" && name != "" {
// Construct the resource ID in the format: {parent_id}/{name}
return parentId + "/" + name, nil
}
return "", errors.New("cannot determine resource identity: 'id' field is empty and fallback from 'parent_id'/'name' failed")
}
return e
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ require (
sigs.k8s.io/yaml v1.6.0 // indirect
)

replace github.com/Azure/terraform-provider-azapi => github.com/upbound/terraform-provider-azapi v0.0.0-20251216073536-fa7bb6f0cc62 // v2.8.0-upjet.1
replace github.com/Azure/terraform-provider-azapi => github.com/upbound/terraform-provider-azapi v0.0.0-20251017090720-3dd7f4b26f05 // v2.7.0-upjet.1
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ=
github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w=
github.com/upbound/terraform-provider-azapi v0.0.0-20251216073536-fa7bb6f0cc62 h1:OhiWU1kE6uF+ZKYGM3VK6XCj6nXkmFg0SAGi157HqiU=
github.com/upbound/terraform-provider-azapi v0.0.0-20251216073536-fa7bb6f0cc62/go.mod h1:9zaKxXlGimvg3BKj+Iyms2/C40+ObatohcJg2U1LMfk=
github.com/upbound/terraform-provider-azapi v0.0.0-20251017090720-3dd7f4b26f05 h1:zzFfRW98MDmcXu/4dvs3kbwUui+z6PB3+m1XZ+HwCvw=
github.com/upbound/terraform-provider-azapi v0.0.0-20251017090720-3dd7f4b26f05/go.mod h1:LWOxEB+pAzifaF73CYBVuOPV9S49DLqQCDa7bmY02O8=
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
Expand Down