Merge pull request #42602 from hashicorp/b-billing-cost-management-global

AWS Billing and Cost Management services are global

Author: ewbankkit

internal/service/bcmdataexports/export.go

@@ -453,7 +453,6 @@ func findExportByID(ctx context.Context, conn *bcmdataexports.Client, exportArn
 }
 
 type exportResourceModel struct {
-	framework.WithRegionModel
 	Export   fwtypes.ListNestedObjectValueOf[exportData] `tfsdk:"export"`
 	ID       types.String                                `tfsdk:"id"`
 	Tags     tftags.Map                                  `tfsdk:"tags"`

internal/service/bcmdataexports/service_package_gen.go

@@ -16,7 +16,6 @@ import (
 )
 
 // @FrameworkDataSource("aws_billing_service_account", name="Service Account")
-// @Region(overrideEnabled=false)
 func newServiceAccountDataSource(context.Context) (datasource.DataSourceWithConfigure, error) {
 	d := &billingServiceAccountDataSource{}
 

internal/service/billing/billing_service_account_data_source.go

@@ -248,7 +248,6 @@ func findEnrollmentStatus(ctx context.Context, conn *costoptimizationhub.Client)
 }
 
 type enrollmentStatusResourceModel struct {
-	framework.WithRegionModel
 	ID                    types.String `tfsdk:"id"`
 	Status                types.String `tfsdk:"status"`
 	IncludeMemberAccounts types.Bool   `tfsdk:"include_member_accounts"`

internal/service/budgets/service_package_gen.go

@@ -247,7 +247,6 @@ func findPreferences(ctx context.Context, conn *costoptimizationhub.Client) (*co
 }
 
 type preferencesResourceModel struct {
-	framework.WithRegionModel
 	ID                              types.String `tfsdk:"id"`
 	MemberAccountDiscountVisibility types.String `tfsdk:"member_account_discount_visibility"`
 	SavingsEstimationMode           types.String `tfsdk:"savings_estimation_mode"`

internal/service/ce/service_package_gen.go

@@ -861,6 +861,8 @@ service "bcmdataexports" {
   provider_package_correct = "bcmdataexports"
   doc_prefix               = ["bcmdataexports_"]
   brand                    = "AWS"
+
+  is_global = true
 }
 
 service "billing" {
@@ -887,6 +889,8 @@ service "billing" {
   provider_package_correct = "billing"
   doc_prefix               = ["billing_"]
   brand                    = "AWS"
+
+  is_global = true
 }
 
 service "billingconductor" {
@@ -961,6 +965,8 @@ service "ce" {
   provider_package_correct = "ce"
   doc_prefix               = ["ce_"]
   brand                    = "AWS"
+
+  is_global = true
 }
 
 service "chatbot" {
@@ -2334,6 +2340,8 @@ service "costoptimizationhub" {
   provider_package_correct = "costoptimizationhub"
   doc_prefix               = ["costoptimizationhub_"]
   brand                    = "AWS"
+
+  is_global = true
 }
 
 service "cur" {
@@ -2366,6 +2374,8 @@ service "cur" {
   provider_package_correct = "cur"
   doc_prefix               = ["cur_"]
   brand                    = "AWS"
+
+  is_global = true
 }
 
 service "dataexchange" {
@@ -6198,6 +6208,8 @@ service "pricing" {
   provider_package_correct = "pricing"
   doc_prefix               = ["pricing_"]
   brand                    = "AWS"
+
+  is_global = true
 }
 
 service "proton" {
@@ -8353,6 +8365,8 @@ service "budgets" {
   provider_package_correct = "budgets"
   doc_prefix               = ["budgets_"]
   brand                    = "AWS"
+
+  is_global = true
 }
 
 service "wellarchitected" {

internal/service/costoptimizationhub/enrollment_status.go

@@ -515,11 +515,18 @@ The following regional resources and data sources had a top-level `region` prior
 All resources for the following services are considered _global_:
 
 * Account Management (`aws_account_*`)
+* Billing (`aws_billing_*`)
+* Billing and Cost Management Data Exports (`aws_bcmdataexports_*`)
+* Budgets (`aws_budgets_*`)
 * CloudFront (`aws_cloudfront_*` and `aws_cloudfrontkeyvaluestore_*`)
+* Cost Explorer (`aws_ce_*`)
+* Cost Optimization Hub (`aws_costoptimizationhub_*`)
+* Cost and Usage Report (`aws_cur_*`)
 * Global Accelerator (`aws_globalaccelerator_*`)
 * IAM (`aws_iam_*`, `aws_rolesanywhere_*` and `aws_caller_identity`)
 * Network Manager (`aws_networkmanager_*`)
 * Organizations (`aws_organizations_*`)
+* Price List (`aws_pricing_*`)
 * Route 53 (`aws_route53_*` and `aws_route53domains_*`)
 * Route 53 ARC (`aws_route53recoverycontrolconfig_*` and `aws_route53recoveryreadiness_*`)
 * Shield Advanced (`aws_shield_*`)
@@ -533,7 +540,6 @@ Some regional services have a subset of resources that are global:
 |---|---|---|
 | Audit Manager | Resource | `aws_auditmanager_organization_admin_account_registration` |
 | Backup | Resource | `aws_backup_global_settings` |
-| Billing | Data Source | `aws_billing_service_account` |
 | Chime SDK Voice | Resource | `aws_chimesdkvoice_global_settings` |
 | CloudTrail | Resource | `aws_cloudtrail_organization_delegated_admin_account` |
 | Detective | Resource | `aws_detective_organization_admin_account` |