From 527a15353e3ab9b78af90123f4885d354af00ba1 Mon Sep 17 00:00:00 2001 From: Tony Carmichael <1105554+aicarmic@users.noreply.github.com> Date: Mon, 13 Jul 2020 13:26:29 -0600 Subject: [PATCH 1/3] Update publishing.html.md Add OSS license requirement and list of permitted licenses to the instructions. --- .../docs/registry/providers/publishing.html.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/website/docs/registry/providers/publishing.html.md b/website/docs/registry/providers/publishing.html.md index 730177c0c..969c97988 100644 --- a/website/docs/registry/providers/publishing.html.md +++ b/website/docs/registry/providers/publishing.html.md @@ -14,7 +14,23 @@ description: |- Providers published to the Terraform Registry are written and built in the same way as other Terraform Providers. For guidance on how to write a provider, see [Writing Custom Providers](/docs/extend/writing-custom-providers.html). -The provider repository on GitHub must match the pattern `terraform-provider-{NAME}`, and the repository must be public. +The provider repository on GitHub must match the pattern `terraform-provider-{NAME}`, and the repository must be public. All Terraform providers must contain one of the following open source licenses: + +* CDDL 1.0, 2.0 +* CPL 1.0 +* Eclipse Public License (EPL) 1.0 +* MPL 1.0, 1.1, 2.0 +* APSL 2.0 +* Ruby's Licensing +* AFL 2.1, 3.0 +* Apache License 2.0 +* Artistic License 1.0, 2.0 +* Apache Software License (ASL) 1.1 +* Boost Software License +* BSD, BSD 3-clause, "BSD-new" +* CC-BY +* Microsoft Public License (MS-PL) +* MIT ### Documenting your Provider From 73d31e5eef3efc7574e723f1df5ee5ad2256bcb0 Mon Sep 17 00:00:00 2001 From: Tony Carmichael <1105554+aicarmic@users.noreply.github.com> Date: Tue, 14 Jul 2020 17:59:14 -0600 Subject: [PATCH 2/3] Update publishing.html.md modify to add separate header so we can target link to this section, and clarify that the licensing requirement is for verified/partner providers only --- website/docs/registry/providers/publishing.html.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/registry/providers/publishing.html.md b/website/docs/registry/providers/publishing.html.md index 969c97988..814a52d9b 100644 --- a/website/docs/registry/providers/publishing.html.md +++ b/website/docs/registry/providers/publishing.html.md @@ -14,8 +14,10 @@ description: |- Providers published to the Terraform Registry are written and built in the same way as other Terraform Providers. For guidance on how to write a provider, see [Writing Custom Providers](/docs/extend/writing-custom-providers.html). -The provider repository on GitHub must match the pattern `terraform-provider-{NAME}`, and the repository must be public. All Terraform providers must contain one of the following open source licenses: +The provider repository on GitHub must match the pattern `terraform-provider-{NAME}`, and the repository must be public. +#### Licensing a Provider +All Terraform Verified providers must contain one of the following open source licenses. This requirement does not apply to Community providers: * CDDL 1.0, 2.0 * CPL 1.0 * Eclipse Public License (EPL) 1.0 From aa36cbc76935651411ce9815f820be09c82aecf2 Mon Sep 17 00:00:00 2001 From: Tony Carmichael <1105554+aicarmic@users.noreply.github.com> Date: Thu, 16 Jul 2020 11:29:16 -0600 Subject: [PATCH 3/3] Update website/docs/registry/providers/publishing.html.md Co-authored-by: Paul Tyng --- website/docs/registry/providers/publishing.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/registry/providers/publishing.html.md b/website/docs/registry/providers/publishing.html.md index 814a52d9b..2a5334ca7 100644 --- a/website/docs/registry/providers/publishing.html.md +++ b/website/docs/registry/providers/publishing.html.md @@ -16,7 +16,7 @@ Providers published to the Terraform Registry are written and built in the same The provider repository on GitHub must match the pattern `terraform-provider-{NAME}`, and the repository must be public. -#### Licensing a Provider +#### Licensing a Verified Provider All Terraform Verified providers must contain one of the following open source licenses. This requirement does not apply to Community providers: * CDDL 1.0, 2.0 * CPL 1.0