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_billing_account_cost_management_export, azurerm_resource_group_cost_management_export, azurerm_subscription_cost_management_export adding property file_format #27122

Merged
merged 6 commits into from
Jan 8, 2025
Merged

azurerm_billing_account_cost_management_export, azurerm_resource_group_cost_management_export, azurerm_subscription_cost_management_export adding property file_format #27122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aab6a94
add file format argument
ned1313 Aug 21, 2024
e041183
Merge branch 'hashicorp:main' into cost-management-export-file-format
ned1313 Aug 21, 2024
3a234bf
make fmt
ned1313 Aug 21, 2024
3e8ab87
Extract value from format pointer
ned1313 Aug 21, 2024
6a9c5b2
Update internal/services/costmanagement/export_resource_group_resourc…
ned1313 Dec 17, 2024
aacfa36
Update internal/services/costmanagement/export_resource_base.go
ned1313 Dec 17, 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/costmanagement/export_resource_base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ func (br costManagementExportBaseResource) arguments(fields map[string]*pluginsd
ValidateFunc: validation.IsRFC3339Time,
},

"file_format": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(exports.FormatTypeCsv),
ValidateFunc: validation.StringInSlice([]string{
string(exports.FormatTypeCsv),
// TODO add support for Parquet once added to the SDK
}, false),
},

"export_data_storage_location": {
Type: pluginsdk.TypeList,
MaxItems: 1,
Expand Down Expand Up @@ -195,6 +205,7 @@ func (br costManagementExportBaseResource) readFunc(scopeFieldName string) sdk.R
if err := metadata.ResourceData.Set("export_data_options", flattenExportDefinition(&props.Definition)); err != nil {
return fmt.Errorf("setting `export_data_options`: %+v", err)
}
metadata.ResourceData.Set("file_format", string(pointer.From(props.Format)))
}
}

Expand Down Expand Up @@ -267,7 +278,8 @@ func createOrUpdateCostManagementExport(ctx context.Context, client *exports.Exp
return fmt.Errorf("expanding `export_data_storage_location`: %+v", err)
}

format := exports.FormatTypeCsv
format := exports.FormatType(metadata.ResourceData.Get("file_format").(string))

recurrenceType := exports.RecurrenceType(metadata.ResourceData.Get("recurrence_type").(string))
props := exports.Export{
ETag: etag,
Expand Down
1 change: 1 addition & 0 deletions internal/services/costmanagement/export_resource_group_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ resource "azurerm_resource_group_cost_management_export" "test" {
recurrence_type = "Monthly"
recurrence_period_start_date = "%sT00:00:00Z"
recurrence_period_end_date = "%sT00:00:00Z"
file_format = "Csv"

export_data_storage_location {
container_id = azurerm_storage_container.test.resource_manager_id
Expand Down
3 changes: 3 additions & 0 deletions website/docs/r/billing_account_cost_management_export.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ resource "azurerm_billing_account_cost_management_export" "example" {
recurrence_type = "Monthly"
recurrence_period_start_date = "2020-08-18T00:00:00Z"
recurrence_period_end_date = "2020-09-18T00:00:00Z"
file_format = "Csv"

export_data_storage_location {
container_id = azurerm_storage_container.example.resource_manager_id
Expand Down Expand Up @@ -72,6 +73,8 @@ The following arguments are supported:

* `active` - (Optional) Is the cost management export active? Default is `true`.

* * `file_format` - (Optional) Format for export. Valid values are `Csv` only. Default is `Csv`.

---

A `export_data_storage_location` block supports the following:
Expand Down
3 changes: 3 additions & 0 deletions website/docs/r/resource_group_cost_management_export.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ resource "azurerm_resource_group_cost_management_export" "example" {
recurrence_type = "Monthly"
recurrence_period_start_date = "2020-08-18T00:00:00Z"
recurrence_period_end_date = "2020-09-18T00:00:00Z"
file_format = "Csv"

export_data_storage_location {
container_id = azurerm_storage_container.example.resource_manager_id
Expand Down Expand Up @@ -71,6 +72,8 @@ The following arguments are supported:

* `active` - (Optional) Is the cost management export active? Default is `true`.

* `file_format` - (Optional) Format for export. Valid values are `Csv` only. Default is `Csv`.

---

A `export_data_storage_location` block supports the following:
Expand Down
3 changes: 3 additions & 0 deletions website/docs/r/subscription_cost_management_export.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ resource "azurerm_subscription_cost_management_export" "example" {
recurrence_type = "Monthly"
recurrence_period_start_date = "2020-08-18T00:00:00Z"
recurrence_period_end_date = "2020-09-18T00:00:00Z"
file_format = "Csv"

export_data_storage_location {
container_id = azurerm_storage_container.example.resource_manager_id
Expand Down Expand Up @@ -73,6 +74,8 @@ The following arguments are supported:

* `active` - (Optional) Is the cost management export active? Default is `true`.

* `file_format` - (Optional) Format for export. Valid values are `Csv` only. Default is `Csv`.

---

A `export_data_storage_location` block supports the following:
Expand Down
Loading