Merge branch 'main' into jm/req-host-val

.github/workflows/go-tests.yml

@@ -395,6 +395,12 @@ jobs:
       runs-on: ${{ needs.setup.outputs.compute-xl }}
       repository-name: ${{ github.repository }}
       go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
+      # pinning this to 1.20.5 because this issue in go-testcontainers occurs
+      # in 1.20.6 with the error "http: invalid Host header, host port waiting failed"
+      # https://github.com/testcontainers/testcontainers-go/issues/1359
+      # remove setting this when the above issue is fixed so that the reusable
+      # job will just get the go version from go.mod.
+      go-version: "1.20.5"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read

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/proxy_configuration.go

@@ -16,7 +16,7 @@ const (
 var (
 	ProxyConfigurationV1Alpha1Type = &pbresource.Type{
 		Group:        GroupName,
-		GroupVersion: CurrentVersion,
+		GroupVersion: VersionV1Alpha1,
 		Kind:         ProxyConfigurationKind,
 	}
 

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

@@ -16,7 +16,7 @@ const (
 var (
 	UpstreamsV1Alpha1Type = &pbresource.Type{
 		Group:        GroupName,
-		GroupVersion: CurrentVersion,
+		GroupVersion: VersionV1Alpha1,
 		Kind:         UpstreamsKind,
 	}
 

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: VersionV1Alpha1,
+		Kind:         UpstreamsConfigurationKind,
+	}
+
+	UpstreamsConfigurationType = UpstreamsConfigurationV1Alpha1Type
+)
+
+func RegisterUpstreamsConfiguration(r resource.Registry) {
+	r.Register(resource.Registration{
+		Type:     UpstreamsConfigurationV1Alpha1Type,
+		Proto:    &pbmesh.UpstreamsConfiguration{},
+		Validate: nil,
+	})
+}