From 8a931241f20bc14de3f88d409d72770be8ced322 Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:23:54 -0500 Subject: [PATCH] chore: fix missing/incorrect license headers (#18555) --- .copywrite.hcl | 1 + agent/xds/configfetcher/config_fetcher.go | 3 +++ agent/xds/proxystateconverter/locality_policy.go | 2 +- agent/xds/proxystateconverter/locality_policy_ce.go | 2 +- internal/mesh/internal/controllers/register.go | 2 +- internal/mesh/internal/controllers/xds/controller.go | 3 +++ internal/mesh/internal/controllers/xds/controller_test.go | 2 +- internal/mesh/internal/controllers/xds/endpoint_builder.go | 3 +++ .../mesh/internal/controllers/xds/endpoint_builder_test.go | 3 +++ internal/mesh/internal/controllers/xds/mock_updater.go | 3 +++ internal/mesh/internal/controllers/xds/reconciliation_data.go | 3 +++ internal/mesh/internal/controllers/xds/status/status.go | 3 +++ internal/protohcl/any.go | 3 +++ internal/protohcl/attributes.go | 3 +++ internal/protohcl/blocks.go | 3 +++ internal/protohcl/cty.go | 3 +++ internal/protohcl/decoder.go | 3 +++ internal/protohcl/doc.go | 3 +++ internal/protohcl/naming.go | 3 +++ internal/protohcl/oneof.go | 3 +++ internal/protohcl/primitives.go | 3 +++ internal/protohcl/testproto/buf.gen.yaml | 3 +++ internal/protohcl/testproto/example.pb.go | 3 +++ internal/protohcl/testproto/example.proto | 3 +++ internal/protohcl/unmarshal.go | 3 +++ internal/protohcl/unmarshal_test.go | 3 +++ internal/protohcl/well_known_types.go | 3 +++ internal/resourcehcl/any.go | 3 +++ internal/resourcehcl/naming.go | 3 +++ internal/resourcehcl/unmarshal.go | 3 +++ internal/resourcehcl/unmarshal_test.go | 3 +++ 31 files changed, 83 insertions(+), 4 deletions(-) diff --git a/.copywrite.hcl b/.copywrite.hcl index 6e582b094b..dbe52115c2 100644 --- a/.copywrite.hcl +++ b/.copywrite.hcl @@ -19,6 +19,7 @@ project { # ignore specific test data files "agent/uiserver/testdata/**", + "internal/resourcehcl/testdata/**", # generated files "agent/structs/structs.deepcopy.go", diff --git a/agent/xds/configfetcher/config_fetcher.go b/agent/xds/configfetcher/config_fetcher.go index 8d4d311caf..db7d4f2035 100644 --- a/agent/xds/configfetcher/config_fetcher.go +++ b/agent/xds/configfetcher/config_fetcher.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package configfetcher // ConfigFetcher is the interface the agent needs to expose diff --git a/agent/xds/proxystateconverter/locality_policy.go b/agent/xds/proxystateconverter/locality_policy.go index db62e63f5f..c33f428fc2 100644 --- a/agent/xds/proxystateconverter/locality_policy.go +++ b/agent/xds/proxystateconverter/locality_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/locality_policy_ce.go b/agent/xds/proxystateconverter/locality_policy_ce.go index 007501ffab..014ed0f8b9 100644 --- a/agent/xds/proxystateconverter/locality_policy_ce.go +++ b/agent/xds/proxystateconverter/locality_policy_ce.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/internal/mesh/internal/controllers/register.go b/internal/mesh/internal/controllers/register.go index b6b8ac855b..e48540609c 100644 --- a/internal/mesh/internal/controllers/register.go +++ b/internal/mesh/internal/controllers/register.go @@ -1,5 +1,5 @@ // Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 +// SPDX-License-Identifier: BUSL-1.1 package controllers diff --git a/internal/mesh/internal/controllers/xds/controller.go b/internal/mesh/internal/controllers/xds/controller.go index 9cb7992d9f..1135f27f75 100644 --- a/internal/mesh/internal/controllers/xds/controller.go +++ b/internal/mesh/internal/controllers/xds/controller.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package xds import ( diff --git a/internal/mesh/internal/controllers/xds/controller_test.go b/internal/mesh/internal/controllers/xds/controller_test.go index cd8a5adc22..2363c0cb84 100644 --- a/internal/mesh/internal/controllers/xds/controller_test.go +++ b/internal/mesh/internal/controllers/xds/controller_test.go @@ -1,5 +1,5 @@ // Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 +// SPDX-License-Identifier: BUSL-1.1 package xds diff --git a/internal/mesh/internal/controllers/xds/endpoint_builder.go b/internal/mesh/internal/controllers/xds/endpoint_builder.go index 71cae4b9b4..715dd2544b 100644 --- a/internal/mesh/internal/controllers/xds/endpoint_builder.go +++ b/internal/mesh/internal/controllers/xds/endpoint_builder.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package xds import ( diff --git a/internal/mesh/internal/controllers/xds/endpoint_builder_test.go b/internal/mesh/internal/controllers/xds/endpoint_builder_test.go index 6334429abd..3340014e06 100644 --- a/internal/mesh/internal/controllers/xds/endpoint_builder_test.go +++ b/internal/mesh/internal/controllers/xds/endpoint_builder_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package xds import ( diff --git a/internal/mesh/internal/controllers/xds/mock_updater.go b/internal/mesh/internal/controllers/xds/mock_updater.go index fc27382d6e..3b8554f491 100644 --- a/internal/mesh/internal/controllers/xds/mock_updater.go +++ b/internal/mesh/internal/controllers/xds/mock_updater.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package xds import ( diff --git a/internal/mesh/internal/controllers/xds/reconciliation_data.go b/internal/mesh/internal/controllers/xds/reconciliation_data.go index 53b515a052..a4aae8fdc4 100644 --- a/internal/mesh/internal/controllers/xds/reconciliation_data.go +++ b/internal/mesh/internal/controllers/xds/reconciliation_data.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package xds import ( diff --git a/internal/mesh/internal/controllers/xds/status/status.go b/internal/mesh/internal/controllers/xds/status/status.go index 796bec4222..0aff944f54 100644 --- a/internal/mesh/internal/controllers/xds/status/status.go +++ b/internal/mesh/internal/controllers/xds/status/status.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package status import ( diff --git a/internal/protohcl/any.go b/internal/protohcl/any.go index bc2a8c6faa..87b4549bfd 100644 --- a/internal/protohcl/any.go +++ b/internal/protohcl/any.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/attributes.go b/internal/protohcl/attributes.go index 1339a3be22..90501722b1 100644 --- a/internal/protohcl/attributes.go +++ b/internal/protohcl/attributes.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/blocks.go b/internal/protohcl/blocks.go index dd156f29a4..cafffa9936 100644 --- a/internal/protohcl/blocks.go +++ b/internal/protohcl/blocks.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/cty.go b/internal/protohcl/cty.go index 2a0ec9ba24..e7ed37ed16 100644 --- a/internal/protohcl/cty.go +++ b/internal/protohcl/cty.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/decoder.go b/internal/protohcl/decoder.go index 23735acd71..67ee074ec1 100644 --- a/internal/protohcl/decoder.go +++ b/internal/protohcl/decoder.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/doc.go b/internal/protohcl/doc.go index aef25a109e..e3270f7cdc 100644 --- a/internal/protohcl/doc.go +++ b/internal/protohcl/doc.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + // The protohcl package aims to define a canonical way to translate between // protobuf and HCL encodings of data. // diff --git a/internal/protohcl/naming.go b/internal/protohcl/naming.go index 14f83f1f48..d8eef2275f 100644 --- a/internal/protohcl/naming.go +++ b/internal/protohcl/naming.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import "google.golang.org/protobuf/reflect/protoreflect" diff --git a/internal/protohcl/oneof.go b/internal/protohcl/oneof.go index 798c3a78d6..0c95326614 100644 --- a/internal/protohcl/oneof.go +++ b/internal/protohcl/oneof.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/primitives.go b/internal/protohcl/primitives.go index 8d2f1c0250..4d1f220330 100644 --- a/internal/protohcl/primitives.go +++ b/internal/protohcl/primitives.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/testproto/buf.gen.yaml b/internal/protohcl/testproto/buf.gen.yaml index 1adab9847c..fecee5cf24 100644 --- a/internal/protohcl/testproto/buf.gen.yaml +++ b/internal/protohcl/testproto/buf.gen.yaml @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: BUSL-1.1 + version: v1 managed: enabled: true diff --git a/internal/protohcl/testproto/example.pb.go b/internal/protohcl/testproto/example.pb.go index 06aba98dab..304eac53d6 100644 --- a/internal/protohcl/testproto/example.pb.go +++ b/internal/protohcl/testproto/example.pb.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.30.0 diff --git a/internal/protohcl/testproto/example.proto b/internal/protohcl/testproto/example.proto index 9a0633cd60..17bf737fa3 100644 --- a/internal/protohcl/testproto/example.proto +++ b/internal/protohcl/testproto/example.proto @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + syntax = "proto3"; package hashicorp.consul.internal.protohcl.testproto; diff --git a/internal/protohcl/unmarshal.go b/internal/protohcl/unmarshal.go index 5423651b3e..0f3c80a4c2 100644 --- a/internal/protohcl/unmarshal.go +++ b/internal/protohcl/unmarshal.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/unmarshal_test.go b/internal/protohcl/unmarshal_test.go index 5f0eb9b180..ef00de3ffb 100644 --- a/internal/protohcl/unmarshal_test.go +++ b/internal/protohcl/unmarshal_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/protohcl/well_known_types.go b/internal/protohcl/well_known_types.go index 508d9dfffe..756f908fc4 100644 --- a/internal/protohcl/well_known_types.go +++ b/internal/protohcl/well_known_types.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package protohcl import ( diff --git a/internal/resourcehcl/any.go b/internal/resourcehcl/any.go index 0f2d657d15..3d797c48e5 100644 --- a/internal/resourcehcl/any.go +++ b/internal/resourcehcl/any.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package resourcehcl import ( diff --git a/internal/resourcehcl/naming.go b/internal/resourcehcl/naming.go index 7c714bb5b6..a1160cc323 100644 --- a/internal/resourcehcl/naming.go +++ b/internal/resourcehcl/naming.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package resourcehcl import ( diff --git a/internal/resourcehcl/unmarshal.go b/internal/resourcehcl/unmarshal.go index fba8bbdb53..610ebc641b 100644 --- a/internal/resourcehcl/unmarshal.go +++ b/internal/resourcehcl/unmarshal.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package resourcehcl import ( diff --git a/internal/resourcehcl/unmarshal_test.go b/internal/resourcehcl/unmarshal_test.go index a47d3c805c..5e35f7df66 100644 --- a/internal/resourcehcl/unmarshal_test.go +++ b/internal/resourcehcl/unmarshal_test.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: BUSL-1.1 + package resourcehcl_test import (