costmanagement: convert export resources to use typed models with Decode/Encode by katbyte · Pull Request #32178 · hashicorp/terraform-provider-azurerm

katbyte · 2026-04-16T05:31:46Z

Community Note

Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

Convert the three cost management export resources (azurerm_billing_account_cost_management_export, azurerm_resource_group_cost_management_export, azurerm_subscription_cost_management_export) from returning nil in ModelObject() with raw metadata.ResourceData.Get()/Set() calls to using proper typed model structs with metadata.Decode()/metadata.Encode().
This follows the same pattern applied to the consumption budget resources in #31929.

PR Checklist

I have followed the guidelines in our Contributing Documentation.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.

Changes to existing Resource / Data Source

I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
I have written new tests for my resource or datasource changes & updated any relevant documentation.
I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.

Testing

go build ./internal/services/costmanagement/... — passes
go vet ./internal/services/costmanagement/... — passes
make static-analysis — passes
Test registration (go test -short) — all cost management export tests discover and register without ValidateModelObject panics
No behavioral changes were made; existing acceptance tests cover the Create/Read/Update/Delete flows and will validate correctness when run with TF_ACC.

Change Log

azurerm_billing_account_cost_management_export - refactor to use typed model with Decode/Encode
azurerm_resource_group_cost_management_export - refactor to use typed model with Decode/Encode
azurerm_subscription_cost_management_export - refactor to use typed model with Decode/Encode
This is a (please select all that apply):

Bug Fix
New Feature (ie adding a service, resource, or data source)
Enhancement
Breaking Change

Related Issue(s)

N/A — internal tech debt cleanup

AI Assistance Disclosure

AI Assisted - This contribution was made by, or with the assistance of, AI/LLMs
AI was used for code generation of the typed model structs, expand/flatten helpers, and inlined CRUD methods. All changes were reviewed and validated manually.

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the provider.

Changes to Security Controls

No changes to security controls.

…ode/Encode

sreallymatt

Thanks @katbyte - I've left some comments inline

sreallymatt · 2026-05-01T15:57:10Z

+
+			format := exports.FormatType(config.FileFormat)
+			recurrenceType := exports.RecurrenceType(config.RecurrenceType)
+


These can be inlined into the exports.Export struct instantiation using pointer.ToEnum

Suggested change

sreallymatt · 2026-05-01T15:57:12Z

+			props := exports.Export{
+				Properties: &exports.ExportProperties{
+					Schedule: &exports.ExportSchedule{
+						Recurrence: &recurrenceType,


Suggested change

Recurrence: &recurrenceType,

Recurrence: pointer.ToEnum[exports.RecurrenceType](config.RecurrenceType),

sreallymatt · 2026-05-01T15:57:16Z

+						},
+						Status: &status,
+					},
+					DeliveryInfo: *deliveryInfo,


expandExportDataStorageLocationFromModel returns nil without an error when the input length is 0, while the block is currently marked as Required and this should always be > 1, we may want to guard against nil pointer dereferences in case this changes to Optional in the future.

sreallymatt · 2026-05-01T15:57:23Z

+						Status: &status,
+					},
+					DeliveryInfo: *deliveryInfo,
+					Format:       &format,


Suggested change

Format: &format,

Format: pointer.ToEnum[exports.FormatType](config.FileFormat),

sreallymatt · 2026-05-01T15:57:25Z

+					},
+					DeliveryInfo: *deliveryInfo,
+					Format:       &format,
+					Definition:   *expandExportDataOptionsFromModel(config.ExportDataOptions),


Similar concern as above with DeliveryInfo

sreallymatt · 2026-05-01T15:57:53Z

+			var opts exports.GetOperationOptions
+			resp, err := client.Get(ctx, *id, opts)
+			if err != nil {
+				return fmt.Errorf("reading %s: %+v", *id, err)


Suggested change

return fmt.Errorf("reading %s: %+v", *id, err)

return fmt.Errorf("retrieving %s: %+v", *id, err)

sreallymatt · 2026-05-01T15:57:57Z

+			format := exports.FormatType(config.FileFormat)
+			recurrenceType := exports.RecurrenceType(config.RecurrenceType)
+
+			props := exports.Export{


Could we use d.HasChanges to conditionally update the returned model instead of rebuilding from scratch?

sreallymatt · 2026-05-01T15:57:59Z

+			recurrenceType := exports.RecurrenceType(config.RecurrenceType)
+
+			props := exports.Export{
+				ETag: resp.Model.ETag,


Potential panic given the error on ln218 only happens when resp.Model is non-nil but eTag is nil

github-actions · 2026-05-01T18:04:31Z

Build failure: GoLang Linting

This pull request contains a build failure in the GoLang Linting check which needs to be addressed here.

How to fix: Run the Go linter locally with golangci-lint run -v ./internal/... and fix any reported issues.

For more information, please refer to our Contributing Guide.

costmanagement: convert export resources to use typed models with Dec…

330b732

…ode/Encode

katbyte requested review from a team, WodansSon and magodo as code owners April 16, 2026 05:31

github-actions Bot added ai-assisted enhancement service/cost-management size/XL labels Apr 16, 2026

sreallymatt requested changes May 1, 2026

View reviewed changes

sreallymatt self-assigned this May 1, 2026

github-actions Bot added the waiting-response label May 1, 2026

address pr comments

6a822a6

github-actions Bot removed the waiting-response label May 1, 2026

github-actions Bot added the waiting-response label May 1, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

costmanagement: convert export resources to use typed models with Decode/Encode#32178

costmanagement: convert export resources to use typed models with Decode/Encode#32178
katbyte wants to merge 2 commits intomainfrom
kt/bad-typed-cost-mgmt

katbyte commented Apr 16, 2026

Uh oh!

sreallymatt left a comment

Uh oh!

sreallymatt May 1, 2026

Uh oh!

sreallymatt May 1, 2026

Uh oh!

sreallymatt May 1, 2026

Uh oh!

sreallymatt May 1, 2026

Uh oh!

sreallymatt May 1, 2026

Uh oh!

sreallymatt May 1, 2026

Uh oh!

sreallymatt May 1, 2026

Uh oh!

sreallymatt May 1, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented May 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		format := exports.FormatType(config.FileFormat)
		recurrenceType := exports.RecurrenceType(config.RecurrenceType)

	Recurrence: &recurrenceType,
	Recurrence: pointer.ToEnum[exports.RecurrenceType](config.RecurrenceType),

	Format: &format,
	Format: pointer.ToEnum[exports.FormatType](config.FileFormat),

	return fmt.Errorf("reading %s: %+v", *id, err)
	return fmt.Errorf("retrieving %s: %+v", *id, err)

Conversation

katbyte commented Apr 16, 2026

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

AI Assistance Disclosure

Rollback Plan

Changes to Security Controls

Uh oh!

sreallymatt left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented May 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants