mesh: adding the protobuf types and resources backing mesh config v2

internal/catalog/exports.go

@@ -32,6 +32,7 @@ var (
 	HealthStatusKind     = types.HealthStatusKind
 	HealthChecksKind     = types.HealthChecksKind
 	DNSPolicyKind        = types.DNSPolicyKind
+	FailoverPolicyKind   = types.FailoverPolicyKind
 
 	// Resource Types for the v1alpha1 version.
 
@@ -43,6 +44,19 @@ var (
 	HealthStatusV1Alpha1Type     = types.HealthStatusV1Alpha1Type
 	HealthChecksV1Alpha1Type     = types.HealthChecksV1Alpha1Type
 	DNSPolicyV1Alpha1Type        = types.DNSPolicyV1Alpha1Type
+	FailoverPolicyV1Alpha1Type   = types.FailoverPolicyV1Alpha1Type
+
+	// Resource Types for the latest version.
+
+	WorkloadType         = types.WorkloadType
+	ServiceType          = types.ServiceType
+	ServiceEndpointsType = types.ServiceEndpointsType
+	VirtualIPsType       = types.VirtualIPsType
+	NodeType             = types.NodeType
+	HealthStatusType     = types.HealthStatusType
+	HealthChecksType     = types.HealthChecksType
+	DNSPolicyType        = types.DNSPolicyType
+	FailoverPolicyType   = types.FailoverPolicyType
 
 	// Controller Statuses
 	NodeHealthStatusKey              = nodehealth.StatusKey

internal/catalog/internal/types/failover_policy.go

@@ -0,0 +1,33 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package types
+
+import (
+	"github.com/hashicorp/consul/internal/resource"
+	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v1alpha1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
+)
+
+const (
+	FailoverPolicyKind = "FailoverPolicy"
+)
+
+var (
+	FailoverPolicyV1Alpha1Type = &pbresource.Type{
+		Group:        GroupName,
+		GroupVersion: VersionV1Alpha1,
+		Kind:         FailoverPolicyKind,
+	}
+
+	FailoverPolicyType = FailoverPolicyV1Alpha1Type
+)
+
+func RegisterFailoverPolicy(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     FailoverPolicyV1Alpha1Type,
+		Proto:    &pbcatalog.FailoverPolicy{},
+		Validate: nil,
+		Mutate:   nil,
+	})
+}

internal/catalog/internal/types/types.go

@@ -22,4 +22,5 @@ func Register(r resource.Registry) {
 	RegisterHealthChecks(r)
 	RegisterDNSPolicy(r)
 	RegisterVirtualIPs(r)
+	RegisterFailoverPolicy(r)
 }

internal/mesh/exports.go

@@ -17,16 +17,39 @@ var (
 
 	// Resource Kind Names.
 
-	ProxyConfigurationKind = types.ProxyConfigurationKind
-	UpstreamsKind          = types.UpstreamsKind
-	ProxyStateKind         = types.ProxyStateTemplateKind
+	ProxyConfigurationKind     = types.ProxyConfigurationKind
+	UpstreamsKind              = types.UpstreamsKind
+	UpstreamsConfigurationKind = types.UpstreamsConfigurationKind
+	ProxyStateKind             = types.ProxyStateTemplateKind
+	HTTPRouteKind              = types.HTTPRouteKind
+	GRPCRouteKind              = types.GRPCRouteKind
+	TCPRouteKind               = types.TCPRouteKind
+	DestinationPolicyKind      = types.DestinationPolicyKind
+	ComputedRoutesKind         = types.ComputedRoutesKind
 
 	// Resource Types for the v1alpha1 version.
 
 	ProxyConfigurationV1Alpha1Type              = types.ProxyConfigurationV1Alpha1Type
 	UpstreamsV1Alpha1Type                       = types.UpstreamsV1Alpha1Type
 	UpstreamsConfigurationV1Alpha1Type          = types.UpstreamsConfigurationV1Alpha1Type
 	ProxyStateTemplateConfigurationV1Alpha1Type = types.ProxyStateTemplateV1Alpha1Type
+	HTTPRouteV1Alpha1Type                       = types.HTTPRouteV1Alpha1Type
+	GRPCRouteV1Alpha1Type                       = types.GRPCRouteV1Alpha1Type
+	TCPRouteV1Alpha1Type                        = types.TCPRouteV1Alpha1Type
+	DestinationPolicyV1Alpha1Type               = types.DestinationPolicyV1Alpha1Type
+	ComputedRoutesV1Alpha1Type                  = types.ComputedRoutesV1Alpha1Type
+
+	// Resource Types for the latest version.
+
+	ProxyConfigurationType              = types.ProxyConfigurationType
+	UpstreamsType                       = types.UpstreamsType
+	UpstreamsConfigurationType          = types.UpstreamsConfigurationType
+	ProxyStateTemplateConfigurationType = types.ProxyStateTemplateType
+	HTTPRouteType                       = types.HTTPRouteType
+	GRPCRouteType                       = types.GRPCRouteType
+	TCPRouteType                        = types.TCPRouteType
+	DestinationPolicyType               = types.DestinationPolicyType
+	ComputedRoutesType                  = types.ComputedRoutesType
 )
 
 // RegisterTypes adds all resource types within the "catalog" API group

internal/mesh/internal/types/computed_routes.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 (
+	ComputedRoutesKind = "ComputedRoutes"
+)
+
+var (
+	ComputedRoutesV1Alpha1Type = &pbresource.Type{
+		Group:        GroupName,
+		GroupVersion: VersionV1Alpha1,
+		Kind:         ComputedRoutesKind,
+	}
+
+	ComputedRoutesType = ComputedRoutesV1Alpha1Type
+)
+
+func RegisterComputedRoutes(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     ComputedRoutesV1Alpha1Type,
+		Proto:    &pbmesh.ComputedRoutes{},
+		Validate: nil,
+	})
+}

internal/mesh/internal/types/destination_policy.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 (
+	DestinationPolicyKind = "DestinationPolicy"
+)
+
+var (
+	DestinationPolicyV1Alpha1Type = &pbresource.Type{
+		Group:        GroupName,
+		GroupVersion: VersionV1Alpha1,
+		Kind:         DestinationPolicyKind,
+	}
+
+	DestinationPolicyType = DestinationPolicyV1Alpha1Type
+)
+
+func RegisterDestinationPolicy(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     DestinationPolicyV1Alpha1Type,
+		Proto:    &pbmesh.DestinationPolicy{},
+		Validate: nil,
+	})
+}

internal/mesh/internal/types/grpc_route.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 (
+	GRPCRouteKind = "GRPCRoute"
+)
+
+var (
+	GRPCRouteV1Alpha1Type = &pbresource.Type{
+		Group:        GroupName,
+		GroupVersion: VersionV1Alpha1,
+		Kind:         GRPCRouteKind,
+	}
+
+	GRPCRouteType = GRPCRouteV1Alpha1Type
+)
+
+func RegisterGRPCRoute(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     GRPCRouteV1Alpha1Type,
+		Proto:    &pbmesh.GRPCRoute{},
+		Validate: nil,
+	})
+}

internal/mesh/internal/types/http_route.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 (
+	HTTPRouteKind = "HTTPRoute"
+)
+
+var (
+	HTTPRouteV1Alpha1Type = &pbresource.Type{
+		Group:        GroupName,
+		GroupVersion: VersionV1Alpha1,
+		Kind:         HTTPRouteKind,
+	}
+
+	HTTPRouteType = HTTPRouteV1Alpha1Type
+)
+
+func RegisterHTTPRoute(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     HTTPRouteV1Alpha1Type,
+		Proto:    &pbmesh.HTTPRoute{},
+		Validate: nil,
+	})
+}

internal/mesh/internal/types/tcp_route.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 (
+	TCPRouteKind = "TCPRoute"
+)
+
+var (
+	TCPRouteV1Alpha1Type = &pbresource.Type{
+		Group:        GroupName,
+		GroupVersion: VersionV1Alpha1,
+		Kind:         TCPRouteKind,
+	}
+
+	TCPRouteType = TCPRouteV1Alpha1Type
+)
+
+func RegisterTCPRoute(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     TCPRouteV1Alpha1Type,
+		Proto:    &pbmesh.TCPRoute{},
+		Validate: nil,
+	})
+}

internal/mesh/internal/types/types.go

@@ -18,4 +18,9 @@ func Register(r resource.Registry) {
 	RegisterUpstreams(r)
 	RegisterUpstreamsConfiguration(r)
 	RegisterProxyStateTemplate(r)
+	RegisterHTTPRoute(r)
+	RegisterTCPRoute(r)
+	RegisterGRPCRoute(r)
+	RegisterDestinationPolicy(r)
+	RegisterComputedRoutes(r)
 }