From e231394c5cdb6acb7f57649ebee244e36d36f297 Mon Sep 17 00:00:00 2001 From: Mark Cornmesser Date: Fri, 5 Dec 2025 10:05:21 -0800 Subject: [PATCH] SREIN-696 - rename finops exort folders consistency --- terraform/azure_0DIN/finops.tf | 12 ++++++------ terraform/azure_fx_nonci/.finops.tf.swp | Bin 12288 -> 0 bytes terraform/azure_fx_nonci/finops.tf | 12 ++++++------ terraform/azure_infrasec/finops.tf | 12 ++++++------ terraform/azure_tceng/finops.tf | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 terraform/azure_fx_nonci/.finops.tf.swp diff --git a/terraform/azure_0DIN/finops.tf b/terraform/azure_0DIN/finops.tf index c8fad9a3..c09e22cf 100644 --- a/terraform/azure_0DIN/finops.tf +++ b/terraform/azure_0DIN/finops.tf @@ -1,6 +1,6 @@ -resource "azapi_resource" "azure_zero_din_cost_export_actual" { +resource "azapi_resource" "zero_din_cost_export_actual" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure_0din_actual" + name = "0din_actual" parent_id = "/subscriptions/e1cb04e4-3788-471a-881f-385e66ad80ab" body = { @@ -19,7 +19,7 @@ resource "azapi_resource" "azure_zero_din_cost_export_actual" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_0din_daily_actual" + rootFolderPath = "0din" } } partitionData = true @@ -34,9 +34,9 @@ resource "azapi_resource" "azure_zero_din_cost_export_actual" { } } -resource "azapi_resource" "azure_zero_din_cost_export_amortized" { +resource "azapi_resource" "zero_din_cost_export_amortized" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure_0din_amortized" + name = "0din_amortized" parent_id = "/subscriptions/e1cb04e4-3788-471a-881f-385e66ad80ab" body = { @@ -55,7 +55,7 @@ resource "azapi_resource" "azure_zero_din_cost_export_amortized" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_0din_daily_amortized" + rootFolderPath = "0din" } } partitionData = true diff --git a/terraform/azure_fx_nonci/.finops.tf.swp b/terraform/azure_fx_nonci/.finops.tf.swp deleted file mode 100644 index af8139002e6c5293f2a2223e26ef3677acf8961e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2J!~9B6vxLDgg_EdfDWY1(SXo;_txi}4+$w&43;G>SlA#ziq+igtUcm(XPKF` zVn;xOL;<1zrJ#V6p+HDTh!SXM`G`asJ{pn+2?~U$DEQCq&E3TkRtml~EB`!qvu|eJ z`@c6MS)M`s)LK7Snr{<4cMx*smwUwrZ_km>?jfY0>RBf3i-VuWE{T)mV7nI@!)SGF zGkW5Y#~xqb2$MMOMTRRybE%4m?$wH?`MI=|B@gD=46;8m~=THw1|3HcUW1|NfW!E4|-unF!5za1vzXYd2~3VaAI zf|tS9w-E9kC;$Uz!71<{I0UXii!Z_Z;1ak9-UJtb)#-KMAFqH{z$@St@Cy9N3OrAO zz~X*S+u2V+u%&2O52+GnH+VQ`txz%CZH>m+u^BaVgB!d#Kj|}~;JKm&xAuKmn(a-w zLJgmeGP@PGqXTQPTu5ca9?wooZJbTUaVt+4A8LN5l3M0we#1xwmm=M?%Z$moG&<6>x!q{< zGz~1{+K7_wlQ-i-vBTBwTA9lk)tM|RIHeInUuL7Eo{{AwoAyQ}wFS^Rt#{lK(qkX(x&EycZ5ww;Ogk-NkUga~4vl&~4|emvClRE$xnR&NMmCn>r0g_f)U1(CfC) zv<~bZ>QAaO;^!)CE`18OW})H&6mJn%V0JUmN~G?4%k2(PV)ts!Qd@FqGsVo}He#FA zCbKTTu66xQB!B(k!AwnuHfoo+f8gX8`QX;Kf%{{_YT%Czl)}H@*qD^(-+pE^E91cU E9ixT1NdN!< diff --git a/terraform/azure_fx_nonci/finops.tf b/terraform/azure_fx_nonci/finops.tf index 130ca4d7..7325c152 100644 --- a/terraform/azure_fx_nonci/finops.tf +++ b/terraform/azure_fx_nonci/finops.tf @@ -1,6 +1,6 @@ -resource "azapi_resource" "azure_infrasec_cost_export_actual" { +resource "azapi_resource" "fx_non_ci_cost_export_actual" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure-firefox-nonci_actual" + name = "fx_non_ci_actual" parent_id = "/subscriptions/0a420ff9-bc77-4475-befc-a05071fc92ec" body = { @@ -19,7 +19,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_firefox_nonci_daily_actual" + rootFolderPath = "fx_non_ci" } } partitionData = true @@ -34,9 +34,9 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" { } } -resource "azapi_resource" "azure_infrasec_cost_export_amortized" { +resource "azapi_resource" "fx_non_ci_cost_export_amortized" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure-firefox-nonci_amortized" + name = "fx_non_ci_amortized" parent_id = "/subscriptions/0a420ff9-bc77-4475-befc-a05071fc92ec" body = { @@ -55,7 +55,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_amortized" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_firefox_nonci_daily_amortized" + rootFolderPath = "fx_non_ci" } } partitionData = true diff --git a/terraform/azure_infrasec/finops.tf b/terraform/azure_infrasec/finops.tf index ecaf17e5..d34fafcc 100644 --- a/terraform/azure_infrasec/finops.tf +++ b/terraform/azure_infrasec/finops.tf @@ -1,7 +1,7 @@ ## Azure Cost Exports for Azure Infrastructure Security Subscription -resource "azapi_resource" "azure_infrasec_cost_export_actual" { +resource "azapi_resource" "infrasec_cost_export_actual" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure-infrasec_actual" + name = "infrasec_actual" parent_id = "/subscriptions/9b9774fb-67f1-45b7-830f-aafe07a94396" body = { @@ -20,7 +20,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_infrasec_daily_actual" + rootFolderPath = "infrasec" } } partitionData = true @@ -35,9 +35,9 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" { } } -resource "azapi_resource" "azure_infrasec_cost_export_amortized" { +resource "azapi_resource" "infrasec_cost_export_amortized" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure-infrasec_amortized" + name = "infrasec_amortized" parent_id = "/subscriptions/9b9774fb-67f1-45b7-830f-aafe07a94396" body = { @@ -56,7 +56,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_amortized" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_infrasec_daily_amortized" + rootFolderPath = "infrasec" } } partitionData = true diff --git a/terraform/azure_tceng/finops.tf b/terraform/azure_tceng/finops.tf index ca106ab2..25ad9631 100644 --- a/terraform/azure_tceng/finops.tf +++ b/terraform/azure_tceng/finops.tf @@ -1,6 +1,6 @@ -resource "azapi_resource" "azure_tceng_cost_export_actual" { +resource "azapi_resource" "tceng_cost_export_actual" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure-tceng_actual" + name = "taskcluster-daily_actual" parent_id = "/subscriptions/8a205152-b25a-417f-a676-80465535a6c9" body = { @@ -19,7 +19,7 @@ resource "azapi_resource" "azure_tceng_cost_export_actual" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_tceng_daily_actual" + rootFolderPath = "taskcluster" } } partitionData = true @@ -34,9 +34,9 @@ resource "azapi_resource" "azure_tceng_cost_export_actual" { } } -resource "azapi_resource" "azure_tceng_cost_export_amortized" { +resource "azapi_resource" "tceng_cost_export_amortized" { type = "Microsoft.CostManagement/exports@2025-03-01" - name = "azure-tceng_amortized" + name = "taskcluster-daily_amortized" parent_id = "/subscriptions/8a205152-b25a-417f-a676-80465535a6c9" body = { @@ -55,7 +55,7 @@ resource "azapi_resource" "azure_tceng_cost_export_amortized" { destination = { resourceId = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata" container = "cost-management" - rootFolderPath = "azure_tceng_daily_amortized" + rootFolderPath = "taskcluster" } } partitionData = true