Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

actions-user · actions-user · commit 1d86b5767c1b · 2026-04-23T02:00:48.000Z
diff --git a/mmv1/products/billingbudgets/Budget.yaml b/mmv1/products/billingbudgets/Budget.yaml
diff --git a/mmv1/products/billingbudgets/product.yaml b/mmv1/products/billingbudgets/product.yaml
@@ -12,7 +12,8 @@
 # limitations under the License.
 
 ---
-name: 'Billing'
+name: 'BillingBudgets'
+legacy_name: 'billing'
 display_name: 'Cloud Billing'
 versions:
   - name: 'ga'
diff --git a/mmv1/products/cloudbilling/ProjectInfo.yaml b/mmv1/products/cloudbilling/ProjectInfo.yaml
diff --git a/mmv1/products/cloudbilling/product.yaml b/mmv1/products/cloudbilling/product.yaml
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 ---
-name: 'CoreBilling'
+name: 'CloudBilling'
 legacy_name: 'billing'
 display_name: 'Cloud Billing'
 versions:
diff --git a/mmv1/templates/terraform/state_migrations/billing_budgets_budget.go.tmpl b/mmv1/templates/terraform/state_migrations/billing_budgets_budget.go.tmpl
@@ -1,4 +1,4 @@
-func resourceBillingBudgetResourceV0() *schema.Resource {
+func resourceBillingBudgetsBudgetResourceV0() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"amount": {
@@ -241,7 +241,7 @@ billingAccounts/{billingAccountId}/budgets/{budgetId}.`,
 	}
 }
 
-func ResourceBillingBudgetUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+func ResourceBillingBudgetsBudgetUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
 	log.Printf("[DEBUG] Attributes before migration: %#v", rawState)
 
 	rawState["name"] = tpgresource.GetResourceNameFromSelfLink(rawState["name"].(string))
diff --git a/mmv1/third_party/terraform/.teamcity/components/inputs/services_beta.kt b/mmv1/third_party/terraform/.teamcity/components/inputs/services_beta.kt
@@ -136,10 +136,10 @@ var ServicesListBeta = mapOf(
         "displayName" to "Bigtable",
         "path" to "./google-beta/services/bigtable"
     ),
-    "billing" to mapOf(
-        "name" to "billing",
-        "displayName" to "Billing",
-        "path" to "./google-beta/services/billing"
+    "billingbudgets" to mapOf(
+        "name" to "billingbudgets",
+        "displayName" to "Billingbudgets",
+        "path" to "./google-beta/services/billingbudgets"
     ),
     "binaryauthorization" to mapOf(
         "name" to "binaryauthorization",
@@ -286,10 +286,10 @@ var ServicesListBeta = mapOf(
         "displayName" to "Containerazure",
         "path" to "./google-beta/services/containerazure"
     ),
-    "corebilling" to mapOf(
-        "name" to "corebilling",
-        "displayName" to "Corebilling",
-        "path" to "./google-beta/services/corebilling"
+    "cloudbilling" to mapOf(
+        "name" to "cloudbilling",
+        "displayName" to "Cloudbilling",
+        "path" to "./google-beta/services/cloudbilling"
     ),
     "databasemigrationservice" to mapOf(
         "name" to "databasemigrationservice",
diff --git a/mmv1/third_party/terraform/.teamcity/components/inputs/services_ga.kt b/mmv1/third_party/terraform/.teamcity/components/inputs/services_ga.kt
@@ -136,10 +136,10 @@ var ServicesListGa = mapOf(
         "displayName" to "Bigtable",
         "path" to "./google/services/bigtable"
     ),
-    "billing" to mapOf(
-        "name" to "billing",
-        "displayName" to "Billing",
-        "path" to "./google/services/billing"
+    "billingbudgets" to mapOf(
+        "name" to "billingbudgets",
+        "displayName" to "Billingbudgets",
+        "path" to "./google/services/billingbudgets"
     ),
     "binaryauthorization" to mapOf(
         "name" to "binaryauthorization",
@@ -286,10 +286,10 @@ var ServicesListGa = mapOf(
         "displayName" to "Containerazure",
         "path" to "./google/services/containerazure"
     ),
-    "corebilling" to mapOf(
-        "name" to "corebilling",
-        "displayName" to "Corebilling",
-        "path" to "./google/services/corebilling"
+    "cloudbilling" to mapOf(
+        "name" to "cloudbilling",
+        "displayName" to "Cloudbilling",
+        "path" to "./google/services/cloudbilling"
     ),
     "databasemigrationservice" to mapOf(
         "name" to "databasemigrationservice",
diff --git a/mmv1/third_party/terraform/fwmodels/provider_model.go.tmpl b/mmv1/third_party/terraform/fwmodels/provider_model.go.tmpl
@@ -44,13 +44,9 @@ type ProviderModel struct {
 {{- end }}
 
 	// Handwritten Products / Versioned / Atypical Entries
-	CloudBillingCustomEndpoint      types.String `tfsdk:"cloud_billing_custom_endpoint"`
 	DataflowCustomEndpoint          types.String `tfsdk:"dataflow_custom_endpoint"`
 	IamCredentialsCustomEndpoint    types.String `tfsdk:"iam_credentials_custom_endpoint"`
 	ResourceManagerV3CustomEndpoint types.String `tfsdk:"resource_manager_v3_custom_endpoint"`
-{{- if ne $.TargetVersionName "ga" }}
-	RuntimeconfigCustomEndpoint     types.String `tfsdk:"runtimeconfig_custom_endpoint"`
-{{- end }}
 	IAMCustomEndpoint               types.String `tfsdk:"iam_custom_endpoint"`
 	TagsLocationCustomEndpoint      types.String `tfsdk:"tags_location_custom_endpoint"`
 
@@ -64,6 +60,13 @@ type ProviderModel struct {
 	CloudResourceManagerCustomEndpoint types.String `tfsdk:"cloud_resource_manager_custom_endpoint"`
 	FirebaserulesCustomEndpoint        types.String `tfsdk:"firebaserules_custom_endpoint"`
 	RecaptchaEnterpriseCustomEndpoint  types.String `tfsdk:"recaptcha_enterprise_custom_endpoint"`
+
+	// Tombstoned
+{{- if ne $.TargetVersionName "ga" }}
+	RuntimeconfigCustomEndpoint types.String `tfsdk:"runtimeconfig_custom_endpoint"`
+{{- end }}
+	CoreBillingCustomEndpoint   types.String `tfsdk:"core_billing_custom_endpoint"`
+	BillingCustomEndpoint       types.String `tfsdk:"billing_custom_endpoint"`
 }
 
 type ProviderBatching struct {
diff --git a/mmv1/third_party/terraform/fwprovider/framework_provider.go.tmpl b/mmv1/third_party/terraform/fwprovider/framework_provider.go.tmpl
@@ -182,12 +182,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
             },
 
             // Handwritten Products / Versioned / Atypical Entries
-            "cloud_billing_custom_endpoint": &schema.StringAttribute{
-                Optional:     true,
-                Validators: []validator.String{
-                    transport_tpg.CustomEndpointValidator(),
-                },
-            },
             "dataflow_custom_endpoint": &schema.StringAttribute{
                 Optional:     true,
                 Validators: []validator.String{
@@ -206,14 +200,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
                     transport_tpg.CustomEndpointValidator(),
                 },
             },
-            {{- if ne $.TargetVersionName "ga" }}
-            "runtimeconfig_custom_endpoint": &schema.StringAttribute{
-                Optional:     true,
-                Validators: []validator.String{
-                    transport_tpg.CustomEndpointValidator(),
-                },
-            },
-            {{- end }}
             "iam_custom_endpoint": &schema.StringAttribute{
                 Optional:     true,
                 Validators: []validator.String{
@@ -270,6 +256,32 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
                     transport_tpg.CustomEndpointValidator(),
                 },
             },
+
+            {{- if ne $.TargetVersionName "ga" }}
+			// Tombstoned - nonfunctional. https://github.com/hashicorp/terraform-provider-google/issues/26814
+            "runtimeconfig_custom_endpoint": &schema.StringAttribute{
+                Optional:     true,
+                Validators: []validator.String{
+                    transport_tpg.CustomEndpointValidator(),
+                },
+            },
+            {{- end }}
+
+			// Tombstoned - nonfunctional. https://github.com/hashicorp/terraform-provider-google/issues/27037
+            "core_billing_custom_endpoint": &schema.StringAttribute{
+                Optional:     true,
+                Validators: []validator.String{
+                    transport_tpg.CustomEndpointValidator(),
+                },
+            },
+
+            // Tombstoned - nonfunctional. https://github.com/hashicorp/terraform-provider-google/issues/27038
+			"billing_custom_endpoint": &schema.StringAttribute{
+				Optional: true,
+				Validators: []validator.String{
+					transport_tpg.CustomEndpointValidator(),
+				},
+			},
         },
         Blocks: map[string]schema.Block{
             "batching": schema.ListNestedBlock{
diff --git a/mmv1/third_party/terraform/provider/provider.go.tmpl b/mmv1/third_party/terraform/provider/provider.go.tmpl
@@ -177,7 +177,6 @@ func Provider() *schema.Provider {
 			},
 
 			// Handwritten Products / Versioned / Atypical Entries
-			transport_tpg.CloudBillingCustomEndpointEntryKey:           transport_tpg.CloudBillingCustomEndpointEntry,
 			transport_tpg.DataflowCustomEndpointEntryKey:               transport_tpg.DataflowCustomEndpointEntry,
 			transport_tpg.IamCredentialsCustomEndpointEntryKey:         transport_tpg.IamCredentialsCustomEndpointEntry,
 			transport_tpg.ResourceManagerV3CustomEndpointEntryKey:      transport_tpg.ResourceManagerV3CustomEndpointEntry,
@@ -201,6 +200,20 @@ func Provider() *schema.Provider {
 				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
 			},
 			{{- end }}
+
+			// Tombstoned - nonfunctional. https://github.com/hashicorp/terraform-provider-google/issues/27037
+			"core_billing_custom_endpoint": &schema.Schema{
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
+			},
+
+			// Tombstoned - nonfunctional. https://github.com/hashicorp/terraform-provider-google/issues/27038
+			"billing_custom_endpoint": &schema.Schema{
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
+			},
 		},
 
 		ProviderMetaSchema: map[string]*schema.Schema{
@@ -401,7 +414,6 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	{{- end }}
 
 	// Handwritten Products / Versioned / Atypical Entries
-	config.CloudBillingBasePath = d.Get(transport_tpg.CloudBillingCustomEndpointEntryKey).(string)
 	config.DataflowBasePath = d.Get(transport_tpg.DataflowCustomEndpointEntryKey).(string)
 	config.IamCredentialsBasePath = d.Get(transport_tpg.IamCredentialsCustomEndpointEntryKey).(string)
 	config.ResourceManagerV3BasePath = d.Get(transport_tpg.ResourceManagerV3CustomEndpointEntryKey).(string)
diff --git a/mmv1/third_party/terraform/services/billingbudgets/resource_billing_budget_test.go b/mmv1/third_party/terraform/services/billingbudgets/resource_billing_budget_test.go
@@ -1,4 +1,4 @@
-package billing_test
+package billingbudgets_test
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
 	"github.com/hashicorp/terraform-provider-google/google/envvar"
-	"github.com/hashicorp/terraform-provider-google/google/services/billing"
+	"github.com/hashicorp/terraform-provider-google/google/services/billingbudgets"
 	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 )
 
@@ -22,7 +22,7 @@ func TestAccBillingBudget_billingBudgetCurrencycode(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckBillingBudgetDestroyProducer(t),
+		CheckDestroy:             testAccCheckBillingBudgetsBudgetDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccBillingBudget_billingBudgetCurrencycode(context),
@@ -80,7 +80,7 @@ func TestAccBillingBudget_billingBudgetUpdate(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckBillingBudgetDestroyProducer(t),
+		CheckDestroy:             testAccCheckBillingBudgetsBudgetDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccBillingBudget_billingBudgetUpdateStart(context),
@@ -137,7 +137,7 @@ func TestAccBillingBudget_billingFilterSubaccounts(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckBillingBudgetDestroyProducer(t),
+		CheckDestroy:             testAccCheckBillingBudgetsBudgetDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccBillingBudget_billingFilterSubaccounts(context),
@@ -523,7 +523,7 @@ func TestBillingBudgetStateUpgradeV0(t *testing.T) {
 	}
 	for tn, tc := range cases {
 		t.Run(tn, func(t *testing.T) {
-			actual, err := billing.ResourceBillingBudgetUpgradeV0(context.Background(), tc.Attributes, tc.Meta)
+			actual, err := billingbudgets.ResourceBillingBudgetsBudgetUpgradeV0(context.Background(), tc.Attributes, tc.Meta)
 
 			if err != nil {
 				t.Error(err)
@@ -553,7 +553,7 @@ func TestAccBillingBudget_budgetFilterProjectsOrdering(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckBillingBudgetDestroyProducer(t),
+		CheckDestroy:             testAccCheckBillingBudgetsBudgetDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccBillingBudget_budgetFilterProjectsOrdering1(context),
diff --git a/mmv1/third_party/terraform/services/cloudbilling/data_source_google_billing_account.go b/mmv1/third_party/terraform/services/cloudbilling/data_source_google_billing_account.go
@@ -1,4 +1,4 @@
-package billing
+package cloudbilling
 
 import (
 	"fmt"
diff --git a/mmv1/third_party/terraform/services/cloudbilling/data_source_google_billing_account_test.go b/mmv1/third_party/terraform/services/cloudbilling/data_source_google_billing_account_test.go
@@ -1,4 +1,4 @@
-package billing_test
+package cloudbilling_test
 
 import (
 	"fmt"
diff --git a/mmv1/third_party/terraform/services/cloudbilling/iam_billing_account.go b/mmv1/third_party/terraform/services/cloudbilling/iam_billing_account.go
@@ -1,4 +1,4 @@
-package billing
+package cloudbilling
 
 import (
 	"fmt"
diff --git a/mmv1/third_party/terraform/services/cloudbilling/iam_billing_account_test.go b/mmv1/third_party/terraform/services/cloudbilling/iam_billing_account_test.go
@@ -1,4 +1,4 @@
-package billing_test
+package cloudbilling_test
 
 import (
 	"fmt"
diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_billing_subaccount.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_billing_subaccount.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
 	"github.com/hashicorp/terraform-provider-google/google/registry"
-	"github.com/hashicorp/terraform-provider-google/google/services/billing"
+	cloudbilling_tpg "github.com/hashicorp/terraform-provider-google/google/services/cloudbilling"
 	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 	"google.golang.org/api/cloudbilling/v1"
@@ -72,7 +72,7 @@ func resourceBillingSubaccountCreate(d *schema.ResourceData, meta interface{}) e
 
 	billingAccount := &cloudbilling.BillingAccount{
 		DisplayName:          displayName,
-		MasterBillingAccount: billing.CanonicalBillingAccountName(masterBillingAccount),
+		MasterBillingAccount: cloudbilling_tpg.CanonicalBillingAccountName(masterBillingAccount),
 	}
 
 	res, err := config.NewBillingClient(userAgent).BillingAccounts.Create(billingAccount).Do()
diff --git a/mmv1/third_party/terraform/transport/config.go.tmpl b/mmv1/third_party/terraform/transport/config.go.tmpl
@@ -270,7 +270,6 @@ type Config struct {
 	{{- end -}}
 	{{- end }}
 
-	CloudBillingBasePath string
 	DataflowBasePath string
 	IamCredentialsBasePath string
 	ResourceManagerV3BasePath string
@@ -296,7 +295,6 @@ type Config struct {
 {{- range $product := $.Products }}
 const {{ $product.Name }}BasePathKey = "{{ $product.Name }}"
 {{- end }}
-const CloudBillingBasePathKey = "CloudBilling"
 const DataflowBasePathKey = "Dataflow"
 const IAMBasePathKey = "IAM"
 const IamCredentialsBasePathKey = "IamCredentials"
@@ -310,7 +308,6 @@ var DefaultBasePaths = map[string]string{
 {{- range $product := $.Products }}
 	{{ $product.Name }}BasePathKey : "{{ $product.Version.BaseUrl }}",
 {{- end }}
-	CloudBillingBasePathKey : "https://cloudbilling.googleapis.com/v1/",
 	DataflowBasePathKey : "https://dataflow.googleapis.com/v1b3/",
 	IAMBasePathKey : "https://iam.googleapis.com/v1/",
 	IamCredentialsBasePathKey : "https://iamcredentials.googleapis.com/v1/",
@@ -419,12 +416,6 @@ func SetEndpointDefaults(d *schema.ResourceData) error {
 	}
 	{{- end }}
 
-	if d.Get(CloudBillingCustomEndpointEntryKey) == "" {
-		d.Set(CloudBillingCustomEndpointEntryKey, MultiEnvDefault([]string{
-			"GOOGLE_CLOUD_BILLING_CUSTOM_ENDPOINT",
-		}, DefaultBasePaths[CloudBillingBasePathKey]))
-	}
-
 	if d.Get(DataflowCustomEndpointEntryKey) == "" {
 		d.Set(DataflowCustomEndpointEntryKey, MultiEnvDefault([]string{
 			"GOOGLE_DATAFLOW_CUSTOM_ENDPOINT",
@@ -1503,7 +1494,6 @@ func ConfigureBasePaths(c *Config) {
 	{{- end }}
 
 	// Handwritten Products / Versioned / Atypical Entries
-	c.CloudBillingBasePath = DefaultBasePaths[CloudBillingBasePathKey]
 	c.DataflowBasePath = DefaultBasePaths[DataflowBasePathKey]
 	c.IamCredentialsBasePath = DefaultBasePaths[IamCredentialsBasePathKey]
 	c.ResourceManagerV3BasePath = DefaultBasePaths[ResourceManagerV3BasePathKey]
diff --git a/mmv1/third_party/terraform/transport/provider_handwritten_endpoint.go b/mmv1/third_party/terraform/transport/provider_handwritten_endpoint.go
@@ -9,13 +9,6 @@ import (
 // files. Collect handwritten ones here. If any of these are modified, be sure
 // to update the provider_reference docs page.
 
-var CloudBillingCustomEndpointEntryKey = "cloud_billing_custom_endpoint"
-var CloudBillingCustomEndpointEntry = &schema.Schema{
-	Type:         schema.TypeString,
-	Optional:     true,
-	ValidateFunc: ValidateCustomEndpoint,
-}
-
 var DataflowCustomEndpointEntryKey = "dataflow_custom_endpoint"
 var DataflowCustomEndpointEntry = &schema.Schema{
 	Type:         schema.TypeString,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-func resourceBillingBudgetResourceV0() *schema.Resource {`
	`1`	`+func resourceBillingBudgetsBudgetResourceV0() *schema.Resource {`
`2`	`2`	`return &schema.Resource{`
`3`	`3`	`Schema: map[string]*schema.Schema{`
`4`	`4`	`"amount": {`
@@ -241,7 +241,7 @@ billingAccounts/{billingAccountId}/budgets/{budgetId}.`,
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`
`244`		`-func ResourceBillingBudgetUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {`
	`244`	`+func ResourceBillingBudgetsBudgetUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {`
`245`	`245`	`log.Printf("[DEBUG] Attributes before migration: %#v", rawState)`
`246`	`246`
`247`	`247`	`rawState["name"] = tpgresource.GetResourceNameFromSelfLink(rawState["name"].(string))`