Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

license: MPL'ify proto-public (manual backport for 1.17.x) #20148

Merged
merged 2 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions proto-public/.copywrite.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
schema_version = 1

project {
license = "MPL-2.0"
copyright_year = 2024

# (OPTIONAL) A list of globs that should not have copyright/license headers.
# Supports doublestar glob patterns for more flexibility in defining which
# files or folders should be ignored
header_ignore = [
# "vendor/**",
# "**autogen**",
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

syntax = "proto3";

package hashicorp.consul.auth.v2beta1;
Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbauth/v2beta1/traffic_permissions.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions proto-public/pbauth/v2beta1/traffic_permissions.proto
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

syntax = "proto3";

package hashicorp.consul.auth.v2beta1;
Expand Down
2 changes: 1 addition & 1 deletion proto-public/pbauth/v2beta1/traffic_permissions_addon.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1
// SPDX-License-Identifier: MPL-2.0

package authv2beta1

Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbauth/v2beta1/workload_identity.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions proto-public/pbauth/v2beta1/workload_identity.proto
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

syntax = "proto3";

package hashicorp.consul.auth.v2beta1;
Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbcatalog/v2beta1/service_addon.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package catalogv2beta1

func (s *Service) IsMeshEnabled() bool {
Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbcatalog/v2beta1/service_addon_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package catalogv2beta1

import (
Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbcatalog/v2beta1/service_endpoints_addon.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package catalogv2beta1

import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package catalogv2beta1

import (
Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbcatalog/v2beta1/workload_addon.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package catalogv2beta1

import "golang.org/x/exp/slices"
Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbcatalog/v2beta1/workload_addon_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package catalogv2beta1

import (
Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbmesh/v2beta1/pbproxystate/protocol_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package pbproxystate

import (
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1
// SPDX-License-Identifier: MPL-2.0

syntax = "proto3";

Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbmesh/v2beta1/proxy_configuration_addon.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package meshv2beta1

func (p *ComputedProxyConfiguration) IsTransparentProxy() bool {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package meshv2beta1

import (
Expand Down
2 changes: 1 addition & 1 deletion proto-public/pbmesh/v2beta1/xroute_addons.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1
// SPDX-License-Identifier: MPL-2.0

package meshv2beta1

Expand Down
2 changes: 1 addition & 1 deletion proto-public/pbmesh/v2beta1/xroute_addons_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1
// SPDX-License-Identifier: MPL-2.0

package meshv2beta1

Expand Down
3 changes: 3 additions & 0 deletions proto-public/pbtenancy/v1alpha1/namespace.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions proto-public/pbtenancy/v1alpha1/namespace.proto
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

syntax = "proto3";

package hashicorp.consul.tenancy.v1alpha1;
Expand Down
Loading