From edaf5ea83b12bc43788a766fdb0294dec66f3b9d Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Thu, 23 May 2024 17:18:26 +0200 Subject: [PATCH] remove SPDX Header (#776) --- pkg/contexts/credentials/internal/logging.go | 4 ---- .../credentials/repositories/vault/repo_int_test.go | 11 +++-------- .../credentials/repositories/vault/repo_test.go | 6 +----- pkg/errkind/kinds.go | 4 ---- pkg/errkind/utils.go | 4 ---- pkg/errors/doc.go | 4 ---- pkg/exception/doc.go | 4 ---- pkg/finalizer/doc.go | 4 ---- pkg/generics/doc.go | 4 ---- pkg/runtimefinalizer/object.go | 4 ---- pkg/runtimefinalizer/object_test.go | 4 ---- pkg/runtimefinalizer/suite_test.go | 4 ---- 12 files changed, 4 insertions(+), 53 deletions(-) diff --git a/pkg/contexts/credentials/internal/logging.go b/pkg/contexts/credentials/internal/logging.go index c80cfbbdc8..6934cbe1ea 100644 --- a/pkg/contexts/credentials/internal/logging.go +++ b/pkg/contexts/credentials/internal/logging.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal import ( diff --git a/pkg/contexts/credentials/repositories/vault/repo_int_test.go b/pkg/contexts/credentials/repositories/vault/repo_int_test.go index 49105706dd..3001d7c65b 100644 --- a/pkg/contexts/credentials/repositories/vault/repo_int_test.go +++ b/pkg/contexts/credentials/repositories/vault/repo_int_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build integration package vault_test @@ -14,12 +10,10 @@ import ( "os/exec" "time" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/hashicorp/vault-client-go" "github.com/hashicorp/vault-client-go/schema" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/credentials" @@ -28,6 +22,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault/identity" "github.com/open-component-model/ocm/pkg/errors" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) type vaultMode string diff --git a/pkg/contexts/credentials/repositories/vault/repo_test.go b/pkg/contexts/credentials/repositories/vault/repo_test.go index 7c9e5044d4..5eb7bdc748 100644 --- a/pkg/contexts/credentials/repositories/vault/repo_test.go +++ b/pkg/contexts/credentials/repositories/vault/repo_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vault_test import ( @@ -11,12 +7,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/credentials" me "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault" "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/vault/identity" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ( diff --git a/pkg/errkind/kinds.go b/pkg/errkind/kinds.go index 8f5b75d022..a04cdd9864 100644 --- a/pkg/errkind/kinds.go +++ b/pkg/errkind/kinds.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errkind const ( diff --git a/pkg/errkind/utils.go b/pkg/errkind/utils.go index 63f28e2235..b6e8c5d8d1 100644 --- a/pkg/errkind/utils.go +++ b/pkg/errkind/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errkind import ( diff --git a/pkg/errors/doc.go b/pkg/errors/doc.go index 5209583143..3e2b1b2489 100644 --- a/pkg/errors/doc.go +++ b/pkg/errors/doc.go @@ -1,6 +1,2 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Deprectated: use github.com/mandelsoft/goutils/errors package errors diff --git a/pkg/exception/doc.go b/pkg/exception/doc.go index aa618166d8..8f4d87c314 100644 --- a/pkg/exception/doc.go +++ b/pkg/exception/doc.go @@ -1,6 +1,2 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Deprecated: use github.com/mandelsoft/goutils/exception package exception diff --git a/pkg/finalizer/doc.go b/pkg/finalizer/doc.go index 969beb562b..7d460fc2d0 100644 --- a/pkg/finalizer/doc.go +++ b/pkg/finalizer/doc.go @@ -1,6 +1,2 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Deprecated: use github.com/mandelsoft/goutils/finalizer package finalizer diff --git a/pkg/generics/doc.go b/pkg/generics/doc.go index 8c5374c670..1ccf181c0b 100644 --- a/pkg/generics/doc.go +++ b/pkg/generics/doc.go @@ -1,6 +1,2 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Deprecated: use appropriate sub packages in github.com/mandelsoft/goutils package generics diff --git a/pkg/runtimefinalizer/object.go b/pkg/runtimefinalizer/object.go index 98679ae3c8..701ee5b276 100644 --- a/pkg/runtimefinalizer/object.go +++ b/pkg/runtimefinalizer/object.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtimefinalizer import ( diff --git a/pkg/runtimefinalizer/object_test.go b/pkg/runtimefinalizer/object_test.go index a66abd3a27..9e3cdc09db 100644 --- a/pkg/runtimefinalizer/object_test.go +++ b/pkg/runtimefinalizer/object_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtimefinalizer_test import ( diff --git a/pkg/runtimefinalizer/suite_test.go b/pkg/runtimefinalizer/suite_test.go index f7a627fc42..53c3041d6b 100644 --- a/pkg/runtimefinalizer/suite_test.go +++ b/pkg/runtimefinalizer/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtimefinalizer_test import (