Merge branch 'jm/NET-4853' into jm/NET-4932

hashicorp · Aug 17, 2023 · b98ea30 · b98ea30
2 parents 982564b + 1b2319b
commit b98ea30
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
   <span>Consul</span>
 </h1>
 
-[![Docker Pulls](https://img.shields.io/docker/pulls/hashicorp/consul.svg)](https://hub.docker.com/hashicorp/consul)
 [![License: BUSL-1.1](https://img.shields.io/badge/License-BUSL--1.1-yellow.svg)](LICENSE)
+[![Docker Pulls](https://img.shields.io/docker/pulls/hashicorp/consul.svg)](https://hub.docker.com/r/hashicorp/consul)
 [![Go Report Card](https://goreportcard.com/badge/github.com/hashicorp/consul)](https://goreportcard.com/report/github.com/hashicorp/consul)
 
 Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure.

diff --git a/agent/xds/endpoints_test.go b/agent/xds/endpoints_test.go
@@ -8,6 +8,8 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/hashicorp/go-hclog"
+
 	envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	"github.com/hashicorp/consul/agent/proxycfg"

diff --git a/agent/xds/proxystateconverter/clusters.go b/agent/xds/proxystateconverter/clusters.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: BUSL-1.1
 
 package proxystateconverter
 

diff --git a/agent/xds/proxystateconverter/converter.go b/agent/xds/proxystateconverter/converter.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: BUSL-1.1
 
 package proxystateconverter
 
@@ -70,7 +70,6 @@ func (g *Converter) resourcesFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) erro
 	//if err != nil {
 	//	return err
 	//}
-
 	//g.secretsFromSnapshot(cfgSnap)
 	return nil
 }

diff --git a/agent/xds/proxystateconverter/endpoints.go b/agent/xds/proxystateconverter/endpoints.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: BUSL-1.1
 
 package proxystateconverter
 

diff --git a/agent/xds/proxystateconverter/failover_policy.go b/agent/xds/proxystateconverter/failover_policy.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: BUSL-1.1
 
 package proxystateconverter
 

diff --git a/agent/xds/proxystateconverter/failover_policy_oss.go b/agent/xds/proxystateconverter/failover_policy_oss.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: BUSL-1.1
 
 //go:build !consulent
 // +build !consulent

diff --git a/agent/xds/proxystateconverter/listeners.go b/agent/xds/proxystateconverter/listeners.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: BUSL-1.1
 
 package proxystateconverter
 

diff --git a/agent/xdsv2/cluster_resources.go b/agent/xdsv2/cluster_resources.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package xdsv2
 
 import (

diff --git a/agent/xdsv2/endpoint_resources.go b/agent/xdsv2/endpoint_resources.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package xdsv2
 
 import (

diff --git a/agent/xdsv2/listener_resources.go b/agent/xdsv2/listener_resources.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package xdsv2
 
 import (

diff --git a/agent/xdsv2/resources.go b/agent/xdsv2/resources.go
@@ -1,5 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: BUSL-1.1
 
 package xdsv2
 
@@ -56,6 +56,7 @@ func (pr *ProxyResources) generateXDSResources() error {
 		}
 		listeners = append(listeners, protoListener)
 	}
+
 	pr.envoyResources[xdscommon.ListenerType] = listeners
 
 	clusters, err := pr.makeXDSClusters()

diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
 package xdsv2
 
 import (