Split pbmesh.UpstreamsConfiguration out of pbmesh.Upstreams

Configuration that previously was inlined into the Upstreams resource applies to both explicit and implicit upstreams
and so it makes sense to split it out into its own resource.

internal/mesh/exports.go

@@ -22,8 +22,9 @@ var (
 
 	// Resource Types for the v1alpha1 version.
 
-	ProxyConfigurationV1Alpha1Type = types.ProxyConfigurationV1Alpha1Type
-	UpstreamsV1Alpha1Type          = types.UpstreamsV1Alpha1Type
+	ProxyConfigurationV1Alpha1Type     = types.ProxyConfigurationV1Alpha1Type
+	UpstreamsV1Alpha1Type              = types.UpstreamsV1Alpha1Type
+	UpstreamsConfigurationV1Alpha1Type = types.UpstreamsConfigurationV1Alpha1Type
 )
 
 // RegisterTypes adds all resource types within the "catalog" API group

internal/mesh/internal/types/types.go

@@ -16,4 +16,5 @@ const (
 func Register(r resource.Registry) {
 	RegisterProxyConfiguration(r)
 	RegisterUpstreams(r)
+	RegisterUpstreamsConfiguration(r)
 }

internal/mesh/internal/types/upstreams.go

@@ -25,7 +25,7 @@ var (
 
 func RegisterUpstreams(r resource.Registry) {
 	r.Register(resource.Registration{
-		Type:     UpstreamsV1Alpha1Type,
+		Type:     UpstreamsType,
 		Proto:    &pbmesh.Upstreams{},
 		Validate: nil,
 	})

internal/mesh/internal/types/upstreams_configuration.go

@@ -0,0 +1,32 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package types
+
+import (
+	"github.com/hashicorp/consul/internal/resource"
+	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v1alpha1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
+)
+
+const (
+	UpstreamsConfigurationKind = "UpstreamsConfiguration"
+)
+
+var (
+	UpstreamsConfigurationV1Alpha1Type = &pbresource.Type{
+		Group:        GroupName,
+		GroupVersion: CurrentVersion,
+		Kind:         UpstreamsConfigurationKind,
+	}
+
+	UpstreamsConfigurationType = UpstreamsConfigurationV1Alpha1Type
+)
+
+func RegisterUpstreamsConfiguration(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     UpstreamsConfigurationType,
+		Proto:    &pbmesh.UpstreamsConfiguration{},
+		Validate: nil,
+	})
+}