From a648048b9d27784cdfaba70f15224503aa1ca70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergen=20Yal=C3=A7=C4=B1n?= Date: Wed, 13 Mar 2024 23:17:08 +0300 Subject: [PATCH 1/2] Move license statements to separate files to prevent license statement duplication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergen Yalçın --- pkg/pipeline/templates/controller.go.tmpl | 4 ---- pkg/pipeline/templates/controller.go.tmpl.license | 3 +++ pkg/pipeline/templates/conversion_hub.go.tmpl | 4 ---- pkg/pipeline/templates/conversion_hub.go.tmpl.license | 3 +++ pkg/pipeline/templates/conversion_spoke.go.tmpl | 4 ---- pkg/pipeline/templates/conversion_spoke.go.tmpl.license | 3 +++ pkg/pipeline/templates/crd_types.go.tmpl | 4 ---- pkg/pipeline/templates/crd_types.go.tmpl.license | 3 +++ pkg/pipeline/templates/groupversion_info.go.tmpl | 4 ---- pkg/pipeline/templates/groupversion_info.go.tmpl.license | 3 +++ pkg/pipeline/templates/register.go.tmpl | 4 ---- pkg/pipeline/templates/register.go.tmpl.license | 3 +++ pkg/pipeline/templates/setup.go.tmpl | 3 --- pkg/pipeline/templates/setup.go.tmpl.license | 3 +++ pkg/pipeline/templates/terraformed.go.tmpl | 4 ---- pkg/pipeline/templates/terraformed.go.tmpl.license | 3 +++ 16 files changed, 24 insertions(+), 31 deletions(-) create mode 100644 pkg/pipeline/templates/controller.go.tmpl.license create mode 100644 pkg/pipeline/templates/conversion_hub.go.tmpl.license create mode 100644 pkg/pipeline/templates/conversion_spoke.go.tmpl.license create mode 100644 pkg/pipeline/templates/crd_types.go.tmpl.license create mode 100644 pkg/pipeline/templates/groupversion_info.go.tmpl.license create mode 100644 pkg/pipeline/templates/register.go.tmpl.license create mode 100644 pkg/pipeline/templates/setup.go.tmpl.license create mode 100644 pkg/pipeline/templates/terraformed.go.tmpl.license diff --git a/pkg/pipeline/templates/controller.go.tmpl b/pkg/pipeline/templates/controller.go.tmpl index 50d67ebd..f3241235 100644 --- a/pkg/pipeline/templates/controller.go.tmpl +++ b/pkg/pipeline/templates/controller.go.tmpl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 - {{ .Header }} {{ .GenStatement }} diff --git a/pkg/pipeline/templates/controller.go.tmpl.license b/pkg/pipeline/templates/controller.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/controller.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/pkg/pipeline/templates/conversion_hub.go.tmpl b/pkg/pipeline/templates/conversion_hub.go.tmpl index 5747ebd5..30386002 100644 --- a/pkg/pipeline/templates/conversion_hub.go.tmpl +++ b/pkg/pipeline/templates/conversion_hub.go.tmpl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 - {{ .Header }} {{ .GenStatement }} diff --git a/pkg/pipeline/templates/conversion_hub.go.tmpl.license b/pkg/pipeline/templates/conversion_hub.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/conversion_hub.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/pkg/pipeline/templates/conversion_spoke.go.tmpl b/pkg/pipeline/templates/conversion_spoke.go.tmpl index c76577a3..fabd0a64 100644 --- a/pkg/pipeline/templates/conversion_spoke.go.tmpl +++ b/pkg/pipeline/templates/conversion_spoke.go.tmpl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 - {{ .Header }} {{ .GenStatement }} diff --git a/pkg/pipeline/templates/conversion_spoke.go.tmpl.license b/pkg/pipeline/templates/conversion_spoke.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/conversion_spoke.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/pkg/pipeline/templates/crd_types.go.tmpl b/pkg/pipeline/templates/crd_types.go.tmpl index 24977246..437d1fda 100644 --- a/pkg/pipeline/templates/crd_types.go.tmpl +++ b/pkg/pipeline/templates/crd_types.go.tmpl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 - {{ .Header }} {{ .GenStatement }} diff --git a/pkg/pipeline/templates/crd_types.go.tmpl.license b/pkg/pipeline/templates/crd_types.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/crd_types.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/pkg/pipeline/templates/groupversion_info.go.tmpl b/pkg/pipeline/templates/groupversion_info.go.tmpl index 91c31a01..56eb3dfd 100644 --- a/pkg/pipeline/templates/groupversion_info.go.tmpl +++ b/pkg/pipeline/templates/groupversion_info.go.tmpl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 - {{ .Header }} {{ .GenStatement }} diff --git a/pkg/pipeline/templates/groupversion_info.go.tmpl.license b/pkg/pipeline/templates/groupversion_info.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/groupversion_info.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/pkg/pipeline/templates/register.go.tmpl b/pkg/pipeline/templates/register.go.tmpl index bb84131a..2c9e01bd 100644 --- a/pkg/pipeline/templates/register.go.tmpl +++ b/pkg/pipeline/templates/register.go.tmpl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 - {{ .Header }} {{ .GenStatement }} diff --git a/pkg/pipeline/templates/register.go.tmpl.license b/pkg/pipeline/templates/register.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/register.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/pkg/pipeline/templates/setup.go.tmpl b/pkg/pipeline/templates/setup.go.tmpl index 184e6718..457c6516 100644 --- a/pkg/pipeline/templates/setup.go.tmpl +++ b/pkg/pipeline/templates/setup.go.tmpl @@ -1,6 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 package controller diff --git a/pkg/pipeline/templates/setup.go.tmpl.license b/pkg/pipeline/templates/setup.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/setup.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/pkg/pipeline/templates/terraformed.go.tmpl b/pkg/pipeline/templates/terraformed.go.tmpl index 49ee620b..238da214 100644 --- a/pkg/pipeline/templates/terraformed.go.tmpl +++ b/pkg/pipeline/templates/terraformed.go.tmpl @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 The Crossplane Authors -// -// SPDX-License-Identifier: Apache-2.0 - {{ .Header }} {{ .GenStatement }} diff --git a/pkg/pipeline/templates/terraformed.go.tmpl.license b/pkg/pipeline/templates/terraformed.go.tmpl.license new file mode 100644 index 00000000..b0dc8fc5 --- /dev/null +++ b/pkg/pipeline/templates/terraformed.go.tmpl.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 From 2d71c5b36d2ed829e810cd8a90132115ff5e1b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergen=20Yal=C3=A7=C4=B1n?= Date: Thu, 14 Mar 2024 14:06:50 +0300 Subject: [PATCH 2/2] Remove blank line on top MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergen Yalçın --- pkg/pipeline/templates/setup.go.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/pipeline/templates/setup.go.tmpl b/pkg/pipeline/templates/setup.go.tmpl index 457c6516..cd5981ad 100644 --- a/pkg/pipeline/templates/setup.go.tmpl +++ b/pkg/pipeline/templates/setup.go.tmpl @@ -1,4 +1,3 @@ - package controller import (