From 327a3560b35c5994647938958aa5523f319094b8 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Fri, 20 May 2022 12:25:30 +0200 Subject: [PATCH] Relicense SOPS module to MPL 2.0 This relicenses all of our SOPS implementation code to MPL 2.0, where Apache 2.0 was previously used due to code being written from scratch. By making this license change, we are better capable of contributing the changes upstream. In case there is doubt about validity of DCO sign-off to make such changes: all code where Apache 2.0 license applies were authored by myself. In addition, Apache 2.0 is compatible with MPL 2.0[1][2]. [1]: https://opensource.com/law/11/9/mpl-20-copyleft-and-license-compatibility [2]: https://blog.gerv.net/2013/02/relicensing-when-do-you-have-to-ask/ Signed-off-by: Hidde Beydals --- internal/sops/age/keysource.go | 3 +++ internal/sops/age/keysource_test.go | 20 +++++-------------- internal/sops/azkv/config.go | 20 +++++-------------- internal/sops/azkv/config_test.go | 20 +++++-------------- internal/sops/azkv/keysource.go | 2 ++ .../sops/azkv/keysource_integration_test.go | 19 +++++------------- internal/sops/azkv/keysource_test.go | 20 +++++-------------- internal/sops/hcvault/keysource.go | 3 +++ internal/sops/hcvault/keysource_test.go | 20 +++++-------------- internal/sops/keyservice/options.go | 20 +++++-------------- internal/sops/keyservice/server.go | 2 ++ internal/sops/keyservice/server_test.go | 20 +++++-------------- internal/sops/keyservice/utils_test.go | 20 +++++-------------- internal/sops/pgp/keysource.go | 3 +++ internal/sops/pgp/keysource_test.go | 20 +++++-------------- 15 files changed, 63 insertions(+), 149 deletions(-) diff --git a/internal/sops/age/keysource.go b/internal/sops/age/keysource.go index ebd289aa..c63d3686 100644 --- a/internal/sops/age/keysource.go +++ b/internal/sops/age/keysource.go @@ -1,3 +1,6 @@ +// Copyright (C) 2021 The Mozilla SOPS authors +// Copyright (C) 2022 The Flux authors +// // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/internal/sops/age/keysource_test.go b/internal/sops/age/keysource_test.go index 44513e15..307abf21 100644 --- a/internal/sops/age/keysource_test.go +++ b/internal/sops/age/keysource_test.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package age diff --git a/internal/sops/azkv/config.go b/internal/sops/azkv/config.go index 850ba591..6aa98cb3 100644 --- a/internal/sops/azkv/config.go +++ b/internal/sops/azkv/config.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package azkv diff --git a/internal/sops/azkv/config_test.go b/internal/sops/azkv/config_test.go index 60db004a..364e5838 100644 --- a/internal/sops/azkv/config_test.go +++ b/internal/sops/azkv/config_test.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package azkv diff --git a/internal/sops/azkv/keysource.go b/internal/sops/azkv/keysource.go index 5ff2be1b..e15857f5 100644 --- a/internal/sops/azkv/keysource.go +++ b/internal/sops/azkv/keysource.go @@ -1,3 +1,5 @@ +// Copyright (C) 2022 The Flux authors +// // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/internal/sops/azkv/keysource_integration_test.go b/internal/sops/azkv/keysource_integration_test.go index f8a50ffc..6fcd7df5 100644 --- a/internal/sops/azkv/keysource_integration_test.go +++ b/internal/sops/azkv/keysource_integration_test.go @@ -1,21 +1,12 @@ //go:build integration // +build integration -/* -Copyright 2022 The Flux authors +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ package azkv import ( diff --git a/internal/sops/azkv/keysource_test.go b/internal/sops/azkv/keysource_test.go index c4d956b6..39c19aab 100644 --- a/internal/sops/azkv/keysource_test.go +++ b/internal/sops/azkv/keysource_test.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package azkv diff --git a/internal/sops/hcvault/keysource.go b/internal/sops/hcvault/keysource.go index 77c12ef8..cfbfde02 100644 --- a/internal/sops/hcvault/keysource.go +++ b/internal/sops/hcvault/keysource.go @@ -1,3 +1,6 @@ +// Copyright (C) 2020 The Mozilla SOPS authors +// Copyright (C) 2022 The Flux authors +// // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/internal/sops/hcvault/keysource_test.go b/internal/sops/hcvault/keysource_test.go index 75ad8b50..ff2f6be3 100644 --- a/internal/sops/hcvault/keysource_test.go +++ b/internal/sops/hcvault/keysource_test.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package hcvault diff --git a/internal/sops/keyservice/options.go b/internal/sops/keyservice/options.go index 6e2cb8e3..507376a3 100644 --- a/internal/sops/keyservice/options.go +++ b/internal/sops/keyservice/options.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package keyservice diff --git a/internal/sops/keyservice/server.go b/internal/sops/keyservice/server.go index 545608e4..3906778a 100644 --- a/internal/sops/keyservice/server.go +++ b/internal/sops/keyservice/server.go @@ -1,3 +1,5 @@ +// Copyright (C) 2022 The Flux authors +// // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/internal/sops/keyservice/server_test.go b/internal/sops/keyservice/server_test.go index 2231a930..a3fe1bb9 100644 --- a/internal/sops/keyservice/server_test.go +++ b/internal/sops/keyservice/server_test.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package keyservice diff --git a/internal/sops/keyservice/utils_test.go b/internal/sops/keyservice/utils_test.go index 945ef1d0..031c6049 100644 --- a/internal/sops/keyservice/utils_test.go +++ b/internal/sops/keyservice/utils_test.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package keyservice diff --git a/internal/sops/pgp/keysource.go b/internal/sops/pgp/keysource.go index 26e1f8de..1d9343df 100644 --- a/internal/sops/pgp/keysource.go +++ b/internal/sops/pgp/keysource.go @@ -1,3 +1,6 @@ +// Copyright (C) 2016-2020 The Mozilla SOPS authors +// Copyright (C) 2022 The Flux authors +// // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/internal/sops/pgp/keysource_test.go b/internal/sops/pgp/keysource_test.go index 09800bf8..86cbb721 100644 --- a/internal/sops/pgp/keysource_test.go +++ b/internal/sops/pgp/keysource_test.go @@ -1,18 +1,8 @@ -/* -Copyright 2022 The Flux authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright (C) 2022 The Flux authors +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. package pgp