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

Author: actions-user

mmv1/templates/terraform/product.go.tmpl

@@ -23,11 +23,16 @@ import (
     "{{ $.ImportPath }}/registry"
 )
 
-const ProductName = "{{ lower $.Name }}"
+var Product = registry.Product{
+    Name: "{{ lower $.Name }}",
+    BaseUrl: "{{ $.Version.BaseUrl }}",
+    {{- if $.Version.RepUrl }}
+    RepUrl: "{{ $.Version.RepUrl }}",
+    {{- end }}
+    CustomEndpointField: "{{ underscore $.Name }}_custom_endpoint",
+    CustomEndpointEnvVar: "GOOGLE_{{ upper (underscore $.Name) }}_CUSTOM_ENDPOINT",
+}
 
 func init() {
-    registry.Product{
-        Name: "{{ lower $.Name }}",
-	    BaseUrl: "{{ $.Version.BaseUrl }}",
-    }.Register()
+    Product.Register()
 }

mmv1/third_party/terraform/fwprovider/framework_provider.go.tmpl

@@ -21,6 +21,7 @@ import (
     "github.com/hashicorp/terraform-provider-google/google/fwvalidators"
     "github.com/hashicorp/terraform-provider-google/google/functions"
     "github.com/hashicorp/terraform-provider-google/google/fwmodels"
+    "github.com/hashicorp/terraform-provider-google/google/registry"
     "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager"
     "github.com/hashicorp/terraform-provider-google/google/services/apigee"
     "github.com/hashicorp/terraform-provider-google/google/services/secretmanager"
@@ -179,15 +180,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
             "prefer_regional_endpoints": schema.BoolAttribute{
                 Optional: true,
             },
-            // Generated Products
-            {{- range $product := $.Products }}
-            "{{ underscore $product.Name }}_custom_endpoint": &schema.StringAttribute{
-                Optional:     true,
-                Validators: []validator.String{
-                    transport_tpg.CustomEndpointValidator(),
-                },
-            },
-            {{- end }}
 
             // Handwritten Products / Versioned / Atypical Entries
             "cloud_billing_custom_endpoint": &schema.StringAttribute{
@@ -321,6 +313,14 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
             },
         },
     }
+	for _, p := range registry.ListProducts() {
+        resp.Schema.Attributes[p.CustomEndpointField] = &schema.StringAttribute{
+            Optional:     true,
+            Validators: []validator.String{
+                transport_tpg.CustomEndpointValidator(),
+            },
+        }
+	}
 }
 
 // Configure prepares the metadata/'meta' required for data sources and resources to function.

mmv1/third_party/terraform/provider/provider.go.tmpl

@@ -176,15 +176,6 @@ func Provider() *schema.Provider {
 				Optional: true,
 			},
 
-			// Generated Products
-			{{- range $product := $.Products }}
-			"{{ underscore $product.Name }}_custom_endpoint": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
-			},
-			{{- end }}
-
 			// Handwritten Products / Versioned / Atypical Entries
 			transport_tpg.CloudBillingCustomEndpointEntryKey:           transport_tpg.CloudBillingCustomEndpointEntry,
 			transport_tpg.DataflowCustomEndpointEntryKey:               transport_tpg.DataflowCustomEndpointEntry,
@@ -224,6 +215,14 @@ func Provider() *schema.Provider {
 		ResourcesMap: registry.ResourceMap(),
 	}
 
+	for _, p := range registry.ListProducts() {
+		provider.Schema[p.CustomEndpointField] = &schema.Schema{
+			Type:         schema.TypeString,
+			Optional:     true,
+			ValidateFunc: transport_tpg.ValidateCustomEndpoint,
+		}
+	}
+
 	provider.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 		return ProviderConfigure(ctx, d, provider)
 	}

mmv1/third_party/terraform/registry/registry.go

@@ -2,6 +2,9 @@ package registry
 
 import (
 	"log"
+	"maps"
+	"slices"
+	"strings"
 	"sync"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -14,6 +17,12 @@ type Product struct {
 	Name string
 	// BaseUrl is the base URL for API requests. It may contain Magic Modules templating directives.
 	BaseUrl string
+	// RepUrl is the base URL for regional API requests. It may contain Magic Modules templating directives.
+	RepUrl string
+	// CustomEndpointField is the name of the product's custom endpoint field in the provider schema.
+	CustomEndpointField string
+	// CustomEndpointEnvVar is the name of the product's custom endpoint environment variable.
+	CustomEndpointEnvVar string
 }
 
 // Register adds the product definition to the internal product registry.
@@ -26,6 +35,14 @@ func (p Product) Register() {
 	products.m[p.Name] = p
 }
 
+func ListProducts() []Product {
+	l := slices.Collect(maps.Values(products.m))
+	slices.SortFunc(l, func(a, b Product) int {
+		return strings.Compare(a.Name, b.Name)
+	})
+	return l
+}
+
 type registeredProducts struct {
 	sync.RWMutex
 	m map[string]Product