From 9e897f642ebb175c93d1bccd7f5754a3bb9b8ad0 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 10:34:46 +0200 Subject: [PATCH 01/16] not required anymore, since we have the ./.reuse/dep5 file which includes with the pattern: `Files: **` all files --- Makefile | 9 +-------- hack/boilerplate.go.txt | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 hack/boilerplate.go.txt diff --git a/Makefile b/Makefile index 57f3e63682..2ec49f714e 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ generate: .PHONY: generate-deepcopy generate-deepcopy: controller-gen - $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths=./pkg/contexts/ocm/compdesc/versions/... paths=./pkg/contexts/ocm/compdesc/meta/... + $(CONTROLLER_GEN) paths=./pkg/contexts/ocm/compdesc/versions/... paths=./pkg/contexts/ocm/compdesc/meta/... .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. @@ -111,13 +111,6 @@ info: @echo "GIT_TREE_STATE= $(GIT_TREE_STATE)" @echo "COMPONENTS = $(COMPONENTS)" -.PHONY: generate-license -generate-license: - for f in $(shell find . -name "*.go" -o -name "*.sh"); do \ - reuse addheader -r --copyright="SAP SE or an SAP affiliate company and Open Component Model contributors." --license="Apache-2.0" $$f --skip-unrecognised; \ - done - - $(GEN)/.exists: @mkdir -p $(GEN) @touch $@ diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt deleted file mode 100644 index e827261184..0000000000 --- a/hack/boilerplate.go.txt +++ /dev/null @@ -1,3 +0,0 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 \ No newline at end of file From b4cadb5f99ecb97b22fa9049e9d653d0628211e8 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 10:37:44 +0200 Subject: [PATCH 02/16] remove obsolete header from scripts --- Makefile | 4 ---- cmds/ocm/commands/ocmcmds/plugins/describe/testdata/action | 4 ---- cmds/ocm/commands/ocmcmds/plugins/describe/testdata/test | 4 ---- cmds/ocm/commands/ocmcmds/plugins/get/testdata/test | 4 ---- .../ocmcmds/plugins/tests/accessmethods/testdata/test | 4 ---- .../ocmcmds/plugins/tests/routingslips/testdata/test | 4 ---- hack/Makefile | 4 ---- hack/check.sh | 4 ---- hack/cross-build.sh | 4 ---- hack/format.sh | 4 ---- hack/generate.sh | 4 ---- hack/install-requirements.sh | 6 ------ hack/install.sh | 4 ---- pkg/contexts/ocm/accessmethods/plugin/testdata/test | 4 ---- pkg/contexts/ocm/actionhandler/plugin/testdata/action | 4 ---- .../ocm/blobhandler/handlers/generic/plugin/testdata/test | 4 ---- pkg/contexts/ocm/download/handlers/plugin/testdata/test | 4 ---- .../ocm/labels/routingslip/types/plugin/testdata/test | 4 ---- pkg/contexts/ocm/plugin/testdata/action | 4 ---- pkg/contexts/ocm/plugin/testdata/identity | 4 ---- pkg/contexts/ocm/plugin/testdata/merge | 4 ---- pkg/contexts/ocm/plugin/testdata/test | 4 ---- .../ocm/repositories/virtual/testdata/descriptors/cd1.yaml | 4 ---- .../ocm/repositories/virtual/testdata/descriptors/cd2.yaml | 4 ---- .../ocm/valuemergehandler/handlers/plugin/testdata/merge | 4 ---- 25 files changed, 102 deletions(-) diff --git a/Makefile b/Makefile index 2ec49f714e..8d66c88c15 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME := ocm REPO_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) GITHUBORG ?= open-component-model diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/action b/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/action index 0df59877e0..8443c4c3ec 100755 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/action +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/action @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/test b/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/test index 2659730865..a99dc69aad 100755 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/test +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/testdata/test b/cmds/ocm/commands/ocmcmds/plugins/get/testdata/test index 2659730865..a99dc69aad 100755 --- a/cmds/ocm/commands/ocmcmds/plugins/get/testdata/test +++ b/cmds/ocm/commands/ocmcmds/plugins/get/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/testdata/test b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/testdata/test index 566e080ff1..71243c2dfc 100755 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/testdata/test +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/testdata/test b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/testdata/test index 3162fb01f3..65d99addb7 100755 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/testdata/test +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" set -e diff --git a/hack/Makefile b/hack/Makefile index 9bf5a73b48..451cf5cc81 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - GOPATH := $(shell go env GOPATH) ifeq ($(OS),Windows_NT) diff --git a/hack/check.sh b/hack/check.sh index 5c6029a582..7f9ad288a7 100755 --- a/hack/check.sh +++ b/hack/check.sh @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - set -e GOLANGCI_LINT_CONFIG_FILE="" diff --git a/hack/cross-build.sh b/hack/cross-build.sh index 4dc83923fa..c6ee228f21 100755 --- a/hack/cross-build.sh +++ b/hack/cross-build.sh @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - set -e CURRENT_DIR=$(dirname $0) diff --git a/hack/format.sh b/hack/format.sh index ad98719c21..4afbc81089 100755 --- a/hack/format.sh +++ b/hack/format.sh @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - set -e log() { diff --git a/hack/generate.sh b/hack/generate.sh index 0948850f48..d574eb5828 100755 --- a/hack/generate.sh +++ b/hack/generate.sh @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - set -e echo "> Generate" diff --git a/hack/install-requirements.sh b/hack/install-requirements.sh index fd5b4f764c..ca584ae39e 100755 --- a/hack/install-requirements.sh +++ b/hack/install-requirements.sh @@ -1,9 +1,5 @@ #!/bin/bash -e -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - CURRENT_DIR=$(dirname $0) PROJECT_ROOT="${CURRENT_DIR}"/.. @@ -23,5 +19,3 @@ echo "> Install Registry test binaries" mkdir -p ${PROJECT_ROOT}/tmp/test/bin curl -L "https://storage.googleapis.com/gardener-public/test/oci-registry/registry-$(go env GOOS)-$(go env GOARCH)" --output ${PROJECT_ROOT}/tmp/test/bin/registry chmod +x ${PROJECT_ROOT}/tmp/test/bin/registry - - diff --git a/hack/install.sh b/hack/install.sh index 930679decc..190f6ca181 100755 --- a/hack/install.sh +++ b/hack/install.sh @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - set -e CURRENT_DIR=$(dirname $0) diff --git a/pkg/contexts/ocm/accessmethods/plugin/testdata/test b/pkg/contexts/ocm/accessmethods/plugin/testdata/test index 566e080ff1..71243c2dfc 100755 --- a/pkg/contexts/ocm/accessmethods/plugin/testdata/test +++ b/pkg/contexts/ocm/accessmethods/plugin/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/actionhandler/plugin/testdata/action b/pkg/contexts/ocm/actionhandler/plugin/testdata/action index e3816e6d32..55205d8631 100755 --- a/pkg/contexts/ocm/actionhandler/plugin/testdata/action +++ b/pkg/contexts/ocm/actionhandler/plugin/testdata/action @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/testdata/test b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/testdata/test index 3361dbd2c2..7b08e5d838 100755 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/testdata/test +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/download/handlers/plugin/testdata/test b/pkg/contexts/ocm/download/handlers/plugin/testdata/test index 71994dc42b..6ad81e0714 100755 --- a/pkg/contexts/ocm/download/handlers/plugin/testdata/test +++ b/pkg/contexts/ocm/download/handlers/plugin/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/testdata/test b/pkg/contexts/ocm/labels/routingslip/types/plugin/testdata/test index 3162fb01f3..65d99addb7 100755 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/testdata/test +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" set -e diff --git a/pkg/contexts/ocm/plugin/testdata/action b/pkg/contexts/ocm/plugin/testdata/action index 0df59877e0..8443c4c3ec 100755 --- a/pkg/contexts/ocm/plugin/testdata/action +++ b/pkg/contexts/ocm/plugin/testdata/action @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/plugin/testdata/identity b/pkg/contexts/ocm/plugin/testdata/identity index df0b268374..eaf62d1fdd 100755 --- a/pkg/contexts/ocm/plugin/testdata/identity +++ b/pkg/contexts/ocm/plugin/testdata/identity @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/plugin/testdata/merge b/pkg/contexts/ocm/plugin/testdata/merge index fce3c0e15d..4e901fcbf9 100755 --- a/pkg/contexts/ocm/plugin/testdata/merge +++ b/pkg/contexts/ocm/plugin/testdata/merge @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/plugin/testdata/test b/pkg/contexts/ocm/plugin/testdata/test index 2f997edaaa..c8ffdbdf7b 100755 --- a/pkg/contexts/ocm/plugin/testdata/test +++ b/pkg/contexts/ocm/plugin/testdata/test @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { diff --git a/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd1.yaml b/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd1.yaml index d721410bcb..bf58e44675 100644 --- a/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd1.yaml +++ b/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd1.yaml @@ -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 - meta: schemaVersion: 'v2' diff --git a/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd2.yaml b/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd2.yaml index b595109674..6a03fd5ab0 100644 --- a/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd2.yaml +++ b/pkg/contexts/ocm/repositories/virtual/testdata/descriptors/cd2.yaml @@ -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 - meta: schemaVersion: 'v2' diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/testdata/merge b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/testdata/merge index 2a607aad86..9aa19add28 100755 --- a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/testdata/merge +++ b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/testdata/merge @@ -1,9 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -# -# SPDX-License-Identifier: Apache-2.0 - NAME="$(basename "$0")" Error() { From 14f230e50105605e8e565d3a45be2f28517e90a8 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 11:17:57 +0200 Subject: [PATCH 03/16] rm SPDX-FileCopyrightText: 2022 in *.go --- cmds/demoplugin/accessmethods/demo.go | 4 ---- cmds/demoplugin/common/const.go | 4 ---- cmds/demoplugin/config/config.go | 4 ---- cmds/demoplugin/main.go | 4 ---- cmds/demoplugin/uploaders/demo.go | 4 ---- cmds/demoplugin/uploaders/writer.go | 4 ---- cmds/demoplugin/valuesets/suite_test.go | 4 ---- cmds/ecrplugin/actions/action.go | 4 ---- cmds/ecrplugin/config/config.go | 4 ---- cmds/ecrplugin/main.go | 4 ---- cmds/helminstaller/app/app.go | 4 ---- cmds/helminstaller/app/config.go | 4 ---- cmds/helminstaller/app/driver/driver.go | 4 ---- cmds/helminstaller/app/driver/helm/driver.go | 4 ---- cmds/helminstaller/app/driver/helm/install.go | 4 ---- .../app/driver/helm/uninstall.go | 4 ---- cmds/helminstaller/app/execute.go | 9 ++------- cmds/helminstaller/app/executor.go | 4 ---- cmds/helminstaller/app/set.go | 4 ---- cmds/helminstaller/main.go | 4 ---- cmds/helminstaller/testhelper/env.go | 4 ---- cmds/ocm/app/app.go | 11 +++-------- cmds/ocm/app/app_test.go | 13 ++++--------- cmds/ocm/app/prepare.go | 4 ---- cmds/ocm/app/suite_test.go | 4 ---- cmds/ocm/ca/component-descriptor.yaml | 10 ++++++++++ cmds/ocm/commands/cachecmds/clean/cmd.go | 4 ---- cmds/ocm/commands/cachecmds/cmd.go | 4 ---- cmds/ocm/commands/cachecmds/describe/cmd.go | 4 ---- cmds/ocm/commands/cachecmds/names/names.go | 4 ---- .../common/elements/components/cmd.go | 4 ---- .../common/options/closureoption/option.go | 4 ---- .../common/options/destoption/option.go | 4 ---- .../common/options/formatoption/option.go | 4 ---- .../common/options/keyoption/option.go | 4 ---- .../commands/controllercmds/install/apply.go | 4 ---- .../commands/controllercmds/install/cmd.go | 4 ---- .../controllercmds/install/cmd_test.go | 8 ++------ .../controllercmds/install/suite_test.go | 4 ---- .../commands/controllercmds/names/names.go | 4 ---- cmds/ocm/commands/misccmds/action/cmd.go | 4 ---- .../commands/misccmds/action/execute/cmd.go | 4 ---- cmds/ocm/commands/misccmds/credentials/cmd.go | 4 ---- .../commands/misccmds/credentials/get/cmd.go | 4 ---- .../misccmds/credentials/get/cmd_test.go | 8 ++------ .../misccmds/credentials/get/suite_test.go | 4 ---- cmds/ocm/commands/misccmds/hash/cmd.go | 4 ---- cmds/ocm/commands/misccmds/names/names.go | 4 ---- cmds/ocm/commands/misccmds/rsakeypair/cmd.go | 4 ---- .../commands/misccmds/rsakeypair/cmd_test.go | 9 ++------- .../misccmds/rsakeypair/suite_test.go | 4 ---- cmds/ocm/commands/ocicmds/artifacts/cmd.go | 4 ---- .../ocicmds/artifacts/describe/cmd.go | 4 ---- .../ocicmds/artifacts/download/cmd.go | 4 ---- .../ocicmds/artifacts/download/cmd_test.go | 8 ++------ .../ocicmds/artifacts/download/option.go | 4 ---- .../ocicmds/artifacts/download/suite_test.go | 4 ---- .../ocm/commands/ocicmds/artifacts/get/cmd.go | 4 ---- .../ocicmds/artifacts/get/cmd_test.go | 8 ++------ .../commands/ocicmds/artifacts/get/options.go | 4 ---- .../ocicmds/artifacts/get/suite_test.go | 4 ---- .../ocicmds/artifacts/transfer/cmd.go | 4 ---- .../ocicmds/artifacts/transfer/cmd_test.go | 8 ++------ .../ocicmds/artifacts/transfer/suite_test.go | 4 ---- cmds/ocm/commands/ocicmds/cmd.go | 4 ---- .../common/handlers/artifacthdlr/attached.go | 4 ---- .../common/handlers/artifacthdlr/clean.go | 4 ---- .../common/handlers/artifacthdlr/closure.go | 4 ---- .../common/handlers/artifacthdlr/convert.go | 4 ---- .../common/handlers/artifacthdlr/sort.go | 4 ---- .../handlers/artifacthdlr/typehandler.go | 4 ---- .../common/options/repooption/option.go | 4 ---- cmds/ocm/commands/ocicmds/common/utils.go | 4 ---- cmds/ocm/commands/ocicmds/ctf/cmd.go | 4 ---- cmds/ocm/commands/ocicmds/ctf/create/cmd.go | 4 ---- .../commands/ocicmds/ctf/create/cmd_test.go | 6 +----- .../commands/ocicmds/ctf/create/suite_test.go | 4 ---- cmds/ocm/commands/ocicmds/names/names.go | 4 ---- cmds/ocm/commands/ocicmds/tags/cmd.go | 4 ---- cmds/ocm/commands/ocicmds/tags/show/cmd.go | 4 ---- .../commands/ocicmds/tags/show/cmd_test.go | 8 ++------ .../commands/ocicmds/tags/show/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/cli/cmd.go | 4 ---- cmds/ocm/commands/ocmcmds/cli/download/cmd.go | 4 ---- .../commands/ocmcmds/cli/download/cmd_test.go | 8 ++------ .../ocmcmds/cli/download/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/cmd.go | 4 ---- cmds/ocm/commands/ocmcmds/common/addconfig.go | 4 ---- .../common/addhdlrs/comp/components.go | 4 ---- .../ocmcmds/common/addhdlrs/comp/elements.go | 7 +------ .../ocmcmds/common/addhdlrs/interface.go | 4 ---- .../ocmcmds/common/addhdlrs/refs/elements.go | 4 ---- .../ocmcmds/common/addhdlrs/rscs/elements.go | 4 ---- .../ocmcmds/common/addhdlrs/srcs/elements.go | 4 ---- .../commands/ocmcmds/common/addhdlrs/utils.go | 4 ---- .../ocmcmds/common/cmds/signing/cmd.go | 4 ---- .../common/handlers/comphdlr/closure.go | 4 ---- .../common/handlers/comphdlr/convert.go | 4 ---- .../common/handlers/comphdlr/options.go | 4 ---- .../ocmcmds/common/handlers/comphdlr/sort.go | 4 ---- .../common/handlers/comphdlr/typehandler.go | 4 ---- .../common/handlers/elemhdlr/convert.go | 4 ---- .../common/handlers/elemhdlr/options.go | 4 ---- .../common/handlers/elemhdlr/output.go | 4 ---- .../ocmcmds/common/handlers/elemhdlr/sort.go | 4 ---- .../common/handlers/elemhdlr/typehandler.go | 4 ---- .../common/handlers/pluginhdlr/typehandler.go | 4 ---- .../common/handlers/vershdlr/options.go | 4 ---- .../ocmcmds/common/handlers/vershdlr/sort.go | 4 ---- .../common/handlers/vershdlr/typehandler.go | 4 ---- .../ocmcmds/common/inputs/cpi/helper.go | 4 ---- .../ocmcmds/common/inputs/inputfields.go | 4 ---- .../ocmcmds/common/inputs/inputtype.go | 4 ---- .../ocmcmds/common/inputs/inputtype_test.go | 4 ---- .../ocmcmds/common/inputs/suite_test.go | 4 ---- .../common/inputs/testutils/testutils.go | 5 ----- .../ocmcmds/common/inputs/types/binary/cli.go | 4 ---- .../inputs/types/binary/inputtype_test.go | 6 +----- .../common/inputs/types/binary/spec.go | 4 ---- .../common/inputs/types/binary/suite_test.go | 4 ---- .../common/inputs/types/binary/type.go | 4 ---- .../common/inputs/types/directory/cli.go | 4 ---- .../inputs/types/directory/inputtype_test.go | 6 +----- .../common/inputs/types/directory/spec.go | 4 ---- .../inputs/types/directory/suite_test.go | 4 ---- .../common/inputs/types/directory/type.go | 4 ---- .../ocmcmds/common/inputs/types/docker/cli.go | 4 ---- .../common/inputs/types/docker/spec.go | 4 ---- .../common/inputs/types/docker/type.go | 4 ---- .../common/inputs/types/dockermulti/cli.go | 4 ---- .../common/inputs/types/dockermulti/spec.go | 7 +------ .../common/inputs/types/dockermulti/type.go | 4 ---- .../ocmcmds/common/inputs/types/file/cli.go | 4 ---- .../ocmcmds/common/inputs/types/file/spec.go | 4 ---- .../common/inputs/types/file/support.go | 4 ---- .../ocmcmds/common/inputs/types/file/type.go | 4 ---- .../ocmcmds/common/inputs/types/helm/cli.go | 4 ---- .../ocmcmds/common/inputs/types/helm/spec.go | 4 ---- .../ocmcmds/common/inputs/types/helm/type.go | 4 ---- .../ocmcmds/common/inputs/types/init.go | 4 ---- .../common/inputs/types/ociartifact/cli.go | 4 ---- .../inputs/types/ociartifact/input_test.go | 11 +++-------- .../common/inputs/types/ociartifact/spec.go | 4 ---- .../inputs/types/ociartifact/suite_test.go | 4 ---- .../common/inputs/types/ociartifact/type.go | 4 ---- .../ocmcmds/common/inputs/types/spiff/cli.go | 4 ---- .../ocmcmds/common/inputs/types/spiff/spec.go | 4 ---- .../common/inputs/types/spiff/spiff_test.go | 6 +----- .../common/inputs/types/spiff/suite_test.go | 4 ---- .../ocmcmds/common/inputs/types/spiff/type.go | 4 ---- .../ocmcmds/common/inputs/types/utf8/cli.go | 4 ---- .../inputs/types/utf8/inputtype_test.go | 8 ++------ .../ocmcmds/common/inputs/types/utf8/spec.go | 4 ---- .../common/inputs/types/utf8/suite_test.go | 4 ---- .../ocmcmds/common/inputs/types/utf8/type.go | 4 ---- .../ocmcmds/common/inputs/types/wget/cli.go | 4 ---- .../ocmcmds/common/inputs/types/wget/spec.go | 4 ---- .../ocmcmds/common/inputs/types/wget/type.go | 4 ---- .../options/comppathopt/comppath_test.go | 4 ---- .../common/options/comppathopt/option.go | 4 ---- .../common/options/downloaderoption/option.go | 7 +------ .../common/options/dryrunoption/option.go | 4 ---- .../common/options/fileoption/option.go | 4 ---- .../common/options/hashoption/option.go | 4 ---- .../common/options/keepglobaloption/option.go | 4 ---- .../common/options/lookupoption/option.go | 4 ---- .../options/omitaccesstypeoption/option.go | 4 ---- .../common/options/optutils/reg_test.go | 7 +------ .../common/options/optutils/registration.go | 4 ---- .../common/options/optutils/suite_test.go | 4 ---- .../common/options/overwriteoption/option.go | 4 ---- .../common/options/repooption/option.go | 4 ---- .../common/options/rscbyvalueoption/option.go | 4 ---- .../common/options/schemaoption/option.go | 4 ---- .../common/options/scriptoption/config.go | 4 ---- .../common/options/scriptoption/option.go | 4 ---- .../common/options/signoption/option.go | 4 ---- .../common/options/skipdigestoption/option.go | 4 ---- .../common/options/skipupdateoption/option.go | 4 ---- .../common/options/srcbyvalueoption/option.go | 4 ---- .../options/stoponexistingoption/option.go | 4 ---- .../common/options/templateroption/option.go | 4 ---- .../common/options/uploaderoption/option.go | 4 ---- .../options/uploaderoption/suite_test.go | 4 ---- .../options/uploaderoption/uploader_test.go | 7 +------ .../versionconstraintsoption/option.go | 4 ---- cmds/ocm/commands/ocmcmds/common/resources.go | 7 +------ .../commands/ocmcmds/common/resources_test.go | 4 ---- cmds/ocm/commands/ocmcmds/common/settings.go | 4 ---- .../ocm/commands/ocmcmds/common/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/common/utils.go | 4 ---- .../commands/ocmcmds/componentarchive/cmd.go | 4 ---- .../ocmcmds/componentarchive/create/cmd.go | 6 +----- .../componentarchive/create/cmd_test.go | 6 +----- .../componentarchive/create/suite_test.go | 4 ---- .../ocmcmds/componentarchive/transfer/cmd.go | 4 ---- .../commands/ocmcmds/components/add/cmd.go | 4 ---- .../ocmcmds/components/add/cmd_test.go | 10 +++------- .../ocmcmds/components/add/suite_test.go | 4 ---- .../commands/ocmcmds/components/check/cmd.go | 4 ---- .../ocmcmds/components/check/cmd_test.go | 8 ++------ .../ocmcmds/components/check/options.go | 4 ---- .../ocmcmds/components/check/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/components/cmd.go | 4 ---- .../ocmcmds/components/download/cmd.go | 4 ---- .../ocmcmds/components/download/cmd_test.go | 13 ++++--------- .../ocmcmds/components/download/suite_test.go | 4 ---- .../commands/ocmcmds/components/get/cmd.go | 4 ---- .../ocmcmds/components/get/cmd_test.go | 8 ++------ .../ocmcmds/components/get/suite_test.go | 4 ---- .../commands/ocmcmds/components/hash/cmd.go | 4 ---- .../ocmcmds/components/hash/cmd_test.go | 8 ++------ .../ocmcmds/components/hash/options.go | 4 ---- .../ocmcmds/components/hash/suite_test.go | 4 ---- .../commands/ocmcmds/components/list/cmd.go | 6 +----- .../ocmcmds/components/list/cmd_test.go | 8 ++------ .../ocmcmds/components/list/suite_test.go | 4 ---- .../commands/ocmcmds/components/sign/cmd.go | 4 ---- .../ocmcmds/components/sign/cmd_test.go | 15 +++++---------- .../ocmcmds/components/sign/suite_test.go | 4 ---- .../ocmcmds/components/transfer/cmd.go | 4 ---- .../ocmcmds/components/transfer/cmd_test.go | 11 +++-------- .../ocmcmds/components/transfer/suite_test.go | 4 ---- .../components/transfer/upload_test.go | 10 +++------- .../commands/ocmcmds/components/verify/cmd.go | 4 ---- .../ocmcmds/components/verify/cmd_test.go | 17 ++++++----------- .../ocmcmds/components/verify/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/ctf/cmd.go | 4 ---- cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go | 4 ---- .../commands/ocmcmds/ctf/transfer/cmd_test.go | 10 +++------- .../ocmcmds/ctf/transfer/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/init.go | 4 ---- cmds/ocm/commands/ocmcmds/names/names.go | 4 ---- cmds/ocm/commands/ocmcmds/plugins/cmd.go | 4 ---- .../commands/ocmcmds/plugins/describe/cmd.go | 4 ---- .../ocmcmds/plugins/describe/cmd_test.go | 8 ++------ .../ocmcmds/plugins/describe/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/plugins/get/cmd.go | 4 ---- .../commands/ocmcmds/plugins/get/cmd_test.go | 8 ++------ .../ocmcmds/plugins/get/suite_test.go | 4 ---- .../commands/ocmcmds/plugins/install/cmd.go | 4 ---- .../ocmcmds/plugins/install/suite_test.go | 4 ---- .../plugins/tests/accessmethods/cmd_test.go | 8 ++------ .../plugins/tests/routingslips/cmd_test.go | 8 ++------ .../commands/ocmcmds/references/add/cmd.go | 4 ---- .../ocmcmds/references/add/cmd_test.go | 6 +----- .../ocmcmds/references/add/provider.go | 4 ---- .../ocmcmds/references/add/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/references/cmd.go | 4 ---- .../ocmcmds/references/common/typehandler.go | 4 ---- .../commands/ocmcmds/references/get/cmd.go | 4 ---- .../ocmcmds/references/get/cmd_test.go | 8 ++------ .../ocmcmds/references/get/suite_test.go | 4 ---- .../ocmcmds/resourceconfig/add/cmd.go | 4 ---- .../ocmcmds/resourceconfig/add/cmd_test.go | 6 +----- .../ocmcmds/resourceconfig/add/suite_test.go | 4 ---- .../commands/ocmcmds/resourceconfig/cmd.go | 4 ---- .../ocm/commands/ocmcmds/resources/add/cmd.go | 4 ---- .../ocmcmds/resources/add/cmd_test.go | 13 ++++--------- .../ocmcmds/resources/add/provider.go | 4 ---- .../ocmcmds/resources/add/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/resources/cmd.go | 4 ---- .../ocmcmds/resources/common/typehandler.go | 4 ---- .../ocmcmds/resources/download/cmd.go | 4 ---- .../ocmcmds/resources/download/cmd_test.go | 11 +++-------- .../resources/download/dirtree_test.go | 13 ++++--------- .../ocmcmds/resources/download/options.go | 4 ---- .../ocmcmds/resources/download/suite_test.go | 4 ---- .../ocm/commands/ocmcmds/resources/get/cmd.go | 4 ---- .../ocmcmds/resources/get/cmd_test.go | 8 ++------ .../ocmcmds/resources/get/deep_test.go | 8 ++------ .../ocmcmds/resources/get/suite_test.go | 4 ---- .../commands/ocmcmds/routingslips/add/cmd.go | 4 ---- .../ocmcmds/routingslips/add/cmd_test.go | 8 ++------ .../ocmcmds/routingslips/add/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/routingslips/cmd.go | 4 ---- .../routingslips/common/typehandler.go | 4 ---- .../commands/ocmcmds/routingslips/get/cmd.go | 4 ---- .../ocmcmds/routingslips/get/cmd_test.go | 8 ++------ .../ocmcmds/routingslips/get/suite_test.go | 4 ---- .../commands/ocmcmds/sourceconfig/add/cmd.go | 4 ---- .../ocmcmds/sourceconfig/add/cmd_test.go | 6 +----- .../ocmcmds/sourceconfig/add/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go | 4 ---- cmds/ocm/commands/ocmcmds/sources/add/cmd.go | 4 ---- .../commands/ocmcmds/sources/add/cmd_test.go | 6 +----- .../ocmcmds/sources/add/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/sources/cmd.go | 4 ---- .../ocmcmds/sources/common/typehandler.go | 4 ---- cmds/ocm/commands/ocmcmds/sources/get/cmd.go | 4 ---- .../commands/ocmcmds/sources/get/cmd_test.go | 8 ++------ .../ocmcmds/sources/get/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/versions/cmd.go | 4 ---- .../ocm/commands/ocmcmds/versions/show/cmd.go | 4 ---- .../ocmcmds/versions/show/cmd_test.go | 8 ++------ .../ocmcmds/versions/show/suite_test.go | 4 ---- cmds/ocm/commands/toicmds/cmd.go | 4 ---- .../commands/toicmds/config/bootstrap/cmd.go | 4 ---- .../toicmds/config/bootstrap/cmd_test.go | 11 +++-------- .../toicmds/config/bootstrap/suite_test.go | 4 ---- cmds/ocm/commands/toicmds/config/cmd.go | 4 ---- cmds/ocm/commands/toicmds/names/names.go | 4 ---- .../commands/toicmds/package/bootstrap/cmd.go | 4 ---- cmds/ocm/commands/toicmds/package/cmd.go | 4 ---- .../commands/toicmds/package/describe/cmd.go | 4 ---- .../commands/toicmds/verbs/bootstrap/cmd.go | 4 ---- .../commands/toicmds/verbs/describe/cmd.go | 4 ---- cmds/ocm/commands/verbs/add/cmd.go | 4 ---- cmds/ocm/commands/verbs/bootstrap/cmd.go | 4 ---- cmds/ocm/commands/verbs/check/cmd.go | 4 ---- cmds/ocm/commands/verbs/clean/cmd.go | 4 ---- cmds/ocm/commands/verbs/controller/cmd.go | 4 ---- cmds/ocm/commands/verbs/create/cmd.go | 4 ---- cmds/ocm/commands/verbs/describe/cmd.go | 4 ---- cmds/ocm/commands/verbs/download/cmd.go | 4 ---- cmds/ocm/commands/verbs/execute/cmd.go | 4 ---- cmds/ocm/commands/verbs/get/cmd.go | 4 ---- cmds/ocm/commands/verbs/hash/cmd.go | 4 ---- cmds/ocm/commands/verbs/install/cmd.go | 4 ---- cmds/ocm/commands/verbs/list/cmd.go | 4 ---- cmds/ocm/commands/verbs/show/cmd.go | 4 ---- cmds/ocm/commands/verbs/sign/cmd.go | 4 ---- cmds/ocm/commands/verbs/transfer/cmd.go | 4 ---- cmds/ocm/commands/verbs/verbs.go | 4 ---- cmds/ocm/commands/verbs/verify/cmd.go | 4 ---- cmds/ocm/main.go | 4 ---- cmds/ocm/pkg/data/convert.go | 4 ---- cmds/ocm/pkg/data/dll.go | 4 ---- cmds/ocm/pkg/data/dll_test.go | 4 ---- cmds/ocm/pkg/data/indexed.go | 4 ---- cmds/ocm/pkg/data/indexed_test.go | 4 ---- cmds/ocm/pkg/data/iterator.go | 4 ---- cmds/ocm/pkg/data/list.go | 4 ---- cmds/ocm/pkg/data/list_test.go | 4 ---- cmds/ocm/pkg/data/sort.go | 4 ---- cmds/ocm/pkg/data/suite_test.go | 4 ---- cmds/ocm/pkg/options/interfaces.go | 4 ---- cmds/ocm/pkg/options/options_test.go | 5 ----- cmds/ocm/pkg/options/suite_test.go | 4 ---- cmds/ocm/pkg/output/attroutput.go | 7 +------ cmds/ocm/pkg/output/attrset.go | 4 ---- cmds/ocm/pkg/output/chain.go | 4 ---- cmds/ocm/pkg/output/complexoutput.go | 9 ++------- cmds/ocm/pkg/output/elementoutput.go | 9 ++------- cmds/ocm/pkg/output/funcoutput.go | 4 ---- cmds/ocm/pkg/output/options.go | 4 ---- cmds/ocm/pkg/output/output.go | 7 +------ cmds/ocm/pkg/output/select.go | 4 ---- cmds/ocm/pkg/output/singleelemoutput.go | 4 ---- cmds/ocm/pkg/output/sort_test.go | 4 ---- cmds/ocm/pkg/output/stringoutput.go | 7 +------ cmds/ocm/pkg/output/suite_test.go | 4 ---- cmds/ocm/pkg/output/table.go | 4 ---- cmds/ocm/pkg/output/tableoutput.go | 11 +++-------- cmds/ocm/pkg/output/treeoutput.go | 4 ---- cmds/ocm/pkg/output/utils.go | 4 ---- cmds/ocm/pkg/processing/buffer.go | 4 ---- cmds/ocm/pkg/processing/buffer_test.go | 7 +------ cmds/ocm/pkg/processing/chain.go | 4 ---- cmds/ocm/pkg/processing/operation.go | 4 ---- cmds/ocm/pkg/processing/parallel.go | 4 ---- cmds/ocm/pkg/processing/pool.go | 4 ---- cmds/ocm/pkg/processing/processing.go | 4 ---- cmds/ocm/pkg/processing/processing_test.go | 7 +------ cmds/ocm/pkg/processing/sequential.go | 4 ---- cmds/ocm/pkg/processing/suite_test.go | 4 ---- cmds/ocm/pkg/processing/utils.go | 4 ---- cmds/ocm/pkg/tree/convert.go | 4 ---- cmds/ocm/pkg/tree/suite_test.go | 4 ---- cmds/ocm/pkg/tree/tree.go | 4 ---- cmds/ocm/pkg/tree/tree_test.go | 4 ---- cmds/ocm/pkg/utils/command.go | 4 ---- cmds/ocm/pkg/utils/handling.go | 4 ---- cmds/ocm/pkg/utils/plural.go | 4 ---- cmds/ocm/pkg/utils/validate.go | 4 ---- cmds/ocm/testhelper/env.go | 4 ---- cmds/ocm/testhelper/forward.go | 4 ---- cmds/ocm/testhelper/suite_test.go | 4 ---- cmds/ocm/testhelper/testhelper_test.go | 7 +------ cmds/ocm/topics/common/attributes/topic.go | 4 ---- cmds/ocm/topics/common/config/topic.go | 4 ---- cmds/ocm/topics/common/credentials/topic.go | 4 ---- cmds/ocm/topics/common/logging/topic.go | 4 ---- cmds/ocm/topics/oci/refs/topic.go | 4 ---- cmds/ocm/topics/ocm/accessmethods/topic.go | 4 ---- cmds/ocm/topics/ocm/downloadhandlers/topic.go | 4 ---- cmds/ocm/topics/ocm/labels/topic.go | 4 ---- cmds/ocm/topics/ocm/refs/topic.go | 4 ---- cmds/ocm/topics/ocm/uploadhandlers/topic.go | 4 ---- cmds/ocm/topics/toi/bootstrapping/topic.go | 4 ---- examples/lib/comparison-scenario/main.go | 4 ---- examples/lib/config1/example.go | 4 ---- examples/lib/config1/main.go | 4 ---- examples/lib/config2/example.go | 4 ---- examples/lib/config2/main.go | 4 ---- examples/lib/config3/example.go | 4 ---- examples/lib/config3/main.go | 4 ---- examples/lib/cred1/example.go | 4 ---- examples/lib/cred1/main.go | 4 ---- examples/lib/cred2/example.go | 4 ---- examples/lib/cred2/main.go | 4 ---- examples/lib/cred3/example.go | 4 ---- examples/lib/cred3/main.go | 4 ---- examples/lib/ctf/example.go | 5 +---- examples/lib/ctf/main.go | 4 ---- examples/lib/example.go | 4 ---- examples/lib/helper/helper.go | 4 ---- examples/lib/main.go | 4 ---- examples/lib/tour/01-getting-started/main.go | 4 ---- .../02-composing-a-component-version/main.go | 4 ---- .../tour/03-working-with-credentials/main.go | 4 ---- .../lib/tour/04-working-with-config/main.go | 4 ---- .../main.go | 4 ---- .../06-signing-component-versions/main.go | 4 ---- examples/lib/transfer1/example.go | 4 ---- examples/lib/transfer1/main.go | 4 ---- hack/generate-docs/cobradoc/gen.go | 4 ---- hack/generate-docs/cobradoc/md_docs.go | 7 +------ hack/generate-docs/cobradoc/mod.go | 4 ---- hack/generate-docs/cobradoc/suite_test.go | 4 ---- hack/generate-docs/cobradoc/util.go | 4 ---- hack/generate-docs/main.go | 4 ---- hack/tools.go | 4 ---- pkg/blobaccess/dockerdaemon/access.go | 4 ---- pkg/blobaccess/dockermulti/access.go | 7 +------ pkg/blobaccess/helm/resource.go | 4 ---- pkg/blobaccess/ociartifact/resource.go | 4 ---- pkg/blobaccess/suite_test.go | 4 ---- pkg/cobrautils/cleanup_test.go | 6 +----- pkg/cobrautils/flag/bytes.go | 4 ---- pkg/cobrautils/flag/labelledstring.go | 4 ---- pkg/cobrautils/flag/labelledstring_test.go | 5 ----- pkg/cobrautils/flag/labelledvalue.go | 4 ---- pkg/cobrautils/flag/labelledvalue_test.go | 5 ----- pkg/cobrautils/flag/semver.go | 4 ---- pkg/cobrautils/flag/semver_constraint.go | 4 ---- pkg/cobrautils/flag/string_to_value.go | 4 ---- pkg/cobrautils/flag/string_to_value_test.go | 5 ----- pkg/cobrautils/flag/suite_test.go | 4 ---- pkg/cobrautils/flag/yaml.go | 4 ---- pkg/cobrautils/flag/yaml_test.go | 5 ----- pkg/cobrautils/flagsets/configoptions.go | 4 ---- pkg/cobrautils/flagsets/configoptionset.go | 4 ---- pkg/cobrautils/flagsets/configure_test.go | 7 +------ pkg/cobrautils/flagsets/flags_test.go | 5 ----- pkg/cobrautils/flagsets/handler.go | 4 ---- pkg/cobrautils/flagsets/provider.go | 4 ---- pkg/cobrautils/flagsets/suite_test.go | 4 ---- pkg/cobrautils/flagsets/typeset_test.go | 4 ---- pkg/cobrautils/flagsets/utils.go | 4 ---- pkg/cobrautils/flagsets/utils_test.go | 4 ---- pkg/cobrautils/funcs.go | 4 ---- pkg/cobrautils/groups/flagusages.go | 4 ---- pkg/cobrautils/links.go | 4 ---- pkg/cobrautils/logopts/suite_test.go | 4 ---- pkg/cobrautils/suite_test.go | 4 ---- pkg/cobrautils/template.go | 4 ---- pkg/cobrautils/tweak.go | 7 +------ pkg/common/accessio/access.go | 4 ---- pkg/common/accessio/cache.go | 4 ---- pkg/common/accessio/cache_test.go | 9 ++------- pkg/common/accessio/downloader/downloader.go | 4 ---- .../accessio/downloader/http/downloader.go | 4 ---- .../accessio/downloader/s3/downloader.go | 4 ---- pkg/common/accessio/format.go | 4 ---- pkg/common/accessio/limitwriter.go | 4 ---- pkg/common/accessio/ondemandreader.go | 4 ---- pkg/common/accessio/opts.go | 4 ---- pkg/common/accessio/resettablereader.go | 4 ---- pkg/common/accessio/resettablereader_test.go | 9 ++------- pkg/common/accessio/suite_test.go | 4 ---- pkg/common/accessio/utils.go | 4 ---- pkg/common/accessio/wrapper.go | 4 ---- pkg/common/accessobj/accessobject.go | 4 ---- pkg/common/accessobj/accessstate.go | 4 ---- pkg/common/accessobj/cachedblob.go | 4 ---- pkg/common/accessobj/check.go | 4 ---- pkg/common/accessobj/filesystemaccess.go | 4 ---- pkg/common/accessobj/format-directory.go | 4 ---- pkg/common/accessobj/format-tar.go | 4 ---- pkg/common/accessobj/format-tgz.go | 4 ---- pkg/common/accessobj/format.go | 4 ---- pkg/common/accessobj/suite_test.go | 4 ---- pkg/common/accessobj/utils.go | 4 ---- pkg/common/compression/c_bzip2.go | 4 ---- pkg/common/compression/c_gzip.go | 4 ---- pkg/common/compression/c_xz.go | 4 ---- pkg/common/compression/c_zstd.go | 4 ---- pkg/common/compression/compression.go | 4 ---- pkg/common/compression/compression_test.go | 4 ---- pkg/common/compression/default.go | 4 ---- pkg/common/compression/matchreader.go | 4 ---- pkg/common/compression/types.go | 4 ---- pkg/common/compression/utils.go | 4 ---- pkg/common/const.go | 4 ---- pkg/common/history.go | 4 ---- pkg/common/history_test.go | 4 ---- pkg/common/printer.go | 4 ---- pkg/common/printer_test.go | 7 +------ pkg/common/properties.go | 4 ---- pkg/common/suite_test.go | 4 ---- pkg/common/types.go | 4 ---- pkg/common/utils.go | 4 ---- pkg/common/walk.go | 4 ---- pkg/contexts/clictx/builder.go | 4 ---- pkg/contexts/clictx/config/config_test.go | 4 ---- pkg/contexts/clictx/config/suite_test.go | 4 ---- pkg/contexts/clictx/config/type.go | 4 ---- pkg/contexts/clictx/interface.go | 4 ---- pkg/contexts/clictx/internal/builder.go | 4 ---- pkg/contexts/clictx/internal/context.go | 4 ---- pkg/contexts/config/builder.go | 4 ---- pkg/contexts/config/config/context_test.go | 9 ++------- pkg/contexts/config/config/dummy_test.go | 4 ---- pkg/contexts/config/config/suite_test.go | 4 ---- pkg/contexts/config/config/type.go | 4 ---- pkg/contexts/config/context_test.go | 6 +----- pkg/contexts/config/cpi/config.go | 4 ---- pkg/contexts/config/cpi/interface.go | 4 ---- pkg/contexts/config/dummy_test.go | 4 ---- pkg/contexts/config/gc_test.go | 4 ---- pkg/contexts/config/init.go | 4 ---- pkg/contexts/config/interface.go | 4 ---- pkg/contexts/config/internal/builder.go | 4 ---- pkg/contexts/config/internal/builder_test.go | 4 ---- pkg/contexts/config/internal/config.go | 4 ---- pkg/contexts/config/internal/configtypes.go | 4 ---- pkg/contexts/config/internal/context.go | 4 ---- pkg/contexts/config/internal/errors.go | 4 ---- pkg/contexts/config/internal/setup_test.go | 4 ---- pkg/contexts/config/internal/store.go | 4 ---- pkg/contexts/config/internal/suite_test.go | 4 ---- pkg/contexts/config/internal/updater.go | 4 ---- pkg/contexts/config/suite_test.go | 4 ---- pkg/contexts/credentials/area_test.go | 4 ---- pkg/contexts/credentials/builder.go | 4 ---- .../credentials/builtin/github/ghcr.go | 4 ---- .../builtin/helm/identity/suite_test.go | 4 ---- pkg/contexts/credentials/builtin/init.go | 4 ---- .../credentials/config/config_test.go | 4 ---- pkg/contexts/credentials/config/suite_test.go | 4 ---- pkg/contexts/credentials/config/type.go | 4 ---- pkg/contexts/credentials/const.go | 4 ---- pkg/contexts/credentials/cpi/builtin.go | 4 ---- pkg/contexts/credentials/cpi/interface.go | 4 ---- pkg/contexts/credentials/cpi/repotypes.go | 4 ---- pkg/contexts/credentials/gc_test.go | 4 ---- .../credentials/identity/hostpath/id_test.go | 4 ---- .../credentials/identity/hostpath/identity.go | 4 ---- .../identity/hostpath/suite_test.go | 4 ---- pkg/contexts/credentials/init.go | 4 ---- pkg/contexts/credentials/interface.go | 4 ---- pkg/contexts/credentials/internal/builder.go | 4 ---- .../credentials/internal/builder_test.go | 4 ---- pkg/contexts/credentials/internal/builtin.go | 4 ---- .../credentials/internal/consumers.go | 4 ---- pkg/contexts/credentials/internal/context.go | 4 ---- .../credentials/internal/cred_test.go | 4 ---- .../credentials/internal/credentials.go | 4 ---- .../credentials/internal/credentialsspec.go | 4 ---- pkg/contexts/credentials/internal/errors.go | 4 ---- pkg/contexts/credentials/internal/identity.go | 4 ---- .../credentials/internal/repository.go | 4 ---- .../credentials/internal/repotypes.go | 4 ---- .../credentials/internal/suite_test.go | 4 ---- pkg/contexts/credentials/internal/utils.go | 4 ---- .../credentials/repositories/aliases/cache.go | 4 ---- .../repositories/aliases/repo_test.go | 4 ---- .../repositories/aliases/repository.go | 4 ---- .../repositories/aliases/suite_test.go | 4 ---- .../credentials/repositories/aliases/type.go | 4 ---- .../repositories/directcreds/credentials.go | 4 ---- .../repositories/directcreds/repo_test.go | 4 ---- .../repositories/directcreds/repository.go | 4 ---- .../repositories/directcreds/suite_test.go | 4 ---- .../repositories/directcreds/type.go | 4 ---- .../repositories/dockerconfig/cache.go | 4 ---- .../repositories/dockerconfig/credentials.go | 4 ---- .../repositories/dockerconfig/repo_test.go | 8 ++------ .../repositories/dockerconfig/repository.go | 4 ---- .../repositories/dockerconfig/suite_test.go | 4 ---- .../repositories/dockerconfig/type.go | 4 ---- .../repositories/gardenerconfig/cache.go | 4 ---- .../gardenerconfig/cpi/interface.go | 4 ---- .../gardenerconfig/credentials.go | 4 ---- .../handler/container_registry/credentials.go | 4 ---- .../handler/container_registry/handler.go | 4 ---- .../repositories/gardenerconfig/init.go | 4 ---- .../repositories/gardenerconfig/repo_test.go | 7 +------ .../repositories/gardenerconfig/repository.go | 4 ---- .../repositories/gardenerconfig/suite_test.go | 4 ---- .../repositories/gardenerconfig/type.go | 4 ---- .../credentials/repositories/memory/cache.go | 4 ---- .../repositories/memory/config/config_test.go | 9 ++------- .../repositories/memory/config/suite_test.go | 4 ---- .../repositories/memory/config/type.go | 4 ---- .../repositories/memory/repo_test.go | 4 ---- .../repositories/memory/repository.go | 4 ---- .../repositories/memory/suite_test.go | 4 ---- .../credentials/repositories/memory/type.go | 4 ---- .../credentials/repositories/vault/cache.go | 4 ---- .../repositories/vault/repository.go | 4 ---- .../repositories/vault/suite_test.go | 4 ---- .../credentials/repositories/vault/type.go | 4 ---- pkg/contexts/credentials/suite_test.go | 4 ---- pkg/contexts/credentials/usage.go | 4 ---- .../datacontext/action/api/suite_test.go | 4 ---- pkg/contexts/datacontext/action/type.go | 4 ---- pkg/contexts/datacontext/attrs.go | 4 ---- pkg/contexts/datacontext/attrs/init.go | 4 ---- .../datacontext/attrs/logforward/attr.go | 4 ---- .../datacontext/attrs/rootcertsattr/attr.go | 4 ---- .../attrs/rootcertsattr/attr_test.go | 4 ---- .../attrs/rootcertsattr/suite_test.go | 4 ---- .../datacontext/attrs/vfsattr/attr.go | 4 ---- .../datacontext/config/attrs/config_test.go | 4 ---- .../datacontext/config/attrs/suite_test.go | 4 ---- pkg/contexts/datacontext/config/attrs/type.go | 4 ---- pkg/contexts/datacontext/config/init.go | 4 ---- .../datacontext/config/logging/config_test.go | 11 +++-------- .../datacontext/config/logging/suite_test.go | 4 ---- .../datacontext/config/logging/type.go | 4 ---- pkg/contexts/datacontext/context.go | 4 ---- pkg/contexts/datacontext/gc_test.go | 6 +----- pkg/contexts/datacontext/session.go | 4 ---- pkg/contexts/datacontext/suite_test.go | 4 ---- pkg/contexts/datacontext/util.go | 4 ---- pkg/contexts/oci/art_test.go | 5 ----- pkg/contexts/oci/artdesc/artifact.go | 4 ---- pkg/contexts/oci/artdesc/config.go | 4 ---- pkg/contexts/oci/artdesc/helper/generic.go | 4 ---- pkg/contexts/oci/artdesc/index.go | 4 ---- pkg/contexts/oci/artdesc/manifest.go | 4 ---- pkg/contexts/oci/artdesc/suite_test.go | 4 ---- pkg/contexts/oci/artdesc/utils.go | 4 ---- pkg/contexts/oci/artdesc/utils_test.go | 4 ---- pkg/contexts/oci/attrs/cacheattr/attr.go | 4 ---- pkg/contexts/oci/attrs/cacheattr/attr_test.go | 4 ---- .../oci/attrs/cacheattr/suite_test.go | 4 ---- pkg/contexts/oci/attrs/init.go | 4 ---- pkg/contexts/oci/builder.go | 4 ---- pkg/contexts/oci/config/config_test.go | 4 ---- pkg/contexts/oci/config/suite_test.go | 4 ---- pkg/contexts/oci/config/type.go | 4 ---- pkg/contexts/oci/cpi/interface.go | 4 ---- pkg/contexts/oci/cpi/repotypes.go | 4 ---- pkg/contexts/oci/cpi/state.go | 4 ---- pkg/contexts/oci/cpi/suite_test.go | 4 ---- pkg/contexts/oci/cpi/support/artifact.go | 4 ---- .../oci/cpi/support/artifactsetblobaccess.go | 4 ---- pkg/contexts/oci/cpi/support/base.go | 4 ---- pkg/contexts/oci/cpi/support/flavor_index.go | 4 ---- .../oci/cpi/support/flavor_manifest.go | 4 ---- pkg/contexts/oci/cpi/support/namespace.go | 4 ---- pkg/contexts/oci/cpi/utils.go | 4 ---- pkg/contexts/oci/gc_test.go | 4 ---- pkg/contexts/oci/grammar/grammar.go | 4 ---- pkg/contexts/oci/grammar/grammar_test.go | 4 ---- pkg/contexts/oci/init.go | 4 ---- pkg/contexts/oci/interface.go | 4 ---- pkg/contexts/oci/internal/builder.go | 4 ---- pkg/contexts/oci/internal/builder_test.go | 4 ---- pkg/contexts/oci/internal/context.go | 4 ---- pkg/contexts/oci/internal/errors.go | 4 ---- pkg/contexts/oci/internal/repository.go | 4 ---- pkg/contexts/oci/internal/repotypes.go | 4 ---- pkg/contexts/oci/internal/suite_test.go | 4 ---- pkg/contexts/oci/internal/uniform.go | 4 ---- pkg/contexts/oci/ociutils/handler.go | 4 ---- pkg/contexts/oci/ociutils/helm/art_test.go | 11 +++-------- pkg/contexts/oci/ociutils/helm/artifact.go | 4 ---- pkg/contexts/oci/ociutils/helm/ignore/doc.go | 4 ---- .../oci/ociutils/helm/ignore/rules.go | 4 ---- .../oci/ociutils/helm/ignore/rules_test.go | 4 ---- pkg/contexts/oci/ociutils/helm/suite_test.go | 4 ---- .../oci/ociutils/helm/sympath/walk.go | 4 ---- .../oci/ociutils/helm/sympath/walk_test.go | 4 ---- pkg/contexts/oci/ociutils/info.go | 4 ---- pkg/contexts/oci/ociutils/print.go | 4 ---- pkg/contexts/oci/ref.go | 4 ---- pkg/contexts/oci/ref_test.go | 7 +------ .../repositories/artifactset/artifactset.go | 4 ---- .../artifactset/artifactset_test.go | 15 +++++---------- .../oci/repositories/artifactset/error.go | 4 ---- .../artifactset/filesystemaccess.go | 4 ---- .../oci/repositories/artifactset/format.go | 4 ---- .../oci/repositories/artifactset/options.go | 4 ---- .../oci/repositories/artifactset/repo_test.go | 6 +----- .../repositories/artifactset/repository.go | 4 ---- .../oci/repositories/artifactset/state.go | 4 ---- .../repositories/artifactset/suite_test.go | 4 ---- .../artifactset/testhelper/formats.go | 4 ---- .../oci/repositories/artifactset/type.go | 4 ---- .../oci/repositories/artifactset/uniform.go | 4 ---- .../artifactset/utils_synthesis.go | 7 +------ pkg/contexts/oci/repositories/ctf/ctf_test.go | 13 ++++--------- pkg/contexts/oci/repositories/ctf/format.go | 4 ---- .../oci/repositories/ctf/format/const.go | 4 ---- .../oci/repositories/ctf/index/ctfindex.go | 4 ---- .../oci/repositories/ctf/index/index.go | 4 ---- .../oci/repositories/ctf/index/index_test.go | 5 +---- .../oci/repositories/ctf/index/suite_test.go | 4 ---- .../oci/repositories/ctf/namespace.go | 4 ---- .../oci/repositories/ctf/repository.go | 4 ---- pkg/contexts/oci/repositories/ctf/state.go | 4 ---- .../oci/repositories/ctf/suite_test.go | 4 ---- .../oci/repositories/ctf/synthesis_test.go | 13 ++++--------- .../oci/repositories/ctf/testhelper/fill.go | 5 ----- pkg/contexts/oci/repositories/ctf/type.go | 4 ---- pkg/contexts/oci/repositories/ctf/uniform.go | 4 ---- .../oci/repositories/docker/artifact.go | 4 ---- .../oci/repositories/docker/client.go | 4 ---- .../oci/repositories/docker/convert.go | 4 ---- pkg/contexts/oci/repositories/docker/type.go | 4 ---- .../oci/repositories/docker/uniform.go | 4 ---- pkg/contexts/oci/repositories/docker/utils.go | 4 ---- .../oci/repositories/empty/repository.go | 4 ---- pkg/contexts/oci/repositories/empty/type.go | 4 ---- .../oci/repositories/empty/uniform.go | 4 ---- pkg/contexts/oci/repositories/init.go | 4 ---- pkg/contexts/oci/repositories/ocireg/blobs.go | 4 ---- .../oci/repositories/ocireg/namespace.go | 4 ---- .../oci/repositories/ocireg/repository.go | 4 ---- pkg/contexts/oci/repositories/ocireg/type.go | 4 ---- .../oci/repositories/ocireg/uniform.go | 4 ---- pkg/contexts/oci/repositories/ocireg/utils.go | 4 ---- pkg/contexts/oci/session.go | 4 ---- pkg/contexts/oci/suite_test.go | 4 ---- pkg/contexts/oci/testhelper/manifests.go | 4 ---- pkg/contexts/oci/testhelper/oci.go | 4 ---- pkg/contexts/oci/transfer/suite_test.go | 4 ---- pkg/contexts/oci/transfer/transfer.go | 4 ---- pkg/contexts/oci/utils.go | 4 ---- .../ocm/accessmethods/compose/method.go | 4 ---- pkg/contexts/ocm/accessmethods/github/cli.go | 4 ---- .../ocm/accessmethods/github/method.go | 4 ---- .../ocm/accessmethods/github/suite_test.go | 4 ---- pkg/contexts/ocm/accessmethods/helm/cli.go | 4 ---- pkg/contexts/ocm/accessmethods/helm/method.go | 4 ---- .../ocm/accessmethods/helm/method_test.go | 9 ++------- .../ocm/accessmethods/helm/suite_test.go | 4 ---- pkg/contexts/ocm/accessmethods/init.go | 4 ---- .../ocm/accessmethods/localblob/cli.go | 4 ---- .../ocm/accessmethods/localblob/method.go | 7 +------ .../accessmethods/localblob/method_test.go | 8 ++------ .../ocm/accessmethods/localblob/suite_test.go | 4 ---- .../ocm/accessmethods/localfsblob/method.go | 7 +------ .../accessmethods/localfsblob/method_test.go | 6 +----- .../accessmethods/localfsblob/suite_test.go | 4 ---- .../ocm/accessmethods/localociblob/method.go | 7 +------ .../accessmethods/localociblob/method_test.go | 6 +----- .../accessmethods/localociblob/suite_test.go | 4 ---- pkg/contexts/ocm/accessmethods/none/method.go | 4 ---- pkg/contexts/ocm/accessmethods/npm/cli.go | 4 ---- pkg/contexts/ocm/accessmethods/npm/method.go | 4 ---- .../ocm/accessmethods/npm/method_test.go | 10 +++------- .../ocm/accessmethods/npm/suite_test.go | 4 ---- .../ocm/accessmethods/ociartifact/cli.go | 4 ---- .../ocm/accessmethods/ociartifact/method.go | 7 +------ .../accessmethods/ociartifact/method_test.go | 8 ++------ .../accessmethods/ociartifact/suite_test.go | 4 ---- pkg/contexts/ocm/accessmethods/ociblob/cli.go | 4 ---- .../ocm/accessmethods/ociblob/method.go | 4 ---- .../ocm/accessmethods/ociblob/method_test.go | 8 ++------ .../ocm/accessmethods/ociblob/suite_test.go | 4 ---- .../ocm/accessmethods/options/init.go | 4 ---- .../ocm/accessmethods/options/registry.go | 4 ---- .../accessmethods/options/registry_test.go | 5 +---- .../ocm/accessmethods/options/standard.go | 4 ---- .../ocm/accessmethods/options/suite_test.go | 4 ---- .../ocm/accessmethods/options/types.go | 4 ---- .../ocm/accessmethods/plugin/cmd_test.go | 13 ++++--------- pkg/contexts/ocm/accessmethods/plugin/doc.go | 4 ---- .../ocm/accessmethods/plugin/method.go | 4 ---- .../ocm/accessmethods/plugin/method_test.go | 8 ++------ .../ocm/accessmethods/plugin/plugin.go | 4 ---- .../ocm/accessmethods/plugin/suite_test.go | 4 ---- pkg/contexts/ocm/accessmethods/plugin/type.go | 4 ---- .../accessmethods/relativeociref/method.go | 4 ---- .../relativeociref/suite_test.go | 4 ---- .../relativeociref/transfer_test.go | 10 +++------- pkg/contexts/ocm/accessmethods/s3/cli.go | 4 ---- pkg/contexts/ocm/accessmethods/s3/method.go | 7 +------ .../ocm/accessmethods/s3/suite_test.go | 4 ---- .../ocm/accessmethods/wget/suite_test.go | 4 ---- .../ocm/actionhandler/plugin/action_test.go | 8 ++------ .../ocm/actionhandler/plugin/actionhandler.go | 4 ---- .../ocm/actionhandler/plugin/registration.go | 4 ---- .../ocm/actionhandler/plugin/suite_test.go | 4 ---- pkg/contexts/ocm/attrs/compatattr/attr.go | 4 ---- .../ocm/attrs/compatattr/attr_test.go | 4 ---- .../ocm/attrs/compatattr/suite_test.go | 4 ---- .../ocm/attrs/compositionmodeattr/attr.go | 4 ---- .../attrs/compositionmodeattr/attr_test.go | 4 ---- .../attrs/compositionmodeattr/suite_test.go | 4 ---- pkg/contexts/ocm/attrs/hashattr/attr.go | 4 ---- pkg/contexts/ocm/attrs/hashattr/attr_test.go | 6 +----- pkg/contexts/ocm/attrs/hashattr/config.go | 4 ---- pkg/contexts/ocm/attrs/hashattr/suite_test.go | 4 ---- pkg/contexts/ocm/attrs/init.go | 4 ---- pkg/contexts/ocm/attrs/keepblobattr/attr.go | 4 ---- .../ocm/attrs/keepblobattr/attr_test.go | 4 ---- .../ocm/attrs/keepblobattr/suite_test.go | 4 ---- pkg/contexts/ocm/attrs/mapocirepoattr/attr.go | 4 ---- .../ocm/attrs/mapocirepoattr/attr_test.go | 4 ---- .../ocm/attrs/mapocirepoattr/suite_test.go | 4 ---- pkg/contexts/ocm/attrs/ociuploadattr/attr.go | 4 ---- .../ocm/attrs/ociuploadattr/attr_test.go | 4 ---- .../ocm/attrs/ociuploadattr/suite_test.go | 4 ---- .../ocm/attrs/plugincacheattr/attr.go | 4 ---- .../ocm/attrs/plugindirattr/attr_test.go | 4 ---- .../ocm/attrs/plugindirattr/suite_test.go | 4 ---- pkg/contexts/ocm/attrs/signingattr/attr.go | 4 ---- .../ocm/attrs/signingattr/attr_test.go | 4 ---- pkg/contexts/ocm/attrs/signingattr/config.go | 4 ---- .../ocm/attrs/signingattr/suite_test.go | 4 ---- pkg/contexts/ocm/bind_test.go | 4 ---- pkg/contexts/ocm/blobhandler/config/type.go | 4 ---- pkg/contexts/ocm/blobhandler/doc.go | 4 ---- .../handlers/generic/ocirepo/blobhandler.go | 4 ---- .../handlers/generic/ocirepo/registration.go | 4 ---- .../handlers/generic/ocirepo/suite_test.go | 4 ---- .../handlers/generic/ocirepo/upload_test.go | 10 +++------- .../handlers/generic/plugin/blobhandler.go | 4 ---- .../handlers/generic/plugin/registration.go | 4 ---- .../handlers/generic/plugin/suite_test.go | 4 ---- .../handlers/generic/plugin/upload_test.go | 13 ++++--------- .../ocm/blobhandler/handlers/oci/ctx.go | 4 ---- .../ocm/blobhandler/handlers/oci/doc.go | 4 ---- .../handlers/oci/ocirepo/blobhandler.go | 7 +------ .../handlers/oci/ocirepo/handler_test.go | 10 +++------- .../handlers/oci/ocirepo/suite_test.go | 4 ---- .../handlers/ocm/comparch/blobhandler.go | 4 ---- .../handlers/ocm/comparch/blobhandler_test.go | 9 ++------- .../handlers/ocm/comparch/suite_test.go | 4 ---- .../ocm/blobhandler/handlers/ocm/ctx.go | 4 ---- .../ocm/blobhandler/handlers/ocm/doc.go | 4 ---- pkg/contexts/ocm/builder.go | 4 ---- pkg/contexts/ocm/compdesc/codecs.go | 4 ---- pkg/contexts/ocm/compdesc/compdesc_test.go | 6 +----- .../ocm/compdesc/componentdescriptor.go | 4 ---- pkg/contexts/ocm/compdesc/default.go | 4 ---- pkg/contexts/ocm/compdesc/helper.go | 4 ---- pkg/contexts/ocm/compdesc/helper_test.go | 6 +----- pkg/contexts/ocm/compdesc/init.go | 4 ---- pkg/contexts/ocm/compdesc/meta/v1/identity.go | 4 ---- pkg/contexts/ocm/compdesc/meta/v1/labels.go | 4 ---- .../ocm/compdesc/meta/v1/resourceref.go | 4 ---- .../ocm/compdesc/meta/v1/signature.go | 4 ---- .../ocm/compdesc/meta/v1/stringmap.go | 4 ---- .../ocm/compdesc/meta/v1/suite_test.go | 4 ---- pkg/contexts/ocm/compdesc/meta/v1/types.go | 4 ---- pkg/contexts/ocm/compdesc/meta/v1/utils.go | 4 ---- .../compdesc/meta/v1/zz_generated.deepcopy.go | 4 ---- pkg/contexts/ocm/compdesc/norm_test.go | 11 +++-------- pkg/contexts/ocm/compdesc/normalization.go | 4 ---- .../ocm/compdesc/normalizations/init.go | 4 ---- .../compdesc/normalizations/jsonv1/norm.go | 4 ---- .../compdesc/normalizations/jsonv2/norm.go | 4 ---- pkg/contexts/ocm/compdesc/schemes.go | 4 ---- pkg/contexts/ocm/compdesc/signing.go | 4 ---- pkg/contexts/ocm/compdesc/suite_test.go | 4 ---- .../ocm/compdesc/testutils/compnametest.go | 5 ----- pkg/contexts/ocm/compdesc/util.go | 4 ---- pkg/contexts/ocm/compdesc/versions/init.go | 4 ---- .../v3alpha1/componentdescriptor.go | 4 ---- .../versions/ocm.software/v3alpha1/default.go | 4 ---- .../v3alpha1/jsonscheme/jsonscheme.go | 4 ---- .../versions/ocm.software/v3alpha1/signing.go | 4 ---- .../ocm.software/v3alpha1/validation.go | 4 ---- .../ocm.software/v3alpha1/validation_test.go | 7 +------ .../versions/ocm.software/v3alpha1/version.go | 4 ---- .../v3alpha1/zz_generated.deepcopy.go | 4 ---- .../versions/v2/componentdescriptor.go | 4 ---- .../ocm/compdesc/versions/v2/default.go | 4 ---- .../versions/v2/jsonscheme/jsonscheme.go | 4 ---- .../ocm/compdesc/versions/v2/signing.go | 4 ---- .../ocm/compdesc/versions/v2/validation.go | 4 ---- .../compdesc/versions/v2/validation_test.go | 9 ++------- .../ocm/compdesc/versions/v2/version.go | 4 ---- .../versions/v2/zz_generated.deepcopy.go | 4 ---- pkg/contexts/ocm/config/config_test.go | 4 ---- pkg/contexts/ocm/config/suite_test.go | 4 ---- pkg/contexts/ocm/config/type.go | 4 ---- pkg/contexts/ocm/consts/extra_identities.go | 4 ---- pkg/contexts/ocm/cpi/compose_test.go | 15 +++++---------- pkg/contexts/ocm/cpi/dummy.go | 4 ---- pkg/contexts/ocm/cpi/interface.go | 4 ---- pkg/contexts/ocm/cpi/repotypes.go | 4 ---- pkg/contexts/ocm/cpi/storagectx.go | 4 ---- pkg/contexts/ocm/cpi/suite_test.go | 4 ---- pkg/contexts/ocm/cpi/utils.go | 4 ---- .../digester/digesters/artifact/digester.go | 4 ---- pkg/contexts/ocm/digester/digesters/init.go | 4 ---- pkg/contexts/ocm/download/config/type.go | 4 ---- pkg/contexts/ocm/download/doc.go | 4 ---- .../ocm/download/handlers/blob/handler.go | 4 ---- .../download/handlers/blueprint/handler.go | 4 ---- .../download/handlers/dirtree/dirtree_test.go | 11 +++-------- .../handlers/dirtree/registration_test.go | 11 +++-------- .../download/handlers/dirtree/suite_test.go | 4 ---- .../download/handlers/executable/handler.go | 4 ---- .../ocm/download/handlers/helm/handler.go | 4 ---- pkg/contexts/ocm/download/handlers/init.go | 4 ---- .../ocm/download/handlers/ocirepo/handler.go | 4 ---- .../download/handlers/ocirepo/suite_test.go | 4 ---- .../download/handlers/ocirepo/upload_test.go | 9 ++------- .../download/handlers/plugin/download_test.go | 11 +++-------- .../ocm/download/handlers/plugin/handler.go | 4 ---- .../download/handlers/plugin/registration.go | 4 ---- .../download/handlers/plugin/suite_test.go | 4 ---- pkg/contexts/ocm/download/registry.go | 4 ---- .../genericaccess/suite_test.go | 4 ---- .../artifactblob/dirtreeblob/suite_test.go | 4 ---- pkg/contexts/ocm/elements/suite_test.go | 4 ---- pkg/contexts/ocm/extraid/extra_identities.go | 4 ---- pkg/contexts/ocm/gc_test.go | 4 ---- pkg/contexts/ocm/grammar/grammar.go | 7 +------ pkg/contexts/ocm/grammar/grammar_test.go | 4 ---- pkg/contexts/ocm/init.go | 4 ---- pkg/contexts/ocm/interface.go | 4 ---- pkg/contexts/ocm/internal/accessspecref.go | 4 ---- pkg/contexts/ocm/internal/accesstypes.go | 4 ---- pkg/contexts/ocm/internal/blobhandler.go | 4 ---- pkg/contexts/ocm/internal/blobhandler_test.go | 6 +----- pkg/contexts/ocm/internal/builder.go | 4 ---- pkg/contexts/ocm/internal/builder_test.go | 4 ---- pkg/contexts/ocm/internal/context.go | 7 +------ pkg/contexts/ocm/internal/digesthandler.go | 4 ---- .../ocm/internal/digesthandler_test.go | 6 +----- pkg/contexts/ocm/internal/errors.go | 4 ---- pkg/contexts/ocm/internal/repository.go | 4 ---- pkg/contexts/ocm/internal/repotypes.go | 4 ---- pkg/contexts/ocm/internal/suite_test.go | 4 ---- pkg/contexts/ocm/internal/uniform.go | 4 ---- pkg/contexts/ocm/internal/uniform_test.go | 4 ---- .../ocm/labels/routingslip/suite_test.go | 4 ---- .../labels/routingslip/types/comment/cli.go | 4 ---- .../routingslip/types/plugin/cmd_test.go | 10 +++------- .../labels/routingslip/types/plugin/doc.go | 4 ---- .../labels/routingslip/types/plugin/entry.go | 4 ---- .../routingslip/types/plugin/entry_test.go | 7 +------ .../labels/routingslip/types/plugin/plugin.go | 4 ---- .../routingslip/types/plugin/suite_test.go | 4 ---- .../labels/routingslip/types/plugin/type.go | 4 ---- pkg/contexts/ocm/plugin/cache/dircache.go | 4 ---- pkg/contexts/ocm/plugin/cache/doc.go | 4 ---- pkg/contexts/ocm/plugin/cache/exec.go | 4 ---- pkg/contexts/ocm/plugin/cache/plugin.go | 4 ---- pkg/contexts/ocm/plugin/cache/plugindir.go | 4 ---- pkg/contexts/ocm/plugin/cache/registry.go | 4 ---- pkg/contexts/ocm/plugin/cache/updater.go | 4 ---- pkg/contexts/ocm/plugin/common/common.go | 4 ---- pkg/contexts/ocm/plugin/common/describe.go | 4 ---- pkg/contexts/ocm/plugin/config/type.go | 4 ---- .../ocm/plugin/descriptor/descriptor.go | 4 ---- pkg/contexts/ocm/plugin/descriptor/doc.go | 4 ---- pkg/contexts/ocm/plugin/doc.go | 4 ---- pkg/contexts/ocm/plugin/interface.go | 4 ---- pkg/contexts/ocm/plugin/internal/access.go | 4 ---- pkg/contexts/ocm/plugin/internal/upload.go | 4 ---- pkg/contexts/ocm/plugin/plugin.go | 4 ---- pkg/contexts/ocm/plugin/plugin_test.go | 6 +----- pkg/contexts/ocm/plugin/plugins/plugins.go | 4 ---- .../ocm/plugin/ppi/cmds/accessmethod/cmd.go | 4 ---- .../ppi/cmds/accessmethod/compose/cmd.go | 4 ---- .../plugin/ppi/cmds/accessmethod/get/cmd.go | 4 ---- .../ppi/cmds/accessmethod/identity/cmd.go | 4 ---- .../ppi/cmds/accessmethod/validate/cmd.go | 4 ---- .../ocm/plugin/ppi/cmds/action/cmd.go | 4 ---- .../ocm/plugin/ppi/cmds/action/execute/cmd.go | 4 ---- pkg/contexts/ocm/plugin/ppi/cmds/app.go | 4 ---- .../ocm/plugin/ppi/cmds/common/const.go | 4 ---- pkg/contexts/ocm/plugin/ppi/cmds/desc.go | 4 ---- .../ocm/plugin/ppi/cmds/describe/cmd.go | 4 ---- .../ocm/plugin/ppi/cmds/doc/generate.go | 4 ---- .../ocm/plugin/ppi/cmds/download/cmd.go | 4 ---- pkg/contexts/ocm/plugin/ppi/cmds/info/cmd.go | 4 ---- .../ocm/plugin/ppi/cmds/mergehandler/cmd.go | 4 ---- .../ppi/cmds/mergehandler/execute/cmd.go | 4 ---- .../ppi/cmds/topics/descriptor/topic.go | 4 ---- .../ocm/plugin/ppi/cmds/upload/cmd.go | 4 ---- .../ocm/plugin/ppi/cmds/upload/put/cmd.go | 4 ---- .../plugin/ppi/cmds/upload/validate/cmd.go | 4 ---- .../ocm/plugin/ppi/cmds/valueset/cmd.go | 4 ---- .../plugin/ppi/cmds/valueset/compose/cmd.go | 4 ---- .../plugin/ppi/cmds/valueset/validate/cmd.go | 4 ---- pkg/contexts/ocm/plugin/ppi/doc.go | 4 ---- pkg/contexts/ocm/plugin/ppi/interface.go | 4 ---- pkg/contexts/ocm/plugin/ppi/options.go | 4 ---- pkg/contexts/ocm/plugin/ppi/plugin.go | 4 ---- pkg/contexts/ocm/plugin/ppi/utils.go | 4 ---- pkg/contexts/ocm/plugin/suite_test.go | 4 ---- pkg/contexts/ocm/plugin/utils.go | 4 ---- pkg/contexts/ocm/ref.go | 4 ---- pkg/contexts/ocm/ref_test.go | 6 +----- pkg/contexts/ocm/registration/registration.go | 4 ---- pkg/contexts/ocm/repo_test.go | 4 ---- .../comparch/accessmethod_localfs.go | 4 ---- .../comparch/accessmethod_test.go | 6 +----- .../repositories/comparch/comparch_test.go | 13 ++++--------- .../repositories/comparch/componentarchive.go | 4 ---- .../ocm/repositories/comparch/format.go | 4 ---- .../ocm/repositories/comparch/repository.go | 4 ---- .../ocm/repositories/comparch/state.go | 4 ---- .../ocm/repositories/comparch/suite_test.go | 4 ---- .../ocm/repositories/comparch/type.go | 4 ---- .../ocm/repositories/comparch/uniform.go | 4 ---- .../ocm/repositories/composition/cache.go | 4 ---- .../repositories/composition/close_test.go | 8 ++------ .../ocm/repositories/composition/gc_test.go | 6 +----- .../composition/repository_test.go | 13 ++++--------- .../repositories/composition/suite_test.go | 4 ---- .../repositories/composition/version_test.go | 6 +----- pkg/contexts/ocm/repositories/ctf/format.go | 4 ---- .../ocm/repositories/ctf/repo_test.go | 19 +++++++------------ .../ocm/repositories/ctf/suite_test.go | 4 ---- pkg/contexts/ocm/repositories/ctf/type.go | 4 ---- pkg/contexts/ocm/repositories/ctf/uniform.go | 4 ---- .../genericocireg/accessmethod_localblob.go | 4 ---- .../accessmethod_localoclblob.go | 4 ---- .../componentmapping/constants.go | 4 ---- .../repositories/genericocireg/cred_test.go | 6 +----- .../genericocireg/fallback_test.go | 4 ---- .../ocm/repositories/genericocireg/info.go | 4 ---- .../repositories/genericocireg/repository.go | 4 ---- .../repositories/genericocireg/spec_test.go | 6 +----- .../ocm/repositories/genericocireg/state.go | 4 ---- .../repositories/genericocireg/suite_test.go | 4 ---- .../ocm/repositories/genericocireg/type.go | 4 ---- .../ocm/repositories/genericocireg/uniform.go | 4 ---- pkg/contexts/ocm/repositories/init.go | 4 ---- .../ocm/repositories/ocireg/suite_test.go | 4 ---- pkg/contexts/ocm/repositories/ocireg/type.go | 4 ---- .../virtual/accessmethod_localblob.go | 4 ---- .../ocm/repositories/virtual/component.go | 4 ---- .../repositories/virtual/componentversion.go | 4 ---- .../ocm/repositories/virtual/repository.go | 4 ---- .../ocm/repositories/virtual/suite_test.go | 4 ---- pkg/contexts/ocm/resolver_test.go | 8 ++------ pkg/contexts/ocm/resourcetypes/const.go | 4 ---- pkg/contexts/ocm/session.go | 4 ---- pkg/contexts/ocm/session_test.go | 6 +----- pkg/contexts/ocm/signing/handle.go | 4 ---- pkg/contexts/ocm/signing/options.go | 4 ---- pkg/contexts/ocm/signing/options_test.go | 6 +----- pkg/contexts/ocm/signing/signing_test.go | 16 ++++++---------- pkg/contexts/ocm/signing/suite_test.go | 4 ---- pkg/contexts/ocm/suite_test.go | 4 ---- pkg/contexts/ocm/transfer/logging.go | 4 ---- pkg/contexts/ocm/transfer/suite_test.go | 4 ---- pkg/contexts/ocm/transfer/transfer.go | 4 ---- .../transfer/transferhandler/config/config.go | 4 ---- .../transfer/transferhandler/spiff/handler.go | 4 ---- .../transferhandler/spiff/handler_test.go | 8 ++------ .../transfer/transferhandler/spiff/options.go | 4 ---- .../transferhandler/spiff/suite_test.go | 4 ---- .../transferhandler/standard/handler.go | 4 ---- .../transferhandler/standard/handler_test.go | 12 ++++-------- .../transferhandler/standard/options.go | 4 ---- .../transferhandler/standard/suite_test.go | 4 ---- pkg/contexts/ocm/transfer/transferrepo.go | 4 ---- pkg/contexts/ocm/usage.go | 4 ---- pkg/contexts/ocm/utils.go | 4 ---- pkg/contexts/ocm/utils/check/check_test.go | 8 ++------ pkg/contexts/ocm/utils/check/suite_test.go | 4 ---- .../utils/defaultconfigregistry/configure.go | 4 ---- pkg/contexts/ocm/utils/localize/config.go | 4 ---- .../ocm/utils/localize/config_test.go | 7 +------ pkg/contexts/ocm/utils/localize/format.go | 4 ---- .../ocm/utils/localize/instantiate.go | 4 ---- .../ocm/utils/localize/instantiate_test.go | 9 ++------- pkg/contexts/ocm/utils/localize/localize.go | 4 ---- .../ocm/utils/localize/localize_test.go | 7 +------ pkg/contexts/ocm/utils/localize/subst.go | 4 ---- pkg/contexts/ocm/utils/localize/subst_test.go | 9 ++------- pkg/contexts/ocm/utils/localize/suite_test.go | 4 ---- .../ocm/utils/localize/target_test.go | 7 +------ pkg/contexts/ocm/utils/localize/utils_test.go | 7 +------ pkg/contexts/ocm/utils/registry/registry.go | 4 ---- .../ocm/utils/registry/registry_test.go | 4 ---- pkg/contexts/ocm/utils/registry/regkey.go | 4 ---- pkg/contexts/ocm/utils/registry/suite_test.go | 4 ---- pkg/contexts/ocm/utils/resourceref.go | 7 +------ pkg/contexts/ocm/utils/resourceref_test.go | 8 ++------ pkg/contexts/ocm/utils/suite_test.go | 4 ---- pkg/contexts/ocm/utils/utils.go | 4 ---- .../valuemergehandler/config/config_test.go | 6 +----- .../valuemergehandler/config/suite_test.go | 4 ---- .../ocm/valuemergehandler/config/type.go | 4 ---- .../handlers/defaultmerge/suite_test.go | 4 ---- .../handlers/maplistmerge/suite_test.go | 4 ---- .../handlers/plugin/handler.go | 4 ---- .../handlers/plugin/handler_test.go | 8 ++------ .../handlers/plugin/suite_test.go | 4 ---- .../handlers/simplelistmerge/suite_test.go | 4 ---- .../handlers/simplemapmerge/suite_test.go | 4 ---- pkg/dirtree/suite_test.go | 4 ---- pkg/docker/fetcher.go | 4 ---- pkg/docker/handler.go | 4 ---- pkg/docker/httpreadseeker.go | 4 ---- pkg/docker/lister.go | 4 ---- pkg/docker/orig.go | 4 ---- pkg/docker/pusher.go | 4 ---- pkg/docker/registry.go | 4 ---- pkg/docker/resolve/interface.go | 4 ---- pkg/docker/resolver.go | 4 ---- pkg/env/builder/builder.go | 4 ---- pkg/env/builder/oci_artifact.go | 4 ---- pkg/env/builder/oci_artifactset.go | 4 ---- pkg/env/builder/oci_config.go | 4 ---- pkg/env/builder/oci_ctf.go | 4 ---- pkg/env/builder/oci_layer.go | 4 ---- pkg/env/builder/oci_namespace.go | 4 ---- pkg/env/builder/oci_repo.go | 4 ---- pkg/env/builder/oci_tags.go | 4 ---- pkg/env/builder/ocm_access.go | 4 ---- pkg/env/builder/ocm_comparch.go | 4 ---- pkg/env/builder/ocm_component.go | 4 ---- pkg/env/builder/ocm_composition.go | 4 ---- pkg/env/builder/ocm_ctf.go | 4 ---- pkg/env/builder/ocm_identity.go | 4 ---- pkg/env/builder/ocm_label.go | 4 ---- pkg/env/builder/ocm_provider.go | 4 ---- pkg/env/builder/ocm_reference.go | 4 ---- pkg/env/builder/ocm_repo.go | 4 ---- pkg/env/builder/ocm_resource.go | 4 ---- pkg/env/builder/ocm_source.go | 4 ---- pkg/env/builder/ocm_version.go | 4 ---- pkg/env/builder/rsa_keypair.go | 4 ---- pkg/env/builder/suite_test.go | 4 ---- pkg/env/env.go | 4 ---- pkg/env/env_test.go | 9 ++------- pkg/env/suite_test.go | 4 ---- pkg/errors/alreadyexists.go | 4 ---- pkg/errors/closed.go | 4 ---- pkg/errors/error.go | 4 ---- pkg/errors/error_test.go | 4 ---- pkg/errors/errprop.go | 4 ---- pkg/errors/errprop_test.go | 4 ---- pkg/errors/format.go | 4 ---- pkg/errors/invalid.go | 4 ---- pkg/errors/kinds.go | 4 ---- pkg/errors/list.go | 4 ---- pkg/errors/list_test.go | 4 ---- pkg/errors/nomatch.go | 4 ---- pkg/errors/notfound.go | 4 ---- pkg/errors/notimpl.go | 4 ---- pkg/errors/notsupported.go | 4 ---- pkg/errors/readonly.go | 4 ---- pkg/errors/recursion.go | 4 ---- pkg/errors/required.go | 4 ---- pkg/errors/stillinuse.go | 4 ---- pkg/errors/suite_test.go | 4 ---- pkg/errors/unknown.go | 4 ---- pkg/errors/utils.go | 4 ---- pkg/exception/suite_test.go | 4 ---- pkg/finalizer/finalizer.go | 4 ---- pkg/finalizer/finalizer_test.go | 6 +----- pkg/finalizer/object_test.go | 4 ---- pkg/finalizer/suite_test.go | 4 ---- pkg/generics/conditional.go | 4 ---- pkg/generics/set.go | 4 ---- pkg/helm/loader/directory.go | 4 ---- pkg/helm/loader/forward.go | 4 ---- pkg/helm/loader/loader.go | 4 ---- pkg/logging/config_test.go | 13 ++++--------- pkg/logging/interface.go | 4 ---- pkg/logging/logging.go | 4 ---- pkg/logging/suite_test.go | 4 ---- pkg/logging/testhelper/testhelper.go | 4 ---- pkg/logging/utils.go | 4 ---- pkg/mime/types.go | 4 ---- pkg/mime/util.go | 4 ---- pkg/out/context.go | 4 ---- pkg/refmgmt/finalized/suite_test.go | 4 ---- pkg/refmgmt/resource/suite_test.go | 4 ---- pkg/refmgmt/suite_test.go | 4 ---- pkg/regex/regex.go | 4 ---- pkg/registrations/registrations_test.go | 6 +----- pkg/registrations/suite_test.go | 4 ---- pkg/runtime/binary.go | 4 ---- pkg/runtime/encoding.go | 4 ---- pkg/runtime/object_test.go | 4 ---- pkg/runtime/scheme.go | 4 ---- pkg/runtime/scheme_test.go | 6 +----- pkg/runtime/suite_test.go | 4 ---- pkg/runtime/typedobject.go | 4 ---- pkg/runtime/unstructured.go | 4 ---- pkg/runtime/unstructured_test.go | 7 +------ pkg/runtime/unstructuredversioned.go | 4 ---- pkg/runtime/utils.go | 4 ---- pkg/runtime/validate.go | 4 ---- pkg/runtime/versionedtype.go | 4 ---- pkg/semverutils/suite_test.go | 4 ---- pkg/semverutils/utils.go | 4 ---- pkg/semverutils/utils_test.go | 8 ++------ pkg/signing/cert.go | 4 ---- pkg/signing/cert_test.go | 4 ---- pkg/signing/handlers/init.go | 7 ++----- .../handlers/rsa-signingservice/client.go | 4 ---- .../handlers/rsa-signingservice/handler.go | 4 ---- pkg/signing/handlers/rsa/format.go | 4 ---- pkg/signing/handlers/rsa/handler.go | 4 ---- pkg/signing/handlers/sigstore/handler.go | 4 ---- pkg/signing/hasher/hashfuncs.go | 4 ---- pkg/signing/hasher/init.go | 4 ---- pkg/signing/hasher/nodigest/hasher.go | 4 ---- pkg/signing/hasher/sha256/hasher.go | 4 ---- pkg/signing/hasher/sha512/hasher.go | 4 ---- pkg/signing/normalization.go | 4 ---- pkg/signing/normalization_test.go | 6 +----- pkg/signing/registry.go | 4 ---- pkg/signing/rules.go | 4 ---- pkg/signing/signing_test.go | 4 ---- pkg/signing/signutils/certs_test.go | 6 +----- pkg/signing/signutils/names_test.go | 6 +----- pkg/signing/signutils/suite_test.go | 4 ---- pkg/signing/suite_test.go | 4 ---- pkg/signing/types.go | 4 ---- pkg/signing/utils.go | 4 ---- pkg/signing/x509_certificate.go | 4 ---- pkg/spiff/options.go | 4 ---- pkg/spiff/spiff.go | 4 ---- pkg/spiff/suite_test.go | 4 ---- pkg/spiff/validate.go | 4 ---- pkg/testutils/signing_test.go | 4 ---- pkg/testutils/string.go | 4 ---- pkg/testutils/suite_test.go | 4 ---- pkg/testutils/utils.go | 5 ----- pkg/testutils/yaml.go | 4 ---- pkg/toi/drivers/default/driver.go | 4 ---- pkg/toi/drivers/docker/client.go | 4 ---- pkg/toi/drivers/filesystem/driver.go | 4 ---- pkg/toi/drivers/mock/driver.go | 4 ---- pkg/toi/install/action.go | 7 +------ pkg/toi/install/bundle/spec.go | 4 ---- pkg/toi/install/credentials.go | 4 ---- pkg/toi/install/credentials_test.go | 6 +----- pkg/toi/install/execute.go | 4 ---- pkg/toi/install/interface.go | 4 ---- pkg/toi/install/suite_test.go | 4 ---- pkg/toi/support/app.go | 7 +------ pkg/toi/support/support.go | 4 ---- pkg/utils/ctf.go | 4 ---- pkg/utils/keyinfo.go | 4 ---- pkg/utils/log.go | 4 ---- pkg/utils/panics/panics.go | 4 ---- pkg/utils/panics/suite_test.go | 4 ---- pkg/utils/selector/selector.go | 4 ---- pkg/utils/stringset.go | 4 ---- pkg/utils/stringslice.go | 4 ---- pkg/utils/subst/subst.go | 4 ---- pkg/utils/subst/subst_test.go | 4 ---- pkg/utils/subst/suite_test.go | 4 ---- pkg/utils/suite_test.go | 4 ---- pkg/utils/tarutils/pack.go | 4 ---- pkg/utils/tarutils/pack_test.go | 9 ++------- pkg/utils/tarutils/suite_test.go | 4 ---- pkg/utils/template/gotmpl.go | 4 ---- pkg/utils/template/none.go | 4 ---- pkg/utils/template/registry.go | 4 ---- pkg/utils/template/spiff.go | 4 ---- pkg/utils/template/subst.go | 4 ---- pkg/utils/template/template.go | 4 ---- pkg/utils/template/template_test.go | 9 ++------- pkg/utils/url.go | 4 ---- pkg/utils/utils.go | 4 ---- pkg/utils/utils_test.go | 4 ---- pkg/version/generate/release_generate.go | 4 ---- pkg/version/version.go | 4 ---- 1271 files changed, 340 insertions(+), 5500 deletions(-) create mode 100644 cmds/ocm/ca/component-descriptor.yaml diff --git a/cmds/demoplugin/accessmethods/demo.go b/cmds/demoplugin/accessmethods/demo.go index 5b22521bc6..af4fba67b9 100644 --- a/cmds/demoplugin/accessmethods/demo.go +++ b/cmds/demoplugin/accessmethods/demo.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessmethods import ( diff --git a/cmds/demoplugin/common/const.go b/cmds/demoplugin/common/const.go index 4663991ed4..2a136fb8dd 100644 --- a/cmds/demoplugin/common/const.go +++ b/cmds/demoplugin/common/const.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common const CONSUMER_TYPE = "demo" diff --git a/cmds/demoplugin/config/config.go b/cmds/demoplugin/config/config.go index 87461e7886..f2956ed6fe 100644 --- a/cmds/demoplugin/config/config.go +++ b/cmds/demoplugin/config/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/cmds/demoplugin/main.go b/cmds/demoplugin/main.go index dd744c3270..a0866c2bf1 100644 --- a/cmds/demoplugin/main.go +++ b/cmds/demoplugin/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/cmds/demoplugin/uploaders/demo.go b/cmds/demoplugin/uploaders/demo.go index b3697c9b6c..050e923914 100644 --- a/cmds/demoplugin/uploaders/demo.go +++ b/cmds/demoplugin/uploaders/demo.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package uploaders import ( diff --git a/cmds/demoplugin/uploaders/writer.go b/cmds/demoplugin/uploaders/writer.go index ef4f306ac4..c1cd6b7d8a 100644 --- a/cmds/demoplugin/uploaders/writer.go +++ b/cmds/demoplugin/uploaders/writer.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package uploaders import ( diff --git a/cmds/demoplugin/valuesets/suite_test.go b/cmds/demoplugin/valuesets/suite_test.go index 89647ef5dc..6152fc880a 100644 --- a/cmds/demoplugin/valuesets/suite_test.go +++ b/cmds/demoplugin/valuesets/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package valuesets_test import ( diff --git a/cmds/ecrplugin/actions/action.go b/cmds/ecrplugin/actions/action.go index 60bfd64c8e..9ee7d1f824 100644 --- a/cmds/ecrplugin/actions/action.go +++ b/cmds/ecrplugin/actions/action.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package actions import ( diff --git a/cmds/ecrplugin/config/config.go b/cmds/ecrplugin/config/config.go index 9af1ffd391..4983dade50 100644 --- a/cmds/ecrplugin/config/config.go +++ b/cmds/ecrplugin/config/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/cmds/ecrplugin/main.go b/cmds/ecrplugin/main.go index 2d7049f5ac..5334e23742 100644 --- a/cmds/ecrplugin/main.go +++ b/cmds/ecrplugin/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/cmds/helminstaller/app/app.go b/cmds/helminstaller/app/app.go index 0f8ab8444e..77edd7c211 100644 --- a/cmds/helminstaller/app/app.go +++ b/cmds/helminstaller/app/app.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app import ( diff --git a/cmds/helminstaller/app/config.go b/cmds/helminstaller/app/config.go index 5aa9cc2d35..3df93131d0 100644 --- a/cmds/helminstaller/app/config.go +++ b/cmds/helminstaller/app/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app import ( diff --git a/cmds/helminstaller/app/driver/driver.go b/cmds/helminstaller/app/driver/driver.go index 8b860bb946..0ba959b021 100644 --- a/cmds/helminstaller/app/driver/driver.go +++ b/cmds/helminstaller/app/driver/driver.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package driver import ( diff --git a/cmds/helminstaller/app/driver/helm/driver.go b/cmds/helminstaller/app/driver/helm/driver.go index 2828581659..2f1f664782 100644 --- a/cmds/helminstaller/app/driver/helm/driver.go +++ b/cmds/helminstaller/app/driver/helm/driver.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/cmds/helminstaller/app/driver/helm/install.go b/cmds/helminstaller/app/driver/helm/install.go index 0dc9b0cf77..f169ca6ce0 100644 --- a/cmds/helminstaller/app/driver/helm/install.go +++ b/cmds/helminstaller/app/driver/helm/install.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/cmds/helminstaller/app/driver/helm/uninstall.go b/cmds/helminstaller/app/driver/helm/uninstall.go index b80e56f711..18ff39b133 100644 --- a/cmds/helminstaller/app/driver/helm/uninstall.go +++ b/cmds/helminstaller/app/driver/helm/uninstall.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/cmds/helminstaller/app/execute.go b/cmds/helminstaller/app/execute.go index ce28912763..690d9d4058 100644 --- a/cmds/helminstaller/app/execute.go +++ b/cmds/helminstaller/app/execute.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app import ( @@ -9,9 +5,6 @@ import ( "fmt" "strings" - . "github.com/open-component-model/ocm/pkg/exception" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -24,6 +17,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/exception" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/helm/loader" "github.com/open-component-model/ocm/pkg/out" "github.com/open-component-model/ocm/pkg/runtime" diff --git a/cmds/helminstaller/app/executor.go b/cmds/helminstaller/app/executor.go index f585b72a87..70e944a208 100644 --- a/cmds/helminstaller/app/executor.go +++ b/cmds/helminstaller/app/executor.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app import ( diff --git a/cmds/helminstaller/app/set.go b/cmds/helminstaller/app/set.go index d66e10a917..83b794066a 100644 --- a/cmds/helminstaller/app/set.go +++ b/cmds/helminstaller/app/set.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app import ( diff --git a/cmds/helminstaller/main.go b/cmds/helminstaller/main.go index 63131bd6c4..47f4dd9093 100644 --- a/cmds/helminstaller/main.go +++ b/cmds/helminstaller/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/cmds/helminstaller/testhelper/env.go b/cmds/helminstaller/testhelper/env.go index 275eb1efd4..f91613618d 100644 --- a/cmds/helminstaller/testhelper/env.go +++ b/cmds/helminstaller/testhelper/env.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( diff --git a/cmds/ocm/app/app.go b/cmds/ocm/app/app.go index c598c9aba5..ca7025d487 100644 --- a/cmds/ocm/app/app.go +++ b/cmds/ocm/app/app.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:generate go run -mod=mod ../../../hack/generate-docs ../../../docs/reference package app @@ -11,10 +7,6 @@ import ( "strings" "unicode" - common2 "github.com/open-component-model/ocm/pkg/clisupport" - _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -62,14 +54,17 @@ import ( topicocmrefs "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/refs" topicocmuploaders "github.com/open-component-model/ocm/cmds/ocm/topics/ocm/uploadhandlers" topicbootstrap "github.com/open-component-model/ocm/cmds/ocm/topics/toi/bootstrapping" + common2 "github.com/open-component-model/ocm/pkg/clisupport" "github.com/open-component-model/ocm/pkg/cobrautils" "github.com/open-component-model/ocm/pkg/cobrautils/logopts" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/clictx" + _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr" datacfg "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/attrs" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" diff --git a/cmds/ocm/app/app_test.go b/cmds/ocm/app/app_test.go index 4d19586ea8..5605655283 100644 --- a/cmds/ocm/app/app_test.go +++ b/cmds/ocm/app/app_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app_test import ( @@ -10,20 +6,19 @@ import ( "fmt" "strings" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/spf13/cobra" "github.com/tonglil/buflogr" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/clictx" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/mapocirepoattr" ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/logging/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" ) var realm = logging.NewRealm("test") diff --git a/cmds/ocm/app/prepare.go b/cmds/ocm/app/prepare.go index 32010c46f2..a3b6f040ab 100644 --- a/cmds/ocm/app/prepare.go +++ b/cmds/ocm/app/prepare.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app import ( diff --git a/cmds/ocm/app/suite_test.go b/cmds/ocm/app/suite_test.go index 54b8d25955..78c82d92a9 100644 --- a/cmds/ocm/app/suite_test.go +++ b/cmds/ocm/app/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package app_test import ( diff --git a/cmds/ocm/ca/component-descriptor.yaml b/cmds/ocm/ca/component-descriptor.yaml new file mode 100644 index 0000000000..c9b54655c1 --- /dev/null +++ b/cmds/ocm/ca/component-descriptor.yaml @@ -0,0 +1,10 @@ +apiVersion: ocm.software/v3alpha1 +kind: ComponentVersion +metadata: + creationTime: "2024-05-03T09:43:30Z" + name: test.com/postgresql + provider: + name: test.com + version: 14.0.5 +repositoryContexts: [] +spec: {} diff --git a/cmds/ocm/commands/cachecmds/clean/cmd.go b/cmds/ocm/commands/cachecmds/clean/cmd.go index c0a58b6acb..583fa8e7ab 100644 --- a/cmds/ocm/commands/cachecmds/clean/cmd.go +++ b/cmds/ocm/commands/cachecmds/clean/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package clean import ( diff --git a/cmds/ocm/commands/cachecmds/cmd.go b/cmds/ocm/commands/cachecmds/cmd.go index 7b915aa0b2..53bc85722a 100644 --- a/cmds/ocm/commands/cachecmds/cmd.go +++ b/cmds/ocm/commands/cachecmds/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cachecmds import ( diff --git a/cmds/ocm/commands/cachecmds/describe/cmd.go b/cmds/ocm/commands/cachecmds/describe/cmd.go index da80952f9d..78ba0037d9 100644 --- a/cmds/ocm/commands/cachecmds/describe/cmd.go +++ b/cmds/ocm/commands/cachecmds/describe/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe import ( diff --git a/cmds/ocm/commands/cachecmds/names/names.go b/cmds/ocm/commands/cachecmds/names/names.go index 812c440275..765238c621 100644 --- a/cmds/ocm/commands/cachecmds/names/names.go +++ b/cmds/ocm/commands/cachecmds/names/names.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package names var Cache = []string{"cache"} diff --git a/cmds/ocm/commands/common/elements/components/cmd.go b/cmds/ocm/commands/common/elements/components/cmd.go index 307d4f8dbc..577c6f3e39 100644 --- a/cmds/ocm/commands/common/elements/components/cmd.go +++ b/cmds/ocm/commands/common/elements/components/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package components import ( diff --git a/cmds/ocm/commands/common/options/closureoption/option.go b/cmds/ocm/commands/common/options/closureoption/option.go index dabfa32a1d..ef148e4c9a 100644 --- a/cmds/ocm/commands/common/options/closureoption/option.go +++ b/cmds/ocm/commands/common/options/closureoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package closureoption import ( diff --git a/cmds/ocm/commands/common/options/destoption/option.go b/cmds/ocm/commands/common/options/destoption/option.go index 45e0f82370..4f7ad402ed 100644 --- a/cmds/ocm/commands/common/options/destoption/option.go +++ b/cmds/ocm/commands/common/options/destoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package destoption import ( diff --git a/cmds/ocm/commands/common/options/formatoption/option.go b/cmds/ocm/commands/common/options/formatoption/option.go index 2df11a2dd2..7c254dd984 100644 --- a/cmds/ocm/commands/common/options/formatoption/option.go +++ b/cmds/ocm/commands/common/options/formatoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package formatoption import ( diff --git a/cmds/ocm/commands/common/options/keyoption/option.go b/cmds/ocm/commands/common/options/keyoption/option.go index ace52bcb06..fd3e41974f 100644 --- a/cmds/ocm/commands/common/options/keyoption/option.go +++ b/cmds/ocm/commands/common/options/keyoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package keyoption import ( diff --git a/cmds/ocm/commands/controllercmds/install/apply.go b/cmds/ocm/commands/controllercmds/install/apply.go index 395bb1eea3..f031127ba9 100644 --- a/cmds/ocm/commands/controllercmds/install/apply.go +++ b/cmds/ocm/commands/controllercmds/install/apply.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( diff --git a/cmds/ocm/commands/controllercmds/install/cmd.go b/cmds/ocm/commands/controllercmds/install/cmd.go index f79063131b..31c9192a6f 100644 --- a/cmds/ocm/commands/controllercmds/install/cmd.go +++ b/cmds/ocm/commands/controllercmds/install/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( diff --git a/cmds/ocm/commands/controllercmds/install/cmd_test.go b/cmds/ocm/commands/controllercmds/install/cmd_test.go index 13d2c4617f..6135cfbe62 100644 --- a/cmds/ocm/commands/controllercmds/install/cmd_test.go +++ b/cmds/ocm/commands/controllercmds/install/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install_test import ( @@ -12,12 +8,12 @@ import ( "os" "strings" + "github.com/mandelsoft/filepath/pkg/filepath" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/filepath/pkg/filepath" ) var _ = Describe("Test Environment", func() { diff --git a/cmds/ocm/commands/controllercmds/install/suite_test.go b/cmds/ocm/commands/controllercmds/install/suite_test.go index 97d79fd488..060cd56f7c 100644 --- a/cmds/ocm/commands/controllercmds/install/suite_test.go +++ b/cmds/ocm/commands/controllercmds/install/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install_test import ( diff --git a/cmds/ocm/commands/controllercmds/names/names.go b/cmds/ocm/commands/controllercmds/names/names.go index 138e9c9cb9..94eca559a2 100644 --- a/cmds/ocm/commands/controllercmds/names/names.go +++ b/cmds/ocm/commands/controllercmds/names/names.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package names var ( diff --git a/cmds/ocm/commands/misccmds/action/cmd.go b/cmds/ocm/commands/misccmds/action/cmd.go index 612a67e23b..2419e61cc1 100644 --- a/cmds/ocm/commands/misccmds/action/cmd.go +++ b/cmds/ocm/commands/misccmds/action/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package action import ( diff --git a/cmds/ocm/commands/misccmds/action/execute/cmd.go b/cmds/ocm/commands/misccmds/action/execute/cmd.go index 03c78cabf5..9ce8351b6d 100644 --- a/cmds/ocm/commands/misccmds/action/execute/cmd.go +++ b/cmds/ocm/commands/misccmds/action/execute/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package execute import ( diff --git a/cmds/ocm/commands/misccmds/credentials/cmd.go b/cmds/ocm/commands/misccmds/credentials/cmd.go index ff8ef97433..29dbaa1e7e 100644 --- a/cmds/ocm/commands/misccmds/credentials/cmd.go +++ b/cmds/ocm/commands/misccmds/credentials/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials import ( diff --git a/cmds/ocm/commands/misccmds/credentials/get/cmd.go b/cmds/ocm/commands/misccmds/credentials/get/cmd.go index 6ddd4c7f0a..64574dc0ee 100644 --- a/cmds/ocm/commands/misccmds/credentials/get/cmd.go +++ b/cmds/ocm/commands/misccmds/credentials/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go b/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go index 68a8aad6e4..8527e85b1e 100644 --- a/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go +++ b/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -9,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Test Environment", func() { diff --git a/cmds/ocm/commands/misccmds/credentials/get/suite_test.go b/cmds/ocm/commands/misccmds/credentials/get/suite_test.go index 08c7892020..7f93315576 100644 --- a/cmds/ocm/commands/misccmds/credentials/get/suite_test.go +++ b/cmds/ocm/commands/misccmds/credentials/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/misccmds/hash/cmd.go b/cmds/ocm/commands/misccmds/hash/cmd.go index ed85415955..f4aca12d31 100644 --- a/cmds/ocm/commands/misccmds/hash/cmd.go +++ b/cmds/ocm/commands/misccmds/hash/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials import ( diff --git a/cmds/ocm/commands/misccmds/names/names.go b/cmds/ocm/commands/misccmds/names/names.go index e305d6d4b7..727abbee0d 100644 --- a/cmds/ocm/commands/misccmds/names/names.go +++ b/cmds/ocm/commands/misccmds/names/names.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package names var ( diff --git a/cmds/ocm/commands/misccmds/rsakeypair/cmd.go b/cmds/ocm/commands/misccmds/rsakeypair/cmd.go index b23367b63f..52f28c7ba4 100644 --- a/cmds/ocm/commands/misccmds/rsakeypair/cmd.go +++ b/cmds/ocm/commands/misccmds/rsakeypair/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rsakeypair import ( diff --git a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go index d4f6cc69b4..125996fdc0 100644 --- a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go +++ b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rsakeypair_test import ( @@ -11,17 +7,16 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/opencontainers/go-digest" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" "github.com/open-component-model/ocm/pkg/encrypt" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" + . "github.com/open-component-model/ocm/pkg/testutils" ) var ISSUER = &pkix.Name{CommonName: "mandelsoft"} diff --git a/cmds/ocm/commands/misccmds/rsakeypair/suite_test.go b/cmds/ocm/commands/misccmds/rsakeypair/suite_test.go index 4293272b8a..cb5cae3e7c 100644 --- a/cmds/ocm/commands/misccmds/rsakeypair/suite_test.go +++ b/cmds/ocm/commands/misccmds/rsakeypair/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rsakeypair_test import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/cmd.go index 7f2efc7fd8..a1579d7dcd 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/cmd.go +++ b/cmds/ocm/commands/ocicmds/artifacts/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifacts import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go index 0c8abbb752..96149a5034 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go +++ b/cmds/ocm/commands/ocicmds/artifacts/describe/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go index 2a1af7be2f..66f5f4edf0 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go +++ b/cmds/ocm/commands/ocicmds/artifacts/download/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go index d33b513cdb..99f89cef79 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( @@ -9,13 +5,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/option.go b/cmds/ocm/commands/ocicmds/artifacts/download/option.go index 516558a18b..9b1a62b199 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/download/option.go +++ b/cmds/ocm/commands/ocicmds/artifacts/download/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/suite_test.go b/cmds/ocm/commands/ocicmds/artifacts/download/suite_test.go index 2cefd07fb6..5333856c24 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/download/suite_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/download/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go index 16bb86c59f..8e67c24b1d 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go +++ b/cmds/ocm/commands/ocicmds/artifacts/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go index 3a2e6d1983..00e643ac7b 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -9,13 +5,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/options.go b/cmds/ocm/commands/ocicmds/artifacts/get/options.go index bbd466d680..dcf4964fa4 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/get/options.go +++ b/cmds/ocm/commands/ocicmds/artifacts/get/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/suite_test.go b/cmds/ocm/commands/ocicmds/artifacts/get/suite_test.go index 5655a33cc1..27cb552795 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/get/suite_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go index 00c7156167..90ca43d55f 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go +++ b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go index c843ab3130..dad7e8c97c 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( @@ -9,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocicmds/artifacts/transfer/suite_test.go b/cmds/ocm/commands/ocicmds/artifacts/transfer/suite_test.go index c43d6ccb14..3584c20999 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/transfer/suite_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/transfer/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( diff --git a/cmds/ocm/commands/ocicmds/cmd.go b/cmds/ocm/commands/ocicmds/cmd.go index f2578d1d4b..4ebb6afb82 100644 --- a/cmds/ocm/commands/ocicmds/cmd.go +++ b/cmds/ocm/commands/ocicmds/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocicmds import ( diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go index 534c2e48e7..35d4904926 100644 --- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go +++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/attached.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifacthdlr import ( diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go index 79f81173c2..efa2a25bc7 100644 --- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go +++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/clean.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifacthdlr import ( diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go index 3a800dda85..e9554e68a0 100644 --- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go +++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/closure.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifacthdlr import ( diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go index 0909fa6a5a..82cbe2b994 100644 --- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go +++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/convert.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifacthdlr import ( diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go index 711b3aebf5..57fa2963de 100644 --- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go +++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/sort.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifacthdlr import ( diff --git a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go index 901269471c..38a8c60677 100644 --- a/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go +++ b/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifacthdlr import ( diff --git a/cmds/ocm/commands/ocicmds/common/options/repooption/option.go b/cmds/ocm/commands/ocicmds/common/options/repooption/option.go index 92fe54f88e..7cd49a5b7c 100644 --- a/cmds/ocm/commands/ocicmds/common/options/repooption/option.go +++ b/cmds/ocm/commands/ocicmds/common/options/repooption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package repooption import ( diff --git a/cmds/ocm/commands/ocicmds/common/utils.go b/cmds/ocm/commands/ocicmds/common/utils.go index 98deef18e3..11c4bbd3cd 100644 --- a/cmds/ocm/commands/ocicmds/common/utils.go +++ b/cmds/ocm/commands/ocicmds/common/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocicmds/ctf/cmd.go b/cmds/ocm/commands/ocicmds/ctf/cmd.go index 49b6ce6d33..b5c70431fe 100644 --- a/cmds/ocm/commands/ocicmds/ctf/cmd.go +++ b/cmds/ocm/commands/ocicmds/ctf/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/cmds/ocm/commands/ocicmds/ctf/create/cmd.go b/cmds/ocm/commands/ocicmds/ctf/create/cmd.go index 5c9ddb65fe..6f119b6d35 100644 --- a/cmds/ocm/commands/ocicmds/ctf/create/cmd.go +++ b/cmds/ocm/commands/ocicmds/ctf/create/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package create import ( diff --git a/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go b/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go index 479e083e8e..ccf08780bc 100644 --- a/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go @@ -1,14 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package create_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" ) diff --git a/cmds/ocm/commands/ocicmds/ctf/create/suite_test.go b/cmds/ocm/commands/ocicmds/ctf/create/suite_test.go index 01346d35a9..08a6e7461c 100644 --- a/cmds/ocm/commands/ocicmds/ctf/create/suite_test.go +++ b/cmds/ocm/commands/ocicmds/ctf/create/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package create_test import ( diff --git a/cmds/ocm/commands/ocicmds/names/names.go b/cmds/ocm/commands/ocicmds/names/names.go index 3ef06ba368..90118150e4 100644 --- a/cmds/ocm/commands/ocicmds/names/names.go +++ b/cmds/ocm/commands/ocicmds/names/names.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package names var ( diff --git a/cmds/ocm/commands/ocicmds/tags/cmd.go b/cmds/ocm/commands/ocicmds/tags/cmd.go index 7751c1d1f9..77b26d800c 100644 --- a/cmds/ocm/commands/ocicmds/tags/cmd.go +++ b/cmds/ocm/commands/ocicmds/tags/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tags import ( diff --git a/cmds/ocm/commands/ocicmds/tags/show/cmd.go b/cmds/ocm/commands/ocicmds/tags/show/cmd.go index 375e8cb637..ff03887ea7 100644 --- a/cmds/ocm/commands/ocicmds/tags/show/cmd.go +++ b/cmds/ocm/commands/ocicmds/tags/show/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package show import ( diff --git a/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go b/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go index 94079d58f4..2775aa33de 100644 --- a/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package show_test import ( @@ -9,11 +5,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocicmds/tags/show/suite_test.go b/cmds/ocm/commands/ocicmds/tags/show/suite_test.go index a622b98a20..308c7d37a0 100644 --- a/cmds/ocm/commands/ocicmds/tags/show/suite_test.go +++ b/cmds/ocm/commands/ocicmds/tags/show/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package show_test import ( diff --git a/cmds/ocm/commands/ocmcmds/cli/cmd.go b/cmds/ocm/commands/ocmcmds/cli/cmd.go index bafb49e717..aea68ce264 100644 --- a/cmds/ocm/commands/ocmcmds/cli/cmd.go +++ b/cmds/ocm/commands/ocmcmds/cli/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cli import ( diff --git a/cmds/ocm/commands/ocmcmds/cli/download/cmd.go b/cmds/ocm/commands/ocmcmds/cli/download/cmd.go index b6ee053969..4f952ae838 100644 --- a/cmds/ocm/commands/ocmcmds/cli/download/cmd.go +++ b/cmds/ocm/commands/ocmcmds/cli/download/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go index 2ca30d586e..df8a421d0a 100644 --- a/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( @@ -12,16 +8,16 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/cli/download" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/extraid" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" env2 "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const CTF = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/cli/download/suite_test.go b/cmds/ocm/commands/ocmcmds/cli/download/suite_test.go index cb15765a6e..1d5900d836 100644 --- a/cmds/ocm/commands/ocmcmds/cli/download/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/cli/download/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( diff --git a/cmds/ocm/commands/ocmcmds/cmd.go b/cmds/ocm/commands/ocmcmds/cmd.go index 617d3401cb..25d5145b40 100644 --- a/cmds/ocm/commands/ocmcmds/cmd.go +++ b/cmds/ocm/commands/ocmcmds/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocmcmds import ( diff --git a/cmds/ocm/commands/ocmcmds/common/addconfig.go b/cmds/ocm/commands/ocmcmds/common/addconfig.go index 8116125ad3..23b5aa53dc 100644 --- a/cmds/ocm/commands/ocmcmds/common/addconfig.go +++ b/cmds/ocm/commands/ocmcmds/common/addconfig.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go index 2fc15e8136..aa92ad3c4f 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comp import ( diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go index 4f971737ea..735c010995 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go @@ -1,14 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comp import ( "fmt" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common" @@ -25,6 +19,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go index eb2e55c299..cbe8315404 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package addhdlrs import ( diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go index b448f44d9a..ae892c882a 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package refs import ( diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go index 7569f6e8e2..ee6a7ea46c 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rscs import ( diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go index 78ca12cd00..b2d815b79d 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package srcs import ( diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go index 2801b48f6a..2b9393fad8 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package addhdlrs import ( diff --git a/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go b/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go index 031b5b336e..23f60897d8 100644 --- a/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go +++ b/cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go index 40c3468fe3..1f91984234 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comphdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go index 123243d834..ffc82cdd76 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/convert.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comphdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go index f3c7e1ce64..5fd9674a7e 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comphdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go index cd252766a0..aad35bd61a 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/sort.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comphdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go index 1c03831787..3712fd7aac 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comphdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go index 15ca47357a..71151e96bc 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/convert.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package elemhdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go index 91b169e5fa..d13f50f468 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package elemhdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go index 91855c9d5e..02e7c61e71 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/output.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package elemhdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go index b1f74d06da..8127338d8d 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/sort.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package elemhdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go index fc3a57f17f..f6dbbc42ee 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package elemhdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go index 8d9665717f..5d53a59a3a 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/pluginhdlr/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package pluginhdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go index 6f6e842841..d1d84a0a92 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vershdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go index 3ada0c6851..941e6aed41 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/sort.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vershdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go index c814c27424..ca08c6ff5f 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vershdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go b/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go index 1a6f32645d..a1d86c03b5 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/cpi/helper.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go b/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go index a12819c971..1e94bd2b5c 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/inputfields.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package inputs import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go index ffabedd0f3..dbe7a2b065 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package inputs import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go index 5b6752193f..5ffbf25547 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/inputtype_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package inputs_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/suite_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/suite_test.go index fed3737521..73388de780 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package inputs_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go b/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go index 1060539759..ead682b84b 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go @@ -1,14 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testutils import ( "encoding/json" . "github.com/onsi/gomega" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go index b3d2c88867..b195b28103 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package binary import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go index 55438108d3..763501a8b9 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package binary import ( . "github.com/onsi/ginkgo/v2" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go index d26a65ee10..e7b33599cc 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package binary import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/suite_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/suite_test.go index 66f4cba4e5..b8eb4ac17b 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package binary import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go index 1a486f7f8a..10d4b76cda 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package binary import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go index 02f34772a0..fe3b007bbf 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directory import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go index 9a64b6f493..eac9e9042b 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directory import ( . "github.com/onsi/ginkgo/v2" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" ) var _ = Describe("Input Type", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go index 9496001e50..4084b544ab 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directory import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/suite_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/suite_test.go index bf047104d2..0ec9b54d8f 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directory import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go index 8658b9f905..94b92fce4d 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directory import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go index fb18a09e8f..fae0c599b9 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go index 67b528ff99..a8a34ffd9c 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go index 289f1954ce..159e8c4af7 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/docker/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go index 2fc02b0f3c..ba884b6fb0 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockermulti import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go index 44a82e6963..697271e2b1 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go @@ -1,14 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockermulti import ( "fmt" - . "github.com/open-component-model/ocm/pkg/finalizer" - "k8s.io/apimachinery/pkg/util/validation/field" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" @@ -20,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go index b6e4888efd..3c367a33ca 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockermulti import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go index f84be039b2..35715de766 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package file import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go index cde4dfec74..c1caefec9c 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package file import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go index fc2d53cf2e..23c10ccb30 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/support.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package file import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go index ad0957f962..ef38730c1d 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/file/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package file import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go index 5670243a8f..cee1743183 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go index 648f61220a..848611a522 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go index 426cf06bf2..ddb5cead7e 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go index a03bc21f54..ccf3c66649 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package handlers import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go index 91af337585..7e47332964 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go index 5502158094..5f46cd0c08 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact_test import ( @@ -10,22 +6,21 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" me "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go index 7695eebb24..3809ec45c5 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/suite_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/suite_test.go index 8d896eda8c..9fadceed1e 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go index c94e0c4a02..8b9188d5e6 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go index 2afa17bf49..3e9a96ea95 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go index e95eb55bde..b79f6d8a29 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go index 6cb55979fe..2756e24efd 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go @@ -1,16 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/suite_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/suite_test.go index 812ce9536c..845f0a96b4 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go index 3b134cf5e0..40e860dff8 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go index 00daa66cbf..166a4c43d4 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utf8 import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go index 978d55eb68..ccc076e05d 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go @@ -1,19 +1,15 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utf8 import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/pkg/contexts/clictx" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Input Type", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go index 835e5b6163..e94c614c73 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utf8 import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/suite_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/suite_test.go index ddb2218189..8dcba1ca84 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utf8 import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go index 9d1e393dac..8606f59d59 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utf8 import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go index fb12cf2e58..21c6f72fd5 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package wget import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go index 2a051a161c..3c58a9d8a1 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package wget import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go index da1285707d..b1b9236a00 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package wget import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go index 9a65fc9645..cf823a156e 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/comppath_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comppathopt_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go index e0571a7bce..67a113465f 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/comppathopt/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comppathopt import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go index f511c41ed1..24c20037fd 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go @@ -1,16 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package downloaderoption import ( - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers" - "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" "github.com/open-component-model/ocm/cmds/ocm/pkg/options" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/download" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers" "github.com/open-component-model/ocm/pkg/listformat" ) diff --git a/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go index 70818f2617..a0a5c25605 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/dryrunoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dryrunoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go index fc2d817fc7..0e661267e8 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package fileoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go index b8ca3345fa..072eb58368 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/hashoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hashoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go b/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go index 593349a206..b2f4ea0192 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/keepglobaloption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package keepglobaloption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go index a16744e45c..38fb8738f1 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/lookupoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package lookupoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go index fd88747656..8329e58d7b 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/omitaccesstypeoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package omitaccesstypeoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go index cc0425bcc2..580d41d553 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package optutils_test import ( @@ -9,13 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" "github.com/open-component-model/ocm/pkg/contexts/clictx" "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("registration options", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go b/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go index 2126dccc39..36d8033669 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go +++ b/cmds/ocm/commands/ocmcmds/common/options/optutils/registration.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package optutils import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/optutils/suite_test.go b/cmds/ocm/commands/ocmcmds/common/options/optutils/suite_test.go index 350e84e69c..bdcfd28203 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/optutils/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/optutils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package optutils_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go index b8bfb4af57..3bdf0c67c7 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/overwriteoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package overwriteoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go b/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go index b9683f2e9f..f922398789 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/repooption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package repooption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go index f1f75e199d..1d259f33a4 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/rscbyvalueoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rscbyvalueoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go index 68d79a3c70..a3a20354f8 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/schemaoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package schemaoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go index 7d2ff5dc5e..dab1b7fe02 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go +++ b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package scriptoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go index 0ccf6d3c50..077ea33919 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/scriptoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package scriptoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go index affc03c218..2840390e71 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go index 75b0aab48a..94ac9e5531 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/skipdigestoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package skipdigestoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go index fa9a40d08b..23bf3ef97b 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/skipupdateoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package skipupdateoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go index c68f42c516..e6f3fd8fd0 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/srcbyvalueoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package srcbyvalueoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go index b8fc9782f8..9a55a36667 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/stoponexistingoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package stoponexistingoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go b/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go index 8126f15b2b..efe98c4cae 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/templateroption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package templateroption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go index fa6d2469fa..be11fc982c 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package uploaderoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/suite_test.go b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/suite_test.go index e89834e31f..72ac4e046b 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package uploaderoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go index 22bdf72984..a580f2df6c 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package uploaderoption import ( @@ -9,12 +5,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" "github.com/open-component-model/ocm/pkg/contexts/clictx" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("uploader option", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go index 1ea52b7796..8a101cf9f4 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/versionconstraintsoption/option.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package versionconstraintsoption import ( diff --git a/cmds/ocm/commands/ocmcmds/common/resources.go b/cmds/ocm/commands/ocmcmds/common/resources.go index ffe97068a5..a5ae2e61c2 100644 --- a/cmds/ocm/commands/ocmcmds/common/resources.go +++ b/cmds/ocm/commands/ocmcmds/common/resources.go @@ -1,15 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( "encoding/json" "fmt" - _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types" - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/spf13/pflag" "golang.org/x/text/cases" @@ -17,6 +11,7 @@ import ( "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" + _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/dryrunoption" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption" diff --git a/cmds/ocm/commands/ocmcmds/common/resources_test.go b/cmds/ocm/commands/ocmcmds/common/resources_test.go index 4c8e387864..9a3fd4bdf6 100644 --- a/cmds/ocm/commands/ocmcmds/common/resources_test.go +++ b/cmds/ocm/commands/ocmcmds/common/resources_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/settings.go b/cmds/ocm/commands/ocmcmds/common/settings.go index f72fa75511..d96564edcb 100644 --- a/cmds/ocm/commands/ocmcmds/common/settings.go +++ b/cmds/ocm/commands/ocmcmds/common/settings.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocmcmds/common/suite_test.go b/cmds/ocm/commands/ocmcmds/common/suite_test.go index 689151b675..ccfc0d2bfc 100644 --- a/cmds/ocm/commands/ocmcmds/common/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common_test import ( diff --git a/cmds/ocm/commands/ocmcmds/common/utils.go b/cmds/ocm/commands/ocmcmds/common/utils.go index cac497181a..8c237db5da 100644 --- a/cmds/ocm/commands/ocmcmds/common/utils.go +++ b/cmds/ocm/commands/ocmcmds/common/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go index 59357cc40a..0d055b37ce 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package componentarchive import ( diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go index 6954114acb..2a4464fff1 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package create import ( @@ -9,7 +5,6 @@ import ( "strings" "github.com/mandelsoft/vfs/pkg/vfs" - "github.com/open-component-model/ocm/pkg/clisupport" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -19,6 +14,7 @@ import ( "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names" "github.com/open-component-model/ocm/cmds/ocm/commands/verbs" "github.com/open-component-model/ocm/cmds/ocm/pkg/utils" + "github.com/open-component-model/ocm/pkg/clisupport" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/clictx" diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go index 258451f1d0..0e234a474a 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go @@ -1,14 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package create_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/suite_test.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/suite_test.go index e2319406c3..4b681acb4c 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/create/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package create_test import ( diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go index 1d632c87b5..c5604bc0e8 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/transfer/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/cmds/ocm/commands/ocmcmds/components/add/cmd.go b/cmds/ocm/commands/ocmcmds/components/add/cmd.go index 9c41c7f346..58a6f3f161 100644 --- a/cmds/ocm/commands/ocmcmds/components/add/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go index b84614ea16..4349ee6ced 100644 --- a/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go @@ -1,20 +1,15 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -25,6 +20,7 @@ import ( ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/cmds/ocm/commands/ocmcmds/components/add/suite_test.go b/cmds/ocm/commands/ocmcmds/components/add/suite_test.go index 5aaf3b8506..7ed2c5b5ff 100644 --- a/cmds/ocm/commands/ocmcmds/components/add/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/add/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/check/cmd.go b/cmds/ocm/commands/ocmcmds/components/check/cmd.go index c298f278d6..f2bd233fbc 100644 --- a/cmds/ocm/commands/ocmcmds/components/check/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/check/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package check import ( diff --git a/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go index 95dec8b0af..f7908bd747 100644 --- a/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package check_test import ( @@ -9,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/check/options.go b/cmds/ocm/commands/ocmcmds/components/check/options.go index ca04567f4b..55a1c6d12f 100644 --- a/cmds/ocm/commands/ocmcmds/components/check/options.go +++ b/cmds/ocm/commands/ocmcmds/components/check/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package check import ( diff --git a/cmds/ocm/commands/ocmcmds/components/check/suite_test.go b/cmds/ocm/commands/ocmcmds/components/check/suite_test.go index c7753f5d8d..087c311045 100644 --- a/cmds/ocm/commands/ocmcmds/components/check/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/check/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package check_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/cmd.go b/cmds/ocm/commands/ocmcmds/components/cmd.go index f15db411f5..597cc1f09f 100644 --- a/cmds/ocm/commands/ocmcmds/components/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package components import ( diff --git a/cmds/ocm/commands/ocmcmds/components/download/cmd.go b/cmds/ocm/commands/ocmcmds/components/download/cmd.go index 5197fd4d8f..57af5f531f 100644 --- a/cmds/ocm/commands/ocmcmds/components/download/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/download/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go index 3f6c1ea37e..df504723b0 100644 --- a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go @@ -1,26 +1,21 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( "bytes" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/grammar" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/components/download/suite_test.go b/cmds/ocm/commands/ocmcmds/components/download/suite_test.go index 2cefd07fb6..5333856c24 100644 --- a/cmds/ocm/commands/ocmcmds/components/download/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/download/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/get/cmd.go b/cmds/ocm/commands/ocmcmds/components/get/cmd.go index 25944d2fc1..6f81005db9 100644 --- a/cmds/ocm/commands/ocmcmds/components/get/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go index bb8c12f2b7..62860f67b9 100644 --- a/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -10,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/get/suite_test.go b/cmds/ocm/commands/ocmcmds/components/get/suite_test.go index 0986c50bf3..9c35ccb7f3 100644 --- a/cmds/ocm/commands/ocmcmds/components/get/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/hash/cmd.go b/cmds/ocm/commands/ocmcmds/components/hash/cmd.go index 6ad5a7d37f..9c5730639f 100644 --- a/cmds/ocm/commands/ocmcmds/components/hash/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/hash/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hash import ( diff --git a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go index 949de4210a..5a6fd15f04 100644 --- a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hash_test import ( @@ -9,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/hash/options.go b/cmds/ocm/commands/ocmcmds/components/hash/options.go index 758644a791..edc82961b1 100644 --- a/cmds/ocm/commands/ocmcmds/components/hash/options.go +++ b/cmds/ocm/commands/ocmcmds/components/hash/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hash import ( diff --git a/cmds/ocm/commands/ocmcmds/components/hash/suite_test.go b/cmds/ocm/commands/ocmcmds/components/hash/suite_test.go index 4e3a9b91ef..325c8d91b1 100644 --- a/cmds/ocm/commands/ocmcmds/components/hash/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/hash/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hash_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/list/cmd.go b/cmds/ocm/commands/ocmcmds/components/list/cmd.go index 47d2757abd..66d8e45326 100644 --- a/cmds/ocm/commands/ocmcmds/components/list/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/list/cmd.go @@ -1,17 +1,13 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package list import ( "fmt" - "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr" "github.com/spf13/cobra" ocmcommon "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr" + "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/handlers/vershdlr" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/lookupoption" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/repooption" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption" diff --git a/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go index 031cc9264f..520284c430 100644 --- a/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package list_test import ( @@ -10,10 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/list/suite_test.go b/cmds/ocm/commands/ocmcmds/components/list/suite_test.go index a1299859ed..b0f9f1b0dd 100644 --- a/cmds/ocm/commands/ocmcmds/components/list/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/list/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package list_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/sign/cmd.go b/cmds/ocm/commands/ocmcmds/components/sign/cmd.go index 0bac2d7c30..e38503bd3a 100644 --- a/cmds/ocm/commands/ocmcmds/components/sign/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/sign/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sign import ( diff --git a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go index 05097d367e..31891633e5 100644 --- a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go @@ -1,33 +1,28 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sign_test import ( "bytes" "os" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" + . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/sign/suite_test.go b/cmds/ocm/commands/ocmcmds/components/sign/suite_test.go index b2245fe423..bf47a24103 100644 --- a/cmds/ocm/commands/ocmcmds/components/sign/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/sign/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sign_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go index 195f37d952..3f2a77b7cc 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go index fdad82d84f..01b850dff8 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( @@ -10,12 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/spf13/cobra" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/clictx" @@ -23,6 +16,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" @@ -31,6 +25,7 @@ import ( handlercfg "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/config" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/suite_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/suite_test.go index e4ab47baa8..8f3709710c 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go index 04e5b72082..11e9f331d4 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( @@ -11,15 +7,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" ctfoci "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/ociuploadattr" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" @@ -29,6 +24,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const COMP = "github.com/compa" diff --git a/cmds/ocm/commands/ocmcmds/components/verify/cmd.go b/cmds/ocm/commands/ocmcmds/components/verify/cmd.go index 35619e2ca5..048452a19f 100644 --- a/cmds/ocm/commands/ocmcmds/components/verify/cmd.go +++ b/cmds/ocm/commands/ocmcmds/components/verify/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package verify import ( diff --git a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go index 6b16f04261..22003bf54a 100644 --- a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go @@ -1,35 +1,30 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package verify_test import ( "bytes" "os" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/components/verify/suite_test.go b/cmds/ocm/commands/ocmcmds/components/verify/suite_test.go index 6aad5ddcdc..a20439831f 100644 --- a/cmds/ocm/commands/ocmcmds/components/verify/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/components/verify/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package verify_test import ( diff --git a/cmds/ocm/commands/ocmcmds/ctf/cmd.go b/cmds/ocm/commands/ocmcmds/ctf/cmd.go index f3c807c553..657963d9ad 100644 --- a/cmds/ocm/commands/ocmcmds/ctf/cmd.go +++ b/cmds/ocm/commands/ocmcmds/ctf/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go index a5b4081cc5..415dde9f9b 100644 --- a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go +++ b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go index 6a1a8a0003..82761ad601 100644 --- a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( @@ -10,19 +6,19 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/ctf/transfer/suite_test.go b/cmds/ocm/commands/ocmcmds/ctf/transfer/suite_test.go index 7b46b2d1b7..91fe8896bb 100644 --- a/cmds/ocm/commands/ocmcmds/ctf/transfer/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/ctf/transfer/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( diff --git a/cmds/ocm/commands/ocmcmds/init.go b/cmds/ocm/commands/ocmcmds/init.go index d0766f6128..aa571e56c2 100644 --- a/cmds/ocm/commands/ocmcmds/init.go +++ b/cmds/ocm/commands/ocmcmds/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocmcmds import ( diff --git a/cmds/ocm/commands/ocmcmds/names/names.go b/cmds/ocm/commands/ocmcmds/names/names.go index dd81133537..bf3b44b534 100644 --- a/cmds/ocm/commands/ocmcmds/names/names.go +++ b/cmds/ocm/commands/ocmcmds/names/names.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package names var ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/cmd.go index 9333d72762..e7b3bb9298 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/cmd.go +++ b/cmds/ocm/commands/ocmcmds/plugins/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugins import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go index b81d7e3bee..ea568cf15e 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go index b50e58d1f2..76287a68fd 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package describe_test @@ -9,12 +5,12 @@ package describe_test import ( "bytes" + "github.com/mandelsoft/filepath/pkg/filepath" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/filepath/pkg/filepath" ) const PLUGINS = "/testdata" diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/suite_test.go b/cmds/ocm/commands/ocmcmds/plugins/describe/suite_test.go index f2f1a448df..8860f28775 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe_test import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go index 347d3849b9..1347dc1e73 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go +++ b/cmds/ocm/commands/ocmcmds/plugins/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go index ba8e31201f..26f7f9a075 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package get_test @@ -9,12 +5,12 @@ package get_test import ( "bytes" + "github.com/mandelsoft/filepath/pkg/filepath" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/filepath/pkg/filepath" ) const PLUGINS = "/testdata" diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/suite_test.go b/cmds/ocm/commands/ocmcmds/plugins/get/suite_test.go index 1fc1b991da..c7663f71d8 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/get/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go b/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go index 5ed274af82..2f9ebd987f 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go +++ b/cmds/ocm/commands/ocmcmds/plugins/install/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/install/suite_test.go b/cmds/ocm/commands/ocmcmds/plugins/install/suite_test.go index 714be3d1a3..552279553e 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/install/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/install/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install_test import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go index 9557131805..5926ff4215 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessmethods_test import ( @@ -9,9 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" @@ -21,6 +16,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" + . "github.com/open-component-model/ocm/pkg/testutils" ) const CA = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go index 12812e0d8d..91e1b09090 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package routingslips_test import ( @@ -9,9 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr" @@ -19,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/references/add/cmd.go b/cmds/ocm/commands/ocmcmds/references/add/cmd.go index 16c0427bd7..fdef0d6da2 100644 --- a/cmds/ocm/commands/ocmcmds/references/add/cmd.go +++ b/cmds/ocm/commands/ocmcmds/references/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go index 30af56ff21..9ead886b1c 100644 --- a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( @@ -9,8 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" diff --git a/cmds/ocm/commands/ocmcmds/references/add/provider.go b/cmds/ocm/commands/ocmcmds/references/add/provider.go index 248aaa6c0c..a0a948c589 100644 --- a/cmds/ocm/commands/ocmcmds/references/add/provider.go +++ b/cmds/ocm/commands/ocmcmds/references/add/provider.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/references/add/suite_test.go b/cmds/ocm/commands/ocmcmds/references/add/suite_test.go index b9fd9462b1..f71b4bb96f 100644 --- a/cmds/ocm/commands/ocmcmds/references/add/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/references/add/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( diff --git a/cmds/ocm/commands/ocmcmds/references/cmd.go b/cmds/ocm/commands/ocmcmds/references/cmd.go index ea1165e286..798a0503b8 100644 --- a/cmds/ocm/commands/ocmcmds/references/cmd.go +++ b/cmds/ocm/commands/ocmcmds/references/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package references import ( diff --git a/cmds/ocm/commands/ocmcmds/references/common/typehandler.go b/cmds/ocm/commands/ocmcmds/references/common/typehandler.go index 888f6720e4..1d603f50c2 100644 --- a/cmds/ocm/commands/ocmcmds/references/common/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/references/common/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocmcmds/references/get/cmd.go b/cmds/ocm/commands/ocmcmds/references/get/cmd.go index 598fec1e18..3f61c030bf 100644 --- a/cmds/ocm/commands/ocmcmds/references/get/cmd.go +++ b/cmds/ocm/commands/ocmcmds/references/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go index e8b1024a15..6bd0236787 100644 --- a/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -9,10 +5,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" + . "github.com/open-component-model/ocm/pkg/testutils" ) const CA = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/references/get/suite_test.go b/cmds/ocm/commands/ocmcmds/references/get/suite_test.go index 6bbee06d5c..74287bb6c3 100644 --- a/cmds/ocm/commands/ocmcmds/references/get/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/references/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go index e63d71ed01..826cc8278d 100644 --- a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go +++ b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go index 83e61da861..3f111a10f9 100644 --- a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go @@ -1,14 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/add/suite_test.go b/cmds/ocm/commands/ocmcmds/resourceconfig/add/suite_test.go index 8cfbdfd074..6dd1820081 100644 --- a/cmds/ocm/commands/ocmcmds/resourceconfig/add/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/resourceconfig/add/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go b/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go index 3e3cc7617f..9aff8887e4 100644 --- a/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go +++ b/cmds/ocm/commands/ocmcmds/resourceconfig/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package resourceconfig import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd.go index d5e974734a..2bf53f1119 100644 --- a/cmds/ocm/commands/ocmcmds/resources/add/cmd.go +++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go index 750a7964f4..e728a61e42 100644 --- a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( @@ -9,21 +5,19 @@ import ( "net/http" "reflect" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" "helm.sh/helm/v3/pkg/chart/loader" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/options" @@ -32,6 +26,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/resources/add/provider.go b/cmds/ocm/commands/ocmcmds/resources/add/provider.go index 24abdaf247..5224a9beed 100644 --- a/cmds/ocm/commands/ocmcmds/resources/add/provider.go +++ b/cmds/ocm/commands/ocmcmds/resources/add/provider.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/add/suite_test.go b/cmds/ocm/commands/ocmcmds/resources/add/suite_test.go index df3aea6a21..75aa638921 100644 --- a/cmds/ocm/commands/ocmcmds/resources/add/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/add/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/cmd.go b/cmds/ocm/commands/ocmcmds/resources/cmd.go index eff7fb68a2..eab7809ec0 100644 --- a/cmds/ocm/commands/ocmcmds/resources/cmd.go +++ b/cmds/ocm/commands/ocmcmds/resources/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package resources import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go b/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go index d65f6f6925..0351c34bf8 100644 --- a/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/resources/common/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/download/cmd.go b/cmds/ocm/commands/ocmcmds/resources/download/cmd.go index 2fd88eef59..38272f7a9b 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/cmd.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go index 6444db9c68..c4b08dbad4 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go @@ -1,22 +1,17 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( "bytes" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go index d5f978ad47..b6ef6b2452 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go @@ -1,27 +1,22 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( "bytes" "encoding/json" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" env2 "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/cmds/ocm/commands/ocmcmds/resources/download/options.go b/cmds/ocm/commands/ocmcmds/resources/download/options.go index cc4bd735f4..a23a78f641 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/options.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/download/suite_test.go b/cmds/ocm/commands/ocmcmds/resources/download/suite_test.go index 2cefd07fb6..5333856c24 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download_test import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/get/cmd.go b/cmds/ocm/commands/ocmcmds/resources/get/cmd.go index c66176d9ca..4877b52fa5 100644 --- a/cmds/ocm/commands/ocmcmds/resources/get/cmd.go +++ b/cmds/ocm/commands/ocmcmds/resources/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go index 0edac1b527..4275b6d934 100644 --- a/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -9,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go b/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go index 61252380d8..26aefa0c21 100644 --- a/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -9,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const C1 = "github.com/gardener/landscaper" diff --git a/cmds/ocm/commands/ocmcmds/resources/get/suite_test.go b/cmds/ocm/commands/ocmcmds/resources/get/suite_test.go index 6bbee06d5c..74287bb6c3 100644 --- a/cmds/ocm/commands/ocmcmds/resources/get/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go index b47d086340..2b7c2cb1f7 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go index 177b173df9..ce7bf783af 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( @@ -9,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/routingslips/add/suite_test.go b/cmds/ocm/commands/ocmcmds/routingslips/add/suite_test.go index c6034febd6..6285705a72 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/add/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/add/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/cmd.go b/cmds/ocm/commands/ocmcmds/routingslips/cmd.go index fc69b2b94d..3af64eca38 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/cmd.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package routingslips import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go b/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go index f5fbdf746c..b1051ea700 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/common/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go index c6645213ec..8ddfb92a84 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go index 7fde37874c..de393df9dc 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -10,9 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" @@ -20,6 +15,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/suite_test.go b/cmds/ocm/commands/ocmcmds/routingslips/get/suite_test.go index cc430b3e5c..d4eac5d24e 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/get/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go index 79184ba76f..40a06f79f1 100644 --- a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go +++ b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go index 93d5aa8c8d..f649626e2d 100644 --- a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go @@ -1,14 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/add/suite_test.go b/cmds/ocm/commands/ocmcmds/sourceconfig/add/suite_test.go index 8cfbdfd074..6dd1820081 100644 --- a/cmds/ocm/commands/ocmcmds/sourceconfig/add/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/sourceconfig/add/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go b/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go index 4c8527fb18..c89bbf4057 100644 --- a/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go +++ b/cmds/ocm/commands/ocmcmds/sourceconfig/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sourceconfig import ( diff --git a/cmds/ocm/commands/ocmcmds/sources/add/cmd.go b/cmds/ocm/commands/ocmcmds/sources/add/cmd.go index 1b8e16782b..95c9fbf31e 100644 --- a/cmds/ocm/commands/ocmcmds/sources/add/cmd.go +++ b/cmds/ocm/commands/ocmcmds/sources/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go index 5d2768623b..21ce42d629 100644 --- a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( @@ -12,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" diff --git a/cmds/ocm/commands/ocmcmds/sources/add/suite_test.go b/cmds/ocm/commands/ocmcmds/sources/add/suite_test.go index b9fd9462b1..f71b4bb96f 100644 --- a/cmds/ocm/commands/ocmcmds/sources/add/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/sources/add/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add_test import ( diff --git a/cmds/ocm/commands/ocmcmds/sources/cmd.go b/cmds/ocm/commands/ocmcmds/sources/cmd.go index e4b7fe9e5c..19378385e3 100644 --- a/cmds/ocm/commands/ocmcmds/sources/cmd.go +++ b/cmds/ocm/commands/ocmcmds/sources/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sources import ( diff --git a/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go b/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go index 7a7d2d5071..60f75806fc 100644 --- a/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go +++ b/cmds/ocm/commands/ocmcmds/sources/common/typehandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/cmds/ocm/commands/ocmcmds/sources/get/cmd.go b/cmds/ocm/commands/ocmcmds/sources/get/cmd.go index e7bac039ad..4b119d8ff1 100644 --- a/cmds/ocm/commands/ocmcmds/sources/get/cmd.go +++ b/cmds/ocm/commands/ocmcmds/sources/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go index c0e625238c..d24e2847eb 100644 --- a/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( @@ -9,11 +5,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/sources/get/suite_test.go b/cmds/ocm/commands/ocmcmds/sources/get/suite_test.go index f452275ca9..47cb6a0eb0 100644 --- a/cmds/ocm/commands/ocmcmds/sources/get/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/sources/get/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get_test import ( diff --git a/cmds/ocm/commands/ocmcmds/versions/cmd.go b/cmds/ocm/commands/ocmcmds/versions/cmd.go index 069cb89306..b40031b0d3 100644 --- a/cmds/ocm/commands/ocmcmds/versions/cmd.go +++ b/cmds/ocm/commands/ocmcmds/versions/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package versions import ( diff --git a/cmds/ocm/commands/ocmcmds/versions/show/cmd.go b/cmds/ocm/commands/ocmcmds/versions/show/cmd.go index 28631943db..c5394ecddd 100644 --- a/cmds/ocm/commands/ocmcmds/versions/show/cmd.go +++ b/cmds/ocm/commands/ocmcmds/versions/show/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package show import ( diff --git a/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go b/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go index d9dea291a4..5f2558b714 100644 --- a/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package show_test import ( @@ -9,10 +5,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/versions/show/suite_test.go b/cmds/ocm/commands/ocmcmds/versions/show/suite_test.go index a622b98a20..308c7d37a0 100644 --- a/cmds/ocm/commands/ocmcmds/versions/show/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/versions/show/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package show_test import ( diff --git a/cmds/ocm/commands/toicmds/cmd.go b/cmds/ocm/commands/toicmds/cmd.go index 9326e592f9..33a3ee21c9 100644 --- a/cmds/ocm/commands/toicmds/cmd.go +++ b/cmds/ocm/commands/toicmds/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package toicmds import ( diff --git a/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go b/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go index 8e2ecd6a4f..910f3c7c02 100644 --- a/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go +++ b/cmds/ocm/commands/toicmds/config/bootstrap/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bootstrap import ( diff --git a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go index 969aa6463c..b7a81efb47 100644 --- a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go +++ b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go @@ -1,23 +1,18 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bootstrap_test import ( "bytes" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/config/bootstrap" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/toi" ) diff --git a/cmds/ocm/commands/toicmds/config/bootstrap/suite_test.go b/cmds/ocm/commands/toicmds/config/bootstrap/suite_test.go index 6ca42b93c2..68b8823c6a 100644 --- a/cmds/ocm/commands/toicmds/config/bootstrap/suite_test.go +++ b/cmds/ocm/commands/toicmds/config/bootstrap/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bootstrap_test import ( diff --git a/cmds/ocm/commands/toicmds/config/cmd.go b/cmds/ocm/commands/toicmds/config/cmd.go index e1c0475006..cb3d174032 100644 --- a/cmds/ocm/commands/toicmds/config/cmd.go +++ b/cmds/ocm/commands/toicmds/config/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/cmds/ocm/commands/toicmds/names/names.go b/cmds/ocm/commands/toicmds/names/names.go index 911bb187d5..7651b222d5 100644 --- a/cmds/ocm/commands/toicmds/names/names.go +++ b/cmds/ocm/commands/toicmds/names/names.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package names import ( diff --git a/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go b/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go index 6af818daf6..cb45d764dc 100644 --- a/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go +++ b/cmds/ocm/commands/toicmds/package/bootstrap/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bootstrap import ( diff --git a/cmds/ocm/commands/toicmds/package/cmd.go b/cmds/ocm/commands/toicmds/package/cmd.go index 82f21b6355..4e38640658 100644 --- a/cmds/ocm/commands/toicmds/package/cmd.go +++ b/cmds/ocm/commands/toicmds/package/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package _package import ( diff --git a/cmds/ocm/commands/toicmds/package/describe/cmd.go b/cmds/ocm/commands/toicmds/package/describe/cmd.go index 8d731eceb4..aac0af3958 100644 --- a/cmds/ocm/commands/toicmds/package/describe/cmd.go +++ b/cmds/ocm/commands/toicmds/package/describe/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe import ( diff --git a/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go b/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go index 4160dc3dbf..392e56a582 100644 --- a/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go +++ b/cmds/ocm/commands/toicmds/verbs/bootstrap/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bootstrap import ( diff --git a/cmds/ocm/commands/toicmds/verbs/describe/cmd.go b/cmds/ocm/commands/toicmds/verbs/describe/cmd.go index c7c1f044c0..baa8d8be91 100644 --- a/cmds/ocm/commands/toicmds/verbs/describe/cmd.go +++ b/cmds/ocm/commands/toicmds/verbs/describe/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe import ( diff --git a/cmds/ocm/commands/verbs/add/cmd.go b/cmds/ocm/commands/verbs/add/cmd.go index 1a1463eded..edb914aff9 100644 --- a/cmds/ocm/commands/verbs/add/cmd.go +++ b/cmds/ocm/commands/verbs/add/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package add import ( diff --git a/cmds/ocm/commands/verbs/bootstrap/cmd.go b/cmds/ocm/commands/verbs/bootstrap/cmd.go index 8fae1eb054..cc03afb76e 100644 --- a/cmds/ocm/commands/verbs/bootstrap/cmd.go +++ b/cmds/ocm/commands/verbs/bootstrap/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bootstrap import ( diff --git a/cmds/ocm/commands/verbs/check/cmd.go b/cmds/ocm/commands/verbs/check/cmd.go index 1cc30fffb2..ca7066080d 100644 --- a/cmds/ocm/commands/verbs/check/cmd.go +++ b/cmds/ocm/commands/verbs/check/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package check import ( diff --git a/cmds/ocm/commands/verbs/clean/cmd.go b/cmds/ocm/commands/verbs/clean/cmd.go index 293ae430aa..ffcb815683 100644 --- a/cmds/ocm/commands/verbs/clean/cmd.go +++ b/cmds/ocm/commands/verbs/clean/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package clean import ( diff --git a/cmds/ocm/commands/verbs/controller/cmd.go b/cmds/ocm/commands/verbs/controller/cmd.go index f93b0d7f95..7e364e72ec 100644 --- a/cmds/ocm/commands/verbs/controller/cmd.go +++ b/cmds/ocm/commands/verbs/controller/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package controller import ( diff --git a/cmds/ocm/commands/verbs/create/cmd.go b/cmds/ocm/commands/verbs/create/cmd.go index 2f74878662..0cd77a58da 100644 --- a/cmds/ocm/commands/verbs/create/cmd.go +++ b/cmds/ocm/commands/verbs/create/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package create import ( diff --git a/cmds/ocm/commands/verbs/describe/cmd.go b/cmds/ocm/commands/verbs/describe/cmd.go index 3053da21a0..e3d27ad9f5 100644 --- a/cmds/ocm/commands/verbs/describe/cmd.go +++ b/cmds/ocm/commands/verbs/describe/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe import ( diff --git a/cmds/ocm/commands/verbs/download/cmd.go b/cmds/ocm/commands/verbs/download/cmd.go index d2340e34f7..e8803b576e 100644 --- a/cmds/ocm/commands/verbs/download/cmd.go +++ b/cmds/ocm/commands/verbs/download/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/cmds/ocm/commands/verbs/execute/cmd.go b/cmds/ocm/commands/verbs/execute/cmd.go index 7ce8c16998..059aac275b 100644 --- a/cmds/ocm/commands/verbs/execute/cmd.go +++ b/cmds/ocm/commands/verbs/execute/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package execute import ( diff --git a/cmds/ocm/commands/verbs/get/cmd.go b/cmds/ocm/commands/verbs/get/cmd.go index d731963f25..61d22474b1 100644 --- a/cmds/ocm/commands/verbs/get/cmd.go +++ b/cmds/ocm/commands/verbs/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/cmds/ocm/commands/verbs/hash/cmd.go b/cmds/ocm/commands/verbs/hash/cmd.go index d5634caaf7..ce3e1a14b8 100644 --- a/cmds/ocm/commands/verbs/hash/cmd.go +++ b/cmds/ocm/commands/verbs/hash/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hash import ( diff --git a/cmds/ocm/commands/verbs/install/cmd.go b/cmds/ocm/commands/verbs/install/cmd.go index d5e1f61cdd..8a33b82318 100644 --- a/cmds/ocm/commands/verbs/install/cmd.go +++ b/cmds/ocm/commands/verbs/install/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( diff --git a/cmds/ocm/commands/verbs/list/cmd.go b/cmds/ocm/commands/verbs/list/cmd.go index 9be99c6001..465ec1a715 100644 --- a/cmds/ocm/commands/verbs/list/cmd.go +++ b/cmds/ocm/commands/verbs/list/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package list import ( diff --git a/cmds/ocm/commands/verbs/show/cmd.go b/cmds/ocm/commands/verbs/show/cmd.go index 4511a8b11b..68269c549d 100644 --- a/cmds/ocm/commands/verbs/show/cmd.go +++ b/cmds/ocm/commands/verbs/show/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package show import ( diff --git a/cmds/ocm/commands/verbs/sign/cmd.go b/cmds/ocm/commands/verbs/sign/cmd.go index 9de900ee40..0dcfb1c2bd 100644 --- a/cmds/ocm/commands/verbs/sign/cmd.go +++ b/cmds/ocm/commands/verbs/sign/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sign import ( diff --git a/cmds/ocm/commands/verbs/transfer/cmd.go b/cmds/ocm/commands/verbs/transfer/cmd.go index 05ef619866..e65a565486 100644 --- a/cmds/ocm/commands/verbs/transfer/cmd.go +++ b/cmds/ocm/commands/verbs/transfer/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/cmds/ocm/commands/verbs/verbs.go b/cmds/ocm/commands/verbs/verbs.go index 636e929676..e8455e3543 100644 --- a/cmds/ocm/commands/verbs/verbs.go +++ b/cmds/ocm/commands/verbs/verbs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package verbs const ( diff --git a/cmds/ocm/commands/verbs/verify/cmd.go b/cmds/ocm/commands/verbs/verify/cmd.go index b1b01a80bc..3e314da437 100644 --- a/cmds/ocm/commands/verbs/verify/cmd.go +++ b/cmds/ocm/commands/verbs/verify/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package verify import ( diff --git a/cmds/ocm/main.go b/cmds/ocm/main.go index 1ab728579f..2514bc96c4 100644 --- a/cmds/ocm/main.go +++ b/cmds/ocm/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/cmds/ocm/pkg/data/convert.go b/cmds/ocm/pkg/data/convert.go index a9047b9c64..86c5a1ae12 100644 --- a/cmds/ocm/pkg/data/convert.go +++ b/cmds/ocm/pkg/data/convert.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data func Slice(s Iterable) []interface{} { diff --git a/cmds/ocm/pkg/data/dll.go b/cmds/ocm/pkg/data/dll.go index f1b61d6078..6d889468ec 100644 --- a/cmds/ocm/pkg/data/dll.go +++ b/cmds/ocm/pkg/data/dll.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data import ( diff --git a/cmds/ocm/pkg/data/dll_test.go b/cmds/ocm/pkg/data/dll_test.go index f1a433f793..1e3e5a49eb 100644 --- a/cmds/ocm/pkg/data/dll_test.go +++ b/cmds/ocm/pkg/data/dll_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data import ( diff --git a/cmds/ocm/pkg/data/indexed.go b/cmds/ocm/pkg/data/indexed.go index da4eb59960..eeb282c1d8 100644 --- a/cmds/ocm/pkg/data/indexed.go +++ b/cmds/ocm/pkg/data/indexed.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data type IndexedAccess interface { diff --git a/cmds/ocm/pkg/data/indexed_test.go b/cmds/ocm/pkg/data/indexed_test.go index f0478aba32..4ff03d50d8 100644 --- a/cmds/ocm/pkg/data/indexed_test.go +++ b/cmds/ocm/pkg/data/indexed_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data import ( diff --git a/cmds/ocm/pkg/data/iterator.go b/cmds/ocm/pkg/data/iterator.go index 8d605e03b8..b8ddb5400d 100644 --- a/cmds/ocm/pkg/data/iterator.go +++ b/cmds/ocm/pkg/data/iterator.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data type Iterable interface { diff --git a/cmds/ocm/pkg/data/list.go b/cmds/ocm/pkg/data/list.go index 44e434b12d..0c39825ee7 100644 --- a/cmds/ocm/pkg/data/list.go +++ b/cmds/ocm/pkg/data/list.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data type Appender interface { diff --git a/cmds/ocm/pkg/data/list_test.go b/cmds/ocm/pkg/data/list_test.go index a5043ad6a3..b0c749a957 100644 --- a/cmds/ocm/pkg/data/list_test.go +++ b/cmds/ocm/pkg/data/list_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data import ( diff --git a/cmds/ocm/pkg/data/sort.go b/cmds/ocm/pkg/data/sort.go index 1f0b960227..7ebc5e2da2 100644 --- a/cmds/ocm/pkg/data/sort.go +++ b/cmds/ocm/pkg/data/sort.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data import ( diff --git a/cmds/ocm/pkg/data/suite_test.go b/cmds/ocm/pkg/data/suite_test.go index 8a6562cbca..3b6ca331cb 100644 --- a/cmds/ocm/pkg/data/suite_test.go +++ b/cmds/ocm/pkg/data/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package data_test import ( diff --git a/cmds/ocm/pkg/options/interfaces.go b/cmds/ocm/pkg/options/interfaces.go index a3f0571920..e6a12a1a59 100644 --- a/cmds/ocm/pkg/options/interfaces.go +++ b/cmds/ocm/pkg/options/interfaces.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options import ( diff --git a/cmds/ocm/pkg/options/options_test.go b/cmds/ocm/pkg/options/options_test.go index 262ad351c5..fd7c1a08cb 100644 --- a/cmds/ocm/pkg/options/options_test.go +++ b/cmds/ocm/pkg/options/options_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/pkg/options" diff --git a/cmds/ocm/pkg/options/suite_test.go b/cmds/ocm/pkg/options/suite_test.go index 20e1de5cea..c3faafe4c2 100644 --- a/cmds/ocm/pkg/options/suite_test.go +++ b/cmds/ocm/pkg/options/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options_test import ( diff --git a/cmds/ocm/pkg/output/attroutput.go b/cmds/ocm/pkg/output/attroutput.go index e9389df70d..ac5ee0dc17 100644 --- a/cmds/ocm/pkg/output/attroutput.go +++ b/cmds/ocm/pkg/output/attroutput.go @@ -1,14 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" - . "github.com/open-component-model/ocm/pkg/out" - "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/out" ) type AttrProcessingOutput struct { diff --git a/cmds/ocm/pkg/output/attrset.go b/cmds/ocm/pkg/output/attrset.go index cfbb95d00c..f38d31691f 100644 --- a/cmds/ocm/pkg/output/attrset.go +++ b/cmds/ocm/pkg/output/attrset.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/chain.go b/cmds/ocm/pkg/output/chain.go index adc7a11c85..bcbca994a1 100644 --- a/cmds/ocm/pkg/output/chain.go +++ b/cmds/ocm/pkg/output/chain.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/complexoutput.go b/cmds/ocm/pkg/output/complexoutput.go index a63bf3ec14..8fc93da04e 100644 --- a/cmds/ocm/pkg/output/complexoutput.go +++ b/cmds/ocm/pkg/output/complexoutput.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( "fmt" - . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" - . "github.com/open-component-model/ocm/pkg/out" - "sigs.k8s.io/yaml" + . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" + . "github.com/open-component-model/ocm/pkg/out" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/cmds/ocm/pkg/output/elementoutput.go b/cmds/ocm/pkg/output/elementoutput.go index 688245b205..a859534e6d 100644 --- a/cmds/ocm/pkg/output/elementoutput.go +++ b/cmds/ocm/pkg/output/elementoutput.go @@ -1,16 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( - . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" - . "github.com/open-component-model/ocm/pkg/out" - "github.com/mandelsoft/logging" "github.com/open-component-model/ocm/cmds/ocm/pkg/data" + . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" + . "github.com/open-component-model/ocm/pkg/out" ) type ElementOutput struct { diff --git a/cmds/ocm/pkg/output/funcoutput.go b/cmds/ocm/pkg/output/funcoutput.go index 8247ee04fb..a952f1435c 100644 --- a/cmds/ocm/pkg/output/funcoutput.go +++ b/cmds/ocm/pkg/output/funcoutput.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/options.go b/cmds/ocm/pkg/output/options.go index d10b33ce4c..7b924e7fdc 100644 --- a/cmds/ocm/pkg/output/options.go +++ b/cmds/ocm/pkg/output/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/output.go b/cmds/ocm/pkg/output/output.go index 52f98f6ea1..1c46513e6c 100644 --- a/cmds/ocm/pkg/output/output.go +++ b/cmds/ocm/pkg/output/output.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( @@ -9,12 +5,11 @@ import ( "encoding/json" "fmt" - . "github.com/open-component-model/ocm/pkg/out" - "sigs.k8s.io/yaml" "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/out" ) type Object = interface{} diff --git a/cmds/ocm/pkg/output/select.go b/cmds/ocm/pkg/output/select.go index 1a6834f055..314f7f450a 100644 --- a/cmds/ocm/pkg/output/select.go +++ b/cmds/ocm/pkg/output/select.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/singleelemoutput.go b/cmds/ocm/pkg/output/singleelemoutput.go index ebe60596d6..36f847e4f8 100644 --- a/cmds/ocm/pkg/output/singleelemoutput.go +++ b/cmds/ocm/pkg/output/singleelemoutput.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/sort_test.go b/cmds/ocm/pkg/output/sort_test.go index 3738be9d7f..fdb8afa81b 100644 --- a/cmds/ocm/pkg/output/sort_test.go +++ b/cmds/ocm/pkg/output/sort_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/stringoutput.go b/cmds/ocm/pkg/output/stringoutput.go index 4255c24e7f..c3b91b6c4c 100644 --- a/cmds/ocm/pkg/output/stringoutput.go +++ b/cmds/ocm/pkg/output/stringoutput.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( "strings" - . "github.com/open-component-model/ocm/pkg/out" - "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" + . "github.com/open-component-model/ocm/pkg/out" ) type StringOutput struct { diff --git a/cmds/ocm/pkg/output/suite_test.go b/cmds/ocm/pkg/output/suite_test.go index 99411761b2..57384d7b80 100644 --- a/cmds/ocm/pkg/output/suite_test.go +++ b/cmds/ocm/pkg/output/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/table.go b/cmds/ocm/pkg/output/table.go index 17641ee593..2641b3a298 100644 --- a/cmds/ocm/pkg/output/table.go +++ b/cmds/ocm/pkg/output/table.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/tableoutput.go b/cmds/ocm/pkg/output/tableoutput.go index 2fadc8218d..b2fa3b7ba8 100644 --- a/cmds/ocm/pkg/output/tableoutput.go +++ b/cmds/ocm/pkg/output/tableoutput.go @@ -1,19 +1,14 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( "strings" - . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" - "github.com/open-component-model/ocm/pkg/semverutils" - "github.com/open-component-model/ocm/pkg/utils" - "github.com/open-component-model/ocm/cmds/ocm/pkg/data" + . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" "github.com/open-component-model/ocm/pkg/errors" "github.com/open-component-model/ocm/pkg/out" + "github.com/open-component-model/ocm/pkg/semverutils" + "github.com/open-component-model/ocm/pkg/utils" ) type SortFields interface { diff --git a/cmds/ocm/pkg/output/treeoutput.go b/cmds/ocm/pkg/output/treeoutput.go index 7b947cfcff..02656b8a90 100644 --- a/cmds/ocm/pkg/output/treeoutput.go +++ b/cmds/ocm/pkg/output/treeoutput.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output import ( diff --git a/cmds/ocm/pkg/output/utils.go b/cmds/ocm/pkg/output/utils.go index 96d2c8da50..dbcf1baf4a 100644 --- a/cmds/ocm/pkg/output/utils.go +++ b/cmds/ocm/pkg/output/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package output // Fields composes a (string) field list based on a sequence of strings and or diff --git a/cmds/ocm/pkg/processing/buffer.go b/cmds/ocm/pkg/processing/buffer.go index 3ae7e0fd91..95ef0709c3 100644 --- a/cmds/ocm/pkg/processing/buffer.go +++ b/cmds/ocm/pkg/processing/buffer.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( diff --git a/cmds/ocm/pkg/processing/buffer_test.go b/cmds/ocm/pkg/processing/buffer_test.go index a638d6afc6..bfab4932c4 100644 --- a/cmds/ocm/pkg/processing/buffer_test.go +++ b/cmds/ocm/pkg/processing/buffer_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( "sync" + "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/logging" - "github.com/open-component-model/ocm/cmds/ocm/pkg/data" ocmlog "github.com/open-component-model/ocm/pkg/logging" ) diff --git a/cmds/ocm/pkg/processing/chain.go b/cmds/ocm/pkg/processing/chain.go index 054a9a9991..5e1fa86530 100644 --- a/cmds/ocm/pkg/processing/chain.go +++ b/cmds/ocm/pkg/processing/chain.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( diff --git a/cmds/ocm/pkg/processing/operation.go b/cmds/ocm/pkg/processing/operation.go index 2cbcf43d21..2a8b33bd00 100644 --- a/cmds/ocm/pkg/processing/operation.go +++ b/cmds/ocm/pkg/processing/operation.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing type operation interface { diff --git a/cmds/ocm/pkg/processing/parallel.go b/cmds/ocm/pkg/processing/parallel.go index c8e78a2818..8b2a2b814a 100644 --- a/cmds/ocm/pkg/processing/parallel.go +++ b/cmds/ocm/pkg/processing/parallel.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( diff --git a/cmds/ocm/pkg/processing/pool.go b/cmds/ocm/pkg/processing/pool.go index 5db6742ce9..dc5f0fc662 100644 --- a/cmds/ocm/pkg/processing/pool.go +++ b/cmds/ocm/pkg/processing/pool.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( diff --git a/cmds/ocm/pkg/processing/processing.go b/cmds/ocm/pkg/processing/processing.go index 51a20e68d4..a01e44bfba 100644 --- a/cmds/ocm/pkg/processing/processing.go +++ b/cmds/ocm/pkg/processing/processing.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( diff --git a/cmds/ocm/pkg/processing/processing_test.go b/cmds/ocm/pkg/processing/processing_test.go index 44532a79fd..20d317a31e 100644 --- a/cmds/ocm/pkg/processing/processing_test.go +++ b/cmds/ocm/pkg/processing/processing_test.go @@ -1,18 +1,13 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( "bytes" "strings" + "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/logging" - "github.com/open-component-model/ocm/cmds/ocm/pkg/data" ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/testutils" diff --git a/cmds/ocm/pkg/processing/sequential.go b/cmds/ocm/pkg/processing/sequential.go index 1275fd46bf..8114dedfc6 100644 --- a/cmds/ocm/pkg/processing/sequential.go +++ b/cmds/ocm/pkg/processing/sequential.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing import ( diff --git a/cmds/ocm/pkg/processing/suite_test.go b/cmds/ocm/pkg/processing/suite_test.go index 48f3309593..bee54948cf 100644 --- a/cmds/ocm/pkg/processing/suite_test.go +++ b/cmds/ocm/pkg/processing/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing_test import ( diff --git a/cmds/ocm/pkg/processing/utils.go b/cmds/ocm/pkg/processing/utils.go index 436c1aa85f..513483aab0 100644 --- a/cmds/ocm/pkg/processing/utils.go +++ b/cmds/ocm/pkg/processing/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package processing func IdentityMapper(e interface{}) interface{} { diff --git a/cmds/ocm/pkg/tree/convert.go b/cmds/ocm/pkg/tree/convert.go index 709f0cdfdb..6c8e9a3dd5 100644 --- a/cmds/ocm/pkg/tree/convert.go +++ b/cmds/ocm/pkg/tree/convert.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tree import ( diff --git a/cmds/ocm/pkg/tree/suite_test.go b/cmds/ocm/pkg/tree/suite_test.go index 6d47a92cc0..de7d71e114 100644 --- a/cmds/ocm/pkg/tree/suite_test.go +++ b/cmds/ocm/pkg/tree/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tree_test import ( diff --git a/cmds/ocm/pkg/tree/tree.go b/cmds/ocm/pkg/tree/tree.go index b5db90ae1f..120455994d 100644 --- a/cmds/ocm/pkg/tree/tree.go +++ b/cmds/ocm/pkg/tree/tree.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tree import ( diff --git a/cmds/ocm/pkg/tree/tree_test.go b/cmds/ocm/pkg/tree/tree_test.go index 1d3d26bc2f..65707d9c24 100644 --- a/cmds/ocm/pkg/tree/tree_test.go +++ b/cmds/ocm/pkg/tree/tree_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tree_test import ( diff --git a/cmds/ocm/pkg/utils/command.go b/cmds/ocm/pkg/utils/command.go index 0435d2f2ba..a6a2675ccf 100644 --- a/cmds/ocm/pkg/utils/command.go +++ b/cmds/ocm/pkg/utils/command.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/cmds/ocm/pkg/utils/handling.go b/cmds/ocm/pkg/utils/handling.go index 44b4a76d8f..c17560006b 100644 --- a/cmds/ocm/pkg/utils/handling.go +++ b/cmds/ocm/pkg/utils/handling.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/cmds/ocm/pkg/utils/plural.go b/cmds/ocm/pkg/utils/plural.go index 03f7bbd116..5c3401fdf2 100644 --- a/cmds/ocm/pkg/utils/plural.go +++ b/cmds/ocm/pkg/utils/plural.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/cmds/ocm/pkg/utils/validate.go b/cmds/ocm/pkg/utils/validate.go index 62ef7e8c10..a56bf9e7c4 100644 --- a/cmds/ocm/pkg/utils/validate.go +++ b/cmds/ocm/pkg/utils/validate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/cmds/ocm/testhelper/env.go b/cmds/ocm/testhelper/env.go index 1a29761c55..1becc71cc1 100644 --- a/cmds/ocm/testhelper/env.go +++ b/cmds/ocm/testhelper/env.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( diff --git a/cmds/ocm/testhelper/forward.go b/cmds/ocm/testhelper/forward.go index 6690542d3c..4ab63e22bd 100644 --- a/cmds/ocm/testhelper/forward.go +++ b/cmds/ocm/testhelper/forward.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( diff --git a/cmds/ocm/testhelper/suite_test.go b/cmds/ocm/testhelper/suite_test.go index cdbf77e16f..24e2abd04f 100644 --- a/cmds/ocm/testhelper/suite_test.go +++ b/cmds/ocm/testhelper/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( diff --git a/cmds/ocm/testhelper/testhelper_test.go b/cmds/ocm/testhelper/testhelper_test.go index 719e0ac4d2..4e919df274 100644 --- a/cmds/ocm/testhelper/testhelper_test.go +++ b/cmds/ocm/testhelper/testhelper_test.go @@ -1,14 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "github.com/mandelsoft/vfs/pkg/vfs" ) var _ = Describe("Test Environment", func() { diff --git a/cmds/ocm/topics/common/attributes/topic.go b/cmds/ocm/topics/common/attributes/topic.go index b6974506eb..3ad5604be0 100644 --- a/cmds/ocm/topics/common/attributes/topic.go +++ b/cmds/ocm/topics/common/attributes/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attributes import ( diff --git a/cmds/ocm/topics/common/config/topic.go b/cmds/ocm/topics/common/config/topic.go index 1b2d5b45a6..c246b70620 100644 --- a/cmds/ocm/topics/common/config/topic.go +++ b/cmds/ocm/topics/common/config/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package topicconfig import ( diff --git a/cmds/ocm/topics/common/credentials/topic.go b/cmds/ocm/topics/common/credentials/topic.go index 4c8835656a..1b9136e87c 100644 --- a/cmds/ocm/topics/common/credentials/topic.go +++ b/cmds/ocm/topics/common/credentials/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attributes import ( diff --git a/cmds/ocm/topics/common/logging/topic.go b/cmds/ocm/topics/common/logging/topic.go index 1398e3a10a..6ef01a8cd5 100644 --- a/cmds/ocm/topics/common/logging/topic.go +++ b/cmds/ocm/topics/common/logging/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging import ( diff --git a/cmds/ocm/topics/oci/refs/topic.go b/cmds/ocm/topics/oci/refs/topic.go index 3664c59110..66cba184c3 100644 --- a/cmds/ocm/topics/oci/refs/topic.go +++ b/cmds/ocm/topics/oci/refs/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package topicocirefs import ( diff --git a/cmds/ocm/topics/ocm/accessmethods/topic.go b/cmds/ocm/topics/ocm/accessmethods/topic.go index 063458830f..7d3d95867e 100644 --- a/cmds/ocm/topics/ocm/accessmethods/topic.go +++ b/cmds/ocm/topics/ocm/accessmethods/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package topicocmaccessmethods import ( diff --git a/cmds/ocm/topics/ocm/downloadhandlers/topic.go b/cmds/ocm/topics/ocm/downloadhandlers/topic.go index c66bbffc98..9ea165bb38 100644 --- a/cmds/ocm/topics/ocm/downloadhandlers/topic.go +++ b/cmds/ocm/topics/ocm/downloadhandlers/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package topicocmaccessmethods import ( diff --git a/cmds/ocm/topics/ocm/labels/topic.go b/cmds/ocm/topics/ocm/labels/topic.go index 3ba8d85e3d..1cc9672382 100644 --- a/cmds/ocm/topics/ocm/labels/topic.go +++ b/cmds/ocm/topics/ocm/labels/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package topicocmlabels import ( diff --git a/cmds/ocm/topics/ocm/refs/topic.go b/cmds/ocm/topics/ocm/refs/topic.go index 41cac75876..ea76985b11 100644 --- a/cmds/ocm/topics/ocm/refs/topic.go +++ b/cmds/ocm/topics/ocm/refs/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package topicocmrefs import ( diff --git a/cmds/ocm/topics/ocm/uploadhandlers/topic.go b/cmds/ocm/topics/ocm/uploadhandlers/topic.go index 7fd9d902e0..a706957b4e 100644 --- a/cmds/ocm/topics/ocm/uploadhandlers/topic.go +++ b/cmds/ocm/topics/ocm/uploadhandlers/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package topicocmaccessmethods import ( diff --git a/cmds/ocm/topics/toi/bootstrapping/topic.go b/cmds/ocm/topics/toi/bootstrapping/topic.go index 6d7277b7b6..ae402b7c5b 100644 --- a/cmds/ocm/topics/toi/bootstrapping/topic.go +++ b/cmds/ocm/topics/toi/bootstrapping/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bootstapping import ( diff --git a/examples/lib/comparison-scenario/main.go b/examples/lib/comparison-scenario/main.go index ca172f17b8..533b186b0c 100644 --- a/examples/lib/comparison-scenario/main.go +++ b/examples/lib/comparison-scenario/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/config1/example.go b/examples/lib/config1/example.go index 2eaf591eb3..7c3cfc888e 100644 --- a/examples/lib/config1/example.go +++ b/examples/lib/config1/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/config1/main.go b/examples/lib/config1/main.go index 464761e82e..df17820f9c 100644 --- a/examples/lib/config1/main.go +++ b/examples/lib/config1/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/config2/example.go b/examples/lib/config2/example.go index 4db1129da4..051607b797 100644 --- a/examples/lib/config2/example.go +++ b/examples/lib/config2/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/config2/main.go b/examples/lib/config2/main.go index 45f1f9b587..c0f372cf9b 100644 --- a/examples/lib/config2/main.go +++ b/examples/lib/config2/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/config3/example.go b/examples/lib/config3/example.go index 74020edf06..0ab06f5a5e 100644 --- a/examples/lib/config3/example.go +++ b/examples/lib/config3/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/config3/main.go b/examples/lib/config3/main.go index 464761e82e..df17820f9c 100644 --- a/examples/lib/config3/main.go +++ b/examples/lib/config3/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/cred1/example.go b/examples/lib/cred1/example.go index 67c579a8c5..08f6668ff4 100644 --- a/examples/lib/cred1/example.go +++ b/examples/lib/cred1/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/cred1/main.go b/examples/lib/cred1/main.go index 31ed0673b2..bfe9c6414d 100644 --- a/examples/lib/cred1/main.go +++ b/examples/lib/cred1/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/cred2/example.go b/examples/lib/cred2/example.go index b4f93b7a09..73146504fd 100644 --- a/examples/lib/cred2/example.go +++ b/examples/lib/cred2/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/cred2/main.go b/examples/lib/cred2/main.go index 31ed0673b2..bfe9c6414d 100644 --- a/examples/lib/cred2/main.go +++ b/examples/lib/cred2/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/cred3/example.go b/examples/lib/cred3/example.go index d15b00db8b..eaf339a104 100644 --- a/examples/lib/cred3/example.go +++ b/examples/lib/cred3/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/cred3/main.go b/examples/lib/cred3/main.go index 31ed0673b2..bfe9c6414d 100644 --- a/examples/lib/cred3/main.go +++ b/examples/lib/cred3/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/ctf/example.go b/examples/lib/ctf/example.go index 48e436c5ff..dab2b5f3da 100644 --- a/examples/lib/ctf/example.go +++ b/examples/lib/ctf/example.go @@ -1,13 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( "fmt" "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/examples/lib/ctf/main.go b/examples/lib/ctf/main.go index e1448838b9..539aa3c7b2 100644 --- a/examples/lib/ctf/main.go +++ b/examples/lib/ctf/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/example.go b/examples/lib/example.go index 566ad067d3..798dcac412 100644 --- a/examples/lib/example.go +++ b/examples/lib/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/helper/helper.go b/examples/lib/helper/helper.go index 0739fa781c..fc2d601dbf 100644 --- a/examples/lib/helper/helper.go +++ b/examples/lib/helper/helper.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helper import ( diff --git a/examples/lib/main.go b/examples/lib/main.go index ef9ab16d60..e61681f885 100644 --- a/examples/lib/main.go +++ b/examples/lib/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/tour/01-getting-started/main.go b/examples/lib/tour/01-getting-started/main.go index 0b551a99c9..a21beded76 100644 --- a/examples/lib/tour/01-getting-started/main.go +++ b/examples/lib/tour/01-getting-started/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/tour/02-composing-a-component-version/main.go b/examples/lib/tour/02-composing-a-component-version/main.go index 074c55e4a0..cb76314235 100644 --- a/examples/lib/tour/02-composing-a-component-version/main.go +++ b/examples/lib/tour/02-composing-a-component-version/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/tour/03-working-with-credentials/main.go b/examples/lib/tour/03-working-with-credentials/main.go index a705fa1167..e3fe4a35c4 100644 --- a/examples/lib/tour/03-working-with-credentials/main.go +++ b/examples/lib/tour/03-working-with-credentials/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/tour/04-working-with-config/main.go b/examples/lib/tour/04-working-with-config/main.go index ca59b4738b..1866d33040 100644 --- a/examples/lib/tour/04-working-with-config/main.go +++ b/examples/lib/tour/04-working-with-config/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/tour/05-transporting-component-versions/main.go b/examples/lib/tour/05-transporting-component-versions/main.go index a1a4b903e6..6e6ad9b265 100644 --- a/examples/lib/tour/05-transporting-component-versions/main.go +++ b/examples/lib/tour/05-transporting-component-versions/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/tour/06-signing-component-versions/main.go b/examples/lib/tour/06-signing-component-versions/main.go index d8eb68e55d..2a31e09f1c 100644 --- a/examples/lib/tour/06-signing-component-versions/main.go +++ b/examples/lib/tour/06-signing-component-versions/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/transfer1/example.go b/examples/lib/transfer1/example.go index 76d107afd8..bd7e7fd1fd 100644 --- a/examples/lib/transfer1/example.go +++ b/examples/lib/transfer1/example.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/examples/lib/transfer1/main.go b/examples/lib/transfer1/main.go index 9b8786099c..1e4c5f1784 100644 --- a/examples/lib/transfer1/main.go +++ b/examples/lib/transfer1/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/hack/generate-docs/cobradoc/gen.go b/hack/generate-docs/cobradoc/gen.go index 011c7ff616..ddf06fc871 100644 --- a/hack/generate-docs/cobradoc/gen.go +++ b/hack/generate-docs/cobradoc/gen.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobradoc import ( diff --git a/hack/generate-docs/cobradoc/md_docs.go b/hack/generate-docs/cobradoc/md_docs.go index 48e465bee6..cc7c397b07 100644 --- a/hack/generate-docs/cobradoc/md_docs.go +++ b/hack/generate-docs/cobradoc/md_docs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobradoc import ( @@ -13,11 +9,10 @@ import ( "strings" "time" + "github.com/mandelsoft/filepath/pkg/filepath" "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/mandelsoft/filepath/pkg/filepath" - "github.com/open-component-model/ocm/pkg/cobrautils" "github.com/open-component-model/ocm/pkg/cobrautils/groups" ) diff --git a/hack/generate-docs/cobradoc/mod.go b/hack/generate-docs/cobradoc/mod.go index 439d72eeb7..ddfd3bf6f5 100644 --- a/hack/generate-docs/cobradoc/mod.go +++ b/hack/generate-docs/cobradoc/mod.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobradoc import ( diff --git a/hack/generate-docs/cobradoc/suite_test.go b/hack/generate-docs/cobradoc/suite_test.go index 3b8d3a300c..0c266aaeef 100644 --- a/hack/generate-docs/cobradoc/suite_test.go +++ b/hack/generate-docs/cobradoc/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobradoc_test import ( diff --git a/hack/generate-docs/cobradoc/util.go b/hack/generate-docs/cobradoc/util.go index f2877380b9..568c629d43 100644 --- a/hack/generate-docs/cobradoc/util.go +++ b/hack/generate-docs/cobradoc/util.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobradoc import ( diff --git a/hack/generate-docs/main.go b/hack/generate-docs/main.go index 2a8b1e001f..404be89e0d 100644 --- a/hack/generate-docs/main.go +++ b/hack/generate-docs/main.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/hack/tools.go b/hack/tools.go index 86d7910b51..b76c619e68 100644 --- a/hack/tools.go +++ b/hack/tools.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build tools // +build tools diff --git a/pkg/blobaccess/dockerdaemon/access.go b/pkg/blobaccess/dockerdaemon/access.go index 695b83ba24..8a636390c9 100644 --- a/pkg/blobaccess/dockerdaemon/access.go +++ b/pkg/blobaccess/dockerdaemon/access.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockerdaemon import ( diff --git a/pkg/blobaccess/dockermulti/access.go b/pkg/blobaccess/dockermulti/access.go index 73489dde55..0a475733eb 100644 --- a/pkg/blobaccess/dockermulti/access.go +++ b/pkg/blobaccess/dockermulti/access.go @@ -1,14 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockermulti import ( "fmt" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -20,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/optionutils" ) diff --git a/pkg/blobaccess/helm/resource.go b/pkg/blobaccess/helm/resource.go index 1e5c5189bf..4f00a31a39 100644 --- a/pkg/blobaccess/helm/resource.go +++ b/pkg/blobaccess/helm/resource.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/pkg/blobaccess/ociartifact/resource.go b/pkg/blobaccess/ociartifact/resource.go index 3b8990464a..b437c9b96e 100644 --- a/pkg/blobaccess/ociartifact/resource.go +++ b/pkg/blobaccess/ociartifact/resource.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact import ( diff --git a/pkg/blobaccess/suite_test.go b/pkg/blobaccess/suite_test.go index 7b565b4525..c57c09d6bb 100644 --- a/pkg/blobaccess/suite_test.go +++ b/pkg/blobaccess/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package blobaccess_test import ( diff --git a/pkg/cobrautils/cleanup_test.go b/pkg/cobrautils/cleanup_test.go index 8870e1fd81..4dc2b16b8a 100644 --- a/pkg/cobrautils/cleanup_test.go +++ b/pkg/cobrautils/cleanup_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobrautils_test 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/cobrautils" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("processing buffer", func() { diff --git a/pkg/cobrautils/flag/bytes.go b/pkg/cobrautils/flag/bytes.go index 96627d6348..6080a8827f 100644 --- a/pkg/cobrautils/flag/bytes.go +++ b/pkg/cobrautils/flag/bytes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/labelledstring.go b/pkg/cobrautils/flag/labelledstring.go index f90e072a1e..4f026ff492 100644 --- a/pkg/cobrautils/flag/labelledstring.go +++ b/pkg/cobrautils/flag/labelledstring.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/labelledstring_test.go b/pkg/cobrautils/flag/labelledstring_test.go index 6ba94ad51d..bcf4640f70 100644 --- a/pkg/cobrautils/flag/labelledstring_test.go +++ b/pkg/cobrautils/flag/labelledstring_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/spf13/pflag" ) diff --git a/pkg/cobrautils/flag/labelledvalue.go b/pkg/cobrautils/flag/labelledvalue.go index aa1b4de538..e1342ba160 100644 --- a/pkg/cobrautils/flag/labelledvalue.go +++ b/pkg/cobrautils/flag/labelledvalue.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/labelledvalue_test.go b/pkg/cobrautils/flag/labelledvalue_test.go index 0972a6707c..e84031e09b 100644 --- a/pkg/cobrautils/flag/labelledvalue_test.go +++ b/pkg/cobrautils/flag/labelledvalue_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/spf13/pflag" ) diff --git a/pkg/cobrautils/flag/semver.go b/pkg/cobrautils/flag/semver.go index 96c33a85ab..7afb041a34 100644 --- a/pkg/cobrautils/flag/semver.go +++ b/pkg/cobrautils/flag/semver.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/semver_constraint.go b/pkg/cobrautils/flag/semver_constraint.go index 2987e963c0..f541d51e79 100644 --- a/pkg/cobrautils/flag/semver_constraint.go +++ b/pkg/cobrautils/flag/semver_constraint.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/string_to_value.go b/pkg/cobrautils/flag/string_to_value.go index c1e639dae6..1712e56ec9 100644 --- a/pkg/cobrautils/flag/string_to_value.go +++ b/pkg/cobrautils/flag/string_to_value.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/string_to_value_test.go b/pkg/cobrautils/flag/string_to_value_test.go index a304283a1c..58bd487558 100644 --- a/pkg/cobrautils/flag/string_to_value_test.go +++ b/pkg/cobrautils/flag/string_to_value_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/testutils" diff --git a/pkg/cobrautils/flag/suite_test.go b/pkg/cobrautils/flag/suite_test.go index f3f2e05d84..5e7b595953 100644 --- a/pkg/cobrautils/flag/suite_test.go +++ b/pkg/cobrautils/flag/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/yaml.go b/pkg/cobrautils/flag/yaml.go index 5f73b5b418..b15c95db3a 100644 --- a/pkg/cobrautils/flag/yaml.go +++ b/pkg/cobrautils/flag/yaml.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( diff --git a/pkg/cobrautils/flag/yaml_test.go b/pkg/cobrautils/flag/yaml_test.go index 340b8b9c7b..cdfda22b25 100644 --- a/pkg/cobrautils/flag/yaml_test.go +++ b/pkg/cobrautils/flag/yaml_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/spf13/pflag" ) diff --git a/pkg/cobrautils/flagsets/configoptions.go b/pkg/cobrautils/flagsets/configoptions.go index e4c15f7a76..a87d7845c9 100644 --- a/pkg/cobrautils/flagsets/configoptions.go +++ b/pkg/cobrautils/flagsets/configoptions.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets import ( diff --git a/pkg/cobrautils/flagsets/configoptionset.go b/pkg/cobrautils/flagsets/configoptionset.go index 0ae91af40a..fd0bc59a15 100644 --- a/pkg/cobrautils/flagsets/configoptionset.go +++ b/pkg/cobrautils/flagsets/configoptionset.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets import ( diff --git a/pkg/cobrautils/flagsets/configure_test.go b/pkg/cobrautils/flagsets/configure_test.go index ad2f8081f1..cbecaefdc4 100644 --- a/pkg/cobrautils/flagsets/configure_test.go +++ b/pkg/cobrautils/flagsets/configure_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" + . "github.com/open-component-model/ocm/pkg/testutils" ) func adder(opts flagsets.ConfigOptions, data flagsets.Config) error { diff --git a/pkg/cobrautils/flagsets/flags_test.go b/pkg/cobrautils/flagsets/flags_test.go index d2ce6983e9..19e84470be 100644 --- a/pkg/cobrautils/flagsets/flags_test.go +++ b/pkg/cobrautils/flagsets/flags_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" diff --git a/pkg/cobrautils/flagsets/handler.go b/pkg/cobrautils/flagsets/handler.go index 0fc015e363..58d1356f72 100644 --- a/pkg/cobrautils/flagsets/handler.go +++ b/pkg/cobrautils/flagsets/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets import ( diff --git a/pkg/cobrautils/flagsets/provider.go b/pkg/cobrautils/flagsets/provider.go index 59df087701..959706d802 100644 --- a/pkg/cobrautils/flagsets/provider.go +++ b/pkg/cobrautils/flagsets/provider.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets import ( diff --git a/pkg/cobrautils/flagsets/suite_test.go b/pkg/cobrautils/flagsets/suite_test.go index 5de6938923..b4ec0a1c63 100644 --- a/pkg/cobrautils/flagsets/suite_test.go +++ b/pkg/cobrautils/flagsets/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets_test import ( diff --git a/pkg/cobrautils/flagsets/typeset_test.go b/pkg/cobrautils/flagsets/typeset_test.go index 6db3d3266b..8bbfa48bf0 100644 --- a/pkg/cobrautils/flagsets/typeset_test.go +++ b/pkg/cobrautils/flagsets/typeset_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets_test import ( diff --git a/pkg/cobrautils/flagsets/utils.go b/pkg/cobrautils/flagsets/utils.go index ae407d185a..74031c7ed4 100644 --- a/pkg/cobrautils/flagsets/utils.go +++ b/pkg/cobrautils/flagsets/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets import ( diff --git a/pkg/cobrautils/flagsets/utils_test.go b/pkg/cobrautils/flagsets/utils_test.go index cf88f9a43e..6112d9b722 100644 --- a/pkg/cobrautils/flagsets/utils_test.go +++ b/pkg/cobrautils/flagsets/utils_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package flagsets_test import ( diff --git a/pkg/cobrautils/funcs.go b/pkg/cobrautils/funcs.go index 47e1065c16..4810e3d5a7 100644 --- a/pkg/cobrautils/funcs.go +++ b/pkg/cobrautils/funcs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobrautils import ( diff --git a/pkg/cobrautils/groups/flagusages.go b/pkg/cobrautils/groups/flagusages.go index dad783616b..b6fe2c12ad 100644 --- a/pkg/cobrautils/groups/flagusages.go +++ b/pkg/cobrautils/groups/flagusages.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package groups import ( diff --git a/pkg/cobrautils/links.go b/pkg/cobrautils/links.go index 2257e9dc6f..70ed6f34fa 100644 --- a/pkg/cobrautils/links.go +++ b/pkg/cobrautils/links.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobrautils import ( diff --git a/pkg/cobrautils/logopts/suite_test.go b/pkg/cobrautils/logopts/suite_test.go index 9b4c99c009..204541e0ff 100644 --- a/pkg/cobrautils/logopts/suite_test.go +++ b/pkg/cobrautils/logopts/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logopts import ( diff --git a/pkg/cobrautils/suite_test.go b/pkg/cobrautils/suite_test.go index 3b20aa0acd..4a85061a0a 100644 --- a/pkg/cobrautils/suite_test.go +++ b/pkg/cobrautils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobrautils_test import ( diff --git a/pkg/cobrautils/template.go b/pkg/cobrautils/template.go index 1908085ba5..eb84dbfeb0 100644 --- a/pkg/cobrautils/template.go +++ b/pkg/cobrautils/template.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobrautils const HelpTemplate = "{{.CommandPath}} \u2014 {{title .Short}}" + `{{if .IsAvailableCommand}} diff --git a/pkg/cobrautils/tweak.go b/pkg/cobrautils/tweak.go index 98715c9b70..3ce7bea83f 100644 --- a/pkg/cobrautils/tweak.go +++ b/pkg/cobrautils/tweak.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cobrautils import ( "regexp" "strings" - _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" - "github.com/spf13/cobra" + _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" "github.com/open-component-model/ocm/pkg/out" ) diff --git a/pkg/common/accessio/access.go b/pkg/common/accessio/access.go index 09792ee981..bd181bc771 100644 --- a/pkg/common/accessio/access.go +++ b/pkg/common/accessio/access.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/cache.go b/pkg/common/accessio/cache.go index c71c147c8b..f6f6552363 100644 --- a/pkg/common/accessio/cache.go +++ b/pkg/common/accessio/cache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/cache_test.go b/pkg/common/accessio/cache_test.go index 74965da6bd..ceaa756f37 100644 --- a/pkg/common/accessio/cache_test.go +++ b/pkg/common/accessio/cache_test.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/common/accessio/downloader/downloader.go b/pkg/common/accessio/downloader/downloader.go index 5033683106..46f67f54bf 100644 --- a/pkg/common/accessio/downloader/downloader.go +++ b/pkg/common/accessio/downloader/downloader.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package downloader import "io" diff --git a/pkg/common/accessio/downloader/http/downloader.go b/pkg/common/accessio/downloader/http/downloader.go index 8a2d28800b..484c0989d2 100644 --- a/pkg/common/accessio/downloader/http/downloader.go +++ b/pkg/common/accessio/downloader/http/downloader.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package http import ( diff --git a/pkg/common/accessio/downloader/s3/downloader.go b/pkg/common/accessio/downloader/s3/downloader.go index 9420530801..8577072bfc 100644 --- a/pkg/common/accessio/downloader/s3/downloader.go +++ b/pkg/common/accessio/downloader/s3/downloader.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package s3 import ( diff --git a/pkg/common/accessio/format.go b/pkg/common/accessio/format.go index 8ccb113184..850a568663 100644 --- a/pkg/common/accessio/format.go +++ b/pkg/common/accessio/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/limitwriter.go b/pkg/common/accessio/limitwriter.go index c17136b09f..555f351404 100644 --- a/pkg/common/accessio/limitwriter.go +++ b/pkg/common/accessio/limitwriter.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/ondemandreader.go b/pkg/common/accessio/ondemandreader.go index 30bd3203a0..3d65826ba4 100644 --- a/pkg/common/accessio/ondemandreader.go +++ b/pkg/common/accessio/ondemandreader.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/opts.go b/pkg/common/accessio/opts.go index a03ad35f6d..40b3a32e9a 100644 --- a/pkg/common/accessio/opts.go +++ b/pkg/common/accessio/opts.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/resettablereader.go b/pkg/common/accessio/resettablereader.go index e03e93f486..2f2d601174 100644 --- a/pkg/common/accessio/resettablereader.go +++ b/pkg/common/accessio/resettablereader.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/resettablereader_test.go b/pkg/common/accessio/resettablereader_test.go index 9619f11691..38a23d4e9a 100644 --- a/pkg/common/accessio/resettablereader_test.go +++ b/pkg/common/accessio/resettablereader_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( "io" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) const testData = "test data" diff --git a/pkg/common/accessio/suite_test.go b/pkg/common/accessio/suite_test.go index 5ed0ad03ba..80b25f1e9c 100644 --- a/pkg/common/accessio/suite_test.go +++ b/pkg/common/accessio/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio_test import ( diff --git a/pkg/common/accessio/utils.go b/pkg/common/accessio/utils.go index 7cfe9a452c..cb68e85fe6 100644 --- a/pkg/common/accessio/utils.go +++ b/pkg/common/accessio/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessio/wrapper.go b/pkg/common/accessio/wrapper.go index 23caa30b69..acbd942cb7 100644 --- a/pkg/common/accessio/wrapper.go +++ b/pkg/common/accessio/wrapper.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessio import ( diff --git a/pkg/common/accessobj/accessobject.go b/pkg/common/accessobj/accessobject.go index 12fc35f91a..45f201c1cd 100644 --- a/pkg/common/accessobj/accessobject.go +++ b/pkg/common/accessobj/accessobject.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/accessstate.go b/pkg/common/accessobj/accessstate.go index 696a761a9e..e9b21decae 100644 --- a/pkg/common/accessobj/accessstate.go +++ b/pkg/common/accessobj/accessstate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/cachedblob.go b/pkg/common/accessobj/cachedblob.go index 280e1a3853..5ca6cfbab8 100644 --- a/pkg/common/accessobj/cachedblob.go +++ b/pkg/common/accessobj/cachedblob.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/check.go b/pkg/common/accessobj/check.go index f25109e6a2..a4dfd31086 100644 --- a/pkg/common/accessobj/check.go +++ b/pkg/common/accessobj/check.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/filesystemaccess.go b/pkg/common/accessobj/filesystemaccess.go index 116c9ea75d..26b43e1bea 100644 --- a/pkg/common/accessobj/filesystemaccess.go +++ b/pkg/common/accessobj/filesystemaccess.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/format-directory.go b/pkg/common/accessobj/format-directory.go index 07edad78cf..9a5414a79f 100644 --- a/pkg/common/accessobj/format-directory.go +++ b/pkg/common/accessobj/format-directory.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/format-tar.go b/pkg/common/accessobj/format-tar.go index 52edd539c2..e2d28f7ba0 100644 --- a/pkg/common/accessobj/format-tar.go +++ b/pkg/common/accessobj/format-tar.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/format-tgz.go b/pkg/common/accessobj/format-tgz.go index e743fb5ae7..c5c348ec77 100644 --- a/pkg/common/accessobj/format-tgz.go +++ b/pkg/common/accessobj/format-tgz.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/format.go b/pkg/common/accessobj/format.go index fd321ccb5d..23e061b2ab 100644 --- a/pkg/common/accessobj/format.go +++ b/pkg/common/accessobj/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/accessobj/suite_test.go b/pkg/common/accessobj/suite_test.go index 9309735b18..babcb59f9a 100644 --- a/pkg/common/accessobj/suite_test.go +++ b/pkg/common/accessobj/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj_test import ( diff --git a/pkg/common/accessobj/utils.go b/pkg/common/accessobj/utils.go index f0fc63b947..c9a8bc98c5 100644 --- a/pkg/common/accessobj/utils.go +++ b/pkg/common/accessobj/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessobj import ( diff --git a/pkg/common/compression/c_bzip2.go b/pkg/common/compression/c_bzip2.go index 0e4807e29e..902b0b7311 100644 --- a/pkg/common/compression/c_bzip2.go +++ b/pkg/common/compression/c_bzip2.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/c_gzip.go b/pkg/common/compression/c_gzip.go index 937368675b..2a86370633 100644 --- a/pkg/common/compression/c_gzip.go +++ b/pkg/common/compression/c_gzip.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/c_xz.go b/pkg/common/compression/c_xz.go index 41a53888e4..0728d57d60 100644 --- a/pkg/common/compression/c_xz.go +++ b/pkg/common/compression/c_xz.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/c_zstd.go b/pkg/common/compression/c_zstd.go index ac757920da..cdfe436c64 100644 --- a/pkg/common/compression/c_zstd.go +++ b/pkg/common/compression/c_zstd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/compression.go b/pkg/common/compression/compression.go index 4fd81aa182..e69a02a94e 100644 --- a/pkg/common/compression/compression.go +++ b/pkg/common/compression/compression.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/compression_test.go b/pkg/common/compression/compression_test.go index 956a1c80df..50094d3563 100644 --- a/pkg/common/compression/compression_test.go +++ b/pkg/common/compression/compression_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/default.go b/pkg/common/compression/default.go index 7563c59546..9ef8f109d2 100644 --- a/pkg/common/compression/default.go +++ b/pkg/common/compression/default.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/matchreader.go b/pkg/common/compression/matchreader.go index 6c84bfc908..c4c983db69 100644 --- a/pkg/common/compression/matchreader.go +++ b/pkg/common/compression/matchreader.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/compression/types.go b/pkg/common/compression/types.go index 9c20383200..ed8f608534 100644 --- a/pkg/common/compression/types.go +++ b/pkg/common/compression/types.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // This package has been initially taken from github.com/containers/image // and modified to be provide a useful simple API based on // an Algorithm interface diff --git a/pkg/common/compression/utils.go b/pkg/common/compression/utils.go index 97de1b8163..163fe3fdf6 100644 --- a/pkg/common/compression/utils.go +++ b/pkg/common/compression/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compression import ( diff --git a/pkg/common/const.go b/pkg/common/const.go index 413a91a62f..7ffc794c2a 100644 --- a/pkg/common/const.go +++ b/pkg/common/const.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common const OCM_TYPE_GROUP_SUFFIX = ".ocm.software" diff --git a/pkg/common/history.go b/pkg/common/history.go index 339563381a..2f2c30f92a 100644 --- a/pkg/common/history.go +++ b/pkg/common/history.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/common/history_test.go b/pkg/common/history_test.go index 8e163cf776..018a90cb17 100644 --- a/pkg/common/history_test.go +++ b/pkg/common/history_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common_test import ( diff --git a/pkg/common/printer.go b/pkg/common/printer.go index 9f6ecfabc6..946ce2d8b0 100644 --- a/pkg/common/printer.go +++ b/pkg/common/printer.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/common/printer_test.go b/pkg/common/printer_test.go index 2f57bdf665..534580c4d4 100644 --- a/pkg/common/printer_test.go +++ b/pkg/common/printer_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( "bytes" + "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/logging" - ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/common/properties.go b/pkg/common/properties.go index 08904373a9..53981a76fe 100644 --- a/pkg/common/properties.go +++ b/pkg/common/properties.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/common/suite_test.go b/pkg/common/suite_test.go index 9563128be1..ff272523e3 100644 --- a/pkg/common/suite_test.go +++ b/pkg/common/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common_test import ( diff --git a/pkg/common/types.go b/pkg/common/types.go index 2bba104131..bc7977bfa9 100644 --- a/pkg/common/types.go +++ b/pkg/common/types.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/common/utils.go b/pkg/common/utils.go index 730e7608a7..3b46dce785 100644 --- a/pkg/common/utils.go +++ b/pkg/common/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/common/walk.go b/pkg/common/walk.go index 592e5503fa..9707c88e5d 100644 --- a/pkg/common/walk.go +++ b/pkg/common/walk.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/contexts/clictx/builder.go b/pkg/contexts/clictx/builder.go index 949067b162..c1f5cc7a55 100644 --- a/pkg/contexts/clictx/builder.go +++ b/pkg/contexts/clictx/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package clictx import ( diff --git a/pkg/contexts/clictx/config/config_test.go b/pkg/contexts/clictx/config/config_test.go index a5379c89cc..3d1299df52 100644 --- a/pkg/contexts/clictx/config/config_test.go +++ b/pkg/contexts/clictx/config/config_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/clictx/config/suite_test.go b/pkg/contexts/clictx/config/suite_test.go index 9fcedbee8b..489f78ce48 100644 --- a/pkg/contexts/clictx/config/suite_test.go +++ b/pkg/contexts/clictx/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/clictx/config/type.go b/pkg/contexts/clictx/config/type.go index b74c387a53..ec39f96f8c 100644 --- a/pkg/contexts/clictx/config/type.go +++ b/pkg/contexts/clictx/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/clictx/interface.go b/pkg/contexts/clictx/interface.go index 7e49075b9e..694a825c25 100644 --- a/pkg/contexts/clictx/interface.go +++ b/pkg/contexts/clictx/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package clictx import ( diff --git a/pkg/contexts/clictx/internal/builder.go b/pkg/contexts/clictx/internal/builder.go index a68397632f..d065c7216e 100644 --- a/pkg/contexts/clictx/internal/builder.go +++ b/pkg/contexts/clictx/internal/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/clictx/internal/context.go b/pkg/contexts/clictx/internal/context.go index d6a3cfa70c..23541b925e 100644 --- a/pkg/contexts/clictx/internal/context.go +++ b/pkg/contexts/clictx/internal/context.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/builder.go b/pkg/contexts/config/builder.go index 836e78ab9c..fd618ae8d3 100644 --- a/pkg/contexts/config/builder.go +++ b/pkg/contexts/config/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/config/config/context_test.go b/pkg/contexts/config/config/context_test.go index 7fffc81209..d876e83eea 100644 --- a/pkg/contexts/config/config/context_test.go +++ b/pkg/contexts/config/config/context_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( @@ -12,13 +8,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/open-component-model/ocm/pkg/contexts/datacontext" - "github.com/open-component-model/ocm/pkg/generics" - "sigs.k8s.io/yaml" "github.com/open-component-model/ocm/pkg/contexts/config" local "github.com/open-component-model/ocm/pkg/contexts/config/config" + "github.com/open-component-model/ocm/pkg/contexts/datacontext" + "github.com/open-component-model/ocm/pkg/generics" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/config/config/dummy_test.go b/pkg/contexts/config/config/dummy_test.go index 117056a0e6..321c378877 100644 --- a/pkg/contexts/config/config/dummy_test.go +++ b/pkg/contexts/config/config/dummy_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/config/config/suite_test.go b/pkg/contexts/config/config/suite_test.go index 12c902e421..43d81cbbb3 100644 --- a/pkg/contexts/config/config/suite_test.go +++ b/pkg/contexts/config/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/config/config/type.go b/pkg/contexts/config/config/type.go index 5549e0da8b..ca289687dd 100644 --- a/pkg/contexts/config/config/type.go +++ b/pkg/contexts/config/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/config/context_test.go b/pkg/contexts/config/context_test.go index b1ee3fcb2a..0fbe8e662d 100644 --- a/pkg/contexts/config/context_test.go +++ b/pkg/contexts/config/context_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( @@ -10,9 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/config" + "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/errors" ) diff --git a/pkg/contexts/config/cpi/config.go b/pkg/contexts/config/cpi/config.go index e09718feb8..07c6da4536 100644 --- a/pkg/contexts/config/cpi/config.go +++ b/pkg/contexts/config/cpi/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/pkg/contexts/config/cpi/interface.go b/pkg/contexts/config/cpi/interface.go index d2ce4d6db2..68b019ba70 100644 --- a/pkg/contexts/config/cpi/interface.go +++ b/pkg/contexts/config/cpi/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi // This is the Context Provider Interface for credential providers diff --git a/pkg/contexts/config/dummy_test.go b/pkg/contexts/config/dummy_test.go index 92ba2b3be9..15ecb8af85 100644 --- a/pkg/contexts/config/dummy_test.go +++ b/pkg/contexts/config/dummy_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/config/gc_test.go b/pkg/contexts/config/gc_test.go index 5644457e72..4cd30b2496 100644 --- a/pkg/contexts/config/gc_test.go +++ b/pkg/contexts/config/gc_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/config/init.go b/pkg/contexts/config/init.go index 57283b0e0f..0e5ec58279 100644 --- a/pkg/contexts/config/init.go +++ b/pkg/contexts/config/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/config/interface.go b/pkg/contexts/config/interface.go index 1371bc919b..e7311f634d 100644 --- a/pkg/contexts/config/interface.go +++ b/pkg/contexts/config/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/config/internal/builder.go b/pkg/contexts/config/internal/builder.go index c99dbeefa7..255fe3912f 100644 --- a/pkg/contexts/config/internal/builder.go +++ b/pkg/contexts/config/internal/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/internal/builder_test.go b/pkg/contexts/config/internal/builder_test.go index 2e8fcc2ae5..f7bd7ed4bb 100644 --- a/pkg/contexts/config/internal/builder_test.go +++ b/pkg/contexts/config/internal/builder_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/config/internal/config.go b/pkg/contexts/config/internal/config.go index 955231a929..97914a3176 100644 --- a/pkg/contexts/config/internal/config.go +++ b/pkg/contexts/config/internal/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/internal/configtypes.go b/pkg/contexts/config/internal/configtypes.go index 87f7b108a0..7b5c920b53 100644 --- a/pkg/contexts/config/internal/configtypes.go +++ b/pkg/contexts/config/internal/configtypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/internal/context.go b/pkg/contexts/config/internal/context.go index ea23e652ac..45f633799e 100644 --- a/pkg/contexts/config/internal/context.go +++ b/pkg/contexts/config/internal/context.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/internal/errors.go b/pkg/contexts/config/internal/errors.go index 1061dbda59..aff9fcaca5 100644 --- a/pkg/contexts/config/internal/errors.go +++ b/pkg/contexts/config/internal/errors.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/internal/setup_test.go b/pkg/contexts/config/internal/setup_test.go index ff6c44ff1a..bfe489c86e 100644 --- a/pkg/contexts/config/internal/setup_test.go +++ b/pkg/contexts/config/internal/setup_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/config/internal/store.go b/pkg/contexts/config/internal/store.go index 2b81982d6b..0b6bd6e48d 100644 --- a/pkg/contexts/config/internal/store.go +++ b/pkg/contexts/config/internal/store.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/internal/suite_test.go b/pkg/contexts/config/internal/suite_test.go index 5bf0e3d50e..df5517ba6b 100644 --- a/pkg/contexts/config/internal/suite_test.go +++ b/pkg/contexts/config/internal/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/config/internal/updater.go b/pkg/contexts/config/internal/updater.go index 170710ca5a..eb372255b6 100644 --- a/pkg/contexts/config/internal/updater.go +++ b/pkg/contexts/config/internal/updater.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/config/suite_test.go b/pkg/contexts/config/suite_test.go index be97d5cff5..a00e062bd0 100644 --- a/pkg/contexts/config/suite_test.go +++ b/pkg/contexts/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/credentials/area_test.go b/pkg/contexts/credentials/area_test.go index cc6cfb4850..df37deea50 100644 --- a/pkg/contexts/credentials/area_test.go +++ b/pkg/contexts/credentials/area_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials_test import ( diff --git a/pkg/contexts/credentials/builder.go b/pkg/contexts/credentials/builder.go index 7d1e5086e5..fcb4c25683 100644 --- a/pkg/contexts/credentials/builder.go +++ b/pkg/contexts/credentials/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials import ( diff --git a/pkg/contexts/credentials/builtin/github/ghcr.go b/pkg/contexts/credentials/builtin/github/ghcr.go index 478dbf002d..9c664afc77 100644 --- a/pkg/contexts/credentials/builtin/github/ghcr.go +++ b/pkg/contexts/credentials/builtin/github/ghcr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package github import ( diff --git a/pkg/contexts/credentials/builtin/helm/identity/suite_test.go b/pkg/contexts/credentials/builtin/helm/identity/suite_test.go index 51009f8b81..8bcbf8fecb 100644 --- a/pkg/contexts/credentials/builtin/helm/identity/suite_test.go +++ b/pkg/contexts/credentials/builtin/helm/identity/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package identity_test import ( diff --git a/pkg/contexts/credentials/builtin/init.go b/pkg/contexts/credentials/builtin/init.go index bb8e53dcfb..7996eab6a6 100644 --- a/pkg/contexts/credentials/builtin/init.go +++ b/pkg/contexts/credentials/builtin/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builtin import ( diff --git a/pkg/contexts/credentials/config/config_test.go b/pkg/contexts/credentials/config/config_test.go index 3df35db5cc..6871066ebf 100644 --- a/pkg/contexts/credentials/config/config_test.go +++ b/pkg/contexts/credentials/config/config_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/credentials/config/suite_test.go b/pkg/contexts/credentials/config/suite_test.go index 3774619113..aa11f5a377 100644 --- a/pkg/contexts/credentials/config/suite_test.go +++ b/pkg/contexts/credentials/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/credentials/config/type.go b/pkg/contexts/credentials/config/type.go index cfed970ff0..529a27ffd4 100644 --- a/pkg/contexts/credentials/config/type.go +++ b/pkg/contexts/credentials/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/credentials/const.go b/pkg/contexts/credentials/const.go index 5d0b30e5c1..13dfe2455e 100644 --- a/pkg/contexts/credentials/const.go +++ b/pkg/contexts/credentials/const.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials import ( diff --git a/pkg/contexts/credentials/cpi/builtin.go b/pkg/contexts/credentials/cpi/builtin.go index d24fe6c582..3384e3dd25 100644 --- a/pkg/contexts/credentials/cpi/builtin.go +++ b/pkg/contexts/credentials/cpi/builtin.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/pkg/contexts/credentials/cpi/interface.go b/pkg/contexts/credentials/cpi/interface.go index 8a50393ab1..982084eea9 100644 --- a/pkg/contexts/credentials/cpi/interface.go +++ b/pkg/contexts/credentials/cpi/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi // This is the Context Provider Interface for credential providers diff --git a/pkg/contexts/credentials/cpi/repotypes.go b/pkg/contexts/credentials/cpi/repotypes.go index 28c5647b35..d79212ce43 100644 --- a/pkg/contexts/credentials/cpi/repotypes.go +++ b/pkg/contexts/credentials/cpi/repotypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi // this file is identical for contexts oci and credentials and similar for diff --git a/pkg/contexts/credentials/gc_test.go b/pkg/contexts/credentials/gc_test.go index bb04219220..feb41777bf 100644 --- a/pkg/contexts/credentials/gc_test.go +++ b/pkg/contexts/credentials/gc_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials_test import ( diff --git a/pkg/contexts/credentials/identity/hostpath/id_test.go b/pkg/contexts/credentials/identity/hostpath/id_test.go index 852eac72a5..c0b1148372 100644 --- a/pkg/contexts/credentials/identity/hostpath/id_test.go +++ b/pkg/contexts/credentials/identity/hostpath/id_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hostpath_test import ( diff --git a/pkg/contexts/credentials/identity/hostpath/identity.go b/pkg/contexts/credentials/identity/hostpath/identity.go index 612512af50..652e2b9c03 100644 --- a/pkg/contexts/credentials/identity/hostpath/identity.go +++ b/pkg/contexts/credentials/identity/hostpath/identity.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hostpath import ( diff --git a/pkg/contexts/credentials/identity/hostpath/suite_test.go b/pkg/contexts/credentials/identity/hostpath/suite_test.go index 578b48d594..c6c1184e13 100644 --- a/pkg/contexts/credentials/identity/hostpath/suite_test.go +++ b/pkg/contexts/credentials/identity/hostpath/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hostpath_test import ( diff --git a/pkg/contexts/credentials/init.go b/pkg/contexts/credentials/init.go index 512a146dd8..1ee7dbf31a 100644 --- a/pkg/contexts/credentials/init.go +++ b/pkg/contexts/credentials/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials import ( diff --git a/pkg/contexts/credentials/interface.go b/pkg/contexts/credentials/interface.go index c7b9d83b42..34f1e74a50 100644 --- a/pkg/contexts/credentials/interface.go +++ b/pkg/contexts/credentials/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials import ( diff --git a/pkg/contexts/credentials/internal/builder.go b/pkg/contexts/credentials/internal/builder.go index 84586314fc..41cb04c55b 100644 --- a/pkg/contexts/credentials/internal/builder.go +++ b/pkg/contexts/credentials/internal/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/builder_test.go b/pkg/contexts/credentials/internal/builder_test.go index b128be5a93..a96db96b95 100644 --- a/pkg/contexts/credentials/internal/builder_test.go +++ b/pkg/contexts/credentials/internal/builder_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/credentials/internal/builtin.go b/pkg/contexts/credentials/internal/builtin.go index 8a38a3a83b..8ad928d8f8 100644 --- a/pkg/contexts/credentials/internal/builtin.go +++ b/pkg/contexts/credentials/internal/builtin.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal const AliasRepositoryType = "Alias" diff --git a/pkg/contexts/credentials/internal/consumers.go b/pkg/contexts/credentials/internal/consumers.go index e2107382c3..796de292aa 100644 --- a/pkg/contexts/credentials/internal/consumers.go +++ b/pkg/contexts/credentials/internal/consumers.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/context.go b/pkg/contexts/credentials/internal/context.go index a2d1074437..60db42a925 100644 --- a/pkg/contexts/credentials/internal/context.go +++ b/pkg/contexts/credentials/internal/context.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/cred_test.go b/pkg/contexts/credentials/internal/cred_test.go index b990ed5af2..26204a9945 100644 --- a/pkg/contexts/credentials/internal/cred_test.go +++ b/pkg/contexts/credentials/internal/cred_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/credentials/internal/credentials.go b/pkg/contexts/credentials/internal/credentials.go index cee09266a9..e5e4933eb9 100644 --- a/pkg/contexts/credentials/internal/credentials.go +++ b/pkg/contexts/credentials/internal/credentials.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/credentialsspec.go b/pkg/contexts/credentials/internal/credentialsspec.go index 05d7c81058..f423c50012 100644 --- a/pkg/contexts/credentials/internal/credentialsspec.go +++ b/pkg/contexts/credentials/internal/credentialsspec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/errors.go b/pkg/contexts/credentials/internal/errors.go index 8a2b337817..bdede17a6b 100644 --- a/pkg/contexts/credentials/internal/errors.go +++ b/pkg/contexts/credentials/internal/errors.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/identity.go b/pkg/contexts/credentials/internal/identity.go index d82e5c1053..57b8c5f90f 100644 --- a/pkg/contexts/credentials/internal/identity.go +++ b/pkg/contexts/credentials/internal/identity.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/repository.go b/pkg/contexts/credentials/internal/repository.go index 6af2989b32..6486301251 100644 --- a/pkg/contexts/credentials/internal/repository.go +++ b/pkg/contexts/credentials/internal/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/repotypes.go b/pkg/contexts/credentials/internal/repotypes.go index 0e96254d71..5c00c00d7b 100644 --- a/pkg/contexts/credentials/internal/repotypes.go +++ b/pkg/contexts/credentials/internal/repotypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/internal/suite_test.go b/pkg/contexts/credentials/internal/suite_test.go index e7dc8b84ac..af089360a5 100644 --- a/pkg/contexts/credentials/internal/suite_test.go +++ b/pkg/contexts/credentials/internal/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/credentials/internal/utils.go b/pkg/contexts/credentials/internal/utils.go index 469346b7d5..553c4cf4f8 100644 --- a/pkg/contexts/credentials/internal/utils.go +++ b/pkg/contexts/credentials/internal/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/aliases/cache.go b/pkg/contexts/credentials/repositories/aliases/cache.go index 5ed2ef3e20..8a9db2441e 100644 --- a/pkg/contexts/credentials/repositories/aliases/cache.go +++ b/pkg/contexts/credentials/repositories/aliases/cache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package aliases import ( diff --git a/pkg/contexts/credentials/repositories/aliases/repo_test.go b/pkg/contexts/credentials/repositories/aliases/repo_test.go index b2f2d4d92d..326d38dd56 100644 --- a/pkg/contexts/credentials/repositories/aliases/repo_test.go +++ b/pkg/contexts/credentials/repositories/aliases/repo_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package aliases_test import ( diff --git a/pkg/contexts/credentials/repositories/aliases/repository.go b/pkg/contexts/credentials/repositories/aliases/repository.go index 003ea59147..3ed4bb259e 100644 --- a/pkg/contexts/credentials/repositories/aliases/repository.go +++ b/pkg/contexts/credentials/repositories/aliases/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package aliases import ( diff --git a/pkg/contexts/credentials/repositories/aliases/suite_test.go b/pkg/contexts/credentials/repositories/aliases/suite_test.go index 683ec2dac3..17542d55a1 100644 --- a/pkg/contexts/credentials/repositories/aliases/suite_test.go +++ b/pkg/contexts/credentials/repositories/aliases/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package aliases_test import ( diff --git a/pkg/contexts/credentials/repositories/aliases/type.go b/pkg/contexts/credentials/repositories/aliases/type.go index 31eb7ce6db..7b8a90b98f 100644 --- a/pkg/contexts/credentials/repositories/aliases/type.go +++ b/pkg/contexts/credentials/repositories/aliases/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package aliases import ( diff --git a/pkg/contexts/credentials/repositories/directcreds/credentials.go b/pkg/contexts/credentials/repositories/directcreds/credentials.go index 1ce6655609..48c29b5285 100644 --- a/pkg/contexts/credentials/repositories/directcreds/credentials.go +++ b/pkg/contexts/credentials/repositories/directcreds/credentials.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directcreds import ( diff --git a/pkg/contexts/credentials/repositories/directcreds/repo_test.go b/pkg/contexts/credentials/repositories/directcreds/repo_test.go index aa5c93d3f0..3694363e89 100644 --- a/pkg/contexts/credentials/repositories/directcreds/repo_test.go +++ b/pkg/contexts/credentials/repositories/directcreds/repo_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directcreds_test import ( diff --git a/pkg/contexts/credentials/repositories/directcreds/repository.go b/pkg/contexts/credentials/repositories/directcreds/repository.go index 7e860c2a18..ec499a26be 100644 --- a/pkg/contexts/credentials/repositories/directcreds/repository.go +++ b/pkg/contexts/credentials/repositories/directcreds/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directcreds import ( diff --git a/pkg/contexts/credentials/repositories/directcreds/suite_test.go b/pkg/contexts/credentials/repositories/directcreds/suite_test.go index e133f8421f..152f2c16a9 100644 --- a/pkg/contexts/credentials/repositories/directcreds/suite_test.go +++ b/pkg/contexts/credentials/repositories/directcreds/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directcreds_test import ( diff --git a/pkg/contexts/credentials/repositories/directcreds/type.go b/pkg/contexts/credentials/repositories/directcreds/type.go index 7fde18b079..bb81cec7b6 100644 --- a/pkg/contexts/credentials/repositories/directcreds/type.go +++ b/pkg/contexts/credentials/repositories/directcreds/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package directcreds import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/cache.go b/pkg/contexts/credentials/repositories/dockerconfig/cache.go index a4415258f7..8b82902422 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/cache.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/cache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockerconfig import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/credentials.go b/pkg/contexts/credentials/repositories/dockerconfig/credentials.go index 490078b0be..6cd9ac1487 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/credentials.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/credentials.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockerconfig import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go b/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go index 7a42e69f0d..fc39bf1d46 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockerconfig_test import ( @@ -13,15 +9,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/open-component-model/ocm/pkg/contexts/datacontext" - . "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" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi" local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/dockerconfig" + "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("docker config", func() { diff --git a/pkg/contexts/credentials/repositories/dockerconfig/repository.go b/pkg/contexts/credentials/repositories/dockerconfig/repository.go index 79d2aea161..4563ab9767 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/repository.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockerconfig import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/suite_test.go b/pkg/contexts/credentials/repositories/dockerconfig/suite_test.go index 48eb8f5799..b7ca5eda8c 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/suite_test.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockerconfig_test import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/type.go b/pkg/contexts/credentials/repositories/dockerconfig/type.go index 0d01494890..b41dda1cc6 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/type.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dockerconfig import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/cache.go b/pkg/contexts/credentials/repositories/gardenerconfig/cache.go index d5c29fa028..43f62e0d20 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/cache.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/cache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package gardenerconfig import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/cpi/interface.go b/pkg/contexts/credentials/repositories/gardenerconfig/cpi/interface.go index 81d3a5bdbc..1ee6b7ed42 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/cpi/interface.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/cpi/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/credentials.go b/pkg/contexts/credentials/repositories/gardenerconfig/credentials.go index 97a10307c6..c633b91207 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/credentials.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/credentials.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package gardenerconfig import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/credentials.go b/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/credentials.go index 0ccf110249..7ff6695916 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/credentials.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/credentials.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package container_registry import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/handler.go b/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/handler.go index 247e04a212..a065838045 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/handler.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/handler/container_registry/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package container_registry import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/init.go b/pkg/contexts/credentials/repositories/gardenerconfig/init.go index eb4eca1ac4..9b69c3a3a7 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/init.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package gardenerconfig import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go b/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go index dc3b9d8db8..c6747a5051 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package gardenerconfig_test import ( @@ -13,11 +9,10 @@ import ( "reflect" "strings" + "github.com/mandelsoft/vfs/pkg/memoryfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/memoryfs" - "github.com/open-component-model/ocm/pkg/contexts/credentials" ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi" diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/repository.go b/pkg/contexts/credentials/repositories/gardenerconfig/repository.go index e9790b3b63..7afc29320f 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/repository.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package gardenerconfig import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/suite_test.go b/pkg/contexts/credentials/repositories/gardenerconfig/suite_test.go index 895b209cf8..be4394f779 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/suite_test.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package gardenerconfig_test import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/type.go b/pkg/contexts/credentials/repositories/gardenerconfig/type.go index b7421da486..2c16057532 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/type.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package gardenerconfig import ( diff --git a/pkg/contexts/credentials/repositories/memory/cache.go b/pkg/contexts/credentials/repositories/memory/cache.go index 39454d4840..aec6fd2b0b 100644 --- a/pkg/contexts/credentials/repositories/memory/cache.go +++ b/pkg/contexts/credentials/repositories/memory/cache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package memory import ( diff --git a/pkg/contexts/credentials/repositories/memory/config/config_test.go b/pkg/contexts/credentials/repositories/memory/config/config_test.go index d0c9e570be..a4133b994c 100644 --- a/pkg/contexts/credentials/repositories/memory/config/config_test.go +++ b/pkg/contexts/credentials/repositories/memory/config/config_test.go @@ -1,20 +1,15 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env" - - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory" + . "github.com/open-component-model/ocm/pkg/env" ) var _ = Describe("configure credentials", func() { diff --git a/pkg/contexts/credentials/repositories/memory/config/suite_test.go b/pkg/contexts/credentials/repositories/memory/config/suite_test.go index 3774619113..aa11f5a377 100644 --- a/pkg/contexts/credentials/repositories/memory/config/suite_test.go +++ b/pkg/contexts/credentials/repositories/memory/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/credentials/repositories/memory/config/type.go b/pkg/contexts/credentials/repositories/memory/config/type.go index a0037f7e01..30dadff232 100644 --- a/pkg/contexts/credentials/repositories/memory/config/type.go +++ b/pkg/contexts/credentials/repositories/memory/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/credentials/repositories/memory/repo_test.go b/pkg/contexts/credentials/repositories/memory/repo_test.go index 48fa2bd889..58af3b1828 100644 --- a/pkg/contexts/credentials/repositories/memory/repo_test.go +++ b/pkg/contexts/credentials/repositories/memory/repo_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package memory_test import ( diff --git a/pkg/contexts/credentials/repositories/memory/repository.go b/pkg/contexts/credentials/repositories/memory/repository.go index 7eb5abf6c7..5149f79920 100644 --- a/pkg/contexts/credentials/repositories/memory/repository.go +++ b/pkg/contexts/credentials/repositories/memory/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package memory import ( diff --git a/pkg/contexts/credentials/repositories/memory/suite_test.go b/pkg/contexts/credentials/repositories/memory/suite_test.go index 23688dfde3..dc9b714fb1 100644 --- a/pkg/contexts/credentials/repositories/memory/suite_test.go +++ b/pkg/contexts/credentials/repositories/memory/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package memory_test import ( diff --git a/pkg/contexts/credentials/repositories/memory/type.go b/pkg/contexts/credentials/repositories/memory/type.go index 2439ef0213..fd2812d760 100644 --- a/pkg/contexts/credentials/repositories/memory/type.go +++ b/pkg/contexts/credentials/repositories/memory/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package memory import ( diff --git a/pkg/contexts/credentials/repositories/vault/cache.go b/pkg/contexts/credentials/repositories/vault/cache.go index 1b2d700bb5..873e1eb967 100644 --- a/pkg/contexts/credentials/repositories/vault/cache.go +++ b/pkg/contexts/credentials/repositories/vault/cache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vault import ( diff --git a/pkg/contexts/credentials/repositories/vault/repository.go b/pkg/contexts/credentials/repositories/vault/repository.go index c09ed75bde..0b11262412 100644 --- a/pkg/contexts/credentials/repositories/vault/repository.go +++ b/pkg/contexts/credentials/repositories/vault/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vault import ( diff --git a/pkg/contexts/credentials/repositories/vault/suite_test.go b/pkg/contexts/credentials/repositories/vault/suite_test.go index 9a64144cc1..74a7d198e9 100644 --- a/pkg/contexts/credentials/repositories/vault/suite_test.go +++ b/pkg/contexts/credentials/repositories/vault/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vault_test import ( diff --git a/pkg/contexts/credentials/repositories/vault/type.go b/pkg/contexts/credentials/repositories/vault/type.go index f09836af3c..9352544297 100644 --- a/pkg/contexts/credentials/repositories/vault/type.go +++ b/pkg/contexts/credentials/repositories/vault/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vault import ( diff --git a/pkg/contexts/credentials/suite_test.go b/pkg/contexts/credentials/suite_test.go index 5df0723ffe..5624242f4f 100644 --- a/pkg/contexts/credentials/suite_test.go +++ b/pkg/contexts/credentials/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials_test import ( diff --git a/pkg/contexts/credentials/usage.go b/pkg/contexts/credentials/usage.go index feb9081bef..c2304b939c 100644 --- a/pkg/contexts/credentials/usage.go +++ b/pkg/contexts/credentials/usage.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package credentials func RepositoryUsage(scheme RepositoryTypeScheme) string { diff --git a/pkg/contexts/datacontext/action/api/suite_test.go b/pkg/contexts/datacontext/action/api/suite_test.go index 9aae47e16f..5ed06214cd 100644 --- a/pkg/contexts/datacontext/action/api/suite_test.go +++ b/pkg/contexts/datacontext/action/api/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package api_test import ( diff --git a/pkg/contexts/datacontext/action/type.go b/pkg/contexts/datacontext/action/type.go index f4aa80999c..efdcad6d3f 100644 --- a/pkg/contexts/datacontext/action/type.go +++ b/pkg/contexts/datacontext/action/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package action import ( diff --git a/pkg/contexts/datacontext/attrs.go b/pkg/contexts/datacontext/attrs.go index 6d7753c2fe..79524286ba 100644 --- a/pkg/contexts/datacontext/attrs.go +++ b/pkg/contexts/datacontext/attrs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package datacontext import ( diff --git a/pkg/contexts/datacontext/attrs/init.go b/pkg/contexts/datacontext/attrs/init.go index 17be4463b1..471f9f03f3 100644 --- a/pkg/contexts/datacontext/attrs/init.go +++ b/pkg/contexts/datacontext/attrs/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attrs import ( diff --git a/pkg/contexts/datacontext/attrs/logforward/attr.go b/pkg/contexts/datacontext/attrs/logforward/attr.go index 7318a98840..998043e527 100644 --- a/pkg/contexts/datacontext/attrs/logforward/attr.go +++ b/pkg/contexts/datacontext/attrs/logforward/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logforward import ( diff --git a/pkg/contexts/datacontext/attrs/rootcertsattr/attr.go b/pkg/contexts/datacontext/attrs/rootcertsattr/attr.go index adecfedb48..865ee28ce3 100644 --- a/pkg/contexts/datacontext/attrs/rootcertsattr/attr.go +++ b/pkg/contexts/datacontext/attrs/rootcertsattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rootcertsattr import ( diff --git a/pkg/contexts/datacontext/attrs/rootcertsattr/attr_test.go b/pkg/contexts/datacontext/attrs/rootcertsattr/attr_test.go index 0b1cba702e..96a91a6250 100644 --- a/pkg/contexts/datacontext/attrs/rootcertsattr/attr_test.go +++ b/pkg/contexts/datacontext/attrs/rootcertsattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rootcertsattr_test import ( diff --git a/pkg/contexts/datacontext/attrs/rootcertsattr/suite_test.go b/pkg/contexts/datacontext/attrs/rootcertsattr/suite_test.go index 1f05b2f5f8..6427d82f5f 100644 --- a/pkg/contexts/datacontext/attrs/rootcertsattr/suite_test.go +++ b/pkg/contexts/datacontext/attrs/rootcertsattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rootcertsattr_test import ( diff --git a/pkg/contexts/datacontext/attrs/vfsattr/attr.go b/pkg/contexts/datacontext/attrs/vfsattr/attr.go index d1ea70072c..cc62eb61b2 100644 --- a/pkg/contexts/datacontext/attrs/vfsattr/attr.go +++ b/pkg/contexts/datacontext/attrs/vfsattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package vfsattr import ( diff --git a/pkg/contexts/datacontext/config/attrs/config_test.go b/pkg/contexts/datacontext/config/attrs/config_test.go index 7a91f7e0fd..c410fd705b 100644 --- a/pkg/contexts/datacontext/config/attrs/config_test.go +++ b/pkg/contexts/datacontext/config/attrs/config_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attrs_test import ( diff --git a/pkg/contexts/datacontext/config/attrs/suite_test.go b/pkg/contexts/datacontext/config/attrs/suite_test.go index 67d7004341..1ec54ac2ba 100644 --- a/pkg/contexts/datacontext/config/attrs/suite_test.go +++ b/pkg/contexts/datacontext/config/attrs/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attrs_test import ( diff --git a/pkg/contexts/datacontext/config/attrs/type.go b/pkg/contexts/datacontext/config/attrs/type.go index e431d5bc3b..7481a1126a 100644 --- a/pkg/contexts/datacontext/config/attrs/type.go +++ b/pkg/contexts/datacontext/config/attrs/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attrs import ( diff --git a/pkg/contexts/datacontext/config/init.go b/pkg/contexts/datacontext/config/init.go index da9b1095f0..3235db34f8 100644 --- a/pkg/contexts/datacontext/config/init.go +++ b/pkg/contexts/datacontext/config/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/datacontext/config/logging/config_test.go b/pkg/contexts/datacontext/config/logging/config_test.go index 7dd9a6b2d9..d81a51553e 100644 --- a/pkg/contexts/datacontext/config/logging/config_test.go +++ b/pkg/contexts/datacontext/config/logging/config_test.go @@ -1,24 +1,19 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging_test import ( "bytes" + "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/logging/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/logging" "github.com/tonglil/buflogr" "github.com/open-component-model/ocm/pkg/contexts/config" "github.com/open-component-model/ocm/pkg/contexts/datacontext" logcfg "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/logging" log "github.com/open-component-model/ocm/pkg/logging" + . "github.com/open-component-model/ocm/pkg/logging/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("logging configuration", func() { diff --git a/pkg/contexts/datacontext/config/logging/suite_test.go b/pkg/contexts/datacontext/config/logging/suite_test.go index 9beb467919..aff79142dd 100644 --- a/pkg/contexts/datacontext/config/logging/suite_test.go +++ b/pkg/contexts/datacontext/config/logging/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging_test import ( diff --git a/pkg/contexts/datacontext/config/logging/type.go b/pkg/contexts/datacontext/config/logging/type.go index f0aa9f1d70..2b1ef96c8e 100644 --- a/pkg/contexts/datacontext/config/logging/type.go +++ b/pkg/contexts/datacontext/config/logging/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging import ( diff --git a/pkg/contexts/datacontext/context.go b/pkg/contexts/datacontext/context.go index 2af9fb34d9..b90b8e1b83 100644 --- a/pkg/contexts/datacontext/context.go +++ b/pkg/contexts/datacontext/context.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package datacontext import ( diff --git a/pkg/contexts/datacontext/gc_test.go b/pkg/contexts/datacontext/gc_test.go index a3c833961f..952f48e64b 100644 --- a/pkg/contexts/datacontext/gc_test.go +++ b/pkg/contexts/datacontext/gc_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package datacontext_test import ( @@ -10,10 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/open-component-model/ocm/pkg/generics" me "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/open-component-model/ocm/pkg/generics" ) var _ = Describe("area test", func() { diff --git a/pkg/contexts/datacontext/session.go b/pkg/contexts/datacontext/session.go index b05f8d44d0..4b1a64cc0f 100644 --- a/pkg/contexts/datacontext/session.go +++ b/pkg/contexts/datacontext/session.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package datacontext import ( diff --git a/pkg/contexts/datacontext/suite_test.go b/pkg/contexts/datacontext/suite_test.go index 5021e53783..01561a85fc 100644 --- a/pkg/contexts/datacontext/suite_test.go +++ b/pkg/contexts/datacontext/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package datacontext_test import ( diff --git a/pkg/contexts/datacontext/util.go b/pkg/contexts/datacontext/util.go index 749f6f00af..1b22089499 100644 --- a/pkg/contexts/datacontext/util.go +++ b/pkg/contexts/datacontext/util.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package datacontext import ( diff --git a/pkg/contexts/oci/art_test.go b/pkg/contexts/oci/art_test.go index 8659350abf..3a4abb21d1 100644 --- a/pkg/contexts/oci/art_test.go +++ b/pkg/contexts/oci/art_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/contexts/oci" diff --git a/pkg/contexts/oci/artdesc/artifact.go b/pkg/contexts/oci/artdesc/artifact.go index b9151d0e92..20f1c778d5 100644 --- a/pkg/contexts/oci/artdesc/artifact.go +++ b/pkg/contexts/oci/artdesc/artifact.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artdesc import ( diff --git a/pkg/contexts/oci/artdesc/config.go b/pkg/contexts/oci/artdesc/config.go index 16e78cdc78..03cdd68422 100644 --- a/pkg/contexts/oci/artdesc/config.go +++ b/pkg/contexts/oci/artdesc/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artdesc import ( diff --git a/pkg/contexts/oci/artdesc/helper/generic.go b/pkg/contexts/oci/artdesc/helper/generic.go index 8ea06c21ea..d8ebf35d5e 100644 --- a/pkg/contexts/oci/artdesc/helper/generic.go +++ b/pkg/contexts/oci/artdesc/helper/generic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helper import ( diff --git a/pkg/contexts/oci/artdesc/index.go b/pkg/contexts/oci/artdesc/index.go index ccc84d3991..ee0e2bc892 100644 --- a/pkg/contexts/oci/artdesc/index.go +++ b/pkg/contexts/oci/artdesc/index.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artdesc import ( diff --git a/pkg/contexts/oci/artdesc/manifest.go b/pkg/contexts/oci/artdesc/manifest.go index cdd91a9c36..46c8fe0248 100644 --- a/pkg/contexts/oci/artdesc/manifest.go +++ b/pkg/contexts/oci/artdesc/manifest.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artdesc import ( diff --git a/pkg/contexts/oci/artdesc/suite_test.go b/pkg/contexts/oci/artdesc/suite_test.go index ea81f9480f..a7082c03d8 100644 --- a/pkg/contexts/oci/artdesc/suite_test.go +++ b/pkg/contexts/oci/artdesc/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artdesc_test import ( diff --git a/pkg/contexts/oci/artdesc/utils.go b/pkg/contexts/oci/artdesc/utils.go index c0f28be42d..cfaa25c7a6 100644 --- a/pkg/contexts/oci/artdesc/utils.go +++ b/pkg/contexts/oci/artdesc/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artdesc import ( diff --git a/pkg/contexts/oci/artdesc/utils_test.go b/pkg/contexts/oci/artdesc/utils_test.go index 88aa0fce47..55a88525ea 100644 --- a/pkg/contexts/oci/artdesc/utils_test.go +++ b/pkg/contexts/oci/artdesc/utils_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artdesc_test import ( diff --git a/pkg/contexts/oci/attrs/cacheattr/attr.go b/pkg/contexts/oci/attrs/cacheattr/attr.go index 9a6fcb2391..b6014602b5 100644 --- a/pkg/contexts/oci/attrs/cacheattr/attr.go +++ b/pkg/contexts/oci/attrs/cacheattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cacheattr import ( diff --git a/pkg/contexts/oci/attrs/cacheattr/attr_test.go b/pkg/contexts/oci/attrs/cacheattr/attr_test.go index 1caccbf873..0dac071dbb 100644 --- a/pkg/contexts/oci/attrs/cacheattr/attr_test.go +++ b/pkg/contexts/oci/attrs/cacheattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cacheattr_test import ( diff --git a/pkg/contexts/oci/attrs/cacheattr/suite_test.go b/pkg/contexts/oci/attrs/cacheattr/suite_test.go index 0acac85902..b1b77a7e4d 100644 --- a/pkg/contexts/oci/attrs/cacheattr/suite_test.go +++ b/pkg/contexts/oci/attrs/cacheattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cacheattr_test import ( diff --git a/pkg/contexts/oci/attrs/init.go b/pkg/contexts/oci/attrs/init.go index a6f281962b..42dc1a55a9 100644 --- a/pkg/contexts/oci/attrs/init.go +++ b/pkg/contexts/oci/attrs/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attrs import ( diff --git a/pkg/contexts/oci/builder.go b/pkg/contexts/oci/builder.go index 424e34c2cd..a6c8f85d56 100644 --- a/pkg/contexts/oci/builder.go +++ b/pkg/contexts/oci/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci import ( diff --git a/pkg/contexts/oci/config/config_test.go b/pkg/contexts/oci/config/config_test.go index 6df034a3bc..1a1fa5b3d1 100644 --- a/pkg/contexts/oci/config/config_test.go +++ b/pkg/contexts/oci/config/config_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/oci/config/suite_test.go b/pkg/contexts/oci/config/suite_test.go index 444820e824..75de586aa0 100644 --- a/pkg/contexts/oci/config/suite_test.go +++ b/pkg/contexts/oci/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/oci/config/type.go b/pkg/contexts/oci/config/type.go index ff40499c41..ad7fafbb1e 100644 --- a/pkg/contexts/oci/config/type.go +++ b/pkg/contexts/oci/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/oci/cpi/interface.go b/pkg/contexts/oci/cpi/interface.go index cd408e983c..f57e92c66f 100644 --- a/pkg/contexts/oci/cpi/interface.go +++ b/pkg/contexts/oci/cpi/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi // This is the Context Provider Interface for credential providers diff --git a/pkg/contexts/oci/cpi/repotypes.go b/pkg/contexts/oci/cpi/repotypes.go index ba33f6bc81..7633e3eb9b 100644 --- a/pkg/contexts/oci/cpi/repotypes.go +++ b/pkg/contexts/oci/cpi/repotypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi // this file is identical for contexts oci and credentials and similar for diff --git a/pkg/contexts/oci/cpi/state.go b/pkg/contexts/oci/cpi/state.go index f82522f9a0..1abc4808ad 100644 --- a/pkg/contexts/oci/cpi/state.go +++ b/pkg/contexts/oci/cpi/state.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/pkg/contexts/oci/cpi/suite_test.go b/pkg/contexts/oci/cpi/suite_test.go index 7479e4ada5..5675655fb9 100644 --- a/pkg/contexts/oci/cpi/suite_test.go +++ b/pkg/contexts/oci/cpi/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi_test import ( diff --git a/pkg/contexts/oci/cpi/support/artifact.go b/pkg/contexts/oci/cpi/support/artifact.go index c339d45b5c..a488dfc086 100644 --- a/pkg/contexts/oci/cpi/support/artifact.go +++ b/pkg/contexts/oci/cpi/support/artifact.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( diff --git a/pkg/contexts/oci/cpi/support/artifactsetblobaccess.go b/pkg/contexts/oci/cpi/support/artifactsetblobaccess.go index 461b8321ec..55a3132b70 100644 --- a/pkg/contexts/oci/cpi/support/artifactsetblobaccess.go +++ b/pkg/contexts/oci/cpi/support/artifactsetblobaccess.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( diff --git a/pkg/contexts/oci/cpi/support/base.go b/pkg/contexts/oci/cpi/support/base.go index 3ce937c632..da2f0c7517 100644 --- a/pkg/contexts/oci/cpi/support/base.go +++ b/pkg/contexts/oci/cpi/support/base.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( diff --git a/pkg/contexts/oci/cpi/support/flavor_index.go b/pkg/contexts/oci/cpi/support/flavor_index.go index 4225e8f325..c392672e88 100644 --- a/pkg/contexts/oci/cpi/support/flavor_index.go +++ b/pkg/contexts/oci/cpi/support/flavor_index.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( diff --git a/pkg/contexts/oci/cpi/support/flavor_manifest.go b/pkg/contexts/oci/cpi/support/flavor_manifest.go index 14d8a7c6da..b31ac21123 100644 --- a/pkg/contexts/oci/cpi/support/flavor_manifest.go +++ b/pkg/contexts/oci/cpi/support/flavor_manifest.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( diff --git a/pkg/contexts/oci/cpi/support/namespace.go b/pkg/contexts/oci/cpi/support/namespace.go index 2a5a9f6017..f257939a87 100644 --- a/pkg/contexts/oci/cpi/support/namespace.go +++ b/pkg/contexts/oci/cpi/support/namespace.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( diff --git a/pkg/contexts/oci/cpi/utils.go b/pkg/contexts/oci/cpi/utils.go index 92172b973f..5eec403f97 100644 --- a/pkg/contexts/oci/cpi/utils.go +++ b/pkg/contexts/oci/cpi/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/pkg/contexts/oci/gc_test.go b/pkg/contexts/oci/gc_test.go index 89fc870c9e..7eb527a0da 100644 --- a/pkg/contexts/oci/gc_test.go +++ b/pkg/contexts/oci/gc_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci_test import ( diff --git a/pkg/contexts/oci/grammar/grammar.go b/pkg/contexts/oci/grammar/grammar.go index 09990802b6..97e04b1d62 100644 --- a/pkg/contexts/oci/grammar/grammar.go +++ b/pkg/contexts/oci/grammar/grammar.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package grammar import ( diff --git a/pkg/contexts/oci/grammar/grammar_test.go b/pkg/contexts/oci/grammar/grammar_test.go index 37ed645f21..a6f6e9e25c 100644 --- a/pkg/contexts/oci/grammar/grammar_test.go +++ b/pkg/contexts/oci/grammar/grammar_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package grammar import ( diff --git a/pkg/contexts/oci/init.go b/pkg/contexts/oci/init.go index 90e8ffe2f8..97dbc0b285 100644 --- a/pkg/contexts/oci/init.go +++ b/pkg/contexts/oci/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci import ( diff --git a/pkg/contexts/oci/interface.go b/pkg/contexts/oci/interface.go index c43072ba5a..86e2ecc859 100644 --- a/pkg/contexts/oci/interface.go +++ b/pkg/contexts/oci/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci import ( diff --git a/pkg/contexts/oci/internal/builder.go b/pkg/contexts/oci/internal/builder.go index 93b4f5ae5b..c930d7ed5f 100644 --- a/pkg/contexts/oci/internal/builder.go +++ b/pkg/contexts/oci/internal/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/oci/internal/builder_test.go b/pkg/contexts/oci/internal/builder_test.go index 2240f5bd48..a3a4e77b55 100644 --- a/pkg/contexts/oci/internal/builder_test.go +++ b/pkg/contexts/oci/internal/builder_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/oci/internal/context.go b/pkg/contexts/oci/internal/context.go index 2fd458db76..36f279b163 100644 --- a/pkg/contexts/oci/internal/context.go +++ b/pkg/contexts/oci/internal/context.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/oci/internal/errors.go b/pkg/contexts/oci/internal/errors.go index e02b785ed0..a6375c8fa1 100644 --- a/pkg/contexts/oci/internal/errors.go +++ b/pkg/contexts/oci/internal/errors.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/oci/internal/repository.go b/pkg/contexts/oci/internal/repository.go index 50a8c4f706..27bad551bd 100644 --- a/pkg/contexts/oci/internal/repository.go +++ b/pkg/contexts/oci/internal/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/oci/internal/repotypes.go b/pkg/contexts/oci/internal/repotypes.go index 01887fc8b5..8870753149 100644 --- a/pkg/contexts/oci/internal/repotypes.go +++ b/pkg/contexts/oci/internal/repotypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/oci/internal/suite_test.go b/pkg/contexts/oci/internal/suite_test.go index 8ac33abd40..e72a52c290 100644 --- a/pkg/contexts/oci/internal/suite_test.go +++ b/pkg/contexts/oci/internal/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/oci/internal/uniform.go b/pkg/contexts/oci/internal/uniform.go index ad4a204bb5..1a57a1c5f4 100644 --- a/pkg/contexts/oci/internal/uniform.go +++ b/pkg/contexts/oci/internal/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/oci/ociutils/handler.go b/pkg/contexts/oci/ociutils/handler.go index 944b60fe1f..05eec8140d 100644 --- a/pkg/contexts/oci/ociutils/handler.go +++ b/pkg/contexts/oci/ociutils/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociutils import ( diff --git a/pkg/contexts/oci/ociutils/helm/art_test.go b/pkg/contexts/oci/ociutils/helm/art_test.go index 54c4e7d2f8..af92e2b7cc 100644 --- a/pkg/contexts/oci/ociutils/helm/art_test.go +++ b/pkg/contexts/oci/ociutils/helm/art_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm_test import ( @@ -10,12 +6,10 @@ import ( "sort" "strings" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" @@ -26,6 +20,7 @@ import ( "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/helm/loader" + . "github.com/open-component-model/ocm/pkg/testutils" ) type Files []*chart.File diff --git a/pkg/contexts/oci/ociutils/helm/artifact.go b/pkg/contexts/oci/ociutils/helm/artifact.go index 4a3f5586c1..3f52625f61 100644 --- a/pkg/contexts/oci/ociutils/helm/artifact.go +++ b/pkg/contexts/oci/ociutils/helm/artifact.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/pkg/contexts/oci/ociutils/helm/ignore/doc.go b/pkg/contexts/oci/ociutils/helm/ignore/doc.go index 289d7713fa..7134ea3e05 100644 --- a/pkg/contexts/oci/ociutils/helm/ignore/doc.go +++ b/pkg/contexts/oci/ociutils/helm/ignore/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - /* Package ignore provides tools for writing ignore files (a la .gitignore). diff --git a/pkg/contexts/oci/ociutils/helm/ignore/rules.go b/pkg/contexts/oci/ociutils/helm/ignore/rules.go index 20a61b181b..db5f8bab05 100644 --- a/pkg/contexts/oci/ociutils/helm/ignore/rules.go +++ b/pkg/contexts/oci/ociutils/helm/ignore/rules.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ignore import ( diff --git a/pkg/contexts/oci/ociutils/helm/ignore/rules_test.go b/pkg/contexts/oci/ociutils/helm/ignore/rules_test.go index 03483687c9..648401cc38 100644 --- a/pkg/contexts/oci/ociutils/helm/ignore/rules_test.go +++ b/pkg/contexts/oci/ociutils/helm/ignore/rules_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ignore import ( diff --git a/pkg/contexts/oci/ociutils/helm/suite_test.go b/pkg/contexts/oci/ociutils/helm/suite_test.go index 4cda015725..329867708f 100644 --- a/pkg/contexts/oci/ociutils/helm/suite_test.go +++ b/pkg/contexts/oci/ociutils/helm/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm_test import ( diff --git a/pkg/contexts/oci/ociutils/helm/sympath/walk.go b/pkg/contexts/oci/ociutils/helm/sympath/walk.go index b44d92cdad..f8c51f9fac 100644 --- a/pkg/contexts/oci/ociutils/helm/sympath/walk.go +++ b/pkg/contexts/oci/ociutils/helm/sympath/walk.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sympath import ( diff --git a/pkg/contexts/oci/ociutils/helm/sympath/walk_test.go b/pkg/contexts/oci/ociutils/helm/sympath/walk_test.go index f5a479c1b8..c27278adcd 100644 --- a/pkg/contexts/oci/ociutils/helm/sympath/walk_test.go +++ b/pkg/contexts/oci/ociutils/helm/sympath/walk_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sympath import ( diff --git a/pkg/contexts/oci/ociutils/info.go b/pkg/contexts/oci/ociutils/info.go index b9d0836b75..47fef72065 100644 --- a/pkg/contexts/oci/ociutils/info.go +++ b/pkg/contexts/oci/ociutils/info.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociutils import ( diff --git a/pkg/contexts/oci/ociutils/print.go b/pkg/contexts/oci/ociutils/print.go index 48ad88acb8..cea469d98e 100644 --- a/pkg/contexts/oci/ociutils/print.go +++ b/pkg/contexts/oci/ociutils/print.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociutils import ( diff --git a/pkg/contexts/oci/ref.go b/pkg/contexts/oci/ref.go index 764058884a..88482f6820 100644 --- a/pkg/contexts/oci/ref.go +++ b/pkg/contexts/oci/ref.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci import ( diff --git a/pkg/contexts/oci/ref_test.go b/pkg/contexts/oci/ref_test.go index b0c8d1977f..4ea9ea31f6 100644 --- a/pkg/contexts/oci/ref_test.go +++ b/pkg/contexts/oci/ref_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci_test import ( @@ -9,8 +5,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - godigest "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -19,6 +13,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) func Type(t string) string { diff --git a/pkg/contexts/oci/repositories/artifactset/artifactset.go b/pkg/contexts/oci/repositories/artifactset/artifactset.go index c606f5fc94..7b033eefa0 100644 --- a/pkg/contexts/oci/repositories/artifactset/artifactset.go +++ b/pkg/contexts/oci/repositories/artifactset/artifactset.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go index a888d7c2fa..e2d7d55005 100644 --- a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go +++ b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset_test import ( @@ -9,20 +5,19 @@ import ( "compress/gzip" "io" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) func defaultManifestFill(a *artifactset.ArtifactSet) { diff --git a/pkg/contexts/oci/repositories/artifactset/error.go b/pkg/contexts/oci/repositories/artifactset/error.go index 5b3c670f47..903853457d 100644 --- a/pkg/contexts/oci/repositories/artifactset/error.go +++ b/pkg/contexts/oci/repositories/artifactset/error.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import "fmt" diff --git a/pkg/contexts/oci/repositories/artifactset/filesystemaccess.go b/pkg/contexts/oci/repositories/artifactset/filesystemaccess.go index 6fb1722789..c0a2ea0230 100644 --- a/pkg/contexts/oci/repositories/artifactset/filesystemaccess.go +++ b/pkg/contexts/oci/repositories/artifactset/filesystemaccess.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/format.go b/pkg/contexts/oci/repositories/artifactset/format.go index deb12c8446..4d4cc6da74 100644 --- a/pkg/contexts/oci/repositories/artifactset/format.go +++ b/pkg/contexts/oci/repositories/artifactset/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/options.go b/pkg/contexts/oci/repositories/artifactset/options.go index d00d978f35..16cc36f688 100644 --- a/pkg/contexts/oci/repositories/artifactset/options.go +++ b/pkg/contexts/oci/repositories/artifactset/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/repo_test.go b/pkg/contexts/oci/repositories/artifactset/repo_test.go index 05075fd6a5..aad177f539 100644 --- a/pkg/contexts/oci/repositories/artifactset/repo_test.go +++ b/pkg/contexts/oci/repositories/artifactset/repo_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset_test 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/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -15,6 +10,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("", func() { diff --git a/pkg/contexts/oci/repositories/artifactset/repository.go b/pkg/contexts/oci/repositories/artifactset/repository.go index 7a2923fcc1..b5d5dc4dcf 100644 --- a/pkg/contexts/oci/repositories/artifactset/repository.go +++ b/pkg/contexts/oci/repositories/artifactset/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/state.go b/pkg/contexts/oci/repositories/artifactset/state.go index c2d67227c9..616af4aa55 100644 --- a/pkg/contexts/oci/repositories/artifactset/state.go +++ b/pkg/contexts/oci/repositories/artifactset/state.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/suite_test.go b/pkg/contexts/oci/repositories/artifactset/suite_test.go index 4f921ccd64..55b5b83a4a 100644 --- a/pkg/contexts/oci/repositories/artifactset/suite_test.go +++ b/pkg/contexts/oci/repositories/artifactset/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset_test import ( diff --git a/pkg/contexts/oci/repositories/artifactset/testhelper/formats.go b/pkg/contexts/oci/repositories/artifactset/testhelper/formats.go index e472a13571..3ac44a18b1 100644 --- a/pkg/contexts/oci/repositories/artifactset/testhelper/formats.go +++ b/pkg/contexts/oci/repositories/artifactset/testhelper/formats.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( diff --git a/pkg/contexts/oci/repositories/artifactset/type.go b/pkg/contexts/oci/repositories/artifactset/type.go index 97cbeba074..83f4937f3e 100644 --- a/pkg/contexts/oci/repositories/artifactset/type.go +++ b/pkg/contexts/oci/repositories/artifactset/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/uniform.go b/pkg/contexts/oci/repositories/artifactset/uniform.go index 01aef447f5..a624c38e11 100644 --- a/pkg/contexts/oci/repositories/artifactset/uniform.go +++ b/pkg/contexts/oci/repositories/artifactset/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( diff --git a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go index b8af51ec13..42a7b164cf 100644 --- a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go +++ b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go @@ -1,14 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifactset import ( "fmt" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" @@ -20,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/transfer" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" ) const SynthesizedBlobFormat = "+tar+gzip" diff --git a/pkg/contexts/oci/repositories/ctf/ctf_test.go b/pkg/contexts/oci/repositories/ctf/ctf_test.go index 75fc07d55a..7bbc758bef 100644 --- a/pkg/contexts/oci/repositories/ctf/ctf_test.go +++ b/pkg/contexts/oci/repositories/ctf/ctf_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf_test import ( @@ -9,14 +5,11 @@ import ( "compress/gzip" "io" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -26,10 +19,12 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/cpi" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" "github.com/open-component-model/ocm/pkg/errors" "github.com/open-component-model/ocm/pkg/finalizer" ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/refmgmt" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("ctf management", func() { diff --git a/pkg/contexts/oci/repositories/ctf/format.go b/pkg/contexts/oci/repositories/ctf/format.go index bc95ac3376..ac88b5d7a9 100644 --- a/pkg/contexts/oci/repositories/ctf/format.go +++ b/pkg/contexts/oci/repositories/ctf/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/oci/repositories/ctf/format/const.go b/pkg/contexts/oci/repositories/ctf/format/const.go index 83076b6e92..29abf7e66d 100644 --- a/pkg/contexts/oci/repositories/ctf/format/const.go +++ b/pkg/contexts/oci/repositories/ctf/format/const.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package format import ( diff --git a/pkg/contexts/oci/repositories/ctf/index/ctfindex.go b/pkg/contexts/oci/repositories/ctf/index/ctfindex.go index d7f5105551..666d476ad8 100644 --- a/pkg/contexts/oci/repositories/ctf/index/ctfindex.go +++ b/pkg/contexts/oci/repositories/ctf/index/ctfindex.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package index import ( diff --git a/pkg/contexts/oci/repositories/ctf/index/index.go b/pkg/contexts/oci/repositories/ctf/index/index.go index ad5f2af4e4..375ff5c697 100644 --- a/pkg/contexts/oci/repositories/ctf/index/index.go +++ b/pkg/contexts/oci/repositories/ctf/index/index.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package index import ( diff --git a/pkg/contexts/oci/repositories/ctf/index/index_test.go b/pkg/contexts/oci/repositories/ctf/index/index_test.go index e9f570060b..2be8577c98 100644 --- a/pkg/contexts/oci/repositories/ctf/index/index_test.go +++ b/pkg/contexts/oci/repositories/ctf/index/index_test.go @@ -1,12 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package index_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/index" ) diff --git a/pkg/contexts/oci/repositories/ctf/index/suite_test.go b/pkg/contexts/oci/repositories/ctf/index/suite_test.go index 303a5508dc..f4612555db 100644 --- a/pkg/contexts/oci/repositories/ctf/index/suite_test.go +++ b/pkg/contexts/oci/repositories/ctf/index/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package index_test import ( diff --git a/pkg/contexts/oci/repositories/ctf/namespace.go b/pkg/contexts/oci/repositories/ctf/namespace.go index 993a21e7c2..063ba85d2b 100644 --- a/pkg/contexts/oci/repositories/ctf/namespace.go +++ b/pkg/contexts/oci/repositories/ctf/namespace.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/oci/repositories/ctf/repository.go b/pkg/contexts/oci/repositories/ctf/repository.go index c27ea80f1f..d65dfe3e83 100644 --- a/pkg/contexts/oci/repositories/ctf/repository.go +++ b/pkg/contexts/oci/repositories/ctf/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/oci/repositories/ctf/state.go b/pkg/contexts/oci/repositories/ctf/state.go index df32af4784..938d4fe8b3 100644 --- a/pkg/contexts/oci/repositories/ctf/state.go +++ b/pkg/contexts/oci/repositories/ctf/state.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/oci/repositories/ctf/suite_test.go b/pkg/contexts/oci/repositories/ctf/suite_test.go index cd12e9d42a..76de40450f 100644 --- a/pkg/contexts/oci/repositories/ctf/suite_test.go +++ b/pkg/contexts/oci/repositories/ctf/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf_test import ( diff --git a/pkg/contexts/oci/repositories/ctf/synthesis_test.go b/pkg/contexts/oci/repositories/ctf/synthesis_test.go index 5e9e3b4561..f24bf25eb9 100644 --- a/pkg/contexts/oci/repositories/ctf/synthesis_test.go +++ b/pkg/contexts/oci/repositories/ctf/synthesis_test.go @@ -1,18 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -22,6 +15,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" @@ -31,6 +25,7 @@ import ( "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" + . "github.com/open-component-model/ocm/pkg/testutils" ) type dummyMethod struct { diff --git a/pkg/contexts/oci/repositories/ctf/testhelper/fill.go b/pkg/contexts/oci/repositories/ctf/testhelper/fill.go index 6df8658afe..19cf83bdd7 100644 --- a/pkg/contexts/oci/repositories/ctf/testhelper/fill.go +++ b/pkg/contexts/oci/repositories/ctf/testhelper/fill.go @@ -1,12 +1,7 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( . "github.com/onsi/gomega" - "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/contexts/oci/repositories/ctf/type.go b/pkg/contexts/oci/repositories/ctf/type.go index a2bcb67191..779170fe9d 100644 --- a/pkg/contexts/oci/repositories/ctf/type.go +++ b/pkg/contexts/oci/repositories/ctf/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/oci/repositories/ctf/uniform.go b/pkg/contexts/oci/repositories/ctf/uniform.go index 2b668addb9..04bd5a1f67 100644 --- a/pkg/contexts/oci/repositories/ctf/uniform.go +++ b/pkg/contexts/oci/repositories/ctf/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/oci/repositories/docker/artifact.go b/pkg/contexts/oci/repositories/docker/artifact.go index 723573fb9a..2b35b1a963 100644 --- a/pkg/contexts/oci/repositories/docker/artifact.go +++ b/pkg/contexts/oci/repositories/docker/artifact.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/contexts/oci/repositories/docker/client.go b/pkg/contexts/oci/repositories/docker/client.go index b3acc71b06..0081c00983 100644 --- a/pkg/contexts/oci/repositories/docker/client.go +++ b/pkg/contexts/oci/repositories/docker/client.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // taken from "github.com/containers/image/v5", unfortunately this is private and cannot be used via import package docker diff --git a/pkg/contexts/oci/repositories/docker/convert.go b/pkg/contexts/oci/repositories/docker/convert.go index 8d60234f2d..24d5acfb1f 100644 --- a/pkg/contexts/oci/repositories/docker/convert.go +++ b/pkg/contexts/oci/repositories/docker/convert.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/contexts/oci/repositories/docker/type.go b/pkg/contexts/oci/repositories/docker/type.go index 8c08a2dc60..b9572b7c7d 100644 --- a/pkg/contexts/oci/repositories/docker/type.go +++ b/pkg/contexts/oci/repositories/docker/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/contexts/oci/repositories/docker/uniform.go b/pkg/contexts/oci/repositories/docker/uniform.go index 6863ead2e9..9d4edd4bb0 100644 --- a/pkg/contexts/oci/repositories/docker/uniform.go +++ b/pkg/contexts/oci/repositories/docker/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/contexts/oci/repositories/docker/utils.go b/pkg/contexts/oci/repositories/docker/utils.go index f822803d3f..336fd231a8 100644 --- a/pkg/contexts/oci/repositories/docker/utils.go +++ b/pkg/contexts/oci/repositories/docker/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/contexts/oci/repositories/empty/repository.go b/pkg/contexts/oci/repositories/empty/repository.go index 9ae46814ba..94b7d96f02 100644 --- a/pkg/contexts/oci/repositories/empty/repository.go +++ b/pkg/contexts/oci/repositories/empty/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package empty import ( diff --git a/pkg/contexts/oci/repositories/empty/type.go b/pkg/contexts/oci/repositories/empty/type.go index 279b575d3a..910084e532 100644 --- a/pkg/contexts/oci/repositories/empty/type.go +++ b/pkg/contexts/oci/repositories/empty/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package empty import ( diff --git a/pkg/contexts/oci/repositories/empty/uniform.go b/pkg/contexts/oci/repositories/empty/uniform.go index 30bf8cce0d..78d78a0cc4 100644 --- a/pkg/contexts/oci/repositories/empty/uniform.go +++ b/pkg/contexts/oci/repositories/empty/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package empty import ( diff --git a/pkg/contexts/oci/repositories/init.go b/pkg/contexts/oci/repositories/init.go index c86b176e3d..4ca9540668 100644 --- a/pkg/contexts/oci/repositories/init.go +++ b/pkg/contexts/oci/repositories/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package repositories import ( diff --git a/pkg/contexts/oci/repositories/ocireg/blobs.go b/pkg/contexts/oci/repositories/ocireg/blobs.go index 185532d110..df91f70f8f 100644 --- a/pkg/contexts/oci/repositories/ocireg/blobs.go +++ b/pkg/contexts/oci/repositories/ocireg/blobs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg import ( diff --git a/pkg/contexts/oci/repositories/ocireg/namespace.go b/pkg/contexts/oci/repositories/ocireg/namespace.go index 328320f3ce..a565df262b 100644 --- a/pkg/contexts/oci/repositories/ocireg/namespace.go +++ b/pkg/contexts/oci/repositories/ocireg/namespace.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg import ( diff --git a/pkg/contexts/oci/repositories/ocireg/repository.go b/pkg/contexts/oci/repositories/ocireg/repository.go index ed474c4ffa..96590b770a 100644 --- a/pkg/contexts/oci/repositories/ocireg/repository.go +++ b/pkg/contexts/oci/repositories/ocireg/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg import ( diff --git a/pkg/contexts/oci/repositories/ocireg/type.go b/pkg/contexts/oci/repositories/ocireg/type.go index d83f9f71b7..53002ae1f3 100644 --- a/pkg/contexts/oci/repositories/ocireg/type.go +++ b/pkg/contexts/oci/repositories/ocireg/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg import ( diff --git a/pkg/contexts/oci/repositories/ocireg/uniform.go b/pkg/contexts/oci/repositories/ocireg/uniform.go index 761a772a60..49f78e9778 100644 --- a/pkg/contexts/oci/repositories/ocireg/uniform.go +++ b/pkg/contexts/oci/repositories/ocireg/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg import ( diff --git a/pkg/contexts/oci/repositories/ocireg/utils.go b/pkg/contexts/oci/repositories/ocireg/utils.go index 0e81a18715..e11b2806d0 100644 --- a/pkg/contexts/oci/repositories/ocireg/utils.go +++ b/pkg/contexts/oci/repositories/ocireg/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg import ( diff --git a/pkg/contexts/oci/session.go b/pkg/contexts/oci/session.go index b15a9fb9f8..0227a3bfa8 100644 --- a/pkg/contexts/oci/session.go +++ b/pkg/contexts/oci/session.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci import ( diff --git a/pkg/contexts/oci/suite_test.go b/pkg/contexts/oci/suite_test.go index 62ea42f6a1..638212fa93 100644 --- a/pkg/contexts/oci/suite_test.go +++ b/pkg/contexts/oci/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci_test import ( diff --git a/pkg/contexts/oci/testhelper/manifests.go b/pkg/contexts/oci/testhelper/manifests.go index 7cf8a811fb..ceee04ac82 100644 --- a/pkg/contexts/oci/testhelper/manifests.go +++ b/pkg/contexts/oci/testhelper/manifests.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //nolint:gosec // digests of test manifests package testhelper diff --git a/pkg/contexts/oci/testhelper/oci.go b/pkg/contexts/oci/testhelper/oci.go index f1e1d3d283..caa0d58f22 100644 --- a/pkg/contexts/oci/testhelper/oci.go +++ b/pkg/contexts/oci/testhelper/oci.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( diff --git a/pkg/contexts/oci/transfer/suite_test.go b/pkg/contexts/oci/transfer/suite_test.go index ce1d813187..7718dd82f5 100644 --- a/pkg/contexts/oci/transfer/suite_test.go +++ b/pkg/contexts/oci/transfer/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( diff --git a/pkg/contexts/oci/transfer/transfer.go b/pkg/contexts/oci/transfer/transfer.go index 7d6c9b56ff..ad4b569038 100644 --- a/pkg/contexts/oci/transfer/transfer.go +++ b/pkg/contexts/oci/transfer/transfer.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/pkg/contexts/oci/utils.go b/pkg/contexts/oci/utils.go index b1357b358f..5ddefced16 100644 --- a/pkg/contexts/oci/utils.go +++ b/pkg/contexts/oci/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci import ( diff --git a/pkg/contexts/ocm/accessmethods/compose/method.go b/pkg/contexts/ocm/accessmethods/compose/method.go index 31ef896445..3811654745 100644 --- a/pkg/contexts/ocm/accessmethods/compose/method.go +++ b/pkg/contexts/ocm/accessmethods/compose/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compose import ( diff --git a/pkg/contexts/ocm/accessmethods/github/cli.go b/pkg/contexts/ocm/accessmethods/github/cli.go index a542c021a7..22e9f538e8 100644 --- a/pkg/contexts/ocm/accessmethods/github/cli.go +++ b/pkg/contexts/ocm/accessmethods/github/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package github import ( diff --git a/pkg/contexts/ocm/accessmethods/github/method.go b/pkg/contexts/ocm/accessmethods/github/method.go index b5862722e0..36de16863f 100644 --- a/pkg/contexts/ocm/accessmethods/github/method.go +++ b/pkg/contexts/ocm/accessmethods/github/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package github import ( diff --git a/pkg/contexts/ocm/accessmethods/github/suite_test.go b/pkg/contexts/ocm/accessmethods/github/suite_test.go index bfa53a11f3..8a9e1886bc 100644 --- a/pkg/contexts/ocm/accessmethods/github/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/github/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package github_test import ( diff --git a/pkg/contexts/ocm/accessmethods/helm/cli.go b/pkg/contexts/ocm/accessmethods/helm/cli.go index 6432361f5a..16c4a1f1b4 100644 --- a/pkg/contexts/ocm/accessmethods/helm/cli.go +++ b/pkg/contexts/ocm/accessmethods/helm/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/pkg/contexts/ocm/accessmethods/helm/method.go b/pkg/contexts/ocm/accessmethods/helm/method.go index 59c49ea713..4b38325d16 100644 --- a/pkg/contexts/ocm/accessmethods/helm/method.go +++ b/pkg/contexts/ocm/accessmethods/helm/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/pkg/contexts/ocm/accessmethods/helm/method_test.go b/pkg/contexts/ocm/accessmethods/helm/method_test.go index 8533dba300..497865a238 100644 --- a/pkg/contexts/ocm/accessmethods/helm/method_test.go +++ b/pkg/contexts/ocm/accessmethods/helm/method_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm_test import ( @@ -10,14 +6,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - "helm.sh/helm/v3/pkg/chart/loader" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/helm" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" + . "github.com/open-component-model/ocm/pkg/env/builder" helm2 "github.com/open-component-model/ocm/pkg/helm" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Method", func() { diff --git a/pkg/contexts/ocm/accessmethods/helm/suite_test.go b/pkg/contexts/ocm/accessmethods/helm/suite_test.go index 814f89272b..33b96f4a52 100644 --- a/pkg/contexts/ocm/accessmethods/helm/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/helm/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm_test import ( diff --git a/pkg/contexts/ocm/accessmethods/init.go b/pkg/contexts/ocm/accessmethods/init.go index 11f5e759e2..52052609d6 100644 --- a/pkg/contexts/ocm/accessmethods/init.go +++ b/pkg/contexts/ocm/accessmethods/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessmethods import ( diff --git a/pkg/contexts/ocm/accessmethods/localblob/cli.go b/pkg/contexts/ocm/accessmethods/localblob/cli.go index 56528fae45..9a1d5a0902 100644 --- a/pkg/contexts/ocm/accessmethods/localblob/cli.go +++ b/pkg/contexts/ocm/accessmethods/localblob/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localblob import ( diff --git a/pkg/contexts/ocm/accessmethods/localblob/method.go b/pkg/contexts/ocm/accessmethods/localblob/method.go index 37dc6c9e88..6de833810c 100644 --- a/pkg/contexts/ocm/accessmethods/localblob/method.go +++ b/pkg/contexts/ocm/accessmethods/localblob/method.go @@ -1,16 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localblob import ( "encoding/json" "fmt" - . "github.com/open-component-model/ocm/pkg/exception" - "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" + . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/localblob/method_test.go b/pkg/contexts/ocm/accessmethods/localblob/method_test.go index da69091570..d038d1b6c0 100644 --- a/pkg/contexts/ocm/accessmethods/localblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/localblob/method_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localblob_test import ( @@ -9,8 +5,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -20,8 +14,10 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const CTF = "ctf" diff --git a/pkg/contexts/ocm/accessmethods/localblob/suite_test.go b/pkg/contexts/ocm/accessmethods/localblob/suite_test.go index 2f9142bc72..27fcf7b2d8 100644 --- a/pkg/contexts/ocm/accessmethods/localblob/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/localblob/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localblob_test import ( diff --git a/pkg/contexts/ocm/accessmethods/localfsblob/method.go b/pkg/contexts/ocm/accessmethods/localfsblob/method.go index c183af8104..25f5d9ca97 100644 --- a/pkg/contexts/ocm/accessmethods/localfsblob/method.go +++ b/pkg/contexts/ocm/accessmethods/localfsblob/method.go @@ -1,14 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localfsblob import ( - . "github.com/open-component-model/ocm/pkg/exception" - "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" + . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go b/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go index dbfb7d4689..beeb5e30e2 100644 --- a/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localfsblob_test import ( @@ -9,10 +5,10 @@ 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/contexts/ocm/accessmethods/localfsblob" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Method", func() { diff --git a/pkg/contexts/ocm/accessmethods/localfsblob/suite_test.go b/pkg/contexts/ocm/accessmethods/localfsblob/suite_test.go index 2367070898..c6723b40a8 100644 --- a/pkg/contexts/ocm/accessmethods/localfsblob/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/localfsblob/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localfsblob_test import ( diff --git a/pkg/contexts/ocm/accessmethods/localociblob/method.go b/pkg/contexts/ocm/accessmethods/localociblob/method.go index 4323ab9b66..a093ec56ec 100644 --- a/pkg/contexts/ocm/accessmethods/localociblob/method.go +++ b/pkg/contexts/ocm/accessmethods/localociblob/method.go @@ -1,16 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localociblob import ( - . "github.com/open-component-model/ocm/pkg/exception" - "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" + . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/localociblob/method_test.go b/pkg/contexts/ocm/accessmethods/localociblob/method_test.go index f1431fe5ba..0767b2ad75 100644 --- a/pkg/contexts/ocm/accessmethods/localociblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/localociblob/method_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localociblob_test import ( @@ -9,9 +5,9 @@ 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/contexts/ocm/accessmethods/localociblob" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Method", func() { diff --git a/pkg/contexts/ocm/accessmethods/localociblob/suite_test.go b/pkg/contexts/ocm/accessmethods/localociblob/suite_test.go index e154bd55d5..f4a3da659a 100644 --- a/pkg/contexts/ocm/accessmethods/localociblob/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/localociblob/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localociblob_test import ( diff --git a/pkg/contexts/ocm/accessmethods/none/method.go b/pkg/contexts/ocm/accessmethods/none/method.go index de69f3f98e..0feef44a51 100644 --- a/pkg/contexts/ocm/accessmethods/none/method.go +++ b/pkg/contexts/ocm/accessmethods/none/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package none import ( diff --git a/pkg/contexts/ocm/accessmethods/npm/cli.go b/pkg/contexts/ocm/accessmethods/npm/cli.go index 12f2582bea..7f15336319 100644 --- a/pkg/contexts/ocm/accessmethods/npm/cli.go +++ b/pkg/contexts/ocm/accessmethods/npm/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package npm import ( diff --git a/pkg/contexts/ocm/accessmethods/npm/method.go b/pkg/contexts/ocm/accessmethods/npm/method.go index 7698cd9920..8d9120df39 100644 --- a/pkg/contexts/ocm/accessmethods/npm/method.go +++ b/pkg/contexts/ocm/accessmethods/npm/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package npm import ( diff --git a/pkg/contexts/ocm/accessmethods/npm/method_test.go b/pkg/contexts/ocm/accessmethods/npm/method_test.go index d15e985cb9..961209df79 100644 --- a/pkg/contexts/ocm/accessmethods/npm/method_test.go +++ b/pkg/contexts/ocm/accessmethods/npm/method_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package npm_test import ( @@ -9,15 +5,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/npm" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/iotools" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const NPMPATH = "/testdata/registry" diff --git a/pkg/contexts/ocm/accessmethods/npm/suite_test.go b/pkg/contexts/ocm/accessmethods/npm/suite_test.go index ce7bd39b97..897e72b305 100644 --- a/pkg/contexts/ocm/accessmethods/npm/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/npm/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package npm_test import ( diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/cli.go b/pkg/contexts/ocm/accessmethods/ociartifact/cli.go index d533387071..11eb07b0a1 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/cli.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact import ( diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/method.go b/pkg/contexts/ocm/accessmethods/ociartifact/method.go index e278b6fe74..328dad7b62 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/method.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact import ( @@ -10,8 +6,6 @@ import ( "strings" "sync" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -25,6 +19,7 @@ import ( ocmcpi "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go b/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go index 08bf70afb1..83e74e85d8 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go @@ -1,22 +1,18 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/oci" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" + . "github.com/open-component-model/ocm/pkg/env/builder" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/suite_test.go b/pkg/contexts/ocm/accessmethods/ociartifact/suite_test.go index ccd2b0a200..2c73fbbfb4 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociartifact_test import ( diff --git a/pkg/contexts/ocm/accessmethods/ociblob/cli.go b/pkg/contexts/ocm/accessmethods/ociblob/cli.go index ef14f94f10..e71d693e65 100644 --- a/pkg/contexts/ocm/accessmethods/ociblob/cli.go +++ b/pkg/contexts/ocm/accessmethods/ociblob/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociblob import ( diff --git a/pkg/contexts/ocm/accessmethods/ociblob/method.go b/pkg/contexts/ocm/accessmethods/ociblob/method.go index 97f8e1222b..92741361be 100644 --- a/pkg/contexts/ocm/accessmethods/ociblob/method.go +++ b/pkg/contexts/ocm/accessmethods/ociblob/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociblob import ( diff --git a/pkg/contexts/ocm/accessmethods/ociblob/method_test.go b/pkg/contexts/ocm/accessmethods/ociblob/method_test.go index 784ed23d86..514fa1a26a 100644 --- a/pkg/contexts/ocm/accessmethods/ociblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/ociblob/method_test.go @@ -1,20 +1,16 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociblob_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" + . "github.com/open-component-model/ocm/pkg/env/builder" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/accessmethods/ociblob/suite_test.go b/pkg/contexts/ocm/accessmethods/ociblob/suite_test.go index f60a8d14c8..3707fc8b5a 100644 --- a/pkg/contexts/ocm/accessmethods/ociblob/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/ociblob/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociblob_test import ( diff --git a/pkg/contexts/ocm/accessmethods/options/init.go b/pkg/contexts/ocm/accessmethods/options/init.go index 27acd23af5..8de3a5fdd9 100644 --- a/pkg/contexts/ocm/accessmethods/options/init.go +++ b/pkg/contexts/ocm/accessmethods/options/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options const ( diff --git a/pkg/contexts/ocm/accessmethods/options/registry.go b/pkg/contexts/ocm/accessmethods/options/registry.go index ba6322b1e4..25942474a1 100644 --- a/pkg/contexts/ocm/accessmethods/options/registry.go +++ b/pkg/contexts/ocm/accessmethods/options/registry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options import ( diff --git a/pkg/contexts/ocm/accessmethods/options/registry_test.go b/pkg/contexts/ocm/accessmethods/options/registry_test.go index 97ffb3bf88..baddee31b3 100644 --- a/pkg/contexts/ocm/accessmethods/options/registry_test.go +++ b/pkg/contexts/ocm/accessmethods/options/registry_test.go @@ -1,12 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/ocm/accessmethods/options/standard.go b/pkg/contexts/ocm/accessmethods/options/standard.go index 052f7e73e0..c13b298134 100644 --- a/pkg/contexts/ocm/accessmethods/options/standard.go +++ b/pkg/contexts/ocm/accessmethods/options/standard.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options // HintOption. diff --git a/pkg/contexts/ocm/accessmethods/options/suite_test.go b/pkg/contexts/ocm/accessmethods/options/suite_test.go index 95a45f13e8..16583ee25c 100644 --- a/pkg/contexts/ocm/accessmethods/options/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/options/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options_test import ( diff --git a/pkg/contexts/ocm/accessmethods/options/types.go b/pkg/contexts/ocm/accessmethods/options/types.go index 3a9dfe6ed3..96883a564b 100644 --- a/pkg/contexts/ocm/accessmethods/options/types.go +++ b/pkg/contexts/ocm/accessmethods/options/types.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package options import ( diff --git a/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go b/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go index 231ece0f07..126b32bb86 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go +++ b/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go @@ -1,17 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/goutils/sliceutils" "github.com/mandelsoft/goutils/transformer" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" @@ -21,6 +14,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" ) const CA = "/tmp/ca" diff --git a/pkg/contexts/ocm/accessmethods/plugin/doc.go b/pkg/contexts/ocm/accessmethods/plugin/doc.go index 5bef8c9885..cd2eaf05dd 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/doc.go +++ b/pkg/contexts/ocm/accessmethods/plugin/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package plugin is an adapter implementation that provides a generic handling of all AccessMethods provided by // plugins. // It includes a generic AccessType object (responsible for un-/marshaling AccessSpec objects), AccessSpec object and diff --git a/pkg/contexts/ocm/accessmethods/plugin/method.go b/pkg/contexts/ocm/accessmethods/plugin/method.go index be5afdf70b..5e329e2b62 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/method.go +++ b/pkg/contexts/ocm/accessmethods/plugin/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/accessmethods/plugin/method_test.go b/pkg/contexts/ocm/accessmethods/plugin/method_test.go index b027178b0d..0a08ac6a5d 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/method_test.go +++ b/pkg/contexts/ocm/accessmethods/plugin/method_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package plugin_test @@ -9,8 +5,6 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -21,6 +15,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "ctf" diff --git a/pkg/contexts/ocm/accessmethods/plugin/plugin.go b/pkg/contexts/ocm/accessmethods/plugin/plugin.go index 87de720d3d..34904569e4 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/plugin.go +++ b/pkg/contexts/ocm/accessmethods/plugin/plugin.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/accessmethods/plugin/suite_test.go b/pkg/contexts/ocm/accessmethods/plugin/suite_test.go index f1ac760593..d63d5e637e 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/plugin/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( diff --git a/pkg/contexts/ocm/accessmethods/plugin/type.go b/pkg/contexts/ocm/accessmethods/plugin/type.go index 645ab7d288..e050a6ae70 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/type.go +++ b/pkg/contexts/ocm/accessmethods/plugin/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/accessmethods/relativeociref/method.go b/pkg/contexts/ocm/accessmethods/relativeociref/method.go index 72e8d687c1..148f25e5f7 100644 --- a/pkg/contexts/ocm/accessmethods/relativeociref/method.go +++ b/pkg/contexts/ocm/accessmethods/relativeociref/method.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package relativeociref import ( diff --git a/pkg/contexts/ocm/accessmethods/relativeociref/suite_test.go b/pkg/contexts/ocm/accessmethods/relativeociref/suite_test.go index b60cd583d9..9f947764cb 100644 --- a/pkg/contexts/ocm/accessmethods/relativeociref/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/relativeociref/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package relativeociref_test import ( diff --git a/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go b/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go index 8b45e327f2..72a35a0256 100644 --- a/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go +++ b/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package relativeociref_test import ( @@ -10,9 +6,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -20,6 +13,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" ocictf "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/relativeociref" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/keepblobattr" @@ -31,6 +25,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const OUT = "/tmp/res" diff --git a/pkg/contexts/ocm/accessmethods/s3/cli.go b/pkg/contexts/ocm/accessmethods/s3/cli.go index 4a670c8787..b8d452ab39 100644 --- a/pkg/contexts/ocm/accessmethods/s3/cli.go +++ b/pkg/contexts/ocm/accessmethods/s3/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package s3 import ( diff --git a/pkg/contexts/ocm/accessmethods/s3/method.go b/pkg/contexts/ocm/accessmethods/s3/method.go index cc1aa9a1ef..4fd15460b8 100644 --- a/pkg/contexts/ocm/accessmethods/s3/method.go +++ b/pkg/contexts/ocm/accessmethods/s3/method.go @@ -1,14 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package s3 import ( "fmt" - . "github.com/open-component-model/ocm/pkg/exception" - "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessio/downloader" @@ -18,6 +12,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/s3/identity" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" + . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" diff --git a/pkg/contexts/ocm/accessmethods/s3/suite_test.go b/pkg/contexts/ocm/accessmethods/s3/suite_test.go index 46f0d71a99..2ddc077d72 100644 --- a/pkg/contexts/ocm/accessmethods/s3/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/s3/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package s3_test import ( diff --git a/pkg/contexts/ocm/accessmethods/wget/suite_test.go b/pkg/contexts/ocm/accessmethods/wget/suite_test.go index 910d088e07..6d72f6b70d 100644 --- a/pkg/contexts/ocm/accessmethods/wget/suite_test.go +++ b/pkg/contexts/ocm/accessmethods/wget/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package wget_test import ( diff --git a/pkg/contexts/ocm/actionhandler/plugin/action_test.go b/pkg/contexts/ocm/actionhandler/plugin/action_test.go index bf2793e003..dbb3e39040 100644 --- a/pkg/contexts/ocm/actionhandler/plugin/action_test.go +++ b/pkg/contexts/ocm/actionhandler/plugin/action_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package plugin_test @@ -9,8 +5,6 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers" oci_repository_prepare "github.com/open-component-model/ocm/pkg/contexts/oci/actions/oci-repository-prepare" @@ -20,6 +14,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "test" diff --git a/pkg/contexts/ocm/actionhandler/plugin/actionhandler.go b/pkg/contexts/ocm/actionhandler/plugin/actionhandler.go index 2c810a9ab7..a2ce7956b3 100644 --- a/pkg/contexts/ocm/actionhandler/plugin/actionhandler.go +++ b/pkg/contexts/ocm/actionhandler/plugin/actionhandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/actionhandler/plugin/registration.go b/pkg/contexts/ocm/actionhandler/plugin/registration.go index e5b860a456..220dfd9f42 100644 --- a/pkg/contexts/ocm/actionhandler/plugin/registration.go +++ b/pkg/contexts/ocm/actionhandler/plugin/registration.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/actionhandler/plugin/suite_test.go b/pkg/contexts/ocm/actionhandler/plugin/suite_test.go index 2251e0a4c0..64a88460c4 100644 --- a/pkg/contexts/ocm/actionhandler/plugin/suite_test.go +++ b/pkg/contexts/ocm/actionhandler/plugin/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( diff --git a/pkg/contexts/ocm/attrs/compatattr/attr.go b/pkg/contexts/ocm/attrs/compatattr/attr.go index 08a4858198..72e21d87e6 100644 --- a/pkg/contexts/ocm/attrs/compatattr/attr.go +++ b/pkg/contexts/ocm/attrs/compatattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compatattr import ( diff --git a/pkg/contexts/ocm/attrs/compatattr/attr_test.go b/pkg/contexts/ocm/attrs/compatattr/attr_test.go index 5b26e53dc7..cf4b1a4c3b 100644 --- a/pkg/contexts/ocm/attrs/compatattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/compatattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compatattr_test import ( diff --git a/pkg/contexts/ocm/attrs/compatattr/suite_test.go b/pkg/contexts/ocm/attrs/compatattr/suite_test.go index e8ecd0c17f..8359be0cab 100644 --- a/pkg/contexts/ocm/attrs/compatattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/compatattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compatattr_test import ( diff --git a/pkg/contexts/ocm/attrs/compositionmodeattr/attr.go b/pkg/contexts/ocm/attrs/compositionmodeattr/attr.go index ec13c9a775..903ff856da 100644 --- a/pkg/contexts/ocm/attrs/compositionmodeattr/attr.go +++ b/pkg/contexts/ocm/attrs/compositionmodeattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compositionmodeattr import ( diff --git a/pkg/contexts/ocm/attrs/compositionmodeattr/attr_test.go b/pkg/contexts/ocm/attrs/compositionmodeattr/attr_test.go index b2576a33a2..a96e036c77 100644 --- a/pkg/contexts/ocm/attrs/compositionmodeattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/compositionmodeattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compositionmodeattr_test import ( diff --git a/pkg/contexts/ocm/attrs/compositionmodeattr/suite_test.go b/pkg/contexts/ocm/attrs/compositionmodeattr/suite_test.go index cafab85bd1..cf4d8ee79b 100644 --- a/pkg/contexts/ocm/attrs/compositionmodeattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/compositionmodeattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compositionmodeattr_test import ( diff --git a/pkg/contexts/ocm/attrs/hashattr/attr.go b/pkg/contexts/ocm/attrs/hashattr/attr.go index bdfcb28799..7cb90ae4f8 100644 --- a/pkg/contexts/ocm/attrs/hashattr/attr.go +++ b/pkg/contexts/ocm/attrs/hashattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hashattr import ( diff --git a/pkg/contexts/ocm/attrs/hashattr/attr_test.go b/pkg/contexts/ocm/attrs/hashattr/attr_test.go index fe7d526442..6173904471 100644 --- a/pkg/contexts/ocm/attrs/hashattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/hashattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hashattr_test import ( @@ -9,7 +5,6 @@ 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/contexts/config" "github.com/open-component-model/ocm/pkg/contexts/datacontext" @@ -17,6 +12,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/hashattr" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/hasher/sha512" + . "github.com/open-component-model/ocm/pkg/testutils" ) const NAME = "test" diff --git a/pkg/contexts/ocm/attrs/hashattr/config.go b/pkg/contexts/ocm/attrs/hashattr/config.go index b8b678f661..a69f04b0ab 100644 --- a/pkg/contexts/ocm/attrs/hashattr/config.go +++ b/pkg/contexts/ocm/attrs/hashattr/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hashattr import ( diff --git a/pkg/contexts/ocm/attrs/hashattr/suite_test.go b/pkg/contexts/ocm/attrs/hashattr/suite_test.go index fbbd6ed2aa..26cf013b03 100644 --- a/pkg/contexts/ocm/attrs/hashattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/hashattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hashattr_test import ( diff --git a/pkg/contexts/ocm/attrs/init.go b/pkg/contexts/ocm/attrs/init.go index b9d7364bc8..591dc43bb1 100644 --- a/pkg/contexts/ocm/attrs/init.go +++ b/pkg/contexts/ocm/attrs/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package attrs import ( diff --git a/pkg/contexts/ocm/attrs/keepblobattr/attr.go b/pkg/contexts/ocm/attrs/keepblobattr/attr.go index c5805d6f11..2f2181bb58 100644 --- a/pkg/contexts/ocm/attrs/keepblobattr/attr.go +++ b/pkg/contexts/ocm/attrs/keepblobattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package keepblobattr import ( diff --git a/pkg/contexts/ocm/attrs/keepblobattr/attr_test.go b/pkg/contexts/ocm/attrs/keepblobattr/attr_test.go index ab700ea831..c46b0943ef 100644 --- a/pkg/contexts/ocm/attrs/keepblobattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/keepblobattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package keepblobattr_test import ( diff --git a/pkg/contexts/ocm/attrs/keepblobattr/suite_test.go b/pkg/contexts/ocm/attrs/keepblobattr/suite_test.go index 3f6ca74ee6..15a5a6a60c 100644 --- a/pkg/contexts/ocm/attrs/keepblobattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/keepblobattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package keepblobattr_test import ( diff --git a/pkg/contexts/ocm/attrs/mapocirepoattr/attr.go b/pkg/contexts/ocm/attrs/mapocirepoattr/attr.go index cb4c646d34..0800f74ff8 100644 --- a/pkg/contexts/ocm/attrs/mapocirepoattr/attr.go +++ b/pkg/contexts/ocm/attrs/mapocirepoattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package mapocirepoattr import ( diff --git a/pkg/contexts/ocm/attrs/mapocirepoattr/attr_test.go b/pkg/contexts/ocm/attrs/mapocirepoattr/attr_test.go index 69127b7dd8..8dbef8ffef 100644 --- a/pkg/contexts/ocm/attrs/mapocirepoattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/mapocirepoattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package mapocirepoattr_test import ( diff --git a/pkg/contexts/ocm/attrs/mapocirepoattr/suite_test.go b/pkg/contexts/ocm/attrs/mapocirepoattr/suite_test.go index 63b09829f1..393c337d0e 100644 --- a/pkg/contexts/ocm/attrs/mapocirepoattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/mapocirepoattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package mapocirepoattr_test import ( diff --git a/pkg/contexts/ocm/attrs/ociuploadattr/attr.go b/pkg/contexts/ocm/attrs/ociuploadattr/attr.go index e6523f1f9c..82fd46306c 100644 --- a/pkg/contexts/ocm/attrs/ociuploadattr/attr.go +++ b/pkg/contexts/ocm/attrs/ociuploadattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociuploadattr import ( diff --git a/pkg/contexts/ocm/attrs/ociuploadattr/attr_test.go b/pkg/contexts/ocm/attrs/ociuploadattr/attr_test.go index 2ae2eb9645..649f0a7e65 100644 --- a/pkg/contexts/ocm/attrs/ociuploadattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/ociuploadattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociuploadattr_test import ( diff --git a/pkg/contexts/ocm/attrs/ociuploadattr/suite_test.go b/pkg/contexts/ocm/attrs/ociuploadattr/suite_test.go index 85a3499b17..b6e55ed373 100644 --- a/pkg/contexts/ocm/attrs/ociuploadattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/ociuploadattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ociuploadattr_test import ( diff --git a/pkg/contexts/ocm/attrs/plugincacheattr/attr.go b/pkg/contexts/ocm/attrs/plugincacheattr/attr.go index ad49116ce3..cb2bd2c8a9 100644 --- a/pkg/contexts/ocm/attrs/plugincacheattr/attr.go +++ b/pkg/contexts/ocm/attrs/plugincacheattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugincacheattr import ( diff --git a/pkg/contexts/ocm/attrs/plugindirattr/attr_test.go b/pkg/contexts/ocm/attrs/plugindirattr/attr_test.go index b2db4e4993..46518dc7a9 100644 --- a/pkg/contexts/ocm/attrs/plugindirattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/plugindirattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugindirattr_test import ( diff --git a/pkg/contexts/ocm/attrs/plugindirattr/suite_test.go b/pkg/contexts/ocm/attrs/plugindirattr/suite_test.go index 9fc799c63d..e3b94aec7a 100644 --- a/pkg/contexts/ocm/attrs/plugindirattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/plugindirattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugindirattr_test import ( diff --git a/pkg/contexts/ocm/attrs/signingattr/attr.go b/pkg/contexts/ocm/attrs/signingattr/attr.go index 136bb54c9d..1a86d62185 100644 --- a/pkg/contexts/ocm/attrs/signingattr/attr.go +++ b/pkg/contexts/ocm/attrs/signingattr/attr.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signingattr import ( diff --git a/pkg/contexts/ocm/attrs/signingattr/attr_test.go b/pkg/contexts/ocm/attrs/signingattr/attr_test.go index d07e8f60ea..eaad443bb0 100644 --- a/pkg/contexts/ocm/attrs/signingattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/signingattr/attr_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signingattr_test import ( diff --git a/pkg/contexts/ocm/attrs/signingattr/config.go b/pkg/contexts/ocm/attrs/signingattr/config.go index 8eff58ab8b..c6545f2c52 100644 --- a/pkg/contexts/ocm/attrs/signingattr/config.go +++ b/pkg/contexts/ocm/attrs/signingattr/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signingattr import ( diff --git a/pkg/contexts/ocm/attrs/signingattr/suite_test.go b/pkg/contexts/ocm/attrs/signingattr/suite_test.go index 43fb27d571..ff61be3a35 100644 --- a/pkg/contexts/ocm/attrs/signingattr/suite_test.go +++ b/pkg/contexts/ocm/attrs/signingattr/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signingattr_test import ( diff --git a/pkg/contexts/ocm/bind_test.go b/pkg/contexts/ocm/bind_test.go index 84f833d784..10a88e8c68 100644 --- a/pkg/contexts/ocm/bind_test.go +++ b/pkg/contexts/ocm/bind_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm_test import ( diff --git a/pkg/contexts/ocm/blobhandler/config/type.go b/pkg/contexts/ocm/blobhandler/config/type.go index fe9115c4cc..9313384d44 100644 --- a/pkg/contexts/ocm/blobhandler/config/type.go +++ b/pkg/contexts/ocm/blobhandler/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/ocm/blobhandler/doc.go b/pkg/contexts/ocm/blobhandler/doc.go index da09619307..d9d0cdec29 100644 --- a/pkg/contexts/ocm/blobhandler/doc.go +++ b/pkg/contexts/ocm/blobhandler/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package blobhandler contains blobhandlers for handling local blobs // for dedicated repository types. It is structured into sub packaged // for all context types, for example the context type oci for diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/blobhandler.go b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/blobhandler.go index 6dd9bc9641..4af29ef562 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/blobhandler.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/blobhandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/registration.go b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/registration.go index b1b7e3c527..afcd30713b 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/registration.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/registration.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/suite_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/suite_test.go index c5486e90d0..5473371796 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/suite_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo_test import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go index 730953e857..9b413b88c4 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go @@ -1,21 +1,15 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" ctfoci "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/ociuploadattr" @@ -26,6 +20,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const COMP = "github.com/compa" diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/blobhandler.go b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/blobhandler.go index 15bb6b6a6b..05c88206d5 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/blobhandler.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/blobhandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/registration.go b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/registration.go index 4105fd4974..5b1d40d751 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/registration.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/registration.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/suite_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/suite_test.go index 3b5e0a3609..ee0c47244e 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/suite_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go index c787b6e57c..0f4aaa7633 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package plugin_test @@ -11,14 +7,11 @@ import ( "fmt" "os" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -35,7 +28,9 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "test" diff --git a/pkg/contexts/ocm/blobhandler/handlers/oci/ctx.go b/pkg/contexts/ocm/blobhandler/handlers/oci/ctx.go index 1db19aa926..44c5a7d1b7 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/oci/ctx.go +++ b/pkg/contexts/ocm/blobhandler/handlers/oci/ctx.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package oci import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/oci/doc.go b/pkg/contexts/ocm/blobhandler/handlers/oci/doc.go index 69b6fd2854..4baf32f143 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/oci/doc.go +++ b/pkg/contexts/ocm/blobhandler/handlers/oci/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package oci contains sub packages for blob handler implementations // for dedicated implementations of the oci go binding interface. package oci diff --git a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go index 5ce47f72e7..aac15de281 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go +++ b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo import ( @@ -9,8 +5,6 @@ import ( "path" "strings" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -32,6 +26,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/generics" ) diff --git a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go index 9575571b93..315e805c55 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo_test import ( @@ -10,15 +6,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" ocictf "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/keepblobattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/mapocirepoattr" @@ -31,7 +25,9 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/suite_test.go b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/suite_test.go index 77d9d62b48..81fba5ba20 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/suite_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo_test import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler.go b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler.go index aa03af1148..2c7d2b7d1a 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler.go +++ b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go index 75eca547b5..7d21e33cd4 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go @@ -1,18 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch_test import ( "encoding/json" "reflect" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" @@ -23,6 +17,7 @@ import ( "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCHIVE = "archive" diff --git a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/suite_test.go b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/suite_test.go index 9ee7edfe70..c8b354bbf6 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/suite_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/ocm/ctx.go b/pkg/contexts/ocm/blobhandler/handlers/ocm/ctx.go index 8b9e211f5d..b51d3eb63a 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/ocm/ctx.go +++ b/pkg/contexts/ocm/blobhandler/handlers/ocm/ctx.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/ocm/doc.go b/pkg/contexts/ocm/blobhandler/handlers/ocm/doc.go index 9577eec703..3a8872083d 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/ocm/doc.go +++ b/pkg/contexts/ocm/blobhandler/handlers/ocm/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package ocm contains sub packages for blob handler implementations // for dedicated implementations of the default ocm go binding interface. package ocm diff --git a/pkg/contexts/ocm/builder.go b/pkg/contexts/ocm/builder.go index ab93ad3bed..6a80b8c0b6 100644 --- a/pkg/contexts/ocm/builder.go +++ b/pkg/contexts/ocm/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm import ( diff --git a/pkg/contexts/ocm/compdesc/codecs.go b/pkg/contexts/ocm/compdesc/codecs.go index 3a7ff5c391..9d977521c0 100644 --- a/pkg/contexts/ocm/compdesc/codecs.go +++ b/pkg/contexts/ocm/compdesc/codecs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/compdesc_test.go b/pkg/contexts/ocm/compdesc/compdesc_test.go index 63efc5aeff..5ac7761f4c 100644 --- a/pkg/contexts/ocm/compdesc/compdesc_test.go +++ b/pkg/contexts/ocm/compdesc/compdesc_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc_test import ( @@ -9,10 +5,10 @@ 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/contexts/ocm/compdesc" compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" + . "github.com/open-component-model/ocm/pkg/testutils" ) func NormalizeYAML(y string) string { diff --git a/pkg/contexts/ocm/compdesc/componentdescriptor.go b/pkg/contexts/ocm/compdesc/componentdescriptor.go index b25fe36e61..b35b4d9b6d 100644 --- a/pkg/contexts/ocm/compdesc/componentdescriptor.go +++ b/pkg/contexts/ocm/compdesc/componentdescriptor.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/default.go b/pkg/contexts/ocm/compdesc/default.go index 347d8ea312..66a83405d1 100644 --- a/pkg/contexts/ocm/compdesc/default.go +++ b/pkg/contexts/ocm/compdesc/default.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/helper.go b/pkg/contexts/ocm/compdesc/helper.go index 1696e87054..9821eec90a 100644 --- a/pkg/contexts/ocm/compdesc/helper.go +++ b/pkg/contexts/ocm/compdesc/helper.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/helper_test.go b/pkg/contexts/ocm/compdesc/helper_test.go index 897149f171..3ac8ffd3c2 100644 --- a/pkg/contexts/ocm/compdesc/helper_test.go +++ b/pkg/contexts/ocm/compdesc/helper_test.go @@ -1,17 +1,13 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc_test 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/contexts/ocm/compdesc" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("helper", func() { diff --git a/pkg/contexts/ocm/compdesc/init.go b/pkg/contexts/ocm/compdesc/init.go index 648f4bce3b..8bb239f404 100644 --- a/pkg/contexts/ocm/compdesc/init.go +++ b/pkg/contexts/ocm/compdesc/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/identity.go b/pkg/contexts/ocm/compdesc/meta/v1/identity.go index ebd78de5a2..efcd5e319c 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/identity.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/identity.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1 import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/labels.go b/pkg/contexts/ocm/compdesc/meta/v1/labels.go index 7e02175288..beba56a072 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/labels.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/labels.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1 import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/resourceref.go b/pkg/contexts/ocm/compdesc/meta/v1/resourceref.go index 4fd557a076..4630ecfab3 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/resourceref.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/resourceref.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1 // ResourceReference describes re resource identity relative to an (aggregation) diff --git a/pkg/contexts/ocm/compdesc/meta/v1/signature.go b/pkg/contexts/ocm/compdesc/meta/v1/signature.go index 1f53e55cd1..734a9ba381 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/signature.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/signature.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1 import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/stringmap.go b/pkg/contexts/ocm/compdesc/meta/v1/stringmap.go index c9a2a257c0..f48d6ab47a 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/stringmap.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/stringmap.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1 type StringMap map[string]string diff --git a/pkg/contexts/ocm/compdesc/meta/v1/suite_test.go b/pkg/contexts/ocm/compdesc/meta/v1/suite_test.go index dd8a4460ad..62255595a1 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/suite_test.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1_test import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/types.go b/pkg/contexts/ocm/compdesc/meta/v1/types.go index 863f1167a6..a6e5055da1 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/types.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/types.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1 import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/utils.go b/pkg/contexts/ocm/compdesc/meta/v1/utils.go index 871312b0c1..0451f17b4d 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/utils.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1 import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/zz_generated.deepcopy.go b/pkg/contexts/ocm/compdesc/meta/v1/zz_generated.deepcopy.go index bd3d75bd51..8947d54acb 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/zz_generated.deepcopy.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/zz_generated.deepcopy.go @@ -1,9 +1,5 @@ //go:build !ignore_autogenerated -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Code generated by controller-gen. DO NOT EDIT. package v1 diff --git a/pkg/contexts/ocm/compdesc/norm_test.go b/pkg/contexts/ocm/compdesc/norm_test.go index f5f8a8b0d2..8ec6924594 100644 --- a/pkg/contexts/ocm/compdesc/norm_test.go +++ b/pkg/contexts/ocm/compdesc/norm_test.go @@ -1,21 +1,16 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc_test import ( - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/normalizations" - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/none" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/normalizations" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" + . "github.com/open-component-model/ocm/pkg/testutils" ) var CD1 = ` diff --git a/pkg/contexts/ocm/compdesc/normalization.go b/pkg/contexts/ocm/compdesc/normalization.go index d559fe5f80..34bd6aacd2 100644 --- a/pkg/contexts/ocm/compdesc/normalization.go +++ b/pkg/contexts/ocm/compdesc/normalization.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/normalizations/init.go b/pkg/contexts/ocm/compdesc/normalizations/init.go index eb17684ac2..1cd917a1a1 100644 --- a/pkg/contexts/ocm/compdesc/normalizations/init.go +++ b/pkg/contexts/ocm/compdesc/normalizations/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package versions import ( diff --git a/pkg/contexts/ocm/compdesc/normalizations/jsonv1/norm.go b/pkg/contexts/ocm/compdesc/normalizations/jsonv1/norm.go index f79d4dd712..73c86518fe 100644 --- a/pkg/contexts/ocm/compdesc/normalizations/jsonv1/norm.go +++ b/pkg/contexts/ocm/compdesc/normalizations/jsonv1/norm.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package jsonv1 provides a normalization which uses schema specific // normalizations. // It creates the requested schema for the component descriptor diff --git a/pkg/contexts/ocm/compdesc/normalizations/jsonv2/norm.go b/pkg/contexts/ocm/compdesc/normalizations/jsonv2/norm.go index d450f4e10d..67f8809903 100644 --- a/pkg/contexts/ocm/compdesc/normalizations/jsonv2/norm.go +++ b/pkg/contexts/ocm/compdesc/normalizations/jsonv2/norm.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package jsonv2 provides a normalization which is completely based on the // abstract (internal) version of the component descriptor and is therefore // agnostic of the final serialization format. Signatures using this algorithm diff --git a/pkg/contexts/ocm/compdesc/schemes.go b/pkg/contexts/ocm/compdesc/schemes.go index 9ecebd43e1..c38f2a74ba 100644 --- a/pkg/contexts/ocm/compdesc/schemes.go +++ b/pkg/contexts/ocm/compdesc/schemes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/signing.go b/pkg/contexts/ocm/compdesc/signing.go index 6ce41e7b90..f21ccedc5a 100644 --- a/pkg/contexts/ocm/compdesc/signing.go +++ b/pkg/contexts/ocm/compdesc/signing.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/suite_test.go b/pkg/contexts/ocm/compdesc/suite_test.go index 65a7ccca0e..3dc2c54026 100644 --- a/pkg/contexts/ocm/compdesc/suite_test.go +++ b/pkg/contexts/ocm/compdesc/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc_test import ( diff --git a/pkg/contexts/ocm/compdesc/testutils/compnametest.go b/pkg/contexts/ocm/compdesc/testutils/compnametest.go index b0f4f5c34a..c0b350d9d8 100644 --- a/pkg/contexts/ocm/compdesc/testutils/compnametest.go +++ b/pkg/contexts/ocm/compdesc/testutils/compnametest.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testutils import ( @@ -10,7 +6,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/sirupsen/logrus" "github.com/open-component-model/ocm/pkg/runtime" diff --git a/pkg/contexts/ocm/compdesc/util.go b/pkg/contexts/ocm/compdesc/util.go index bfb68b0bb8..96421afb38 100644 --- a/pkg/contexts/ocm/compdesc/util.go +++ b/pkg/contexts/ocm/compdesc/util.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc type conversionError struct { diff --git a/pkg/contexts/ocm/compdesc/versions/init.go b/pkg/contexts/ocm/compdesc/versions/init.go index 039dbbe407..bc607a7972 100644 --- a/pkg/contexts/ocm/compdesc/versions/init.go +++ b/pkg/contexts/ocm/compdesc/versions/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package versions import ( diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/componentdescriptor.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/componentdescriptor.go index 50cc3e5ff8..1b8fcb9397 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/componentdescriptor.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/componentdescriptor.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v3alpha1 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/default.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/default.go index 6487824d61..9534ce1f93 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/default.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/default.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v3alpha1 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/jsonscheme/jsonscheme.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/jsonscheme/jsonscheme.go index 01268b2347..707e175734 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/jsonscheme/jsonscheme.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/jsonscheme/jsonscheme.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:generate go-bindata -nometadata -pkg jsonscheme ../../../../../../../../resources/component-descriptor-ocm-v3-schema.yaml //go:generate gofmt -s -w bindata.go diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/signing.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/signing.go index bb2b51be83..652621fb31 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/signing.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/signing.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v3alpha1 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation.go index e727264521..d0a3d81a23 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v3alpha1 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go index eaf67dec5a..55ed39a05d 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v3alpha1_test import ( @@ -10,13 +6,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" - "k8s.io/apimachinery/pkg/util/validation/field" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" meta "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/testutils" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/jsonscheme" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/version.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/version.go index 5da06f3ece..c56c80095d 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/version.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/version.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v3alpha1 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/zz_generated.deepcopy.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/zz_generated.deepcopy.go index 6a7a920bdb..7d13ee1ff9 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/zz_generated.deepcopy.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/zz_generated.deepcopy.go @@ -1,9 +1,5 @@ //go:build !ignore_autogenerated -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Code generated by controller-gen. DO NOT EDIT. package v3alpha1 diff --git a/pkg/contexts/ocm/compdesc/versions/v2/componentdescriptor.go b/pkg/contexts/ocm/compdesc/versions/v2/componentdescriptor.go index 7b00c325e6..e738959991 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/componentdescriptor.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/componentdescriptor.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v2 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/v2/default.go b/pkg/contexts/ocm/compdesc/versions/v2/default.go index a899a6b757..4c2c0e1135 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/default.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/default.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v2 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/v2/jsonscheme/jsonscheme.go b/pkg/contexts/ocm/compdesc/versions/v2/jsonscheme/jsonscheme.go index ef6a412b8a..e7130320ca 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/jsonscheme/jsonscheme.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/jsonscheme/jsonscheme.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:generate go-bindata -nometadata -pkg jsonscheme ../../../../../../../resources/component-descriptor-v2-schema.yaml //go:generate gofmt -s -w bindata.go diff --git a/pkg/contexts/ocm/compdesc/versions/v2/signing.go b/pkg/contexts/ocm/compdesc/versions/v2/signing.go index bc581ab007..f545a5808a 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/signing.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/signing.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v2 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/v2/validation.go b/pkg/contexts/ocm/compdesc/versions/v2/validation.go index 9a20e6aff9..f788b8ef21 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/validation.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/validation.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v2 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go b/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go index 84238a78cd..d4ee39a991 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v2_test import ( @@ -13,17 +9,16 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2" - . "github.com/open-component-model/ocm/pkg/testutils" - "k8s.io/apimachinery/pkg/util/validation/field" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" meta "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/testutils" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2/jsonscheme" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) func TestConfig(t *testing.T) { diff --git a/pkg/contexts/ocm/compdesc/versions/v2/version.go b/pkg/contexts/ocm/compdesc/versions/v2/version.go index e980f8171c..eb3ff15998 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/version.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/version.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v2 import ( diff --git a/pkg/contexts/ocm/compdesc/versions/v2/zz_generated.deepcopy.go b/pkg/contexts/ocm/compdesc/versions/v2/zz_generated.deepcopy.go index bd66eac0f6..da32ccf2e8 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/zz_generated.deepcopy.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/zz_generated.deepcopy.go @@ -1,9 +1,5 @@ //go:build !ignore_autogenerated -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Code generated by controller-gen. DO NOT EDIT. package v2 diff --git a/pkg/contexts/ocm/config/config_test.go b/pkg/contexts/ocm/config/config_test.go index 4223801bfa..f6ecfc444d 100644 --- a/pkg/contexts/ocm/config/config_test.go +++ b/pkg/contexts/ocm/config/config_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/ocm/config/suite_test.go b/pkg/contexts/ocm/config/suite_test.go index 444820e824..75de586aa0 100644 --- a/pkg/contexts/ocm/config/suite_test.go +++ b/pkg/contexts/ocm/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/ocm/config/type.go b/pkg/contexts/ocm/config/type.go index 6d377bd10b..4e69d689da 100644 --- a/pkg/contexts/ocm/config/type.go +++ b/pkg/contexts/ocm/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/ocm/consts/extra_identities.go b/pkg/contexts/ocm/consts/extra_identities.go index 870435f0f4..dbb35a4224 100644 --- a/pkg/contexts/ocm/consts/extra_identities.go +++ b/pkg/contexts/ocm/consts/extra_identities.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package consts import ( diff --git a/pkg/contexts/ocm/cpi/compose_test.go b/pkg/contexts/ocm/cpi/compose_test.go index 538c6d5c29..40140567c1 100644 --- a/pkg/contexts/ocm/cpi/compose_test.go +++ b/pkg/contexts/ocm/cpi/compose_test.go @@ -1,18 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -24,7 +16,10 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPONENT = "github.com/mandelsoft/ocm" diff --git a/pkg/contexts/ocm/cpi/dummy.go b/pkg/contexts/ocm/cpi/dummy.go index 1e8856b7ca..ef5422b6ba 100644 --- a/pkg/contexts/ocm/cpi/dummy.go +++ b/pkg/contexts/ocm/cpi/dummy.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/pkg/contexts/ocm/cpi/interface.go b/pkg/contexts/ocm/cpi/interface.go index c17344ad3a..16ea177f7f 100644 --- a/pkg/contexts/ocm/cpi/interface.go +++ b/pkg/contexts/ocm/cpi/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi // This is the Context Provider Interface for credential providers diff --git a/pkg/contexts/ocm/cpi/repotypes.go b/pkg/contexts/ocm/cpi/repotypes.go index cc51b8a3b5..8ac6d6f836 100644 --- a/pkg/contexts/ocm/cpi/repotypes.go +++ b/pkg/contexts/ocm/cpi/repotypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi // this file is similar to contexts oci. diff --git a/pkg/contexts/ocm/cpi/storagectx.go b/pkg/contexts/ocm/cpi/storagectx.go index e03c46f0d0..9a7e7e7b1b 100644 --- a/pkg/contexts/ocm/cpi/storagectx.go +++ b/pkg/contexts/ocm/cpi/storagectx.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi type DefaultStorageContext struct { diff --git a/pkg/contexts/ocm/cpi/suite_test.go b/pkg/contexts/ocm/cpi/suite_test.go index 7fc7504c2f..15a86283a4 100644 --- a/pkg/contexts/ocm/cpi/suite_test.go +++ b/pkg/contexts/ocm/cpi/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi_test import ( diff --git a/pkg/contexts/ocm/cpi/utils.go b/pkg/contexts/ocm/cpi/utils.go index 76efc5d380..62a71fcfdc 100644 --- a/pkg/contexts/ocm/cpi/utils.go +++ b/pkg/contexts/ocm/cpi/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cpi import ( diff --git a/pkg/contexts/ocm/digester/digesters/artifact/digester.go b/pkg/contexts/ocm/digester/digesters/artifact/digester.go index 0ad12fb71a..ca576bc622 100644 --- a/pkg/contexts/ocm/digester/digesters/artifact/digester.go +++ b/pkg/contexts/ocm/digester/digesters/artifact/digester.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package artifact import ( diff --git a/pkg/contexts/ocm/digester/digesters/init.go b/pkg/contexts/ocm/digester/digesters/init.go index 74ccdccdb6..bdd5ed2f47 100644 --- a/pkg/contexts/ocm/digester/digesters/init.go +++ b/pkg/contexts/ocm/digester/digesters/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package digesters import ( diff --git a/pkg/contexts/ocm/download/config/type.go b/pkg/contexts/ocm/download/config/type.go index 5c19e89870..eb75cdd5b8 100644 --- a/pkg/contexts/ocm/download/config/type.go +++ b/pkg/contexts/ocm/download/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/ocm/download/doc.go b/pkg/contexts/ocm/download/doc.go index 999c865bec..601947e86c 100644 --- a/pkg/contexts/ocm/download/doc.go +++ b/pkg/contexts/ocm/download/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package download provides an API for resource download handlers. // A download handler is used for downloading resoures. By default the native // blob as provided by the access method is the resukt of a download. diff --git a/pkg/contexts/ocm/download/handlers/blob/handler.go b/pkg/contexts/ocm/download/handlers/blob/handler.go index 20f54c1d26..bc71026618 100644 --- a/pkg/contexts/ocm/download/handlers/blob/handler.go +++ b/pkg/contexts/ocm/download/handlers/blob/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package blob import ( diff --git a/pkg/contexts/ocm/download/handlers/blueprint/handler.go b/pkg/contexts/ocm/download/handlers/blueprint/handler.go index f6ccb40d16..4ff1cd2bcd 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/handler.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package blueprint import ( diff --git a/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go b/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go index e6467272a1..81ee15d28e 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go @@ -1,18 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtree_test import ( "encoding/json" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/open-component-model/ocm/pkg/common" @@ -28,6 +22,7 @@ import ( env2 "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go b/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go index 8edcaaa0e3..678620b747 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go @@ -1,16 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtree_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -24,6 +18,7 @@ import ( env2 "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/download/handlers/dirtree/suite_test.go b/pkg/contexts/ocm/download/handlers/dirtree/suite_test.go index 9327c8368f..5e5322096b 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/suite_test.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtree_test import ( diff --git a/pkg/contexts/ocm/download/handlers/executable/handler.go b/pkg/contexts/ocm/download/handlers/executable/handler.go index 86d3cff70e..5cb93ab340 100644 --- a/pkg/contexts/ocm/download/handlers/executable/handler.go +++ b/pkg/contexts/ocm/download/handlers/executable/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package executable import ( diff --git a/pkg/contexts/ocm/download/handlers/helm/handler.go b/pkg/contexts/ocm/download/handlers/helm/handler.go index 15524f88ef..cc190dccb3 100644 --- a/pkg/contexts/ocm/download/handlers/helm/handler.go +++ b/pkg/contexts/ocm/download/handlers/helm/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package helm import ( diff --git a/pkg/contexts/ocm/download/handlers/init.go b/pkg/contexts/ocm/download/handlers/init.go index daaf062dbd..63eb3f4b79 100644 --- a/pkg/contexts/ocm/download/handlers/init.go +++ b/pkg/contexts/ocm/download/handlers/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package handlers import ( diff --git a/pkg/contexts/ocm/download/handlers/ocirepo/handler.go b/pkg/contexts/ocm/download/handlers/ocirepo/handler.go index c72ee5467d..db2f44e55f 100644 --- a/pkg/contexts/ocm/download/handlers/ocirepo/handler.go +++ b/pkg/contexts/ocm/download/handlers/ocirepo/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo import ( diff --git a/pkg/contexts/ocm/download/handlers/ocirepo/suite_test.go b/pkg/contexts/ocm/download/handlers/ocirepo/suite_test.go index ced21e0d31..c855a66282 100644 --- a/pkg/contexts/ocm/download/handlers/ocirepo/suite_test.go +++ b/pkg/contexts/ocm/download/handlers/ocirepo/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo_test import ( diff --git a/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go b/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go index 5f85cd7fee..7ed608fac2 100644 --- a/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go +++ b/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocirepo_test import ( @@ -9,9 +5,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -26,7 +19,9 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers/ocirepo" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const COMP = "github.com/compa" diff --git a/pkg/contexts/ocm/download/handlers/plugin/download_test.go b/pkg/contexts/ocm/download/handlers/plugin/download_test.go index 91fa22bf4a..5cd3f52e38 100644 --- a/pkg/contexts/ocm/download/handlers/plugin/download_test.go +++ b/pkg/contexts/ocm/download/handlers/plugin/download_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package plugin_test @@ -10,12 +6,9 @@ import ( "fmt" "os" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -29,8 +22,10 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/config" "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/out" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "test" diff --git a/pkg/contexts/ocm/download/handlers/plugin/handler.go b/pkg/contexts/ocm/download/handlers/plugin/handler.go index 8d5790020d..87295cfc77 100644 --- a/pkg/contexts/ocm/download/handlers/plugin/handler.go +++ b/pkg/contexts/ocm/download/handlers/plugin/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/download/handlers/plugin/registration.go b/pkg/contexts/ocm/download/handlers/plugin/registration.go index ea3609054a..7442d5570c 100644 --- a/pkg/contexts/ocm/download/handlers/plugin/registration.go +++ b/pkg/contexts/ocm/download/handlers/plugin/registration.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/download/handlers/plugin/suite_test.go b/pkg/contexts/ocm/download/handlers/plugin/suite_test.go index 8ac9d1af25..736f0d3f64 100644 --- a/pkg/contexts/ocm/download/handlers/plugin/suite_test.go +++ b/pkg/contexts/ocm/download/handlers/plugin/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( diff --git a/pkg/contexts/ocm/download/registry.go b/pkg/contexts/ocm/download/registry.go index db4faac43d..a1abd91233 100644 --- a/pkg/contexts/ocm/download/registry.go +++ b/pkg/contexts/ocm/download/registry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/suite_test.go b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/suite_test.go index ccc913db65..38b3a2f983 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/suite_test.go +++ b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericaccess_test import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/suite_test.go b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/suite_test.go index 75204ace34..60da404720 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/suite_test.go +++ b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtreeblob_test import ( diff --git a/pkg/contexts/ocm/elements/suite_test.go b/pkg/contexts/ocm/elements/suite_test.go index 79af1da3b6..0e2dc982f4 100644 --- a/pkg/contexts/ocm/elements/suite_test.go +++ b/pkg/contexts/ocm/elements/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package elements_test import ( diff --git a/pkg/contexts/ocm/extraid/extra_identities.go b/pkg/contexts/ocm/extraid/extra_identities.go index 315a03bc40..9a2216769a 100644 --- a/pkg/contexts/ocm/extraid/extra_identities.go +++ b/pkg/contexts/ocm/extraid/extra_identities.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package extraid import ( diff --git a/pkg/contexts/ocm/gc_test.go b/pkg/contexts/ocm/gc_test.go index ee61aa8234..d80a50b476 100644 --- a/pkg/contexts/ocm/gc_test.go +++ b/pkg/contexts/ocm/gc_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm_test import ( diff --git a/pkg/contexts/ocm/grammar/grammar.go b/pkg/contexts/ocm/grammar/grammar.go index d84ac83cf8..ead99aff9a 100644 --- a/pkg/contexts/ocm/grammar/grammar.go +++ b/pkg/contexts/ocm/grammar/grammar.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package grammar import ( - . "github.com/open-component-model/ocm/pkg/regex" - "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" + . "github.com/open-component-model/ocm/pkg/regex" ) const ( diff --git a/pkg/contexts/ocm/grammar/grammar_test.go b/pkg/contexts/ocm/grammar/grammar_test.go index 1878e60256..22e1cf4ef0 100644 --- a/pkg/contexts/ocm/grammar/grammar_test.go +++ b/pkg/contexts/ocm/grammar/grammar_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package grammar import ( diff --git a/pkg/contexts/ocm/init.go b/pkg/contexts/ocm/init.go index 68232fefad..8686caeab5 100644 --- a/pkg/contexts/ocm/init.go +++ b/pkg/contexts/ocm/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm import ( diff --git a/pkg/contexts/ocm/interface.go b/pkg/contexts/ocm/interface.go index 92b09eaf02..e9f32736bc 100644 --- a/pkg/contexts/ocm/interface.go +++ b/pkg/contexts/ocm/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm import ( diff --git a/pkg/contexts/ocm/internal/accessspecref.go b/pkg/contexts/ocm/internal/accessspecref.go index c61665b96d..87103a205c 100644 --- a/pkg/contexts/ocm/internal/accessspecref.go +++ b/pkg/contexts/ocm/internal/accessspecref.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/accesstypes.go b/pkg/contexts/ocm/internal/accesstypes.go index 3c8b91373e..e60286a60d 100644 --- a/pkg/contexts/ocm/internal/accesstypes.go +++ b/pkg/contexts/ocm/internal/accesstypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/blobhandler.go b/pkg/contexts/ocm/internal/blobhandler.go index d655f6743a..4023e79a82 100644 --- a/pkg/contexts/ocm/internal/blobhandler.go +++ b/pkg/contexts/ocm/internal/blobhandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/blobhandler_test.go b/pkg/contexts/ocm/internal/blobhandler_test.go index ed87a5ea61..06470cd418 100644 --- a/pkg/contexts/ocm/internal/blobhandler_test.go +++ b/pkg/contexts/ocm/internal/blobhandler_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( @@ -9,11 +5,11 @@ 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/contexts/ocm/internal" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/registrations" + . "github.com/open-component-model/ocm/pkg/testutils" ) const REPO = "repo" diff --git a/pkg/contexts/ocm/internal/builder.go b/pkg/contexts/ocm/internal/builder.go index 5ead7c036c..bfc0cbd52f 100644 --- a/pkg/contexts/ocm/internal/builder.go +++ b/pkg/contexts/ocm/internal/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/builder_test.go b/pkg/contexts/ocm/internal/builder_test.go index 98b133c2c2..ccbe34fac3 100644 --- a/pkg/contexts/ocm/internal/builder_test.go +++ b/pkg/contexts/ocm/internal/builder_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/ocm/internal/context.go b/pkg/contexts/ocm/internal/context.go index f09de688b8..83b5635b1a 100644 --- a/pkg/contexts/ocm/internal/context.go +++ b/pkg/contexts/ocm/internal/context.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal import ( @@ -9,8 +5,6 @@ import ( "reflect" "strings" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/modern-go/reflect2" "github.com/open-component-model/ocm/pkg/contexts/config" @@ -20,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/contexts/ocm/internal/digesthandler.go b/pkg/contexts/ocm/internal/digesthandler.go index 002dc30a89..c13f6943db 100644 --- a/pkg/contexts/ocm/internal/digesthandler.go +++ b/pkg/contexts/ocm/internal/digesthandler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/digesthandler_test.go b/pkg/contexts/ocm/internal/digesthandler_test.go index 9b0342202c..d3e02c3270 100644 --- a/pkg/contexts/ocm/internal/digesthandler_test.go +++ b/pkg/contexts/ocm/internal/digesthandler_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( @@ -9,13 +5,13 @@ 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/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/internal" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" + . "github.com/open-component-model/ocm/pkg/testutils" ) type DigestHandler struct { diff --git a/pkg/contexts/ocm/internal/errors.go b/pkg/contexts/ocm/internal/errors.go index 19e9eb3f9f..63efc0e7ba 100644 --- a/pkg/contexts/ocm/internal/errors.go +++ b/pkg/contexts/ocm/internal/errors.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/repository.go b/pkg/contexts/ocm/internal/repository.go index 8505db3983..9fa462dcea 100644 --- a/pkg/contexts/ocm/internal/repository.go +++ b/pkg/contexts/ocm/internal/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/repotypes.go b/pkg/contexts/ocm/internal/repotypes.go index 613893f6af..fa641d6171 100644 --- a/pkg/contexts/ocm/internal/repotypes.go +++ b/pkg/contexts/ocm/internal/repotypes.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/suite_test.go b/pkg/contexts/ocm/internal/suite_test.go index a899fda2d2..6a98e1cd34 100644 --- a/pkg/contexts/ocm/internal/suite_test.go +++ b/pkg/contexts/ocm/internal/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/ocm/internal/uniform.go b/pkg/contexts/ocm/internal/uniform.go index 91bcbbd3b2..511e9e2327 100644 --- a/pkg/contexts/ocm/internal/uniform.go +++ b/pkg/contexts/ocm/internal/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/internal/uniform_test.go b/pkg/contexts/ocm/internal/uniform_test.go index 7b9a23cd6a..5405070f75 100644 --- a/pkg/contexts/ocm/internal/uniform_test.go +++ b/pkg/contexts/ocm/internal/uniform_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package internal_test import ( diff --git a/pkg/contexts/ocm/labels/routingslip/suite_test.go b/pkg/contexts/ocm/labels/routingslip/suite_test.go index ba4042abc3..2e8959c74b 100644 --- a/pkg/contexts/ocm/labels/routingslip/suite_test.go +++ b/pkg/contexts/ocm/labels/routingslip/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package routingslip_test import ( diff --git a/pkg/contexts/ocm/labels/routingslip/types/comment/cli.go b/pkg/contexts/ocm/labels/routingslip/types/comment/cli.go index 375e89820a..257d9d0b82 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/comment/cli.go +++ b/pkg/contexts/ocm/labels/routingslip/types/comment/cli.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comment import ( diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go index 4fe6da4742..79eeb87583 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( @@ -9,9 +5,6 @@ import ( "github.com/mandelsoft/goutils/transformer" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" @@ -19,6 +12,9 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" + "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/doc.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/doc.go index b713535635..b0ba47c52d 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/doc.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package plugin is an adapter implementation that provides a generic handling of all ValueSets provided by // plugins. package plugin diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry.go index 41cb3bc3f8..830a56f341 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go index 3b2b183ea0..b42f15632b 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package plugin_test @@ -9,8 +5,6 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" @@ -21,6 +15,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("setup plugin cache", func() { diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/plugin.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/plugin.go index 966e1589c2..485cf5ba5f 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/plugin.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/plugin.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/suite_test.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/suite_test.go index d968f1e4fa..cc4eb53134 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/suite_test.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/type.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/type.go index 058906307d..135d85b907 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/type.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/plugin/cache/dircache.go b/pkg/contexts/ocm/plugin/cache/dircache.go index 6c0bb52532..06d270d84b 100644 --- a/pkg/contexts/ocm/plugin/cache/dircache.go +++ b/pkg/contexts/ocm/plugin/cache/dircache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cache import ( diff --git a/pkg/contexts/ocm/plugin/cache/doc.go b/pkg/contexts/ocm/plugin/cache/doc.go index 3204d3ebbc..4760d9b0e7 100644 --- a/pkg/contexts/ocm/plugin/cache/doc.go +++ b/pkg/contexts/ocm/plugin/cache/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package cache implements the plugin cache that contains all loaded plugins. It keeps the metadata for the various // discovered plugins and provides a Go abstraction to call the appropriate commands. package cache diff --git a/pkg/contexts/ocm/plugin/cache/exec.go b/pkg/contexts/ocm/plugin/cache/exec.go index 8b1e1c589d..9573cc4cab 100644 --- a/pkg/contexts/ocm/plugin/cache/exec.go +++ b/pkg/contexts/ocm/plugin/cache/exec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cache import ( diff --git a/pkg/contexts/ocm/plugin/cache/plugin.go b/pkg/contexts/ocm/plugin/cache/plugin.go index 8cac803d48..4547e91614 100644 --- a/pkg/contexts/ocm/plugin/cache/plugin.go +++ b/pkg/contexts/ocm/plugin/cache/plugin.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cache import ( diff --git a/pkg/contexts/ocm/plugin/cache/plugindir.go b/pkg/contexts/ocm/plugin/cache/plugindir.go index e3d341b47d..806aff197d 100644 --- a/pkg/contexts/ocm/plugin/cache/plugindir.go +++ b/pkg/contexts/ocm/plugin/cache/plugindir.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cache import ( diff --git a/pkg/contexts/ocm/plugin/cache/registry.go b/pkg/contexts/ocm/plugin/cache/registry.go index f3071705fe..fabde3799b 100644 --- a/pkg/contexts/ocm/plugin/cache/registry.go +++ b/pkg/contexts/ocm/plugin/cache/registry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cache import ( diff --git a/pkg/contexts/ocm/plugin/cache/updater.go b/pkg/contexts/ocm/plugin/cache/updater.go index 198970187a..9ff1ecc679 100644 --- a/pkg/contexts/ocm/plugin/cache/updater.go +++ b/pkg/contexts/ocm/plugin/cache/updater.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cache import ( diff --git a/pkg/contexts/ocm/plugin/common/common.go b/pkg/contexts/ocm/plugin/common/common.go index efbf1d3560..e5f89156a1 100644 --- a/pkg/contexts/ocm/plugin/common/common.go +++ b/pkg/contexts/ocm/plugin/common/common.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/contexts/ocm/plugin/common/describe.go b/pkg/contexts/ocm/plugin/common/describe.go index 429f42e26f..b99b9324d1 100644 --- a/pkg/contexts/ocm/plugin/common/describe.go +++ b/pkg/contexts/ocm/plugin/common/describe.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common import ( diff --git a/pkg/contexts/ocm/plugin/config/type.go b/pkg/contexts/ocm/plugin/config/type.go index fc577561c8..a5d9c12fba 100644 --- a/pkg/contexts/ocm/plugin/config/type.go +++ b/pkg/contexts/ocm/plugin/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/ocm/plugin/descriptor/descriptor.go b/pkg/contexts/ocm/plugin/descriptor/descriptor.go index f254539110..a0c9d01bcf 100644 --- a/pkg/contexts/ocm/plugin/descriptor/descriptor.go +++ b/pkg/contexts/ocm/plugin/descriptor/descriptor.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package descriptor import ( diff --git a/pkg/contexts/ocm/plugin/descriptor/doc.go b/pkg/contexts/ocm/plugin/descriptor/doc.go index fa70e8a992..dd942caa08 100644 --- a/pkg/contexts/ocm/plugin/descriptor/doc.go +++ b/pkg/contexts/ocm/plugin/descriptor/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package descriptor declares several structs that describe the information that formally describes the capabilities // provided by each plugin. The plugin implementation has to provide this information and the plugin user has to // evaluate this information. diff --git a/pkg/contexts/ocm/plugin/doc.go b/pkg/contexts/ocm/plugin/doc.go index 30682971c7..efc963c1c0 100644 --- a/pkg/contexts/ocm/plugin/doc.go +++ b/pkg/contexts/ocm/plugin/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package plugin maps a Go plugin interface to a technical command line interface. Thereby, it allows to embed plugins // and their provided functionality into the library. It is the basis for adapter implementations for accessmethods, // downloaders, uploaders, blob handlers, actions, value mergers and label merge specifications. diff --git a/pkg/contexts/ocm/plugin/interface.go b/pkg/contexts/ocm/plugin/interface.go index 0f46cdf259..2745249816 100644 --- a/pkg/contexts/ocm/plugin/interface.go +++ b/pkg/contexts/ocm/plugin/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/plugin/internal/access.go b/pkg/contexts/ocm/plugin/internal/access.go index b53cbae0e7..c78beaa81e 100644 --- a/pkg/contexts/ocm/plugin/internal/access.go +++ b/pkg/contexts/ocm/plugin/internal/access.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/plugin/internal/upload.go b/pkg/contexts/ocm/plugin/internal/upload.go index 780b5e94d8..09a0460d45 100644 --- a/pkg/contexts/ocm/plugin/internal/upload.go +++ b/pkg/contexts/ocm/plugin/internal/upload.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 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/ocm/plugin/plugin.go b/pkg/contexts/ocm/plugin/plugin.go index e184f8174a..198f8b981b 100644 --- a/pkg/contexts/ocm/plugin/plugin.go +++ b/pkg/contexts/ocm/plugin/plugin.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/plugin/plugin_test.go b/pkg/contexts/ocm/plugin/plugin_test.go index 66350bd124..2f40db5571 100644 --- a/pkg/contexts/ocm/plugin/plugin_test.go +++ b/pkg/contexts/ocm/plugin/plugin_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package plugin_test @@ -9,7 +5,6 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" common2 "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/credentials" @@ -26,6 +21,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("setup plugin cache", func() { diff --git a/pkg/contexts/ocm/plugin/plugins/plugins.go b/pkg/contexts/ocm/plugin/plugins/plugins.go index 5da523245d..7772c610d3 100644 --- a/pkg/contexts/ocm/plugin/plugins/plugins.go +++ b/pkg/contexts/ocm/plugin/plugins/plugins.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugins import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/cmd.go index e314f67d40..223c672231 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package accessmethod import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/compose/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/compose/cmd.go index f5abf52258..fa0ea68c07 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/compose/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/compose/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compose import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/get/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/get/cmd.go index ba7337e697..949b9880a0 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/get/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/get/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package get import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/identity/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/identity/cmd.go index 4611a19027..70818ea163 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/identity/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/identity/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package identity import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/validate/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/validate/cmd.go index 9647f93fec..f26839d804 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/validate/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/accessmethod/validate/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package validate import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/action/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/action/cmd.go index cd7f8d57dd..e87c563454 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/action/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/action/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package action import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/action/execute/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/action/execute/cmd.go index aded4b62d6..0e563be581 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/action/execute/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/action/execute/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package execute import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/app.go b/pkg/contexts/ocm/plugin/ppi/cmds/app.go index 2283b3c1c2..cc2ebf2d8e 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/app.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/app.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:generate go run -mod=mod ./doc ../../../../../../docs/pluginreference package cmds diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/common/const.go b/pkg/contexts/ocm/plugin/ppi/cmds/common/const.go index 931bfa442a..b4451a419c 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/common/const.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/common/const.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package common const ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/desc.go b/pkg/contexts/ocm/plugin/ppi/cmds/desc.go index 6abad97f9c..e1cde8a42d 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/desc.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/desc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package cmds func Description(name string) string { diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/describe/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/describe/cmd.go index 4447975d4e..a29e05958e 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/describe/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/describe/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package describe import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/doc/generate.go b/pkg/contexts/ocm/plugin/ppi/cmds/doc/generate.go index 8b586a45ed..153aceb7e9 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/doc/generate.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/doc/generate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/download/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/download/cmd.go index 54f4b50f1f..73f618e4ed 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/download/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/download/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package download import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/info/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/info/cmd.go index b07ea2db1a..b446b381ce 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/info/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/info/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package info import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/cmd.go index b7ad7c02e7..54651305f2 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package mergehandler import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/execute/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/execute/cmd.go index cbfc422ce5..0730cc80a0 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/execute/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/mergehandler/execute/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package execute import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/topics/descriptor/topic.go b/pkg/contexts/ocm/plugin/ppi/cmds/topics/descriptor/topic.go index 23cd9be25b..0f92d562d2 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/topics/descriptor/topic.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/topics/descriptor/topic.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package descriptor import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/upload/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/upload/cmd.go index a7a7b8797e..d6a9e5cd33 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/upload/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/upload/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package upload import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/upload/put/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/upload/put/cmd.go index 01d37fcf64..fe1630a65e 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/upload/put/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/upload/put/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package put import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/upload/validate/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/upload/validate/cmd.go index 3ca2a216b7..fcb8367598 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/upload/validate/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/upload/validate/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package validate import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/valueset/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/valueset/cmd.go index 133c52d471..2652308e7f 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/valueset/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/valueset/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package valueset import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/valueset/compose/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/valueset/compose/cmd.go index e61c3ccf96..9e80623ba6 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/valueset/compose/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/valueset/compose/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compose import ( diff --git a/pkg/contexts/ocm/plugin/ppi/cmds/valueset/validate/cmd.go b/pkg/contexts/ocm/plugin/ppi/cmds/valueset/validate/cmd.go index 4f822de256..4be1f9eccf 100644 --- a/pkg/contexts/ocm/plugin/ppi/cmds/valueset/validate/cmd.go +++ b/pkg/contexts/ocm/plugin/ppi/cmds/valueset/validate/cmd.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package validate import ( diff --git a/pkg/contexts/ocm/plugin/ppi/doc.go b/pkg/contexts/ocm/plugin/ppi/doc.go index b79d66be66..e0f9f8051b 100644 --- a/pkg/contexts/ocm/plugin/ppi/doc.go +++ b/pkg/contexts/ocm/plugin/ppi/doc.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // Package ppi provides the plugin programming interface. // The ppi can be used by plugin developers as support. It reduces the command line interface to a corresponding Go // interface. In other words, if the developer implements this Go plugin interface, the ppi automatically provides a diff --git a/pkg/contexts/ocm/plugin/ppi/interface.go b/pkg/contexts/ocm/plugin/ppi/interface.go index e919828821..5946a078b9 100644 --- a/pkg/contexts/ocm/plugin/ppi/interface.go +++ b/pkg/contexts/ocm/plugin/ppi/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ppi import ( diff --git a/pkg/contexts/ocm/plugin/ppi/options.go b/pkg/contexts/ocm/plugin/ppi/options.go index 5f9057806a..7b7dbe0f53 100644 --- a/pkg/contexts/ocm/plugin/ppi/options.go +++ b/pkg/contexts/ocm/plugin/ppi/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ppi import ( diff --git a/pkg/contexts/ocm/plugin/ppi/plugin.go b/pkg/contexts/ocm/plugin/ppi/plugin.go index 31930d3852..11d9ac60b2 100644 --- a/pkg/contexts/ocm/plugin/ppi/plugin.go +++ b/pkg/contexts/ocm/plugin/ppi/plugin.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ppi import ( diff --git a/pkg/contexts/ocm/plugin/ppi/utils.go b/pkg/contexts/ocm/plugin/ppi/utils.go index afd15577c4..1eb8f9ab57 100644 --- a/pkg/contexts/ocm/plugin/ppi/utils.go +++ b/pkg/contexts/ocm/plugin/ppi/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ppi import ( diff --git a/pkg/contexts/ocm/plugin/suite_test.go b/pkg/contexts/ocm/plugin/suite_test.go index 357349401b..53c8f2894f 100644 --- a/pkg/contexts/ocm/plugin/suite_test.go +++ b/pkg/contexts/ocm/plugin/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( diff --git a/pkg/contexts/ocm/plugin/utils.go b/pkg/contexts/ocm/plugin/utils.go index 0a3745410d..4573a2ad80 100644 --- a/pkg/contexts/ocm/plugin/utils.go +++ b/pkg/contexts/ocm/plugin/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/ref.go b/pkg/contexts/ocm/ref.go index c630a621a0..5af1d6ffd2 100644 --- a/pkg/contexts/ocm/ref.go +++ b/pkg/contexts/ocm/ref.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm import ( diff --git a/pkg/contexts/ocm/ref_test.go b/pkg/contexts/ocm/ref_test.go index 3501bc4905..ad0899651a 100644 --- a/pkg/contexts/ocm/ref_test.go +++ b/pkg/contexts/ocm/ref_test.go @@ -1,16 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm_test 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/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/contexts/ocm/registration/registration.go b/pkg/contexts/ocm/registration/registration.go index e8fd3899a6..cf2281eac0 100644 --- a/pkg/contexts/ocm/registration/registration.go +++ b/pkg/contexts/ocm/registration/registration.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package registration import ( diff --git a/pkg/contexts/ocm/repo_test.go b/pkg/contexts/ocm/repo_test.go index cfeb9fb3bc..572567eea5 100644 --- a/pkg/contexts/ocm/repo_test.go +++ b/pkg/contexts/ocm/repo_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm_test import ( diff --git a/pkg/contexts/ocm/repositories/comparch/accessmethod_localfs.go b/pkg/contexts/ocm/repositories/comparch/accessmethod_localfs.go index db622c078d..57eca72ee0 100644 --- a/pkg/contexts/ocm/repositories/comparch/accessmethod_localfs.go +++ b/pkg/contexts/ocm/repositories/comparch/accessmethod_localfs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go b/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go index 6245483950..a52e071a3d 100644 --- a/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go +++ b/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch_test import ( @@ -11,7 +7,6 @@ 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/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -22,6 +17,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var DefaultContext = ocm.New() diff --git a/pkg/contexts/ocm/repositories/comparch/comparch_test.go b/pkg/contexts/ocm/repositories/comparch/comparch_test.go index f0b004b303..3e2f24aa9d 100644 --- a/pkg/contexts/ocm/repositories/comparch/comparch_test.go +++ b/pkg/contexts/ocm/repositories/comparch/comparch_test.go @@ -1,21 +1,14 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch_test import ( "encoding/json" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -26,11 +19,13 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/digester/digesters/blob" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/repositories/comparch/componentarchive.go b/pkg/contexts/ocm/repositories/comparch/componentarchive.go index 42eaa96fa0..6a52a29a7f 100644 --- a/pkg/contexts/ocm/repositories/comparch/componentarchive.go +++ b/pkg/contexts/ocm/repositories/comparch/componentarchive.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/comparch/format.go b/pkg/contexts/ocm/repositories/comparch/format.go index f4e7bb653b..08bbbc1d0b 100644 --- a/pkg/contexts/ocm/repositories/comparch/format.go +++ b/pkg/contexts/ocm/repositories/comparch/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/comparch/repository.go b/pkg/contexts/ocm/repositories/comparch/repository.go index c99c9c0d98..310719f802 100644 --- a/pkg/contexts/ocm/repositories/comparch/repository.go +++ b/pkg/contexts/ocm/repositories/comparch/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/comparch/state.go b/pkg/contexts/ocm/repositories/comparch/state.go index f6dbfd68b8..edbdfeaf00 100644 --- a/pkg/contexts/ocm/repositories/comparch/state.go +++ b/pkg/contexts/ocm/repositories/comparch/state.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/comparch/suite_test.go b/pkg/contexts/ocm/repositories/comparch/suite_test.go index e2a50c30b3..eff0bd4c13 100644 --- a/pkg/contexts/ocm/repositories/comparch/suite_test.go +++ b/pkg/contexts/ocm/repositories/comparch/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/comparch/type.go b/pkg/contexts/ocm/repositories/comparch/type.go index 170c5e33cd..d8d3e26343 100644 --- a/pkg/contexts/ocm/repositories/comparch/type.go +++ b/pkg/contexts/ocm/repositories/comparch/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/comparch/uniform.go b/pkg/contexts/ocm/repositories/comparch/uniform.go index 81b679ea43..015277ef5b 100644 --- a/pkg/contexts/ocm/repositories/comparch/uniform.go +++ b/pkg/contexts/ocm/repositories/comparch/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package comparch import ( diff --git a/pkg/contexts/ocm/repositories/composition/cache.go b/pkg/contexts/ocm/repositories/composition/cache.go index 8f807647cb..90d63d3442 100644 --- a/pkg/contexts/ocm/repositories/composition/cache.go +++ b/pkg/contexts/ocm/repositories/composition/cache.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package composition import ( diff --git a/pkg/contexts/ocm/repositories/composition/close_test.go b/pkg/contexts/ocm/repositories/composition/close_test.go index 6be999d23e..91ead25087 100644 --- a/pkg/contexts/ocm/repositories/composition/close_test.go +++ b/pkg/contexts/ocm/repositories/composition/close_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package composition_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/relativeociref" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" @@ -21,6 +16,7 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" + . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/repositories/composition/gc_test.go b/pkg/contexts/ocm/repositories/composition/gc_test.go index d7bc0c6f1d..51f2367e9f 100644 --- a/pkg/contexts/ocm/repositories/composition/gc_test.go +++ b/pkg/contexts/ocm/repositories/composition/gc_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package composition_test import ( @@ -10,12 +6,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/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/ocm" me "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition" "github.com/open-component-model/ocm/pkg/refmgmt" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("repository", func() { diff --git a/pkg/contexts/ocm/repositories/composition/repository_test.go b/pkg/contexts/ocm/repositories/composition/repository_test.go index cefbf5b1d0..7ff7eaa25d 100644 --- a/pkg/contexts/ocm/repositories/composition/repository_test.go +++ b/pkg/contexts/ocm/repositories/composition/repository_test.go @@ -1,20 +1,14 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package composition_test import ( + "github.com/mandelsoft/vfs/pkg/memoryfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/open-component-model/ocm/pkg/common/accessio" - "github.com/open-component-model/ocm/pkg/common/accessobj" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/blobaccess/bpi" + "github.com/open-component-model/ocm/pkg/common/accessio" + "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" me "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition" @@ -25,6 +19,7 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" + . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPONENT = "acme.org/testcomp" diff --git a/pkg/contexts/ocm/repositories/composition/suite_test.go b/pkg/contexts/ocm/repositories/composition/suite_test.go index 7ec0cf7774..64a032a7df 100644 --- a/pkg/contexts/ocm/repositories/composition/suite_test.go +++ b/pkg/contexts/ocm/repositories/composition/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package composition_test import ( diff --git a/pkg/contexts/ocm/repositories/composition/version_test.go b/pkg/contexts/ocm/repositories/composition/version_test.go index 30fe2aff0a..8b31436a66 100644 --- a/pkg/contexts/ocm/repositories/composition/version_test.go +++ b/pkg/contexts/ocm/repositories/composition/version_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package composition_test 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/blobaccess" "github.com/open-component-model/ocm/pkg/blobaccess/bpi" @@ -19,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("version", func() { diff --git a/pkg/contexts/ocm/repositories/ctf/format.go b/pkg/contexts/ocm/repositories/ctf/format.go index f2bc385214..74bcbca964 100644 --- a/pkg/contexts/ocm/repositories/ctf/format.go +++ b/pkg/contexts/ocm/repositories/ctf/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/ocm/repositories/ctf/repo_test.go b/pkg/contexts/ocm/repositories/ctf/repo_test.go index c4d3e57734..d3925a3433 100644 --- a/pkg/contexts/ocm/repositories/ctf/repo_test.go +++ b/pkg/contexts/ocm/repositories/ctf/repo_test.go @@ -1,25 +1,15 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf_test import ( "bytes" "github.com/mandelsoft/logging" + "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/finalizer" - ocmlog "github.com/open-component-model/ocm/pkg/logging" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/tonglil/buflogr" - "github.com/mandelsoft/vfs/pkg/memoryfs" - "github.com/mandelsoft/vfs/pkg/vfs" - "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -27,9 +17,14 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/finalizer" + ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" + . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPONENT = "github.com/mandelsoft/ocm" diff --git a/pkg/contexts/ocm/repositories/ctf/suite_test.go b/pkg/contexts/ocm/repositories/ctf/suite_test.go index c34c79baca..b88769b16f 100644 --- a/pkg/contexts/ocm/repositories/ctf/suite_test.go +++ b/pkg/contexts/ocm/repositories/ctf/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf_test import ( diff --git a/pkg/contexts/ocm/repositories/ctf/type.go b/pkg/contexts/ocm/repositories/ctf/type.go index d9ee6cbdd8..1da842ef6e 100644 --- a/pkg/contexts/ocm/repositories/ctf/type.go +++ b/pkg/contexts/ocm/repositories/ctf/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/ocm/repositories/ctf/uniform.go b/pkg/contexts/ocm/repositories/ctf/uniform.go index 7183206f47..dec215d464 100644 --- a/pkg/contexts/ocm/repositories/ctf/uniform.go +++ b/pkg/contexts/ocm/repositories/ctf/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localblob.go b/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localblob.go index 22cb85f0ad..97ee92fc36 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localblob.go +++ b/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localblob.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localoclblob.go b/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localoclblob.go index 84ef006905..15a57690ad 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localoclblob.go +++ b/pkg/contexts/ocm/repositories/genericocireg/accessmethod_localoclblob.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/componentmapping/constants.go b/pkg/contexts/ocm/repositories/genericocireg/componentmapping/constants.go index 5d2d83cfad..31d2374625 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/componentmapping/constants.go +++ b/pkg/contexts/ocm/repositories/genericocireg/componentmapping/constants.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package componentmapping import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/cred_test.go b/pkg/contexts/ocm/repositories/genericocireg/cred_test.go index e978cc545f..f4dea6fc4b 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/cred_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/cred_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg_test 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" @@ -16,6 +11,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("consumer id handling", func() { diff --git a/pkg/contexts/ocm/repositories/genericocireg/fallback_test.go b/pkg/contexts/ocm/repositories/genericocireg/fallback_test.go index 737ee10a33..a6e68a7597 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/fallback_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/fallback_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg_test import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/info.go b/pkg/contexts/ocm/repositories/genericocireg/info.go index c4cf5f5f98..b642014705 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/info.go +++ b/pkg/contexts/ocm/repositories/genericocireg/info.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/repository.go b/pkg/contexts/ocm/repositories/genericocireg/repository.go index 37c46ae8a7..59b68984d9 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/repository.go +++ b/pkg/contexts/ocm/repositories/genericocireg/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/spec_test.go b/pkg/contexts/ocm/repositories/genericocireg/spec_test.go index 5d33a7e4c4..88e098d6d7 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/spec_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/spec_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg_test import ( @@ -10,13 +6,13 @@ 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/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" ocmreg "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var DefaultOCIContext = oci.New() diff --git a/pkg/contexts/ocm/repositories/genericocireg/state.go b/pkg/contexts/ocm/repositories/genericocireg/state.go index 884ce3aba4..4d3b24e01e 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/state.go +++ b/pkg/contexts/ocm/repositories/genericocireg/state.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/suite_test.go b/pkg/contexts/ocm/repositories/genericocireg/suite_test.go index e0b1e9b5aa..3daa4931bc 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/suite_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg_test import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/type.go b/pkg/contexts/ocm/repositories/genericocireg/type.go index 461fb55692..dff4c1db03 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/type.go +++ b/pkg/contexts/ocm/repositories/genericocireg/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/uniform.go b/pkg/contexts/ocm/repositories/genericocireg/uniform.go index f6793ededb..72aa019e72 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/uniform.go +++ b/pkg/contexts/ocm/repositories/genericocireg/uniform.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/init.go b/pkg/contexts/ocm/repositories/init.go index 6b931c1307..f813c1ee7d 100644 --- a/pkg/contexts/ocm/repositories/init.go +++ b/pkg/contexts/ocm/repositories/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package repositories import ( diff --git a/pkg/contexts/ocm/repositories/ocireg/suite_test.go b/pkg/contexts/ocm/repositories/ocireg/suite_test.go index bc5da284fd..95a1566969 100644 --- a/pkg/contexts/ocm/repositories/ocireg/suite_test.go +++ b/pkg/contexts/ocm/repositories/ocireg/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg_test import ( diff --git a/pkg/contexts/ocm/repositories/ocireg/type.go b/pkg/contexts/ocm/repositories/ocireg/type.go index b8e5bbf839..7a24c59eae 100644 --- a/pkg/contexts/ocm/repositories/ocireg/type.go +++ b/pkg/contexts/ocm/repositories/ocireg/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg import ( diff --git a/pkg/contexts/ocm/repositories/virtual/accessmethod_localblob.go b/pkg/contexts/ocm/repositories/virtual/accessmethod_localblob.go index a3061410ab..4c166fd0c3 100644 --- a/pkg/contexts/ocm/repositories/virtual/accessmethod_localblob.go +++ b/pkg/contexts/ocm/repositories/virtual/accessmethod_localblob.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package virtual import ( diff --git a/pkg/contexts/ocm/repositories/virtual/component.go b/pkg/contexts/ocm/repositories/virtual/component.go index b09ad99ee2..25049af090 100644 --- a/pkg/contexts/ocm/repositories/virtual/component.go +++ b/pkg/contexts/ocm/repositories/virtual/component.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package virtual import ( diff --git a/pkg/contexts/ocm/repositories/virtual/componentversion.go b/pkg/contexts/ocm/repositories/virtual/componentversion.go index 745e13c098..6c12a0672f 100644 --- a/pkg/contexts/ocm/repositories/virtual/componentversion.go +++ b/pkg/contexts/ocm/repositories/virtual/componentversion.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package virtual import ( diff --git a/pkg/contexts/ocm/repositories/virtual/repository.go b/pkg/contexts/ocm/repositories/virtual/repository.go index dafbe5457d..980abf9d0e 100644 --- a/pkg/contexts/ocm/repositories/virtual/repository.go +++ b/pkg/contexts/ocm/repositories/virtual/repository.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package virtual import ( diff --git a/pkg/contexts/ocm/repositories/virtual/suite_test.go b/pkg/contexts/ocm/repositories/virtual/suite_test.go index 67a2fd712f..d1241c2c4c 100644 --- a/pkg/contexts/ocm/repositories/virtual/suite_test.go +++ b/pkg/contexts/ocm/repositories/virtual/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package virtual_test import ( diff --git a/pkg/contexts/ocm/resolver_test.go b/pkg/contexts/ocm/resolver_test.go index a8538ef9f0..4d7edaf351 100644 --- a/pkg/contexts/ocm/resolver_test.go +++ b/pkg/contexts/ocm/resolver_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm_test import ( @@ -10,8 +6,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -19,6 +13,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/internal" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "ctf" diff --git a/pkg/contexts/ocm/resourcetypes/const.go b/pkg/contexts/ocm/resourcetypes/const.go index 287d3a3c5e..4c1be2b37b 100644 --- a/pkg/contexts/ocm/resourcetypes/const.go +++ b/pkg/contexts/ocm/resourcetypes/const.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package resourcetypes const ( diff --git a/pkg/contexts/ocm/session.go b/pkg/contexts/ocm/session.go index b257b52953..5557afbfe2 100644 --- a/pkg/contexts/ocm/session.go +++ b/pkg/contexts/ocm/session.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm import ( diff --git a/pkg/contexts/ocm/session_test.go b/pkg/contexts/ocm/session_test.go index 9deeb7ac23..159b78df22 100644 --- a/pkg/contexts/ocm/session_test.go +++ b/pkg/contexts/ocm/session_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm_test import ( @@ -9,9 +5,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" ocmreg "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/contexts/ocm/signing/handle.go b/pkg/contexts/ocm/signing/handle.go index fd1dabc3b6..9513b8eb3a 100644 --- a/pkg/contexts/ocm/signing/handle.go +++ b/pkg/contexts/ocm/signing/handle.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/contexts/ocm/signing/options.go b/pkg/contexts/ocm/signing/options.go index fd44ac0204..d286fc0016 100644 --- a/pkg/contexts/ocm/signing/options.go +++ b/pkg/contexts/ocm/signing/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/contexts/ocm/signing/options_test.go b/pkg/contexts/ocm/signing/options_test.go index dadcc1949d..8ddeba8593 100644 --- a/pkg/contexts/ocm/signing/options_test.go +++ b/pkg/contexts/ocm/signing/options_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( @@ -11,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" "github.com/open-component-model/ocm/pkg/contexts/ocm" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" diff --git a/pkg/contexts/ocm/signing/signing_test.go b/pkg/contexts/ocm/signing/signing_test.go index aeb5ea9bec..9af54ea88a 100644 --- a/pkg/contexts/ocm/signing/signing_test.go +++ b/pkg/contexts/ocm/signing/signing_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( @@ -11,18 +7,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/none" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -33,13 +24,18 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" tenv "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" "github.com/open-component-model/ocm/pkg/signing/hasher/sha512" "github.com/open-component-model/ocm/pkg/signing/signutils" + . "github.com/open-component-model/ocm/pkg/testutils" ) var DefaultContext = ocm.New() diff --git a/pkg/contexts/ocm/signing/suite_test.go b/pkg/contexts/ocm/signing/suite_test.go index 75497bfaa1..5007a0ab61 100644 --- a/pkg/contexts/ocm/signing/suite_test.go +++ b/pkg/contexts/ocm/signing/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( diff --git a/pkg/contexts/ocm/suite_test.go b/pkg/contexts/ocm/suite_test.go index 188aaa92e5..cdcf94940d 100644 --- a/pkg/contexts/ocm/suite_test.go +++ b/pkg/contexts/ocm/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm_test import ( diff --git a/pkg/contexts/ocm/transfer/logging.go b/pkg/contexts/ocm/transfer/logging.go index 0b88e1795f..aec3cdcae7 100644 --- a/pkg/contexts/ocm/transfer/logging.go +++ b/pkg/contexts/ocm/transfer/logging.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/pkg/contexts/ocm/transfer/suite_test.go b/pkg/contexts/ocm/transfer/suite_test.go index f91d893bd0..66d4341a3a 100644 --- a/pkg/contexts/ocm/transfer/suite_test.go +++ b/pkg/contexts/ocm/transfer/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( diff --git a/pkg/contexts/ocm/transfer/transfer.go b/pkg/contexts/ocm/transfer/transfer.go index b14884902f..fd76f7ef1a 100644 --- a/pkg/contexts/ocm/transfer/transfer.go +++ b/pkg/contexts/ocm/transfer/transfer.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/config/config.go b/pkg/contexts/ocm/transfer/transferhandler/config/config.go index 41b3dfa64f..2a45ba832b 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/config/config.go +++ b/pkg/contexts/ocm/transfer/transferhandler/config/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package scriptoption import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/spiff/handler.go b/pkg/contexts/ocm/transfer/transferhandler/spiff/handler.go index 34b15c2430..0297c09408 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/spiff/handler.go +++ b/pkg/contexts/ocm/transfer/transferhandler/spiff/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go b/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go index 729547f236..2a256183be 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go +++ b/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff_test import ( @@ -10,14 +6,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" @@ -26,6 +21,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/spiff" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/ocm/transfer/transferhandler/spiff/options.go b/pkg/contexts/ocm/transfer/transferhandler/spiff/options.go index 990b5c5a1e..db74ca9419 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/spiff/options.go +++ b/pkg/contexts/ocm/transfer/transferhandler/spiff/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/spiff/suite_test.go b/pkg/contexts/ocm/transfer/transferhandler/spiff/suite_test.go index 932c02c42a..d883148df5 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/spiff/suite_test.go +++ b/pkg/contexts/ocm/transfer/transferhandler/spiff/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff_test import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go b/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go index ce0e18e2e9..36d33566fa 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go +++ b/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package standard import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go b/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go index 804a5f0ec3..78e53d49b4 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go +++ b/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package standard_test import ( @@ -10,10 +6,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common" @@ -22,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -32,13 +25,16 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" ocmsign "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/options.go b/pkg/contexts/ocm/transfer/transferhandler/standard/options.go index 5b8d1a734c..5ee687e658 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/standard/options.go +++ b/pkg/contexts/ocm/transfer/transferhandler/standard/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package standard import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/suite_test.go b/pkg/contexts/ocm/transfer/transferhandler/standard/suite_test.go index 71af742590..1ddd4aa69d 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/standard/suite_test.go +++ b/pkg/contexts/ocm/transfer/transferhandler/standard/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package standard_test import ( diff --git a/pkg/contexts/ocm/transfer/transferrepo.go b/pkg/contexts/ocm/transfer/transferrepo.go index 4161d0c930..f60bb1f69a 100644 --- a/pkg/contexts/ocm/transfer/transferrepo.go +++ b/pkg/contexts/ocm/transfer/transferrepo.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer import ( diff --git a/pkg/contexts/ocm/usage.go b/pkg/contexts/ocm/usage.go index 7ed4e0e10b..09f8371dfb 100644 --- a/pkg/contexts/ocm/usage.go +++ b/pkg/contexts/ocm/usage.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm func AccessUsage(scheme AccessTypeScheme, cli bool) string { diff --git a/pkg/contexts/ocm/utils.go b/pkg/contexts/ocm/utils.go index 1518dbab84..2d65083b03 100644 --- a/pkg/contexts/ocm/utils.go +++ b/pkg/contexts/ocm/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocm import ( diff --git a/pkg/contexts/ocm/utils/check/check_test.go b/pkg/contexts/ocm/utils/check/check_test.go index 259adf82f2..b46ba3842e 100644 --- a/pkg/contexts/ocm/utils/check/check_test.go +++ b/pkg/contexts/ocm/utils/check/check_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package check_test import ( @@ -9,8 +5,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -20,6 +14,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/check" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/pkg/contexts/ocm/utils/check/suite_test.go b/pkg/contexts/ocm/utils/check/suite_test.go index 2ecf25801a..7c8ed3056a 100644 --- a/pkg/contexts/ocm/utils/check/suite_test.go +++ b/pkg/contexts/ocm/utils/check/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package check_test import ( diff --git a/pkg/contexts/ocm/utils/defaultconfigregistry/configure.go b/pkg/contexts/ocm/utils/defaultconfigregistry/configure.go index 67f51b24c7..cce4170c7d 100644 --- a/pkg/contexts/ocm/utils/defaultconfigregistry/configure.go +++ b/pkg/contexts/ocm/utils/defaultconfigregistry/configure.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package defaultconfigregistry import ( diff --git a/pkg/contexts/ocm/utils/localize/config.go b/pkg/contexts/ocm/utils/localize/config.go index 6c41c9a198..8ea8d9dbc0 100644 --- a/pkg/contexts/ocm/utils/localize/config.go +++ b/pkg/contexts/ocm/utils/localize/config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize import ( diff --git a/pkg/contexts/ocm/utils/localize/config_test.go b/pkg/contexts/ocm/utils/localize/config_test.go index c09d0ad96d..de1701d439 100644 --- a/pkg/contexts/ocm/utils/localize/config_test.go +++ b/pkg/contexts/ocm/utils/localize/config_test.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize_test import ( + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/vfs" - "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/pkg/contexts/ocm/utils/localize/format.go b/pkg/contexts/ocm/utils/localize/format.go index 4fb91e327e..0fa56defbf 100644 --- a/pkg/contexts/ocm/utils/localize/format.go +++ b/pkg/contexts/ocm/utils/localize/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize import ( diff --git a/pkg/contexts/ocm/utils/localize/instantiate.go b/pkg/contexts/ocm/utils/localize/instantiate.go index 8aca5ffeda..35d66361f9 100644 --- a/pkg/contexts/ocm/utils/localize/instantiate.go +++ b/pkg/contexts/ocm/utils/localize/instantiate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize import ( diff --git a/pkg/contexts/ocm/utils/localize/instantiate_test.go b/pkg/contexts/ocm/utils/localize/instantiate_test.go index 09d86e0c27..7ea39c1de5 100644 --- a/pkg/contexts/ocm/utils/localize/instantiate_test.go +++ b/pkg/contexts/ocm/utils/localize/instantiate_test.go @@ -1,19 +1,14 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize_test import ( "bytes" "compress/gzip" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/utils/localize/localize.go b/pkg/contexts/ocm/utils/localize/localize.go index df68df9620..d4f7e7ac63 100644 --- a/pkg/contexts/ocm/utils/localize/localize.go +++ b/pkg/contexts/ocm/utils/localize/localize.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize import ( diff --git a/pkg/contexts/ocm/utils/localize/localize_test.go b/pkg/contexts/ocm/utils/localize/localize_test.go index 17bf44ff6c..4b9dd784ac 100644 --- a/pkg/contexts/ocm/utils/localize/localize_test.go +++ b/pkg/contexts/ocm/utils/localize/localize_test.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize_test import ( + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/vfs" - "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/pkg/contexts/ocm/utils/localize/subst.go b/pkg/contexts/ocm/utils/localize/subst.go index 10ddb51078..36ec20f681 100644 --- a/pkg/contexts/ocm/utils/localize/subst.go +++ b/pkg/contexts/ocm/utils/localize/subst.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize import ( diff --git a/pkg/contexts/ocm/utils/localize/subst_test.go b/pkg/contexts/ocm/utils/localize/subst_test.go index 292e3c491c..185593581f 100644 --- a/pkg/contexts/ocm/utils/localize/subst_test.go +++ b/pkg/contexts/ocm/utils/localize/subst_test.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/localize" env2 "github.com/open-component-model/ocm/pkg/env" diff --git a/pkg/contexts/ocm/utils/localize/suite_test.go b/pkg/contexts/ocm/utils/localize/suite_test.go index 320690e345..48145acc88 100644 --- a/pkg/contexts/ocm/utils/localize/suite_test.go +++ b/pkg/contexts/ocm/utils/localize/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize_test import ( diff --git a/pkg/contexts/ocm/utils/localize/target_test.go b/pkg/contexts/ocm/utils/localize/target_test.go index b22fb86166..3ed73977c0 100644 --- a/pkg/contexts/ocm/utils/localize/target_test.go +++ b/pkg/contexts/ocm/utils/localize/target_test.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize_test import ( + "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/vfs" - "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/pkg/contexts/ocm/utils/localize/utils_test.go b/pkg/contexts/ocm/utils/localize/utils_test.go index 939e90bf47..e003456407 100644 --- a/pkg/contexts/ocm/utils/localize/utils_test.go +++ b/pkg/contexts/ocm/utils/localize/utils_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package localize_test import ( - . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/localize" "github.com/open-component-model/ocm/pkg/runtime" diff --git a/pkg/contexts/ocm/utils/registry/registry.go b/pkg/contexts/ocm/utils/registry/registry.go index e5fbdd5822..b61741e1f5 100644 --- a/pkg/contexts/ocm/utils/registry/registry.go +++ b/pkg/contexts/ocm/utils/registry/registry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package registry import ( diff --git a/pkg/contexts/ocm/utils/registry/registry_test.go b/pkg/contexts/ocm/utils/registry/registry_test.go index 841aedffbc..a55f364817 100644 --- a/pkg/contexts/ocm/utils/registry/registry_test.go +++ b/pkg/contexts/ocm/utils/registry/registry_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package registry_test import ( diff --git a/pkg/contexts/ocm/utils/registry/regkey.go b/pkg/contexts/ocm/utils/registry/regkey.go index 858ac6874a..6350f9fab1 100644 --- a/pkg/contexts/ocm/utils/registry/regkey.go +++ b/pkg/contexts/ocm/utils/registry/regkey.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package registry import ( diff --git a/pkg/contexts/ocm/utils/registry/suite_test.go b/pkg/contexts/ocm/utils/registry/suite_test.go index 3759e98ba9..f3d9d46bec 100644 --- a/pkg/contexts/ocm/utils/registry/suite_test.go +++ b/pkg/contexts/ocm/utils/registry/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package registry_test import ( diff --git a/pkg/contexts/ocm/utils/resourceref.go b/pkg/contexts/ocm/utils/resourceref.go index b0c45014c7..e32accf68b 100644 --- a/pkg/contexts/ocm/utils/resourceref.go +++ b/pkg/contexts/ocm/utils/resourceref.go @@ -1,18 +1,13 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( "fmt" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/ocm" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" ) func ResolveReferencePath(cv ocm.ComponentVersionAccess, path []metav1.Identity, resolver ocm.ComponentVersionResolver) (ocm.ComponentVersionAccess, error) { diff --git a/pkg/contexts/ocm/utils/resourceref_test.go b/pkg/contexts/ocm/utils/resourceref_test.go index 3c76f10ee9..d717db44ad 100644 --- a/pkg/contexts/ocm/utils/resourceref_test.go +++ b/pkg/contexts/ocm/utils/resourceref_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils_test import ( @@ -9,8 +5,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -18,8 +12,10 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/utils/suite_test.go b/pkg/contexts/ocm/utils/suite_test.go index b0dd82706c..0a64359a6d 100644 --- a/pkg/contexts/ocm/utils/suite_test.go +++ b/pkg/contexts/ocm/utils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils_test import ( diff --git a/pkg/contexts/ocm/utils/utils.go b/pkg/contexts/ocm/utils/utils.go index 3b27906978..f86636fbdc 100644 --- a/pkg/contexts/ocm/utils/utils.go +++ b/pkg/contexts/ocm/utils/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/pkg/contexts/ocm/valuemergehandler/config/config_test.go b/pkg/contexts/ocm/valuemergehandler/config/config_test.go index 846ba9cdc8..ed79e5dd15 100644 --- a/pkg/contexts/ocm/valuemergehandler/config/config_test.go +++ b/pkg/contexts/ocm/valuemergehandler/config/config_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( @@ -9,7 +5,6 @@ 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/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -17,6 +12,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/config" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("merge config", func() { diff --git a/pkg/contexts/ocm/valuemergehandler/config/suite_test.go b/pkg/contexts/ocm/valuemergehandler/config/suite_test.go index 3bb407741d..cacc59bc60 100644 --- a/pkg/contexts/ocm/valuemergehandler/config/suite_test.go +++ b/pkg/contexts/ocm/valuemergehandler/config/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config_test import ( diff --git a/pkg/contexts/ocm/valuemergehandler/config/type.go b/pkg/contexts/ocm/valuemergehandler/config/type.go index d767bf5325..b51f73276a 100644 --- a/pkg/contexts/ocm/valuemergehandler/config/type.go +++ b/pkg/contexts/ocm/valuemergehandler/config/type.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package config import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/suite_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/suite_test.go index 471c0d8eab..6c1c4bebdf 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/suite_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package defaultmerge_test import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/suite_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/suite_test.go index 5b8ab87991..af70fe2ad2 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/suite_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package maplistmerge_test import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler.go b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler.go index 27050d2cdf..8f58da2106 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go index 3e934c722c..ae771ba32e 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - //go:build unix package plugin_test @@ -9,8 +5,6 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" @@ -18,6 +12,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "merge" diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/suite_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/suite_test.go index aeff7f3c55..1cd3802591 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/suite_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package plugin_test import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/suite_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/suite_test.go index 3f03aa0854..82f4c1a026 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/suite_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package simplelistmerge_test import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/suite_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/suite_test.go index b7fcf6fc01..4e398c684e 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/suite_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package simplemapmerge_test import ( diff --git a/pkg/dirtree/suite_test.go b/pkg/dirtree/suite_test.go index 582c79f97c..434381ed9a 100644 --- a/pkg/dirtree/suite_test.go +++ b/pkg/dirtree/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtree_test import ( diff --git a/pkg/docker/fetcher.go b/pkg/docker/fetcher.go index 230b2b9773..6afe946308 100644 --- a/pkg/docker/fetcher.go +++ b/pkg/docker/fetcher.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/docker/handler.go b/pkg/docker/handler.go index 0292af5897..0ff9959ad3 100644 --- a/pkg/docker/handler.go +++ b/pkg/docker/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/docker/httpreadseeker.go b/pkg/docker/httpreadseeker.go index 4949021789..c6b803810b 100644 --- a/pkg/docker/httpreadseeker.go +++ b/pkg/docker/httpreadseeker.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/docker/lister.go b/pkg/docker/lister.go index c0ac5cd8e9..22e9122c34 100644 --- a/pkg/docker/lister.go +++ b/pkg/docker/lister.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/docker/orig.go b/pkg/docker/orig.go index bd0ee0df2f..c9b2468fba 100644 --- a/pkg/docker/orig.go +++ b/pkg/docker/orig.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/docker/pusher.go b/pkg/docker/pusher.go index b1439e38f8..e4bb720328 100644 --- a/pkg/docker/pusher.go +++ b/pkg/docker/pusher.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/docker/registry.go b/pkg/docker/registry.go index 9f2868491f..795dd6e244 100644 --- a/pkg/docker/registry.go +++ b/pkg/docker/registry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/docker/resolve/interface.go b/pkg/docker/resolve/interface.go index 1dab8e256e..8476000012 100644 --- a/pkg/docker/resolve/interface.go +++ b/pkg/docker/resolve/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package resolve import ( diff --git a/pkg/docker/resolver.go b/pkg/docker/resolver.go index c1a8dc39e6..9776a60294 100644 --- a/pkg/docker/resolver.go +++ b/pkg/docker/resolver.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/env/builder/builder.go b/pkg/env/builder/builder.go index 2eba2f7b86..40dc6efdab 100644 --- a/pkg/env/builder/builder.go +++ b/pkg/env/builder/builder.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_artifact.go b/pkg/env/builder/oci_artifact.go index 815162c604..e0c1030284 100644 --- a/pkg/env/builder/oci_artifact.go +++ b/pkg/env/builder/oci_artifact.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_artifactset.go b/pkg/env/builder/oci_artifactset.go index dee90107fa..4ab3aa029c 100644 --- a/pkg/env/builder/oci_artifactset.go +++ b/pkg/env/builder/oci_artifactset.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_config.go b/pkg/env/builder/oci_config.go index 4ea99cbffc..1c10841033 100644 --- a/pkg/env/builder/oci_config.go +++ b/pkg/env/builder/oci_config.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_ctf.go b/pkg/env/builder/oci_ctf.go index bf0d8062c5..86cae80b0a 100644 --- a/pkg/env/builder/oci_ctf.go +++ b/pkg/env/builder/oci_ctf.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_layer.go b/pkg/env/builder/oci_layer.go index bd7713a397..287054885e 100644 --- a/pkg/env/builder/oci_layer.go +++ b/pkg/env/builder/oci_layer.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_namespace.go b/pkg/env/builder/oci_namespace.go index d0ba30df8b..e2d7eaf7c9 100644 --- a/pkg/env/builder/oci_namespace.go +++ b/pkg/env/builder/oci_namespace.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_repo.go b/pkg/env/builder/oci_repo.go index d57f546bd5..3fab3024df 100644 --- a/pkg/env/builder/oci_repo.go +++ b/pkg/env/builder/oci_repo.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/oci_tags.go b/pkg/env/builder/oci_tags.go index 65ce56feb3..d26a929dfe 100644 --- a/pkg/env/builder/oci_tags.go +++ b/pkg/env/builder/oci_tags.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder func (b *Builder) Tags(tags ...string) { diff --git a/pkg/env/builder/ocm_access.go b/pkg/env/builder/ocm_access.go index 8bf65937a5..c08a956e35 100644 --- a/pkg/env/builder/ocm_access.go +++ b/pkg/env/builder/ocm_access.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_comparch.go b/pkg/env/builder/ocm_comparch.go index 98012e2c12..956ff7865d 100644 --- a/pkg/env/builder/ocm_comparch.go +++ b/pkg/env/builder/ocm_comparch.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_component.go b/pkg/env/builder/ocm_component.go index 6d9d4a3a66..d2565e6117 100644 --- a/pkg/env/builder/ocm_component.go +++ b/pkg/env/builder/ocm_component.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_composition.go b/pkg/env/builder/ocm_composition.go index d055c74ab6..db4571cda0 100644 --- a/pkg/env/builder/ocm_composition.go +++ b/pkg/env/builder/ocm_composition.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_ctf.go b/pkg/env/builder/ocm_ctf.go index 25e9da4322..dfa52a34b1 100644 --- a/pkg/env/builder/ocm_ctf.go +++ b/pkg/env/builder/ocm_ctf.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_identity.go b/pkg/env/builder/ocm_identity.go index 617dacaba8..f77719a7e3 100644 --- a/pkg/env/builder/ocm_identity.go +++ b/pkg/env/builder/ocm_identity.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder const T_OCMMETA = "element with metadata" diff --git a/pkg/env/builder/ocm_label.go b/pkg/env/builder/ocm_label.go index 200fb50f6e..ff9982b8b1 100644 --- a/pkg/env/builder/ocm_label.go +++ b/pkg/env/builder/ocm_label.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_provider.go b/pkg/env/builder/ocm_provider.go index d72a26cf18..190052c5ce 100644 --- a/pkg/env/builder/ocm_provider.go +++ b/pkg/env/builder/ocm_provider.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_reference.go b/pkg/env/builder/ocm_reference.go index 08f2892052..b9b84fa6a0 100644 --- a/pkg/env/builder/ocm_reference.go +++ b/pkg/env/builder/ocm_reference.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_repo.go b/pkg/env/builder/ocm_repo.go index a991f0bb7c..47f3ca60ba 100644 --- a/pkg/env/builder/ocm_repo.go +++ b/pkg/env/builder/ocm_repo.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_resource.go b/pkg/env/builder/ocm_resource.go index 78da564678..57351c4752 100644 --- a/pkg/env/builder/ocm_resource.go +++ b/pkg/env/builder/ocm_resource.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_source.go b/pkg/env/builder/ocm_source.go index 8c718aa38d..dd788cb473 100644 --- a/pkg/env/builder/ocm_source.go +++ b/pkg/env/builder/ocm_source.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/ocm_version.go b/pkg/env/builder/ocm_version.go index 40bf1a71c3..f23bf0a479 100644 --- a/pkg/env/builder/ocm_version.go +++ b/pkg/env/builder/ocm_version.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/rsa_keypair.go b/pkg/env/builder/rsa_keypair.go index 379b1a4c61..10b4452ed7 100644 --- a/pkg/env/builder/rsa_keypair.go +++ b/pkg/env/builder/rsa_keypair.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/builder/suite_test.go b/pkg/env/builder/suite_test.go index bbb33e866b..42a58a2603 100644 --- a/pkg/env/builder/suite_test.go +++ b/pkg/env/builder/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder import ( diff --git a/pkg/env/env.go b/pkg/env/env.go index 3990def951..66c1a85cb7 100644 --- a/pkg/env/env.go +++ b/pkg/env/env.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package env import ( diff --git a/pkg/env/env_test.go b/pkg/env/env_test.go index aba133b7be..fc76fde32d 100644 --- a/pkg/env/env_test.go +++ b/pkg/env/env_test.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package env import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/contexts/ocm" ) diff --git a/pkg/env/suite_test.go b/pkg/env/suite_test.go index 4ddc2d096c..6fd6b59720 100644 --- a/pkg/env/suite_test.go +++ b/pkg/env/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package env import ( diff --git a/pkg/errors/alreadyexists.go b/pkg/errors/alreadyexists.go index 655ffa22e4..65aa022687 100644 --- a/pkg/errors/alreadyexists.go +++ b/pkg/errors/alreadyexists.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type AlreadyExistsError struct { diff --git a/pkg/errors/closed.go b/pkg/errors/closed.go index 6153d535c1..0a9d9df21c 100644 --- a/pkg/errors/closed.go +++ b/pkg/errors/closed.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type ClosedError struct { diff --git a/pkg/errors/error.go b/pkg/errors/error.go index 78124efc71..db20051ea7 100644 --- a/pkg/errors/error.go +++ b/pkg/errors/error.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - // //nolint: errorlint // this is the new As method, also handling error lists package errors diff --git a/pkg/errors/error_test.go b/pkg/errors/error_test.go index 97a90dd252..7a8275d455 100644 --- a/pkg/errors/error_test.go +++ b/pkg/errors/error_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors_test import ( diff --git a/pkg/errors/errprop.go b/pkg/errors/errprop.go index b1a3a2047f..8046b27175 100644 --- a/pkg/errors/errprop.go +++ b/pkg/errors/errprop.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors import ( diff --git a/pkg/errors/errprop_test.go b/pkg/errors/errprop_test.go index 0cc1eaa21b..7ceb009fa1 100644 --- a/pkg/errors/errprop_test.go +++ b/pkg/errors/errprop_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors_test import ( diff --git a/pkg/errors/format.go b/pkg/errors/format.go index 15d456cd23..b6cab0145e 100644 --- a/pkg/errors/format.go +++ b/pkg/errors/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type ErrorFormatter interface { diff --git a/pkg/errors/invalid.go b/pkg/errors/invalid.go index 3e85d8acad..065fa65368 100644 --- a/pkg/errors/invalid.go +++ b/pkg/errors/invalid.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors import ( diff --git a/pkg/errors/kinds.go b/pkg/errors/kinds.go index 8d43be0984..9a8a2a3fa9 100644 --- a/pkg/errors/kinds.go +++ b/pkg/errors/kinds.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors const ( diff --git a/pkg/errors/list.go b/pkg/errors/list.go index 699d02a17d..6b589684e6 100644 --- a/pkg/errors/list.go +++ b/pkg/errors/list.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors import ( diff --git a/pkg/errors/list_test.go b/pkg/errors/list_test.go index e3c0b2458a..2b81b325dd 100644 --- a/pkg/errors/list_test.go +++ b/pkg/errors/list_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors import ( diff --git a/pkg/errors/nomatch.go b/pkg/errors/nomatch.go index f3c97a1b4a..0e16a50164 100644 --- a/pkg/errors/nomatch.go +++ b/pkg/errors/nomatch.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type NoMatchError struct { diff --git a/pkg/errors/notfound.go b/pkg/errors/notfound.go index 79d3546a0a..881fd62744 100644 --- a/pkg/errors/notfound.go +++ b/pkg/errors/notfound.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type NotFoundError struct { diff --git a/pkg/errors/notimpl.go b/pkg/errors/notimpl.go index 35d8f71f98..a1693f2c2d 100644 --- a/pkg/errors/notimpl.go +++ b/pkg/errors/notimpl.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type NotImplementedError struct { diff --git a/pkg/errors/notsupported.go b/pkg/errors/notsupported.go index e863abda60..2c2e8402f2 100644 --- a/pkg/errors/notsupported.go +++ b/pkg/errors/notsupported.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type NotSupportedError struct { diff --git a/pkg/errors/readonly.go b/pkg/errors/readonly.go index 477af5bb35..b3ed211e61 100644 --- a/pkg/errors/readonly.go +++ b/pkg/errors/readonly.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type ReadOnlyError struct { diff --git a/pkg/errors/recursion.go b/pkg/errors/recursion.go index cb9fb0dc4d..35e5cb0953 100644 --- a/pkg/errors/recursion.go +++ b/pkg/errors/recursion.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors import ( diff --git a/pkg/errors/required.go b/pkg/errors/required.go index cd0239459a..f3c8e62c99 100644 --- a/pkg/errors/required.go +++ b/pkg/errors/required.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type RequiredError struct { diff --git a/pkg/errors/stillinuse.go b/pkg/errors/stillinuse.go index e747d2d0d8..589b09802f 100644 --- a/pkg/errors/stillinuse.go +++ b/pkg/errors/stillinuse.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type StillInUseError struct { diff --git a/pkg/errors/suite_test.go b/pkg/errors/suite_test.go index dd393978b4..981f6d4487 100644 --- a/pkg/errors/suite_test.go +++ b/pkg/errors/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors_test import ( diff --git a/pkg/errors/unknown.go b/pkg/errors/unknown.go index 4fcead5065..324d997ef8 100644 --- a/pkg/errors/unknown.go +++ b/pkg/errors/unknown.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors type UnknownError struct { diff --git a/pkg/errors/utils.go b/pkg/errors/utils.go index 27cb1c3b37..77d41f17b2 100644 --- a/pkg/errors/utils.go +++ b/pkg/errors/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package errors import ( diff --git a/pkg/exception/suite_test.go b/pkg/exception/suite_test.go index 18232f1c93..32398a9753 100644 --- a/pkg/exception/suite_test.go +++ b/pkg/exception/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package exception_test import ( diff --git a/pkg/finalizer/finalizer.go b/pkg/finalizer/finalizer.go index 154516d493..629a3e9a15 100644 --- a/pkg/finalizer/finalizer.go +++ b/pkg/finalizer/finalizer.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package finalizer import ( diff --git a/pkg/finalizer/finalizer_test.go b/pkg/finalizer/finalizer_test.go index 9d7261965f..c71a97d5f7 100644 --- a/pkg/finalizer/finalizer_test.go +++ b/pkg/finalizer/finalizer_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package finalizer_test import ( @@ -10,10 +6,10 @@ 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/exception" "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" ) type Order []string diff --git a/pkg/finalizer/object_test.go b/pkg/finalizer/object_test.go index 0590242ff6..6223988550 100644 --- a/pkg/finalizer/object_test.go +++ b/pkg/finalizer/object_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package finalizer_test import ( diff --git a/pkg/finalizer/suite_test.go b/pkg/finalizer/suite_test.go index e721838b23..c9a2d906de 100644 --- a/pkg/finalizer/suite_test.go +++ b/pkg/finalizer/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package finalizer_test import ( diff --git a/pkg/generics/conditional.go b/pkg/generics/conditional.go index 9289489265..502761d240 100644 --- a/pkg/generics/conditional.go +++ b/pkg/generics/conditional.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package generics func Conditional[T any](cond bool, a, b T) T { diff --git a/pkg/generics/set.go b/pkg/generics/set.go index 5015bf13e1..6c827d7a4d 100644 --- a/pkg/generics/set.go +++ b/pkg/generics/set.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package generics import ( diff --git a/pkg/helm/loader/directory.go b/pkg/helm/loader/directory.go index f8d987ea7c..46b99f54f2 100644 --- a/pkg/helm/loader/directory.go +++ b/pkg/helm/loader/directory.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package loader import ( diff --git a/pkg/helm/loader/forward.go b/pkg/helm/loader/forward.go index 2928b76a2d..6c9e236363 100644 --- a/pkg/helm/loader/forward.go +++ b/pkg/helm/loader/forward.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package loader import ( diff --git a/pkg/helm/loader/loader.go b/pkg/helm/loader/loader.go index 65f1a35017..f400f4c247 100644 --- a/pkg/helm/loader/loader.go +++ b/pkg/helm/loader/loader.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package loader import ( diff --git a/pkg/logging/config_test.go b/pkg/logging/config_test.go index 788e586bcd..2533530be1 100644 --- a/pkg/logging/config_test.go +++ b/pkg/logging/config_test.go @@ -1,22 +1,17 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging_test import ( "bytes" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/logging/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/logging" logcfg "github.com/mandelsoft/logging/config" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/tonglil/buflogr" local "github.com/open-component-model/ocm/pkg/logging" + . "github.com/open-component-model/ocm/pkg/logging/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/logging/interface.go b/pkg/logging/interface.go index 43097dc484..ffe74c6788 100644 --- a/pkg/logging/interface.go +++ b/pkg/logging/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging import ( diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go index cab3549981..02df5b1834 100644 --- a/pkg/logging/logging.go +++ b/pkg/logging/logging.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging import ( diff --git a/pkg/logging/suite_test.go b/pkg/logging/suite_test.go index 427cc90d20..1b89de7334 100644 --- a/pkg/logging/suite_test.go +++ b/pkg/logging/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging_test import ( diff --git a/pkg/logging/testhelper/testhelper.go b/pkg/logging/testhelper/testhelper.go index 04debdfa88..8c29498f99 100644 --- a/pkg/logging/testhelper/testhelper.go +++ b/pkg/logging/testhelper/testhelper.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testhelper import ( diff --git a/pkg/logging/utils.go b/pkg/logging/utils.go index 887dc9e5b0..202602462d 100644 --- a/pkg/logging/utils.go +++ b/pkg/logging/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logging import ( diff --git a/pkg/mime/types.go b/pkg/mime/types.go index 9a56cac904..020968835e 100644 --- a/pkg/mime/types.go +++ b/pkg/mime/types.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package mime const ( diff --git a/pkg/mime/util.go b/pkg/mime/util.go index 133e7706f6..42f45d52bd 100644 --- a/pkg/mime/util.go +++ b/pkg/mime/util.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package mime import ( diff --git a/pkg/out/context.go b/pkg/out/context.go index 674081c0a5..d1707f1995 100644 --- a/pkg/out/context.go +++ b/pkg/out/context.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package out import ( diff --git a/pkg/refmgmt/finalized/suite_test.go b/pkg/refmgmt/finalized/suite_test.go index 46c70a1d28..86dfc03e11 100644 --- a/pkg/refmgmt/finalized/suite_test.go +++ b/pkg/refmgmt/finalized/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package finalized_test import ( diff --git a/pkg/refmgmt/resource/suite_test.go b/pkg/refmgmt/resource/suite_test.go index 3af476571e..a832c663d7 100644 --- a/pkg/refmgmt/resource/suite_test.go +++ b/pkg/refmgmt/resource/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package resource_test import ( diff --git a/pkg/refmgmt/suite_test.go b/pkg/refmgmt/suite_test.go index b911f4d956..e143a1809d 100644 --- a/pkg/refmgmt/suite_test.go +++ b/pkg/refmgmt/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package refmgmt_test import ( diff --git a/pkg/regex/regex.go b/pkg/regex/regex.go index e53aa5b218..180e6bbcd4 100644 --- a/pkg/regex/regex.go +++ b/pkg/regex/regex.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package regex import ( diff --git a/pkg/registrations/registrations_test.go b/pkg/registrations/registrations_test.go index c7348a60f7..c49e3bb12a 100644 --- a/pkg/registrations/registrations_test.go +++ b/pkg/registrations/registrations_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package registrations_test 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/registrations" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/registrations/suite_test.go b/pkg/registrations/suite_test.go index e6001860a8..9820acc85f 100644 --- a/pkg/registrations/suite_test.go +++ b/pkg/registrations/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package registrations_test import ( diff --git a/pkg/runtime/binary.go b/pkg/runtime/binary.go index ccff45fad6..a0014960f9 100644 --- a/pkg/runtime/binary.go +++ b/pkg/runtime/binary.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime import ( diff --git a/pkg/runtime/encoding.go b/pkg/runtime/encoding.go index 199bffc3e5..fcc0924766 100644 --- a/pkg/runtime/encoding.go +++ b/pkg/runtime/encoding.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime // github.com/ghodss/yaml diff --git a/pkg/runtime/object_test.go b/pkg/runtime/object_test.go index 1b9890a67a..e39a6a55da 100644 --- a/pkg/runtime/object_test.go +++ b/pkg/runtime/object_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime_test import ( diff --git a/pkg/runtime/scheme.go b/pkg/runtime/scheme.go index 3afad936d4..96404ade64 100644 --- a/pkg/runtime/scheme.go +++ b/pkg/runtime/scheme.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime import ( diff --git a/pkg/runtime/scheme_test.go b/pkg/runtime/scheme_test.go index f36291bb47..12f4e80fc1 100644 --- a/pkg/runtime/scheme_test.go +++ b/pkg/runtime/scheme_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime_test 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/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/runtime/suite_test.go b/pkg/runtime/suite_test.go index 927626c04d..0175e8621a 100644 --- a/pkg/runtime/suite_test.go +++ b/pkg/runtime/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime_test import ( diff --git a/pkg/runtime/typedobject.go b/pkg/runtime/typedobject.go index 9db5e2eca6..fe06ea6125 100644 --- a/pkg/runtime/typedobject.go +++ b/pkg/runtime/typedobject.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime // ObjectTypedObject is the minimal implementation of a typed object diff --git a/pkg/runtime/unstructured.go b/pkg/runtime/unstructured.go index 3d3f8ddc2d..bcfb665aff 100644 --- a/pkg/runtime/unstructured.go +++ b/pkg/runtime/unstructured.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime import ( diff --git a/pkg/runtime/unstructured_test.go b/pkg/runtime/unstructured_test.go index dccf2c3301..925e4ea7f9 100644 --- a/pkg/runtime/unstructured_test.go +++ b/pkg/runtime/unstructured_test.go @@ -1,18 +1,13 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime_test import ( "encoding/json" "reflect" + "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mandelsoft/logging" - ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/runtime/unstructuredversioned.go b/pkg/runtime/unstructuredversioned.go index c3f6ff42e7..3ba9f37e01 100644 --- a/pkg/runtime/unstructuredversioned.go +++ b/pkg/runtime/unstructuredversioned.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime import ( diff --git a/pkg/runtime/utils.go b/pkg/runtime/utils.go index cbd1360537..0c0a6fd166 100644 --- a/pkg/runtime/utils.go +++ b/pkg/runtime/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime import ( diff --git a/pkg/runtime/validate.go b/pkg/runtime/validate.go index 66ae3efee1..ce806e8298 100644 --- a/pkg/runtime/validate.go +++ b/pkg/runtime/validate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime import ( diff --git a/pkg/runtime/versionedtype.go b/pkg/runtime/versionedtype.go index 4181b65bd2..c2243883b2 100644 --- a/pkg/runtime/versionedtype.go +++ b/pkg/runtime/versionedtype.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime import ( diff --git a/pkg/semverutils/suite_test.go b/pkg/semverutils/suite_test.go index 0bb7fabb25..d0ca58ac43 100644 --- a/pkg/semverutils/suite_test.go +++ b/pkg/semverutils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package semverutils_test import ( diff --git a/pkg/semverutils/utils.go b/pkg/semverutils/utils.go index 5193173915..4714a8ca29 100644 --- a/pkg/semverutils/utils.go +++ b/pkg/semverutils/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package semverutils import ( diff --git a/pkg/semverutils/utils_test.go b/pkg/semverutils/utils_test.go index 0a60bed042..b39bc9524f 100644 --- a/pkg/semverutils/utils_test.go +++ b/pkg/semverutils/utils_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package semverutils import ( + "github.com/Masterminds/semver/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/Masterminds/semver/v3" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("filter", func() { diff --git a/pkg/signing/cert.go b/pkg/signing/cert.go index de1573ada7..4b348ab6e7 100644 --- a/pkg/signing/cert.go +++ b/pkg/signing/cert.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/signing/cert_test.go b/pkg/signing/cert_test.go index 4b43fb4569..433b03d5af 100644 --- a/pkg/signing/cert_test.go +++ b/pkg/signing/cert_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( diff --git a/pkg/signing/handlers/init.go b/pkg/signing/handlers/init.go index 7010b70e49..42cb45536c 100644 --- a/pkg/signing/handlers/init.go +++ b/pkg/signing/handlers/init.go @@ -1,14 +1,11 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package handlers import ( + _ "github.com/sigstore/cosign/v2/pkg/providers/all" + _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-pss" _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-pss-signingservice" _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-signingservice" _ "github.com/open-component-model/ocm/pkg/signing/handlers/sigstore" - _ "github.com/sigstore/cosign/v2/pkg/providers/all" ) diff --git a/pkg/signing/handlers/rsa-signingservice/client.go b/pkg/signing/handlers/rsa-signingservice/client.go index 2e89aac218..5a88661420 100644 --- a/pkg/signing/handlers/rsa-signingservice/client.go +++ b/pkg/signing/handlers/rsa-signingservice/client.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rsa_signingservice import ( diff --git a/pkg/signing/handlers/rsa-signingservice/handler.go b/pkg/signing/handlers/rsa-signingservice/handler.go index e6d9c3af0c..a914b22af6 100644 --- a/pkg/signing/handlers/rsa-signingservice/handler.go +++ b/pkg/signing/handlers/rsa-signingservice/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rsa_signingservice import ( diff --git a/pkg/signing/handlers/rsa/format.go b/pkg/signing/handlers/rsa/format.go index a518cefe39..9e35b03e57 100644 --- a/pkg/signing/handlers/rsa/format.go +++ b/pkg/signing/handlers/rsa/format.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rsa import ( diff --git a/pkg/signing/handlers/rsa/handler.go b/pkg/signing/handlers/rsa/handler.go index 3f63d81e6e..2c1b5280ba 100644 --- a/pkg/signing/handlers/rsa/handler.go +++ b/pkg/signing/handlers/rsa/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package rsa import ( diff --git a/pkg/signing/handlers/sigstore/handler.go b/pkg/signing/handlers/sigstore/handler.go index 98b1f2de8a..2402fd6e7f 100644 --- a/pkg/signing/handlers/sigstore/handler.go +++ b/pkg/signing/handlers/sigstore/handler.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sigstore import ( diff --git a/pkg/signing/hasher/hashfuncs.go b/pkg/signing/hasher/hashfuncs.go index 941cadb9c5..ac090ed591 100644 --- a/pkg/signing/hasher/hashfuncs.go +++ b/pkg/signing/hasher/hashfuncs.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hasher import ( diff --git a/pkg/signing/hasher/init.go b/pkg/signing/hasher/init.go index 02a488f071..24b89a6b03 100644 --- a/pkg/signing/hasher/init.go +++ b/pkg/signing/hasher/init.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package hasher import ( diff --git a/pkg/signing/hasher/nodigest/hasher.go b/pkg/signing/hasher/nodigest/hasher.go index 810d99707c..b319be1aee 100644 --- a/pkg/signing/hasher/nodigest/hasher.go +++ b/pkg/signing/hasher/nodigest/hasher.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package nodigest import ( diff --git a/pkg/signing/hasher/sha256/hasher.go b/pkg/signing/hasher/sha256/hasher.go index 8d133b74f0..0dd2ff9226 100644 --- a/pkg/signing/hasher/sha256/hasher.go +++ b/pkg/signing/hasher/sha256/hasher.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sha256 import ( diff --git a/pkg/signing/hasher/sha512/hasher.go b/pkg/signing/hasher/sha512/hasher.go index 5896a40189..3ebdd0677a 100644 --- a/pkg/signing/hasher/sha512/hasher.go +++ b/pkg/signing/hasher/sha512/hasher.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package sha512 import ( diff --git a/pkg/signing/normalization.go b/pkg/signing/normalization.go index 2882d4df48..9b34db2013 100644 --- a/pkg/signing/normalization.go +++ b/pkg/signing/normalization.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/signing/normalization_test.go b/pkg/signing/normalization_test.go index ea4b1f80db..717c689e28 100644 --- a/pkg/signing/normalization_test.go +++ b/pkg/signing/normalization_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( @@ -10,7 +6,6 @@ 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/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -22,6 +17,7 @@ import ( "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/norm/entry" "github.com/open-component-model/ocm/pkg/signing/norm/jcs" + . "github.com/open-component-model/ocm/pkg/testutils" ) var CDExcludes = signing.MapExcludes{ diff --git a/pkg/signing/registry.go b/pkg/signing/registry.go index adbcea5d0c..134919117c 100644 --- a/pkg/signing/registry.go +++ b/pkg/signing/registry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/signing/rules.go b/pkg/signing/rules.go index 3586dbd85d..e1728f1db2 100644 --- a/pkg/signing/rules.go +++ b/pkg/signing/rules.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing type Normalization interface { diff --git a/pkg/signing/signing_test.go b/pkg/signing/signing_test.go index a0eeb286e2..dbfeb1c3d1 100644 --- a/pkg/signing/signing_test.go +++ b/pkg/signing/signing_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( diff --git a/pkg/signing/signutils/certs_test.go b/pkg/signing/signutils/certs_test.go index 8c99817ec1..46b82f0667 100644 --- a/pkg/signing/signutils/certs_test.go +++ b/pkg/signing/signutils/certs_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signutils_test import ( @@ -12,12 +8,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/blobaccess" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("normalization", func() { diff --git a/pkg/signing/signutils/names_test.go b/pkg/signing/signutils/names_test.go index b4c33b9e05..4406e502e8 100644 --- a/pkg/signing/signutils/names_test.go +++ b/pkg/signing/signutils/names_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signutils_test import ( @@ -9,9 +5,9 @@ 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/signing/signutils" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("normalization", func() { diff --git a/pkg/signing/signutils/suite_test.go b/pkg/signing/signutils/suite_test.go index 1cec31790b..af3f04ccc9 100644 --- a/pkg/signing/signutils/suite_test.go +++ b/pkg/signing/signutils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signutils_test import ( diff --git a/pkg/signing/suite_test.go b/pkg/signing/suite_test.go index 3610d11981..1f245ca583 100644 --- a/pkg/signing/suite_test.go +++ b/pkg/signing/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( diff --git a/pkg/signing/types.go b/pkg/signing/types.go index 40640d9b32..7875530aeb 100644 --- a/pkg/signing/types.go +++ b/pkg/signing/types.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/signing/utils.go b/pkg/signing/utils.go index ec75a1a6c5..27354aa8f7 100644 --- a/pkg/signing/utils.go +++ b/pkg/signing/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/signing/x509_certificate.go b/pkg/signing/x509_certificate.go index 6bde22d3a5..0cf1e69176 100644 --- a/pkg/signing/x509_certificate.go +++ b/pkg/signing/x509_certificate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing import ( diff --git a/pkg/spiff/options.go b/pkg/spiff/options.go index 5808231d93..dcade5d6ee 100644 --- a/pkg/spiff/options.go +++ b/pkg/spiff/options.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/pkg/spiff/spiff.go b/pkg/spiff/spiff.go index 5fb2066422..f91dae34e9 100644 --- a/pkg/spiff/spiff.go +++ b/pkg/spiff/spiff.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/pkg/spiff/suite_test.go b/pkg/spiff/suite_test.go index 4bd5508de2..de2c84c244 100644 --- a/pkg/spiff/suite_test.go +++ b/pkg/spiff/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff_test import ( diff --git a/pkg/spiff/validate.go b/pkg/spiff/validate.go index b2524a00aa..84c6ec6172 100644 --- a/pkg/spiff/validate.go +++ b/pkg/spiff/validate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff import ( diff --git a/pkg/testutils/signing_test.go b/pkg/testutils/signing_test.go index af4e3f4358..d03a40bde0 100644 --- a/pkg/testutils/signing_test.go +++ b/pkg/testutils/signing_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testutils_test import ( diff --git a/pkg/testutils/string.go b/pkg/testutils/string.go index 1423f0e284..df337866ce 100644 --- a/pkg/testutils/string.go +++ b/pkg/testutils/string.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testutils import ( diff --git a/pkg/testutils/suite_test.go b/pkg/testutils/suite_test.go index 3fe7388419..c47f9dd5f9 100644 --- a/pkg/testutils/suite_test.go +++ b/pkg/testutils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testutils_test import ( diff --git a/pkg/testutils/utils.go b/pkg/testutils/utils.go index 9a36ff8d32..28633021a7 100644 --- a/pkg/testutils/utils.go +++ b/pkg/testutils/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testutils import ( @@ -11,7 +7,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/onsi/gomega/types" "github.com/open-component-model/ocm/pkg/runtime" diff --git a/pkg/testutils/yaml.go b/pkg/testutils/yaml.go index db770f00a6..8af97b75c8 100644 --- a/pkg/testutils/yaml.go +++ b/pkg/testutils/yaml.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package testutils import ( diff --git a/pkg/toi/drivers/default/driver.go b/pkg/toi/drivers/default/driver.go index 583c18681e..f6e9b92d21 100644 --- a/pkg/toi/drivers/default/driver.go +++ b/pkg/toi/drivers/default/driver.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package _default import ( diff --git a/pkg/toi/drivers/docker/client.go b/pkg/toi/drivers/docker/client.go index 9ca0066902..4cec691d6f 100644 --- a/pkg/toi/drivers/docker/client.go +++ b/pkg/toi/drivers/docker/client.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package docker import ( diff --git a/pkg/toi/drivers/filesystem/driver.go b/pkg/toi/drivers/filesystem/driver.go index 0f50e4d86b..6aa46c5eb8 100644 --- a/pkg/toi/drivers/filesystem/driver.go +++ b/pkg/toi/drivers/filesystem/driver.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package filesystem import ( diff --git a/pkg/toi/drivers/mock/driver.go b/pkg/toi/drivers/mock/driver.go index 3998e2150e..a2fb70333f 100644 --- a/pkg/toi/drivers/mock/driver.go +++ b/pkg/toi/drivers/mock/driver.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package mock import ( diff --git a/pkg/toi/install/action.go b/pkg/toi/install/action.go index 5f933e0a85..2ccf46b876 100644 --- a/pkg/toi/install/action.go +++ b/pkg/toi/install/action.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( @@ -9,8 +5,6 @@ import ( "fmt" "sort" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/ghodss/yaml" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -32,6 +26,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/spiff" diff --git a/pkg/toi/install/bundle/spec.go b/pkg/toi/install/bundle/spec.go index 163c23e723..835054a4c3 100644 --- a/pkg/toi/install/bundle/spec.go +++ b/pkg/toi/install/bundle/spec.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package bundle import ( diff --git a/pkg/toi/install/credentials.go b/pkg/toi/install/credentials.go index 0c4e29190f..f6868dd5e6 100644 --- a/pkg/toi/install/credentials.go +++ b/pkg/toi/install/credentials.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( diff --git a/pkg/toi/install/credentials_test.go b/pkg/toi/install/credentials_test.go index 6b4c33432e..2b067f5700 100644 --- a/pkg/toi/install/credentials_test.go +++ b/pkg/toi/install/credentials_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install_test 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/config" @@ -17,6 +12,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds" "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/toi/install" ) diff --git a/pkg/toi/install/execute.go b/pkg/toi/install/execute.go index 8cf57cc0c9..ec405370c8 100644 --- a/pkg/toi/install/execute.go +++ b/pkg/toi/install/execute.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( diff --git a/pkg/toi/install/interface.go b/pkg/toi/install/interface.go index c3bf495124..53fce0dba3 100644 --- a/pkg/toi/install/interface.go +++ b/pkg/toi/install/interface.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install import ( diff --git a/pkg/toi/install/suite_test.go b/pkg/toi/install/suite_test.go index 53ca50870c..44ac79956f 100644 --- a/pkg/toi/install/suite_test.go +++ b/pkg/toi/install/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install_test import ( diff --git a/pkg/toi/support/app.go b/pkg/toi/support/app.go index 0b1886f67e..1b03692cb8 100644 --- a/pkg/toi/support/app.go +++ b/pkg/toi/support/app.go @@ -1,15 +1,9 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( "fmt" "strings" - _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" - "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -17,6 +11,7 @@ import ( "github.com/open-component-model/ocm/pkg/cobrautils" "github.com/open-component-model/ocm/pkg/cobrautils/logopts" "github.com/open-component-model/ocm/pkg/common" + _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr" diff --git a/pkg/toi/support/support.go b/pkg/toi/support/support.go index df2bb2ad16..8c5c7d2160 100644 --- a/pkg/toi/support/support.go +++ b/pkg/toi/support/support.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package support import ( diff --git a/pkg/utils/ctf.go b/pkg/utils/ctf.go index be279dd072..4b8b51bc06 100644 --- a/pkg/utils/ctf.go +++ b/pkg/utils/ctf.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/pkg/utils/keyinfo.go b/pkg/utils/keyinfo.go index 8f5ef564ff..32e2e1e738 100644 --- a/pkg/utils/keyinfo.go +++ b/pkg/utils/keyinfo.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/pkg/utils/log.go b/pkg/utils/log.go index 091c00379c..cc3dee16b7 100644 --- a/pkg/utils/log.go +++ b/pkg/utils/log.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/pkg/utils/panics/panics.go b/pkg/utils/panics/panics.go index da386cd081..a235707ab7 100644 --- a/pkg/utils/panics/panics.go +++ b/pkg/utils/panics/panics.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package panics import ( diff --git a/pkg/utils/panics/suite_test.go b/pkg/utils/panics/suite_test.go index a7eb26cb8b..00b48089bd 100644 --- a/pkg/utils/panics/suite_test.go +++ b/pkg/utils/panics/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package panics_test import ( diff --git a/pkg/utils/selector/selector.go b/pkg/utils/selector/selector.go index bf67e870a3..723ac33719 100644 --- a/pkg/utils/selector/selector.go +++ b/pkg/utils/selector/selector.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package selector import ( diff --git a/pkg/utils/stringset.go b/pkg/utils/stringset.go index 10200d1352..72887e9291 100644 --- a/pkg/utils/stringset.go +++ b/pkg/utils/stringset.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils type StringSet map[string]struct{} diff --git a/pkg/utils/stringslice.go b/pkg/utils/stringslice.go index 41d21fc43a..b173c65053 100644 --- a/pkg/utils/stringslice.go +++ b/pkg/utils/stringslice.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/pkg/utils/subst/subst.go b/pkg/utils/subst/subst.go index 8eec669dc5..8bcf7af18b 100644 --- a/pkg/utils/subst/subst.go +++ b/pkg/utils/subst/subst.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package subst import ( diff --git a/pkg/utils/subst/subst_test.go b/pkg/utils/subst/subst_test.go index 2cecebb199..2a89ec4ac4 100644 --- a/pkg/utils/subst/subst_test.go +++ b/pkg/utils/subst/subst_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package subst import ( diff --git a/pkg/utils/subst/suite_test.go b/pkg/utils/subst/suite_test.go index 1df31e5688..360ff37521 100644 --- a/pkg/utils/subst/suite_test.go +++ b/pkg/utils/subst/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package subst import ( diff --git a/pkg/utils/suite_test.go b/pkg/utils/suite_test.go index c2ee81ed0b..1f37a6e1c1 100644 --- a/pkg/utils/suite_test.go +++ b/pkg/utils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils_test import ( diff --git a/pkg/utils/tarutils/pack.go b/pkg/utils/tarutils/pack.go index 1464838319..362271242c 100644 --- a/pkg/utils/tarutils/pack.go +++ b/pkg/utils/tarutils/pack.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tarutils import ( diff --git a/pkg/utils/tarutils/pack_test.go b/pkg/utils/tarutils/pack_test.go index 3ca873cb1e..a089da1e94 100644 --- a/pkg/utils/tarutils/pack_test.go +++ b/pkg/utils/tarutils/pack_test.go @@ -1,18 +1,13 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tarutils_test import ( "os" + "github.com/mandelsoft/vfs/pkg/osfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/osfs" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/utils/tarutils/suite_test.go b/pkg/utils/tarutils/suite_test.go index 972cbfd11c..38166ff09a 100644 --- a/pkg/utils/tarutils/suite_test.go +++ b/pkg/utils/tarutils/suite_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package tarutils_test import ( diff --git a/pkg/utils/template/gotmpl.go b/pkg/utils/template/gotmpl.go index 640e5afd28..e6c0acd11c 100644 --- a/pkg/utils/template/gotmpl.go +++ b/pkg/utils/template/gotmpl.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package template import ( diff --git a/pkg/utils/template/none.go b/pkg/utils/template/none.go index ab9d1cf270..aeb321d2b8 100644 --- a/pkg/utils/template/none.go +++ b/pkg/utils/template/none.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package template import ( diff --git a/pkg/utils/template/registry.go b/pkg/utils/template/registry.go index 2d4872a2ef..12028cca3b 100644 --- a/pkg/utils/template/registry.go +++ b/pkg/utils/template/registry.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package template import ( diff --git a/pkg/utils/template/spiff.go b/pkg/utils/template/spiff.go index ee2bb80c91..5d303f2bfe 100644 --- a/pkg/utils/template/spiff.go +++ b/pkg/utils/template/spiff.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package template import ( diff --git a/pkg/utils/template/subst.go b/pkg/utils/template/subst.go index 905c2739f8..e8778e0fe4 100644 --- a/pkg/utils/template/subst.go +++ b/pkg/utils/template/subst.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package template import ( diff --git a/pkg/utils/template/template.go b/pkg/utils/template/template.go index ece0fa4f96..eecca9fcb2 100644 --- a/pkg/utils/template/template.go +++ b/pkg/utils/template/template.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package template import ( diff --git a/pkg/utils/template/template_test.go b/pkg/utils/template/template_test.go index 837598c86e..9fe8910aca 100644 --- a/pkg/utils/template/template_test.go +++ b/pkg/utils/template/template_test.go @@ -1,19 +1,14 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package template_test import ( "testing" + "github.com/mandelsoft/vfs/pkg/osfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/osfs" "gopkg.in/yaml.v3" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/template" ) diff --git a/pkg/utils/url.go b/pkg/utils/url.go index 126f32b4cc..bd920f177c 100644 --- a/pkg/utils/url.go +++ b/pkg/utils/url.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 8ce3548b65..39148ba27c 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils import ( diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index ee9c85b2cd..8618c8e871 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package utils_test import ( diff --git a/pkg/version/generate/release_generate.go b/pkg/version/generate/release_generate.go index cf193fd7b5..3e864c26a9 100644 --- a/pkg/version/generate/release_generate.go +++ b/pkg/version/generate/release_generate.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( diff --git a/pkg/version/version.go b/pkg/version/version.go index 5a9742f2f1..c764b1a3b0 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,7 +1,3 @@ -// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package version import ( From 0535211af604c29740d02d68598e9ee6950b17ab Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 11:19:55 +0200 Subject: [PATCH 04/16] rm SPDX-FileCopyrightText: 2023 in *.go --- cmds/demoplugin/valuesets/check.go | 4 ---- cmds/demoplugin/valuesets/check_test.go | 11 +++-------- cmds/ecrplugin/config/tweak.go | 4 ---- .../common/options/failonerroroption/option.go | 4 ---- cmds/ocm/commands/misccmds/hash/sign/cmd.go | 4 ---- cmds/ocm/commands/misccmds/hash/sign/cmd_test.go | 5 +---- .../ocm/commands/misccmds/hash/sign/suite_test.go | 4 ---- cmds/ocm/commands/ocmcmds/cli/download/const.go | 4 ---- cmds/ocm/commands/ocmcmds/cli/download/is_unix.go | 4 ---- .../commands/ocmcmds/cli/download/is_windows.go | 4 ---- .../ocmcmds/common/handlers/comphdlr/util.go | 4 ---- .../ocmcmds/common/inputs/types/helm/utils.go | 4 ---- .../components/transfer/disableupload_test.go | 10 +++------- .../commands/ocmcmds/plugins/describe/describe.go | 4 ---- .../commands/ocmcmds/resources/download/action.go | 4 ---- .../ocmcmds/routingslips/common/options.go | 4 ---- .../commands/ocmcmds/routingslips/get/options.go | 4 ---- cmds/ocm/pkg/processing/logging.go | 4 ---- cmds/ocm/pkg/utils/fileutils.go | 4 ---- examples/lib/comparison-scenario/00-consumer.go | 5 +---- examples/lib/comparison-scenario/00-provider.go | 4 ---- examples/lib/comparison-scenario/01-create.go | 4 ---- examples/lib/comparison-scenario/02-sign.go | 4 ---- examples/lib/comparison-scenario/04-transport.go | 4 ---- examples/lib/comparison-scenario/05-verify.go | 4 ---- examples/lib/comparison-scenario/06-download.go | 5 +---- examples/lib/comparison-scenario/07-getref.go | 4 ---- .../lib/comparison-scenario/08-deployscript.go | 4 ---- examples/lib/comparison-scenario/09-localize.go | 9 +++------ examples/lib/comparison-scenario/utils.go | 11 ++++------- examples/lib/tour/01-getting-started/example.go | 4 ---- .../01-basic-componentversion-creation.go | 4 ---- .../02-composition-version.go | 4 ---- .../01-using-credentials.go | 4 ---- .../02-basic-credential-management.go | 4 ---- .../03-credential-repositories.go | 4 ---- .../tour/03-working-with-credentials/common.go | 4 ---- .../01-basic-config-management.go | 4 ---- .../02-handle-arbitrary-config.go | 4 ---- .../04-working-with-config/03-using-ocm-config.go | 7 ++----- .../04-write-config-type.go | 7 ++----- .../05-write-config-consumer.go | 4 ---- .../lib/tour/04-working-with-config/common.go | 4 ---- .../05-transporting-component-versions/common.go | 4 ---- .../05-transporting-component-versions/example.go | 4 ---- .../01-basic-signing.go | 4 ---- .../02-using-context-settings.go | 4 ---- .../tour/06-signing-component-versions/common.go | 4 ---- examples/lib/tour/doc.go | 4 ---- hack/generate-docs/cobradoc/space.go | 4 ---- pkg/blobaccess/blobaccess_test.go | 11 +++-------- pkg/blobaccess/bpi/interface.go | 4 ---- pkg/blobaccess/bpi/utils.go | 4 ---- pkg/blobaccess/bpi/view.go | 4 ---- pkg/blobaccess/cached.go | 4 ---- pkg/blobaccess/compress.go | 4 ---- pkg/blobaccess/compress_test.go | 6 +----- pkg/blobaccess/dataaccess.go | 4 ---- pkg/blobaccess/digest.go | 4 ---- pkg/blobaccess/interface.go | 4 ---- pkg/blobaccess/internal/interface.go | 4 ---- pkg/blobaccess/temp_test.go | 9 ++------- pkg/blobaccess/utils.go | 4 ---- pkg/cobrautils/flagsets/filter.go | 4 ---- pkg/cobrautils/flagsets/flagsetscheme/doc.go | 4 ---- pkg/cobrautils/flagsets/flagsetscheme/scheme.go | 4 ---- pkg/cobrautils/flagsets/flagsetscheme/types.go | 4 ---- .../flagsets/flagsetscheme/types_options.go | 4 ---- pkg/cobrautils/logopts/options.go | 4 ---- pkg/cobrautils/logopts/options_test.go | 11 +++-------- pkg/common/accessio/digestreader.go | 4 ---- pkg/common/accessio/digestwriter.go | 4 ---- pkg/common/accessio/retry_test.go | 6 +----- pkg/contexts/config/internal/logging.go | 4 ---- pkg/contexts/config/logging.go | 4 ---- pkg/contexts/credentials/builtin/github/github.go | 4 ---- .../builtin/github/identity/identity.go | 4 ---- .../credentials/builtin/helm/identity/identity.go | 4 ---- .../builtin/helm/identity/identity_test.go | 6 +----- .../credentials/builtin/oci/identity/creds.go | 4 ---- .../credentials/builtin/oci/identity/id_test.go | 4 ---- .../credentials/builtin/oci/identity/identity.go | 4 ---- .../builtin/oci/identity/suite_test.go | 4 ---- .../builtin/wget/identity/suite_test.go | 4 ---- pkg/contexts/credentials/doc.go | 4 ---- .../repositories/directcreds/a_usage.go | 4 ---- .../repositories/dockerconfig/a_usage.go | 4 ---- .../repositories/dockerconfig/logging.go | 4 ---- .../repositories/dockerconfig/provider.go | 4 ---- .../gardenerconfig/identity/identity.go | 4 ---- .../credentials/repositories/vault/a_usage.go | 4 ---- .../credentials/repositories/vault/auth.go | 4 ---- .../repositories/vault/identity/identity.go | 4 ---- .../credentials/repositories/vault/logging.go | 4 ---- .../credentials/repositories/vault/options.go | 4 ---- .../credentials/repositories/vault/provider.go | 4 ---- pkg/contexts/credentials/utils.go | 4 ---- .../datacontext/action/api/action_test.go | 4 ---- pkg/contexts/datacontext/action/api/interface.go | 4 ---- pkg/contexts/datacontext/action/api/options.go | 4 ---- pkg/contexts/datacontext/action/api/registry.go | 4 ---- .../datacontext/action/api/registry_test.go | 6 +----- pkg/contexts/datacontext/action/api/utils.go | 4 ---- .../datacontext/action/handlers/options.go | 4 ---- .../datacontext/action/handlers/registry.go | 4 ---- pkg/contexts/datacontext/builder.go | 4 ---- pkg/contexts/datacontext/cpi.go | 4 ---- pkg/contexts/datacontext/logging.go | 4 ---- pkg/contexts/datacontext/setup.go | 4 ---- pkg/contexts/oci/action_test.go | 4 ---- pkg/contexts/oci/actions/init.go | 4 ---- .../oci/actions/oci-repository-prepare/exec.go | 4 ---- .../oci/actions/oci-repository-prepare/type.go | 4 ---- pkg/contexts/oci/annotations/annotations.go | 4 ---- pkg/contexts/oci/cpi/utils_test.go | 4 ---- pkg/contexts/oci/cpi/view.go | 4 ---- pkg/contexts/oci/identity/creds.go | 4 ---- pkg/contexts/oci/repositories/ocireg/logging.go | 4 ---- pkg/contexts/oci/transfer/transfer_test.go | 10 +++------- .../ocm/accessmethods/ociartifact/logging.go | 4 ---- .../ocm/accessmethods/ociartifact/utils.go | 4 ---- .../accessmethods/relativeociref/method_test.go | 10 +++------- .../ocm/accessmethods/s3/identity/identity.go | 4 ---- pkg/contexts/ocm/accessmethods/s3/ifce_test.go | 4 ---- pkg/contexts/ocm/accessmethods/s3/v1.go | 7 +------ pkg/contexts/ocm/accessmethods/s3/v2.go | 7 +------ pkg/contexts/ocm/accessmethods/wget/logging.go | 4 ---- pkg/contexts/ocm/actionhandler/init.go | 4 ---- pkg/contexts/ocm/attrs/signingattr/setup.go | 4 ---- pkg/contexts/ocm/blobhandler/interface.go | 4 ---- pkg/contexts/ocm/blobhandler/registration.go | 4 ---- pkg/contexts/ocm/compdesc/equal.go | 4 ---- pkg/contexts/ocm/compdesc/equal_test.go | 6 +----- pkg/contexts/ocm/compdesc/equivalent/equal.go | 4 ---- .../ocm/compdesc/equivalent/testhelper/helper.go | 4 ---- pkg/contexts/ocm/compdesc/logging.go | 4 ---- pkg/contexts/ocm/compdesc/logging_test.go | 9 ++------- pkg/contexts/ocm/compdesc/meta.go | 4 ---- .../ocm/compdesc/meta/v1/identity_test.go | 6 +----- pkg/contexts/ocm/compdesc/meta/v1/labels_test.go | 8 ++------ pkg/contexts/ocm/compdesc/meta/v1/types_test.go | 6 +----- pkg/contexts/ocm/compdesc/none.go | 4 ---- .../normalizations/rules/compdescrules.go | 4 ---- pkg/contexts/ocm/compdesc/op.go | 4 ---- pkg/contexts/ocm/compdesc/selectors.go | 4 ---- pkg/contexts/ocm/context/interface.go | 4 ---- .../ocm/cpi/accspeccpi/accessspec_options.go | 4 ---- pkg/contexts/ocm/cpi/accspeccpi/accesstypes.go | 4 ---- pkg/contexts/ocm/cpi/accspeccpi/interface.go | 4 ---- pkg/contexts/ocm/cpi/accspeccpi/method.go | 4 ---- pkg/contexts/ocm/cpi/accspeccpi/methodview.go | 4 ---- pkg/contexts/ocm/cpi/logging.go | 4 ---- pkg/contexts/ocm/cpi/modopts.go | 4 ---- pkg/contexts/ocm/cpi/ref.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/backend.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/blobcache.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/bridge_c.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/bridge_cv.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/bridge_r.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/doc.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/helperinterfaces.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/view_c.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/view_cv.go | 4 ---- pkg/contexts/ocm/cpi/repocpi/view_r.go | 4 ---- pkg/contexts/ocm/cpi/view_rsc.go | 4 ---- .../ocm/digester/digesters/blob/digester.go | 4 ---- pkg/contexts/ocm/download/download.go | 4 ---- .../download/handlers/blueprint/blueprint_test.go | 11 +++-------- .../ocm/download/handlers/blueprint/extractor.go | 4 ---- .../ocm/download/handlers/blueprint/suite_test.go | 4 ---- .../ocm/download/handlers/dirtree/handler.go | 4 ---- .../ocm/download/handlers/dirtree/registration.go | 4 ---- .../ocm/download/handlers/helm/download.go | 4 ---- .../ocm/download/handlers/ocirepo/registration.go | 4 ---- pkg/contexts/ocm/download/logging.go | 4 ---- pkg/contexts/ocm/download/registration.go | 4 ---- pkg/contexts/ocm/download/setup.go | 4 ---- pkg/contexts/ocm/elements/artifactaccess/doc.go | 4 ---- .../artifactaccess/genericaccess/resource.go | 4 ---- .../artifactaccess/genericaccess/resource_test.go | 10 +++------- .../artifactaccess/githubaccess/options.go | 4 ---- .../artifactaccess/githubaccess/resource.go | 4 ---- .../artifactaccess/helmaccess/resource.go | 4 ---- .../elements/artifactaccess/npmaccess/resource.go | 4 ---- .../artifactaccess/ociartifactaccess/resource.go | 4 ---- .../artifactaccess/ociblobaccess/options.go | 4 ---- .../artifactaccess/ociblobaccess/resource.go | 4 ---- .../elements/artifactaccess/s3access/options.go | 4 ---- .../elements/artifactaccess/s3access/resource.go | 4 ---- .../ocm/elements/artifactblob/api/options.go | 4 ---- .../ocm/elements/artifactblob/datablob/options.go | 4 ---- .../elements/artifactblob/datablob/resource.go | 4 ---- .../elements/artifactblob/dirtreeblob/options.go | 4 ---- .../elements/artifactblob/dirtreeblob/resource.go | 4 ---- .../artifactblob/dirtreeblob/resource_test.go | 6 +----- pkg/contexts/ocm/elements/artifactblob/doc.go | 4 ---- .../artifactblob/dockerdaemonblob/options.go | 4 ---- .../artifactblob/dockerdaemonblob/resource.go | 4 ---- .../artifactblob/dockermultiblob/options.go | 4 ---- .../artifactblob/dockermultiblob/resource.go | 4 ---- .../ocm/elements/artifactblob/externalblob/doc.go | 4 ---- .../elements/artifactblob/externalblob/options.go | 4 ---- .../artifactblob/externalblob/resource.go | 4 ---- .../ocm/elements/artifactblob/fileblob/options.go | 4 ---- .../elements/artifactblob/fileblob/resource.go | 4 ---- .../elements/artifactblob/genericblob/options.go | 4 ---- .../elements/artifactblob/genericblob/resource.go | 4 ---- .../ocm/elements/artifactblob/helmblob/options.go | 4 ---- .../elements/artifactblob/helmblob/resource.go | 4 ---- .../artifactblob/ociartifactblob/options.go | 4 ---- .../artifactblob/ociartifactblob/resource.go | 4 ---- .../ocm/elements/artifactblob/textblob/options.go | 4 ---- .../elements/artifactblob/textblob/resource.go | 4 ---- pkg/contexts/ocm/elements/artifacts.go | 4 ---- pkg/contexts/ocm/elements/common.go | 4 ---- pkg/contexts/ocm/elements/digests.go | 4 ---- pkg/contexts/ocm/elements/doc.go | 4 ---- pkg/contexts/ocm/elements/references.go | 4 ---- pkg/contexts/ocm/elements/resources.go | 4 ---- pkg/contexts/ocm/elements/resources_test.go | 6 +----- pkg/contexts/ocm/elements/sources.go | 4 ---- pkg/contexts/ocm/internal/delegation.go | 4 ---- pkg/contexts/ocm/internal/hasher.go | 4 ---- pkg/contexts/ocm/internal/modopts.go | 4 ---- pkg/contexts/ocm/internal/resolver.go | 4 ---- pkg/contexts/ocm/labels/init.go | 4 ---- pkg/contexts/ocm/labels/routingslip/entry.go | 4 ---- .../ocm/labels/routingslip/entrytypes_test.go | 6 +----- pkg/contexts/ocm/labels/routingslip/init.go | 4 ---- pkg/contexts/ocm/labels/routingslip/interface.go | 4 ---- .../ocm/labels/routingslip/internal/attr.go | 4 ---- .../ocm/labels/routingslip/internal/entrytypes.go | 4 ---- pkg/contexts/ocm/labels/routingslip/label.go | 4 ---- pkg/contexts/ocm/labels/routingslip/slip.go | 4 ---- pkg/contexts/ocm/labels/routingslip/slip_test.go | 7 +------ .../labels/routingslip/spi/entrytype_options.go | 4 ---- .../ocm/labels/routingslip/spi/interface.go | 4 ---- .../ocm/labels/routingslip/spi/support.go | 4 ---- .../ocm/labels/routingslip/transfer_test.go | 6 +----- .../ocm/labels/routingslip/types/comment/entry.go | 4 ---- pkg/contexts/ocm/labels/routingslip/types/init.go | 4 ---- pkg/contexts/ocm/labels/routingslip/usage.go | 4 ---- pkg/contexts/ocm/modopts.go | 4 ---- pkg/contexts/ocm/plugin/descriptor/const.go | 4 ---- pkg/contexts/ocm/plugin/descriptor/keys.go | 4 ---- pkg/contexts/ocm/plugin/descriptor/suite_test.go | 4 ---- pkg/contexts/ocm/plugin/descriptor/utils.go | 4 ---- pkg/contexts/ocm/plugin/descriptor/utils_test.go | 4 ---- pkg/contexts/ocm/plugin/internal/action.go | 4 ---- pkg/contexts/ocm/plugin/internal/valueset.go | 4 ---- pkg/contexts/ocm/registration/logging.go | 4 ---- .../ocm/repositories/composition/repository.go | 4 ---- pkg/contexts/ocm/repositories/composition/type.go | 4 ---- .../ocm/repositories/composition/version.go | 4 ---- pkg/contexts/ocm/repositories/ctf/ctf_test.go | 11 +++-------- .../ocm/repositories/genericocireg/excludes.go | 4 ---- .../ocm/repositories/genericocireg/logging.go | 4 ---- .../ocm/repositories/genericocireg/semver_test.go | 9 ++------- pkg/contexts/ocm/repositories/virtual/access.go | 4 ---- .../ocm/repositories/virtual/example/doc.go | 4 ---- .../ocm/repositories/virtual/example/example.go | 4 ---- pkg/contexts/ocm/repositories/virtual/index.go | 4 ---- .../ocm/repositories/virtual/repo_test.go | 15 +++++---------- pkg/contexts/ocm/repositories/virtual/type.go | 4 ---- pkg/contexts/ocm/resolver.go | 4 ---- pkg/contexts/ocm/signing/convenience.go | 4 ---- pkg/contexts/ocm/signing/digestctx.go | 4 ---- pkg/contexts/ocm/signing/transport_test.go | 14 +++++--------- pkg/contexts/ocm/testhelper/references.go | 4 ---- pkg/contexts/ocm/testhelper/refmgmt.go | 4 ---- pkg/contexts/ocm/testhelper/resources.go | 4 ---- pkg/contexts/ocm/transfer/autohandler.go | 4 ---- pkg/contexts/ocm/transfer/autohandler_test.go | 6 +----- pkg/contexts/ocm/transfer/convenience.go | 4 ---- pkg/contexts/ocm/transfer/debug.go | 4 ---- pkg/contexts/ocm/transfer/init.go | 4 ---- pkg/contexts/ocm/transfer/internal/merge.go | 4 ---- pkg/contexts/ocm/transfer/merge_test.go | 9 ++------- pkg/contexts/ocm/transfer/needs.go | 4 ---- pkg/contexts/ocm/transfer/options.go | 4 ---- pkg/contexts/ocm/transfer/transferhandler/doc.go | 4 ---- .../ocm/transfer/transferhandler/registry.go | 4 ---- .../transfer/transferhandler/transferhandler.go | 4 ---- pkg/contexts/ocm/utils/resource.go | 4 ---- pkg/contexts/ocm/utils/walk.go | 4 ---- .../handlers/defaultmerge/config.go | 4 ---- .../handlers/defaultmerge/handler.go | 4 ---- .../handlers/defaultmerge/handler_test.go | 6 +----- .../ocm/valuemergehandler/handlers/init.go | 4 ---- .../handlers/maplistmerge/config.go | 4 ---- .../handlers/maplistmerge/handler.go | 4 ---- .../handlers/maplistmerge/handler_test.go | 6 +----- .../valuemergehandler/handlers/plugin/config.go | 4 ---- .../handlers/simplelistmerge/config.go | 4 ---- .../handlers/simplelistmerge/handler.go | 4 ---- .../handlers/simplelistmerge/handler_test.go | 6 +----- .../handlers/simplemapmerge/config.go | 4 ---- .../handlers/simplemapmerge/handler.go | 4 ---- .../handlers/simplemapmerge/handler_test.go | 6 +----- .../ocm/valuemergehandler/hpi/interface.go | 4 ---- pkg/contexts/ocm/valuemergehandler/hpi/logging.go | 4 ---- pkg/contexts/ocm/valuemergehandler/hpi/merge.go | 4 ---- pkg/contexts/ocm/valuemergehandler/hpi/setup.go | 4 ---- pkg/contexts/ocm/valuemergehandler/hpi/support.go | 4 ---- pkg/contexts/ocm/valuemergehandler/interface.go | 9 ++------- .../ocm/valuemergehandler/internal/interface.go | 4 ---- .../ocm/valuemergehandler/internal/support.go | 4 ---- .../internal/valuemergehandler.go | 4 ---- pkg/contexts/ocm/valuemergehandler/merge.go | 4 ---- pkg/contexts/ocm/valuemergehandler/usage.go | 4 ---- pkg/contexts/options/utils.go | 4 ---- pkg/dirtree/context.go | 6 +----- pkg/dirtree/dirtree.go | 4 ---- pkg/dirtree/tar.go | 4 ---- pkg/dirtree/utils.go | 4 ---- pkg/dirtree/vfs.go | 4 ---- pkg/dirtree/vfs_test.go | 9 ++------- pkg/encrypt/encrypt.go | 4 ---- pkg/env/builder/blob.go | 4 ---- pkg/env/builder/builder_test.go | 4 ---- pkg/env/builder/oci_anno.go | 4 ---- pkg/env/builder/oci_platform.go | 4 ---- pkg/env/builder/ocm_version_test.go | 10 +++------- pkg/env/keypair.go | 4 ---- pkg/exception/exception.go | 4 ---- pkg/exception/exception_test.go | 4 ---- pkg/finalizer/closer.go | 4 ---- pkg/finalizer/object.go | 4 ---- pkg/generics/cast.go | 4 ---- pkg/generics/convert.go | 4 ---- pkg/generics/map.go | 4 ---- pkg/generics/slice.go | 4 ---- pkg/generics/utils.go | 4 ---- pkg/helm/chartaccess.go | 4 ---- pkg/helm/downloader.go | 4 ---- pkg/helm/identity/identity.go | 4 ---- pkg/helm/loader/access.go | 4 ---- pkg/helm/options.go | 4 ---- pkg/iotools/countingreader.go | 4 ---- pkg/iotools/digestreader.go | 4 ---- pkg/iotools/digestwriter.go | 4 ---- pkg/iotools/files.go | 4 ---- pkg/iotools/readerwriter.go | 4 ---- pkg/iotools/utils.go | 4 ---- pkg/listformat/listhelp.go | 4 ---- pkg/logging/stdkeys.go | 4 ---- pkg/optionutils/nested.go | 4 ---- pkg/optionutils/options.go | 4 ---- pkg/optionutils/pointer.go | 4 ---- pkg/optionutils/target.go | 4 ---- pkg/refmgmt/doc.go | 4 ---- pkg/refmgmt/finalized/finalized_test.go | 4 ---- pkg/refmgmt/refcloser.go | 4 ---- pkg/refmgmt/refmgmt.go | 4 ---- pkg/refmgmt/resource/doc.go | 4 ---- pkg/refmgmt/resource/resource.go | 4 ---- pkg/refmgmt/resource/resource_test.go | 6 +----- pkg/refmgmt/view.go | 4 ---- pkg/refmgmt/view_test.go | 6 +----- pkg/registrations/info.go | 4 ---- pkg/registrations/registrations.go | 4 ---- pkg/registrations/utils.go | 4 ---- pkg/runtime/convert.go | 4 ---- pkg/runtime/datatypes.go | 4 ---- pkg/runtime/descriptivetype/options.go | 4 ---- pkg/runtime/descriptivetype/type.go | 4 ---- pkg/runtime/multi.go | 4 ---- pkg/runtime/multi_test.go | 6 +----- pkg/runtime/value.go | 4 ---- pkg/runtime/version_test.go | 6 +----- pkg/semverutils/sort.go | 4 ---- pkg/signing/deprecated.go | 4 ---- pkg/signing/encrypt.go | 4 ---- pkg/signing/handlers/rsa/certhelper.go | 4 ---- pkg/signing/hashfuncs.go | 4 ---- pkg/signing/norm/entry/norm.go | 4 ---- pkg/signing/norm/jcs/norm.go | 4 ---- pkg/signing/signutils/certs.go | 4 ---- pkg/signing/signutils/names.go | 4 ---- pkg/signing/signutils/signature.go | 4 ---- pkg/signing/signutils/types.go | 4 ---- pkg/signing/tsa/pem.go | 4 ---- pkg/signing/tsa/tsa.go | 4 ---- pkg/signing/tsa/types.go | 4 ---- pkg/spiff/spiff_test.go | 9 ++------- pkg/testutils/object.go | 4 ---- pkg/toi/drivers/docker/opts.go | 4 ---- pkg/toi/install/action_test.go | 13 ++++--------- pkg/toi/install/functions.go | 4 ---- pkg/toi/logging.go | 4 ---- pkg/toi/spec.go | 4 ---- pkg/utils/locator.go | 4 ---- pkg/utils/panics/panics_test.go | 4 ---- pkg/utils/tarutils/compress.go | 4 ---- pkg/utils/tarutils/extract.go | 4 ---- pkg/utils/tarutils/list.go | 4 ---- pkg/utils/template/merge.go | 4 ---- pkg/utils/time.go | 4 ---- pkg/utils/unwrap.go | 4 ---- pkg/utils/validate.go | 4 ---- 400 files changed, 98 insertions(+), 1708 deletions(-) diff --git a/cmds/demoplugin/valuesets/check.go b/cmds/demoplugin/valuesets/check.go index 498491bf0e..6360af9097 100644 --- a/cmds/demoplugin/valuesets/check.go +++ b/cmds/demoplugin/valuesets/check.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 valuesets import ( diff --git a/cmds/demoplugin/valuesets/check_test.go b/cmds/demoplugin/valuesets/check_test.go index fc18624394..19be5d0baa 100644 --- a/cmds/demoplugin/valuesets/check_test.go +++ b/cmds/demoplugin/valuesets/check_test.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 - //go:build unix package valuesets_test @@ -9,10 +5,6 @@ package valuesets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr" @@ -21,7 +13,10 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/cache" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ecrplugin/config/tweak.go b/cmds/ecrplugin/config/tweak.go index 84ba30cc4f..3c8a30f655 100644 --- a/cmds/ecrplugin/config/tweak.go +++ b/cmds/ecrplugin/config/tweak.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 config import ( diff --git a/cmds/ocm/commands/common/options/failonerroroption/option.go b/cmds/ocm/commands/common/options/failonerroroption/option.go index d50aed70c5..6616096e3a 100644 --- a/cmds/ocm/commands/common/options/failonerroroption/option.go +++ b/cmds/ocm/commands/common/options/failonerroroption/option.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 failonerroroption import ( diff --git a/cmds/ocm/commands/misccmds/hash/sign/cmd.go b/cmds/ocm/commands/misccmds/hash/sign/cmd.go index 68777ad498..eb4d9525e3 100644 --- a/cmds/ocm/commands/misccmds/hash/sign/cmd.go +++ b/cmds/ocm/commands/misccmds/hash/sign/cmd.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 sign import ( diff --git a/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go b/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go index 762f14046c..8eb0c6e2b5 100644 --- a/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go +++ b/cmds/ocm/commands/misccmds/hash/sign/cmd_test.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 sign_test import ( @@ -9,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/misccmds/hash/sign/suite_test.go b/cmds/ocm/commands/misccmds/hash/sign/suite_test.go index 4e58a574ec..956ec56419 100644 --- a/cmds/ocm/commands/misccmds/hash/sign/suite_test.go +++ b/cmds/ocm/commands/misccmds/hash/sign/suite_test.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 sign_test import ( diff --git a/cmds/ocm/commands/ocmcmds/cli/download/const.go b/cmds/ocm/commands/ocmcmds/cli/download/const.go index 951069500e..eea3474fd9 100644 --- a/cmds/ocm/commands/ocmcmds/cli/download/const.go +++ b/cmds/ocm/commands/ocmcmds/cli/download/const.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 download const COMPONENT = "ocm.software/ocmcli" diff --git a/cmds/ocm/commands/ocmcmds/cli/download/is_unix.go b/cmds/ocm/commands/ocmcmds/cli/download/is_unix.go index 5268beb6fe..29ae32b564 100644 --- a/cmds/ocm/commands/ocmcmds/cli/download/is_unix.go +++ b/cmds/ocm/commands/ocmcmds/cli/download/is_unix.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 - //go:build !windows package download diff --git a/cmds/ocm/commands/ocmcmds/cli/download/is_windows.go b/cmds/ocm/commands/ocmcmds/cli/download/is_windows.go index 6151831aab..c578051708 100644 --- a/cmds/ocm/commands/ocmcmds/cli/download/is_windows.go +++ b/cmds/ocm/commands/ocmcmds/cli/download/is_windows.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 - //go:build windows package download diff --git a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.go b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.go index f93156b5d8..89f11f6856 100644 --- a/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.go +++ b/cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/util.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 comphdlr import ( diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/utils.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/utils.go index 61566883d0..7c2f7fe88c 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/utils.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/helm/utils.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 helm import ( diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go index bd255e1c2b..73be600adf 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.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 transfer_test import ( @@ -9,15 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" ocictf "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" storagecontext "github.com/open-component-model/ocm/pkg/contexts/ocm/blobhandler/handlers/oci" @@ -26,6 +21,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/testutils" ) const BASEURL = "baseurl.io" diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/describe.go b/cmds/ocm/commands/ocmcmds/plugins/describe/describe.go index b43f55cfe9..7eaa336863 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/describe.go +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/describe.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 describe import ( diff --git a/cmds/ocm/commands/ocmcmds/resources/download/action.go b/cmds/ocm/commands/ocmcmds/resources/download/action.go index d2e0eaac6c..7d543716bd 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/action.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/action.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 download import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/common/options.go b/cmds/ocm/commands/ocmcmds/routingslips/common/options.go index 9a337cd2b3..f6d1039f28 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/common/options.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/common/options.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 common import ( diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/options.go b/cmds/ocm/commands/ocmcmds/routingslips/get/options.go index a3bd5d0de6..2741cdc2d2 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/get/options.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/get/options.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 get import ( diff --git a/cmds/ocm/pkg/processing/logging.go b/cmds/ocm/pkg/processing/logging.go index 660907b751..f4abfaec69 100644 --- a/cmds/ocm/pkg/processing/logging.go +++ b/cmds/ocm/pkg/processing/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 processing import ( diff --git a/cmds/ocm/pkg/utils/fileutils.go b/cmds/ocm/pkg/utils/fileutils.go index cfeabdeb93..f5f46da53a 100644 --- a/cmds/ocm/pkg/utils/fileutils.go +++ b/cmds/ocm/pkg/utils/fileutils.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 utils import ( diff --git a/examples/lib/comparison-scenario/00-consumer.go b/examples/lib/comparison-scenario/00-consumer.go index 5a54fb965a..5a781bc7a8 100644 --- a/examples/lib/comparison-scenario/00-consumer.go +++ b/examples/lib/comparison-scenario/00-consumer.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 main import ( @@ -9,6 +5,7 @@ import ( "fmt" "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/open-component-model/ocm/examples/lib/helper" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/examples/lib/comparison-scenario/00-provider.go b/examples/lib/comparison-scenario/00-provider.go index 169f93704b..1217e9b43f 100644 --- a/examples/lib/comparison-scenario/00-provider.go +++ b/examples/lib/comparison-scenario/00-provider.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 main import ( diff --git a/examples/lib/comparison-scenario/01-create.go b/examples/lib/comparison-scenario/01-create.go index 57839bfaae..24c3babc09 100644 --- a/examples/lib/comparison-scenario/01-create.go +++ b/examples/lib/comparison-scenario/01-create.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 main import ( diff --git a/examples/lib/comparison-scenario/02-sign.go b/examples/lib/comparison-scenario/02-sign.go index e5b14eacdd..0e1af17988 100644 --- a/examples/lib/comparison-scenario/02-sign.go +++ b/examples/lib/comparison-scenario/02-sign.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 main import ( diff --git a/examples/lib/comparison-scenario/04-transport.go b/examples/lib/comparison-scenario/04-transport.go index fff4865348..1a78fa8f53 100644 --- a/examples/lib/comparison-scenario/04-transport.go +++ b/examples/lib/comparison-scenario/04-transport.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 main import ( diff --git a/examples/lib/comparison-scenario/05-verify.go b/examples/lib/comparison-scenario/05-verify.go index 78faac0745..51f6147886 100644 --- a/examples/lib/comparison-scenario/05-verify.go +++ b/examples/lib/comparison-scenario/05-verify.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 main import ( diff --git a/examples/lib/comparison-scenario/06-download.go b/examples/lib/comparison-scenario/06-download.go index 53a6726316..f899fa0a12 100644 --- a/examples/lib/comparison-scenario/06-download.go +++ b/examples/lib/comparison-scenario/06-download.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 main import ( @@ -9,6 +5,7 @@ import ( "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/examples/lib/helper" "github.com/open-component-model/ocm/pkg/contexts/ocm" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" diff --git a/examples/lib/comparison-scenario/07-getref.go b/examples/lib/comparison-scenario/07-getref.go index e12968671c..d9de5d7fbf 100644 --- a/examples/lib/comparison-scenario/07-getref.go +++ b/examples/lib/comparison-scenario/07-getref.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 main import ( diff --git a/examples/lib/comparison-scenario/08-deployscript.go b/examples/lib/comparison-scenario/08-deployscript.go index 7813827c56..3ab42c061d 100644 --- a/examples/lib/comparison-scenario/08-deployscript.go +++ b/examples/lib/comparison-scenario/08-deployscript.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 main import ( diff --git a/examples/lib/comparison-scenario/09-localize.go b/examples/lib/comparison-scenario/09-localize.go index 0cfe6f3554..596f03fbe5 100644 --- a/examples/lib/comparison-scenario/09-localize.go +++ b/examples/lib/comparison-scenario/09-localize.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 main import ( @@ -10,6 +6,9 @@ import ( "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/vfs" + "helm.sh/helm/v3/pkg/chart" + "sigs.k8s.io/yaml" + "github.com/open-component-model/ocm/examples/lib/helper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" @@ -23,8 +22,6 @@ import ( "github.com/open-component-model/ocm/pkg/utils" "github.com/open-component-model/ocm/pkg/utils/tarutils" "github.com/open-component-model/ocm/pkg/utils/template" - "helm.sh/helm/v3/pkg/chart" - "sigs.k8s.io/yaml" ) type DeployDescriptor struct { diff --git a/examples/lib/comparison-scenario/utils.go b/examples/lib/comparison-scenario/utils.go index bf8a6cb09f..d57ac8be8f 100644 --- a/examples/lib/comparison-scenario/utils.go +++ b/examples/lib/comparison-scenario/utils.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 main import ( @@ -10,13 +6,14 @@ import ( "io" "os" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/cli" + "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - "helm.sh/helm/v3/pkg/action" - "helm.sh/helm/v3/pkg/chart" - "helm.sh/helm/v3/pkg/cli" ) func PrintPublicKey(ctx ocm.Context, name string) { diff --git a/examples/lib/tour/01-getting-started/example.go b/examples/lib/tour/01-getting-started/example.go index 6021d9d7b9..4eeb6941a2 100644 --- a/examples/lib/tour/01-getting-started/example.go +++ b/examples/lib/tour/01-getting-started/example.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 main import ( diff --git a/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go b/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go index 64d46a7eb2..dcfea0a3d5 100644 --- a/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.go +++ b/examples/lib/tour/02-composing-a-component-version/01-basic-componentversion-creation.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 main import ( diff --git a/examples/lib/tour/02-composing-a-component-version/02-composition-version.go b/examples/lib/tour/02-composing-a-component-version/02-composition-version.go index 1820e5b68b..0c7074fc8c 100644 --- a/examples/lib/tour/02-composing-a-component-version/02-composition-version.go +++ b/examples/lib/tour/02-composing-a-component-version/02-composition-version.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 main import ( diff --git a/examples/lib/tour/03-working-with-credentials/01-using-credentials.go b/examples/lib/tour/03-working-with-credentials/01-using-credentials.go index 387aa9e493..ae41377529 100644 --- a/examples/lib/tour/03-working-with-credentials/01-using-credentials.go +++ b/examples/lib/tour/03-working-with-credentials/01-using-credentials.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 main import ( diff --git a/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.go b/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.go index fe9b6104e4..e19d3066c8 100644 --- a/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.go +++ b/examples/lib/tour/03-working-with-credentials/02-basic-credential-management.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 main import ( diff --git a/examples/lib/tour/03-working-with-credentials/03-credential-repositories.go b/examples/lib/tour/03-working-with-credentials/03-credential-repositories.go index ec1fb57b97..0ef2dfae79 100644 --- a/examples/lib/tour/03-working-with-credentials/03-credential-repositories.go +++ b/examples/lib/tour/03-working-with-credentials/03-credential-repositories.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 main import ( diff --git a/examples/lib/tour/03-working-with-credentials/common.go b/examples/lib/tour/03-working-with-credentials/common.go index 503fa71a83..2af4692145 100644 --- a/examples/lib/tour/03-working-with-credentials/common.go +++ b/examples/lib/tour/03-working-with-credentials/common.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 main import ( diff --git a/examples/lib/tour/04-working-with-config/01-basic-config-management.go b/examples/lib/tour/04-working-with-config/01-basic-config-management.go index 6e8d66533e..2c122c225b 100644 --- a/examples/lib/tour/04-working-with-config/01-basic-config-management.go +++ b/examples/lib/tour/04-working-with-config/01-basic-config-management.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 main import ( diff --git a/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.go b/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.go index c3c7864f7e..84e176a1c5 100644 --- a/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.go +++ b/examples/lib/tour/04-working-with-config/02-handle-arbitrary-config.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 main import ( diff --git a/examples/lib/tour/04-working-with-config/03-using-ocm-config.go b/examples/lib/tour/04-working-with-config/03-using-ocm-config.go index fe1b58e955..82dc1c8314 100644 --- a/examples/lib/tour/04-working-with-config/03-using-ocm-config.go +++ b/examples/lib/tour/04-working-with-config/03-using-ocm-config.go @@ -1,12 +1,10 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( "fmt" + "sigs.k8s.io/yaml" + "github.com/open-component-model/ocm/examples/lib/helper" configcfg "github.com/open-component-model/ocm/pkg/contexts/config/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" @@ -16,7 +14,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/errors" - "sigs.k8s.io/yaml" ) func HandleOCMConfig(cfg *helper.Config) error { diff --git a/examples/lib/tour/04-working-with-config/04-write-config-type.go b/examples/lib/tour/04-working-with-config/04-write-config-type.go index 7e7404e21a..a74a356976 100644 --- a/examples/lib/tour/04-working-with-config/04-write-config-type.go +++ b/examples/lib/tour/04-working-with-config/04-write-config-type.go @@ -1,13 +1,11 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package main import ( "encoding/json" "fmt" + "sigs.k8s.io/yaml" + "github.com/open-component-model/ocm/examples/lib/helper" configcfg "github.com/open-component-model/ocm/pkg/contexts/config/config" "github.com/open-component-model/ocm/pkg/contexts/config/cpi" @@ -17,7 +15,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/errors" "github.com/open-component-model/ocm/pkg/runtime" - "sigs.k8s.io/yaml" ) // TYPE is the name of our new configuration object type. diff --git a/examples/lib/tour/04-working-with-config/05-write-config-consumer.go b/examples/lib/tour/04-working-with-config/05-write-config-consumer.go index 8bfe5958cd..2848c9c704 100644 --- a/examples/lib/tour/04-working-with-config/05-write-config-consumer.go +++ b/examples/lib/tour/04-working-with-config/05-write-config-consumer.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 main import ( diff --git a/examples/lib/tour/04-working-with-config/common.go b/examples/lib/tour/04-working-with-config/common.go index 4957898867..2c08f1d35a 100644 --- a/examples/lib/tour/04-working-with-config/common.go +++ b/examples/lib/tour/04-working-with-config/common.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 main import ( diff --git a/examples/lib/tour/05-transporting-component-versions/common.go b/examples/lib/tour/05-transporting-component-versions/common.go index cdc9171da9..24ca1178ea 100644 --- a/examples/lib/tour/05-transporting-component-versions/common.go +++ b/examples/lib/tour/05-transporting-component-versions/common.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 main import ( diff --git a/examples/lib/tour/05-transporting-component-versions/example.go b/examples/lib/tour/05-transporting-component-versions/example.go index 34c5713aa5..d6dec77222 100644 --- a/examples/lib/tour/05-transporting-component-versions/example.go +++ b/examples/lib/tour/05-transporting-component-versions/example.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 main import ( diff --git a/examples/lib/tour/06-signing-component-versions/01-basic-signing.go b/examples/lib/tour/06-signing-component-versions/01-basic-signing.go index 055e5d05fa..9240b199b6 100644 --- a/examples/lib/tour/06-signing-component-versions/01-basic-signing.go +++ b/examples/lib/tour/06-signing-component-versions/01-basic-signing.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 main import ( diff --git a/examples/lib/tour/06-signing-component-versions/02-using-context-settings.go b/examples/lib/tour/06-signing-component-versions/02-using-context-settings.go index c0e8dd3d0a..b1c6e0c020 100644 --- a/examples/lib/tour/06-signing-component-versions/02-using-context-settings.go +++ b/examples/lib/tour/06-signing-component-versions/02-using-context-settings.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 main import ( diff --git a/examples/lib/tour/06-signing-component-versions/common.go b/examples/lib/tour/06-signing-component-versions/common.go index 6181ff3b2d..75377f8ae4 100644 --- a/examples/lib/tour/06-signing-component-versions/common.go +++ b/examples/lib/tour/06-signing-component-versions/common.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 main import ( diff --git a/examples/lib/tour/doc.go b/examples/lib/tour/doc.go index 9b7a6be504..d20d8d6dd7 100644 --- a/examples/lib/tour/doc.go +++ b/examples/lib/tour/doc.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 - //go:generate mdref --headings --list docsrc . package tour diff --git a/hack/generate-docs/cobradoc/space.go b/hack/generate-docs/cobradoc/space.go index 4e6f8e406e..b4fd8c63eb 100644 --- a/hack/generate-docs/cobradoc/space.go +++ b/hack/generate-docs/cobradoc/space.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 cobradoc import ( diff --git a/pkg/blobaccess/blobaccess_test.go b/pkg/blobaccess/blobaccess_test.go index 17993d466a..4ea99a80f4 100644 --- a/pkg/blobaccess/blobaccess_test.go +++ b/pkg/blobaccess/blobaccess_test.go @@ -1,22 +1,17 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package blobaccess_test import ( "os" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/blobaccess/bpi" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("blob access ref counting", func() { diff --git a/pkg/blobaccess/bpi/interface.go b/pkg/blobaccess/bpi/interface.go index 488b926630..2b296218ed 100644 --- a/pkg/blobaccess/bpi/interface.go +++ b/pkg/blobaccess/bpi/interface.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 bpi import ( diff --git a/pkg/blobaccess/bpi/utils.go b/pkg/blobaccess/bpi/utils.go index 2589c17791..8a3f0c1a40 100644 --- a/pkg/blobaccess/bpi/utils.go +++ b/pkg/blobaccess/bpi/utils.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 bpi import ( diff --git a/pkg/blobaccess/bpi/view.go b/pkg/blobaccess/bpi/view.go index 6e56e96c9d..abfc174c54 100644 --- a/pkg/blobaccess/bpi/view.go +++ b/pkg/blobaccess/bpi/view.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 bpi import ( diff --git a/pkg/blobaccess/cached.go b/pkg/blobaccess/cached.go index 7290a051c3..d71748a367 100644 --- a/pkg/blobaccess/cached.go +++ b/pkg/blobaccess/cached.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 blobaccess import ( diff --git a/pkg/blobaccess/compress.go b/pkg/blobaccess/compress.go index d246c9391c..2bc9ff6591 100644 --- a/pkg/blobaccess/compress.go +++ b/pkg/blobaccess/compress.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 blobaccess import ( diff --git a/pkg/blobaccess/compress_test.go b/pkg/blobaccess/compress_test.go index 9a748d11e8..37eaf6f92d 100644 --- a/pkg/blobaccess/compress_test.go +++ b/pkg/blobaccess/compress_test.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 blobaccess_test import ( @@ -11,10 +7,10 @@ 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/blobaccess" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("temp file management", func() { diff --git a/pkg/blobaccess/dataaccess.go b/pkg/blobaccess/dataaccess.go index 2ac98460a8..3635723f51 100644 --- a/pkg/blobaccess/dataaccess.go +++ b/pkg/blobaccess/dataaccess.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 blobaccess import ( diff --git a/pkg/blobaccess/digest.go b/pkg/blobaccess/digest.go index acefe02a70..d42f952b41 100644 --- a/pkg/blobaccess/digest.go +++ b/pkg/blobaccess/digest.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 blobaccess import ( diff --git a/pkg/blobaccess/interface.go b/pkg/blobaccess/interface.go index 1e31db6fe8..a0c751ac73 100644 --- a/pkg/blobaccess/interface.go +++ b/pkg/blobaccess/interface.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 blobaccess import ( diff --git a/pkg/blobaccess/internal/interface.go b/pkg/blobaccess/internal/interface.go index 0c1b33dabe..36cc92b5fd 100644 --- a/pkg/blobaccess/internal/interface.go +++ b/pkg/blobaccess/internal/interface.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/blobaccess/temp_test.go b/pkg/blobaccess/temp_test.go index 41a0f62e43..7ed780dca1 100644 --- a/pkg/blobaccess/temp_test.go +++ b/pkg/blobaccess/temp_test.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package blobaccess_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/blobaccess" ) diff --git a/pkg/blobaccess/utils.go b/pkg/blobaccess/utils.go index 6a0afa8a03..7ce1c0ec66 100644 --- a/pkg/blobaccess/utils.go +++ b/pkg/blobaccess/utils.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 blobaccess import ( diff --git a/pkg/cobrautils/flagsets/filter.go b/pkg/cobrautils/flagsets/filter.go index 1fe454afef..aeab3b5d71 100644 --- a/pkg/cobrautils/flagsets/filter.go +++ b/pkg/cobrautils/flagsets/filter.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 flagsets func Not(f Filter) Filter { diff --git a/pkg/cobrautils/flagsets/flagsetscheme/doc.go b/pkg/cobrautils/flagsets/flagsetscheme/doc.go index 898f8d56e9..d83cb619db 100644 --- a/pkg/cobrautils/flagsets/flagsetscheme/doc.go +++ b/pkg/cobrautils/flagsets/flagsetscheme/doc.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 flagsetscheme provides a runtime.TypeScheme with support // for command line option sets for the described object types. // Therefore, the object types (VersionTypedObjectType) have to provide diff --git a/pkg/cobrautils/flagsets/flagsetscheme/scheme.go b/pkg/cobrautils/flagsets/flagsetscheme/scheme.go index 327b2ea997..aafc90fd68 100644 --- a/pkg/cobrautils/flagsets/flagsetscheme/scheme.go +++ b/pkg/cobrautils/flagsets/flagsetscheme/scheme.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 flagsetscheme import ( diff --git a/pkg/cobrautils/flagsets/flagsetscheme/types.go b/pkg/cobrautils/flagsets/flagsetscheme/types.go index 48b8acb25a..f69af8478b 100644 --- a/pkg/cobrautils/flagsets/flagsetscheme/types.go +++ b/pkg/cobrautils/flagsets/flagsetscheme/types.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 flagsetscheme import ( diff --git a/pkg/cobrautils/flagsets/flagsetscheme/types_options.go b/pkg/cobrautils/flagsets/flagsetscheme/types_options.go index 104b76eac9..a04a30f35b 100644 --- a/pkg/cobrautils/flagsets/flagsetscheme/types_options.go +++ b/pkg/cobrautils/flagsets/flagsetscheme/types_options.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 flagsetscheme import ( diff --git a/pkg/cobrautils/logopts/options.go b/pkg/cobrautils/logopts/options.go index 5af9483f5f..ea39f8beb8 100644 --- a/pkg/cobrautils/logopts/options.go +++ b/pkg/cobrautils/logopts/options.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 logopts import ( diff --git a/pkg/cobrautils/logopts/options_test.go b/pkg/cobrautils/logopts/options_test.go index 827fe0254f..5bbbe5ea3b 100644 --- a/pkg/cobrautils/logopts/options_test.go +++ b/pkg/cobrautils/logopts/options_test.go @@ -1,21 +1,16 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package logopts import ( "fmt" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/logging" "github.com/mandelsoft/logging/config" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "sigs.k8s.io/yaml" "github.com/open-component-model/ocm/pkg/contexts/clictx" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("log configuration", func() { diff --git a/pkg/common/accessio/digestreader.go b/pkg/common/accessio/digestreader.go index 05b94e4687..e4df566ac4 100644 --- a/pkg/common/accessio/digestreader.go +++ b/pkg/common/accessio/digestreader.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 accessio import ( diff --git a/pkg/common/accessio/digestwriter.go b/pkg/common/accessio/digestwriter.go index aebd4ca9ab..d2454be130 100644 --- a/pkg/common/accessio/digestwriter.go +++ b/pkg/common/accessio/digestwriter.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 accessio import ( diff --git a/pkg/common/accessio/retry_test.go b/pkg/common/accessio/retry_test.go index 5d712edcb4..4d72e9423b 100644 --- a/pkg/common/accessio/retry_test.go +++ b/pkg/common/accessio/retry_test.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 accessio_test import ( @@ -10,10 +6,10 @@ 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/accessio" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/testutils" ) var Retry = accessio.Retry diff --git a/pkg/contexts/config/internal/logging.go b/pkg/contexts/config/internal/logging.go index dfae7f2ab9..396e750258 100644 --- a/pkg/contexts/config/internal/logging.go +++ b/pkg/contexts/config/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/config/logging.go b/pkg/contexts/config/logging.go index 081de27e76..cc39161178 100644 --- a/pkg/contexts/config/logging.go +++ b/pkg/contexts/config/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 config import ( diff --git a/pkg/contexts/credentials/builtin/github/github.go b/pkg/contexts/credentials/builtin/github/github.go index 4422c9fc22..733820d04f 100644 --- a/pkg/contexts/credentials/builtin/github/github.go +++ b/pkg/contexts/credentials/builtin/github/github.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 github import ( diff --git a/pkg/contexts/credentials/builtin/github/identity/identity.go b/pkg/contexts/credentials/builtin/github/identity/identity.go index 2d95dd7759..c07a16906a 100644 --- a/pkg/contexts/credentials/builtin/github/identity/identity.go +++ b/pkg/contexts/credentials/builtin/github/identity/identity.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 identity import ( diff --git a/pkg/contexts/credentials/builtin/helm/identity/identity.go b/pkg/contexts/credentials/builtin/helm/identity/identity.go index 586ab6054e..eac8271257 100644 --- a/pkg/contexts/credentials/builtin/helm/identity/identity.go +++ b/pkg/contexts/credentials/builtin/helm/identity/identity.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 identity import ( diff --git a/pkg/contexts/credentials/builtin/helm/identity/identity_test.go b/pkg/contexts/credentials/builtin/helm/identity/identity_test.go index b650c9d74e..60469dec0e 100644 --- a/pkg/contexts/credentials/builtin/helm/identity/identity_test.go +++ b/pkg/contexts/credentials/builtin/helm/identity/identity_test.go @@ -1,16 +1,12 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package identity_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/helm/identity" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/credentials" + . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/helm/identity" ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" diff --git a/pkg/contexts/credentials/builtin/oci/identity/creds.go b/pkg/contexts/credentials/builtin/oci/identity/creds.go index 000bcdc27c..972f8cf9cd 100644 --- a/pkg/contexts/credentials/builtin/oci/identity/creds.go +++ b/pkg/contexts/credentials/builtin/oci/identity/creds.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 identity import ( diff --git a/pkg/contexts/credentials/builtin/oci/identity/id_test.go b/pkg/contexts/credentials/builtin/oci/identity/id_test.go index 24b3c953b6..39e5644086 100644 --- a/pkg/contexts/credentials/builtin/oci/identity/id_test.go +++ b/pkg/contexts/credentials/builtin/oci/identity/id_test.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 identity_test import ( diff --git a/pkg/contexts/credentials/builtin/oci/identity/identity.go b/pkg/contexts/credentials/builtin/oci/identity/identity.go index a0bebc60ce..57917f4d04 100644 --- a/pkg/contexts/credentials/builtin/oci/identity/identity.go +++ b/pkg/contexts/credentials/builtin/oci/identity/identity.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 identity import ( diff --git a/pkg/contexts/credentials/builtin/oci/identity/suite_test.go b/pkg/contexts/credentials/builtin/oci/identity/suite_test.go index 4cb69b40c6..31d86c4202 100644 --- a/pkg/contexts/credentials/builtin/oci/identity/suite_test.go +++ b/pkg/contexts/credentials/builtin/oci/identity/suite_test.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 identity_test import ( diff --git a/pkg/contexts/credentials/builtin/wget/identity/suite_test.go b/pkg/contexts/credentials/builtin/wget/identity/suite_test.go index 4cb69b40c6..31d86c4202 100644 --- a/pkg/contexts/credentials/builtin/wget/identity/suite_test.go +++ b/pkg/contexts/credentials/builtin/wget/identity/suite_test.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 identity_test import ( diff --git a/pkg/contexts/credentials/doc.go b/pkg/contexts/credentials/doc.go index a494f9499c..5865a35395 100644 --- a/pkg/contexts/credentials/doc.go +++ b/pkg/contexts/credentials/doc.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 credentials handles the access to credentials for consumers of // credential sets. // diff --git a/pkg/contexts/credentials/repositories/directcreds/a_usage.go b/pkg/contexts/credentials/repositories/directcreds/a_usage.go index 705144e3bf..b808e7d9f1 100644 --- a/pkg/contexts/credentials/repositories/directcreds/a_usage.go +++ b/pkg/contexts/credentials/repositories/directcreds/a_usage.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 directcreds import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/a_usage.go b/pkg/contexts/credentials/repositories/dockerconfig/a_usage.go index b6f15f95ba..1df556666d 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/a_usage.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/a_usage.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 dockerconfig import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/logging.go b/pkg/contexts/credentials/repositories/dockerconfig/logging.go index 4f24fc88e7..1902d87bcd 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/logging.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/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 dockerconfig import ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/provider.go b/pkg/contexts/credentials/repositories/dockerconfig/provider.go index b2411aff1f..88335fc3e9 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/provider.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/provider.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 dockerconfig import ( diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/identity/identity.go b/pkg/contexts/credentials/repositories/gardenerconfig/identity/identity.go index d6f1a40b43..39ff6d1729 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/identity/identity.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/identity/identity.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 identity import ( diff --git a/pkg/contexts/credentials/repositories/vault/a_usage.go b/pkg/contexts/credentials/repositories/vault/a_usage.go index b772496657..2407385a5c 100644 --- a/pkg/contexts/credentials/repositories/vault/a_usage.go +++ b/pkg/contexts/credentials/repositories/vault/a_usage.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 vault import ( diff --git a/pkg/contexts/credentials/repositories/vault/auth.go b/pkg/contexts/credentials/repositories/vault/auth.go index c646e4c2f5..a8d3386d8f 100644 --- a/pkg/contexts/credentials/repositories/vault/auth.go +++ b/pkg/contexts/credentials/repositories/vault/auth.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 vault import ( diff --git a/pkg/contexts/credentials/repositories/vault/identity/identity.go b/pkg/contexts/credentials/repositories/vault/identity/identity.go index 79ba43d7eb..6c0ac54b9e 100644 --- a/pkg/contexts/credentials/repositories/vault/identity/identity.go +++ b/pkg/contexts/credentials/repositories/vault/identity/identity.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 identity import ( diff --git a/pkg/contexts/credentials/repositories/vault/logging.go b/pkg/contexts/credentials/repositories/vault/logging.go index d75d785db6..e5ccfdaeb4 100644 --- a/pkg/contexts/credentials/repositories/vault/logging.go +++ b/pkg/contexts/credentials/repositories/vault/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 vault import ( diff --git a/pkg/contexts/credentials/repositories/vault/options.go b/pkg/contexts/credentials/repositories/vault/options.go index 71031496f1..aeba1f6b3b 100644 --- a/pkg/contexts/credentials/repositories/vault/options.go +++ b/pkg/contexts/credentials/repositories/vault/options.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 vault import ( diff --git a/pkg/contexts/credentials/repositories/vault/provider.go b/pkg/contexts/credentials/repositories/vault/provider.go index 1d8c9fb4ec..418d3641a4 100644 --- a/pkg/contexts/credentials/repositories/vault/provider.go +++ b/pkg/contexts/credentials/repositories/vault/provider.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 vault import ( diff --git a/pkg/contexts/credentials/utils.go b/pkg/contexts/credentials/utils.go index d7bcde9b9d..117f78508a 100644 --- a/pkg/contexts/credentials/utils.go +++ b/pkg/contexts/credentials/utils.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 credentials import ( diff --git a/pkg/contexts/datacontext/action/api/action_test.go b/pkg/contexts/datacontext/action/api/action_test.go index 9d42354757..d2f0a301ab 100644 --- a/pkg/contexts/datacontext/action/api/action_test.go +++ b/pkg/contexts/datacontext/action/api/action_test.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 api_test import ( diff --git a/pkg/contexts/datacontext/action/api/interface.go b/pkg/contexts/datacontext/action/api/interface.go index 2e3c4b2ffd..eb3a7928fa 100644 --- a/pkg/contexts/datacontext/action/api/interface.go +++ b/pkg/contexts/datacontext/action/api/interface.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 api import ( diff --git a/pkg/contexts/datacontext/action/api/options.go b/pkg/contexts/datacontext/action/api/options.go index ea8b9a3ee7..7e8dce4065 100644 --- a/pkg/contexts/datacontext/action/api/options.go +++ b/pkg/contexts/datacontext/action/api/options.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 api func NewOptions(olist ...Option) *Options { diff --git a/pkg/contexts/datacontext/action/api/registry.go b/pkg/contexts/datacontext/action/api/registry.go index e55e7c7ce2..ba2ad44261 100644 --- a/pkg/contexts/datacontext/action/api/registry.go +++ b/pkg/contexts/datacontext/action/api/registry.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 api import ( diff --git a/pkg/contexts/datacontext/action/api/registry_test.go b/pkg/contexts/datacontext/action/api/registry_test.go index 30cddf2620..a466951fe2 100644 --- a/pkg/contexts/datacontext/action/api/registry_test.go +++ b/pkg/contexts/datacontext/action/api/registry_test.go @@ -1,19 +1,15 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package api_test 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/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api" "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) type Handler struct { diff --git a/pkg/contexts/datacontext/action/api/utils.go b/pkg/contexts/datacontext/action/api/utils.go index 22a6009e1f..1652b95684 100644 --- a/pkg/contexts/datacontext/action/api/utils.go +++ b/pkg/contexts/datacontext/action/api/utils.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 api import ( diff --git a/pkg/contexts/datacontext/action/handlers/options.go b/pkg/contexts/datacontext/action/handlers/options.go index 60f38532a3..3bcb9e82ee 100644 --- a/pkg/contexts/datacontext/action/handlers/options.go +++ b/pkg/contexts/datacontext/action/handlers/options.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 handlers import ( diff --git a/pkg/contexts/datacontext/action/handlers/registry.go b/pkg/contexts/datacontext/action/handlers/registry.go index 208917b4b3..96301a9e0b 100644 --- a/pkg/contexts/datacontext/action/handlers/registry.go +++ b/pkg/contexts/datacontext/action/handlers/registry.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 handlers import ( diff --git a/pkg/contexts/datacontext/builder.go b/pkg/contexts/datacontext/builder.go index 03ccb4a7e6..bb6a7ae194 100644 --- a/pkg/contexts/datacontext/builder.go +++ b/pkg/contexts/datacontext/builder.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 datacontext import ( diff --git a/pkg/contexts/datacontext/cpi.go b/pkg/contexts/datacontext/cpi.go index 4d372330ad..be80c6f010 100644 --- a/pkg/contexts/datacontext/cpi.go +++ b/pkg/contexts/datacontext/cpi.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 datacontext import ( diff --git a/pkg/contexts/datacontext/logging.go b/pkg/contexts/datacontext/logging.go index ececf32720..4fa21e3ffd 100644 --- a/pkg/contexts/datacontext/logging.go +++ b/pkg/contexts/datacontext/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 datacontext import ( diff --git a/pkg/contexts/datacontext/setup.go b/pkg/contexts/datacontext/setup.go index 19ba83e7d6..63bad8ddd8 100644 --- a/pkg/contexts/datacontext/setup.go +++ b/pkg/contexts/datacontext/setup.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 datacontext import ( diff --git a/pkg/contexts/oci/action_test.go b/pkg/contexts/oci/action_test.go index 4d5f9f518b..4b1c6af4cf 100644 --- a/pkg/contexts/oci/action_test.go +++ b/pkg/contexts/oci/action_test.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 oci_test import ( diff --git a/pkg/contexts/oci/actions/init.go b/pkg/contexts/oci/actions/init.go index e2a7fbdda2..95a51189f7 100644 --- a/pkg/contexts/oci/actions/init.go +++ b/pkg/contexts/oci/actions/init.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 actions import ( diff --git a/pkg/contexts/oci/actions/oci-repository-prepare/exec.go b/pkg/contexts/oci/actions/oci-repository-prepare/exec.go index 6fae1d6e24..175fcce154 100644 --- a/pkg/contexts/oci/actions/oci-repository-prepare/exec.go +++ b/pkg/contexts/oci/actions/oci-repository-prepare/exec.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 oci_repository_prepare import ( diff --git a/pkg/contexts/oci/actions/oci-repository-prepare/type.go b/pkg/contexts/oci/actions/oci-repository-prepare/type.go index f8a23648e3..6637b9cbc2 100644 --- a/pkg/contexts/oci/actions/oci-repository-prepare/type.go +++ b/pkg/contexts/oci/actions/oci-repository-prepare/type.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 oci_repository_prepare import ( diff --git a/pkg/contexts/oci/annotations/annotations.go b/pkg/contexts/oci/annotations/annotations.go index a8cbbf2812..ed2fc1d6fe 100644 --- a/pkg/contexts/oci/annotations/annotations.go +++ b/pkg/contexts/oci/annotations/annotations.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 annotations import ( diff --git a/pkg/contexts/oci/cpi/utils_test.go b/pkg/contexts/oci/cpi/utils_test.go index 873b71bb92..e325c5ebcb 100644 --- a/pkg/contexts/oci/cpi/utils_test.go +++ b/pkg/contexts/oci/cpi/utils_test.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 cpi_test import ( diff --git a/pkg/contexts/oci/cpi/view.go b/pkg/contexts/oci/cpi/view.go index e6c7bcea23..3984648d62 100644 --- a/pkg/contexts/oci/cpi/view.go +++ b/pkg/contexts/oci/cpi/view.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 cpi import ( diff --git a/pkg/contexts/oci/identity/creds.go b/pkg/contexts/oci/identity/creds.go index 1799842ce2..6b61c41114 100644 --- a/pkg/contexts/oci/identity/creds.go +++ b/pkg/contexts/oci/identity/creds.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 identity import ( diff --git a/pkg/contexts/oci/repositories/ocireg/logging.go b/pkg/contexts/oci/repositories/ocireg/logging.go index f489618c6f..b3a4743df7 100644 --- a/pkg/contexts/oci/repositories/ocireg/logging.go +++ b/pkg/contexts/oci/repositories/ocireg/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 ocireg import ( diff --git a/pkg/contexts/oci/transfer/transfer_test.go b/pkg/contexts/oci/transfer/transfer_test.go index cce4531423..f1c8bb23eb 100644 --- a/pkg/contexts/oci/transfer/transfer_test.go +++ b/pkg/contexts/oci/transfer/transfer_test.go @@ -1,23 +1,19 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" ) const OUT = "/tmp/res" diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/logging.go b/pkg/contexts/ocm/accessmethods/ociartifact/logging.go index c88da246f6..9c855da8d0 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/logging.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/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 ociartifact import ( diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/utils.go b/pkg/contexts/ocm/accessmethods/ociartifact/utils.go index d0e847ad3c..d1bb35a05b 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/utils.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/utils.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 ociartifact import ( diff --git a/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go b/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go index 90d1a030f6..6661d30665 100644 --- a/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go +++ b/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go @@ -1,25 +1,21 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package relativeociref_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/relativeociref" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/accessmethods/s3/identity/identity.go b/pkg/contexts/ocm/accessmethods/s3/identity/identity.go index 9ada72af70..2df1faacdf 100644 --- a/pkg/contexts/ocm/accessmethods/s3/identity/identity.go +++ b/pkg/contexts/ocm/accessmethods/s3/identity/identity.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 identity import ( diff --git a/pkg/contexts/ocm/accessmethods/s3/ifce_test.go b/pkg/contexts/ocm/accessmethods/s3/ifce_test.go index b00b832071..0a31c93fbc 100644 --- a/pkg/contexts/ocm/accessmethods/s3/ifce_test.go +++ b/pkg/contexts/ocm/accessmethods/s3/ifce_test.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 s3 import ( diff --git a/pkg/contexts/ocm/accessmethods/s3/v1.go b/pkg/contexts/ocm/accessmethods/s3/v1.go index 7d817748c5..7be29d42ae 100644 --- a/pkg/contexts/ocm/accessmethods/s3/v1.go +++ b/pkg/contexts/ocm/accessmethods/s3/v1.go @@ -1,14 +1,9 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package s3 import ( - . "github.com/open-component-model/ocm/pkg/exception" - "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" + . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/s3/v2.go b/pkg/contexts/ocm/accessmethods/s3/v2.go index 35818382f3..89a0ccbb21 100644 --- a/pkg/contexts/ocm/accessmethods/s3/v2.go +++ b/pkg/contexts/ocm/accessmethods/s3/v2.go @@ -1,14 +1,9 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package s3 import ( - . "github.com/open-component-model/ocm/pkg/exception" - "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" + . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/wget/logging.go b/pkg/contexts/ocm/accessmethods/wget/logging.go index 40329208e3..91d2c768fa 100644 --- a/pkg/contexts/ocm/accessmethods/wget/logging.go +++ b/pkg/contexts/ocm/accessmethods/wget/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 wget import ( diff --git a/pkg/contexts/ocm/actionhandler/init.go b/pkg/contexts/ocm/actionhandler/init.go index d949717b4e..f22bc94665 100644 --- a/pkg/contexts/ocm/actionhandler/init.go +++ b/pkg/contexts/ocm/actionhandler/init.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 actionhandler import ( diff --git a/pkg/contexts/ocm/attrs/signingattr/setup.go b/pkg/contexts/ocm/attrs/signingattr/setup.go index 074efb208b..66b83ad4e8 100644 --- a/pkg/contexts/ocm/attrs/signingattr/setup.go +++ b/pkg/contexts/ocm/attrs/signingattr/setup.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 signingattr import ( diff --git a/pkg/contexts/ocm/blobhandler/interface.go b/pkg/contexts/ocm/blobhandler/interface.go index 30c2bd8c0b..dc3694dc26 100644 --- a/pkg/contexts/ocm/blobhandler/interface.go +++ b/pkg/contexts/ocm/blobhandler/interface.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 blobhandler import ( diff --git a/pkg/contexts/ocm/blobhandler/registration.go b/pkg/contexts/ocm/blobhandler/registration.go index 940d0063bc..ca354dd691 100644 --- a/pkg/contexts/ocm/blobhandler/registration.go +++ b/pkg/contexts/ocm/blobhandler/registration.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 blobhandler import ( diff --git a/pkg/contexts/ocm/compdesc/equal.go b/pkg/contexts/ocm/compdesc/equal.go index 8141cd540d..ace1a2b163 100644 --- a/pkg/contexts/ocm/compdesc/equal.go +++ b/pkg/contexts/ocm/compdesc/equal.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 compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/equal_test.go b/pkg/contexts/ocm/compdesc/equal_test.go index 78b0a22507..bafe5cb349 100644 --- a/pkg/contexts/ocm/compdesc/equal_test.go +++ b/pkg/contexts/ocm/compdesc/equal_test.go @@ -1,19 +1,15 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/none" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ) diff --git a/pkg/contexts/ocm/compdesc/equivalent/equal.go b/pkg/contexts/ocm/compdesc/equivalent/equal.go index a0442021e3..4758ad5610 100644 --- a/pkg/contexts/ocm/compdesc/equivalent/equal.go +++ b/pkg/contexts/ocm/compdesc/equivalent/equal.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 equivalent // EqualState describes the equivalence state of elements diff --git a/pkg/contexts/ocm/compdesc/equivalent/testhelper/helper.go b/pkg/contexts/ocm/compdesc/equivalent/testhelper/helper.go index b7278a9afc..a639d72c4d 100644 --- a/pkg/contexts/ocm/compdesc/equivalent/testhelper/helper.go +++ b/pkg/contexts/ocm/compdesc/equivalent/testhelper/helper.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 testhelper import ( diff --git a/pkg/contexts/ocm/compdesc/logging.go b/pkg/contexts/ocm/compdesc/logging.go index fa6c3bc5c7..ea3a6b56e4 100644 --- a/pkg/contexts/ocm/compdesc/logging.go +++ b/pkg/contexts/ocm/compdesc/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 compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/logging_test.go b/pkg/contexts/ocm/compdesc/logging_test.go index fe9f6767c0..caa6b815ea 100644 --- a/pkg/contexts/ocm/compdesc/logging_test.go +++ b/pkg/contexts/ocm/compdesc/logging_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc_test import ( "bytes" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - "github.com/go-logr/logr" "github.com/mandelsoft/logging" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/tonglil/buflogr" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" diff --git a/pkg/contexts/ocm/compdesc/meta.go b/pkg/contexts/ocm/compdesc/meta.go index 9dfddd7ae4..e98f6961de 100644 --- a/pkg/contexts/ocm/compdesc/meta.go +++ b/pkg/contexts/ocm/compdesc/meta.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 compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go b/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go index a44ed3933e..b33d13029d 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go @@ -1,14 +1,10 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ) diff --git a/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go b/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go index d8ac61f80f..d2fa4376f0 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go @@ -1,16 +1,12 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("labels", func() { diff --git a/pkg/contexts/ocm/compdesc/meta/v1/types_test.go b/pkg/contexts/ocm/compdesc/meta/v1/types_test.go index 4e6179d2da..a2596ea218 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/types_test.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/types_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package v1_test import ( "time" . "github.com/onsi/ginkgo/v2" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ) diff --git a/pkg/contexts/ocm/compdesc/none.go b/pkg/contexts/ocm/compdesc/none.go index 2d232fb4a9..2138407d07 100644 --- a/pkg/contexts/ocm/compdesc/none.go +++ b/pkg/contexts/ocm/compdesc/none.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 compdesc // Type is the access type for no blob. diff --git a/pkg/contexts/ocm/compdesc/normalizations/rules/compdescrules.go b/pkg/contexts/ocm/compdesc/normalizations/rules/compdescrules.go index c3749da87d..75253e0da8 100644 --- a/pkg/contexts/ocm/compdesc/normalizations/rules/compdescrules.go +++ b/pkg/contexts/ocm/compdesc/normalizations/rules/compdescrules.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 rules import ( diff --git a/pkg/contexts/ocm/compdesc/op.go b/pkg/contexts/ocm/compdesc/op.go index b1e1e59325..2e83178f58 100644 --- a/pkg/contexts/ocm/compdesc/op.go +++ b/pkg/contexts/ocm/compdesc/op.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 compdesc import ( diff --git a/pkg/contexts/ocm/compdesc/selectors.go b/pkg/contexts/ocm/compdesc/selectors.go index dbc95be427..81c6f60988 100644 --- a/pkg/contexts/ocm/compdesc/selectors.go +++ b/pkg/contexts/ocm/compdesc/selectors.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 compdesc import ( diff --git a/pkg/contexts/ocm/context/interface.go b/pkg/contexts/ocm/context/interface.go index 09a4dc0b80..1448b63251 100644 --- a/pkg/contexts/ocm/context/interface.go +++ b/pkg/contexts/ocm/context/interface.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 context import ( diff --git a/pkg/contexts/ocm/cpi/accspeccpi/accessspec_options.go b/pkg/contexts/ocm/cpi/accspeccpi/accessspec_options.go index 2864a76114..e9d2cd6132 100644 --- a/pkg/contexts/ocm/cpi/accspeccpi/accessspec_options.go +++ b/pkg/contexts/ocm/cpi/accspeccpi/accessspec_options.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 accspeccpi import ( diff --git a/pkg/contexts/ocm/cpi/accspeccpi/accesstypes.go b/pkg/contexts/ocm/cpi/accspeccpi/accesstypes.go index 373305745e..21454dffc6 100644 --- a/pkg/contexts/ocm/cpi/accspeccpi/accesstypes.go +++ b/pkg/contexts/ocm/cpi/accspeccpi/accesstypes.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 accspeccpi import ( diff --git a/pkg/contexts/ocm/cpi/accspeccpi/interface.go b/pkg/contexts/ocm/cpi/accspeccpi/interface.go index 26b93d58fd..3e541635d3 100644 --- a/pkg/contexts/ocm/cpi/accspeccpi/interface.go +++ b/pkg/contexts/ocm/cpi/accspeccpi/interface.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 accspeccpi import ( diff --git a/pkg/contexts/ocm/cpi/accspeccpi/method.go b/pkg/contexts/ocm/cpi/accspeccpi/method.go index 9ed12fd139..ed4de33991 100644 --- a/pkg/contexts/ocm/cpi/accspeccpi/method.go +++ b/pkg/contexts/ocm/cpi/accspeccpi/method.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 accspeccpi import ( diff --git a/pkg/contexts/ocm/cpi/accspeccpi/methodview.go b/pkg/contexts/ocm/cpi/accspeccpi/methodview.go index 072773696b..27d5ce9488 100644 --- a/pkg/contexts/ocm/cpi/accspeccpi/methodview.go +++ b/pkg/contexts/ocm/cpi/accspeccpi/methodview.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 accspeccpi import ( diff --git a/pkg/contexts/ocm/cpi/logging.go b/pkg/contexts/ocm/cpi/logging.go index 7188156da1..57d55024e5 100644 --- a/pkg/contexts/ocm/cpi/logging.go +++ b/pkg/contexts/ocm/cpi/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 cpi import ( diff --git a/pkg/contexts/ocm/cpi/modopts.go b/pkg/contexts/ocm/cpi/modopts.go index 5b5773f4df..4a768f75a9 100644 --- a/pkg/contexts/ocm/cpi/modopts.go +++ b/pkg/contexts/ocm/cpi/modopts.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 cpi import ( diff --git a/pkg/contexts/ocm/cpi/ref.go b/pkg/contexts/ocm/cpi/ref.go index b429687b44..c281602374 100644 --- a/pkg/contexts/ocm/cpi/ref.go +++ b/pkg/contexts/ocm/cpi/ref.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 cpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/backend.go b/pkg/contexts/ocm/cpi/repocpi/backend.go index 5b03d33e97..52a4ea982f 100644 --- a/pkg/contexts/ocm/cpi/repocpi/backend.go +++ b/pkg/contexts/ocm/cpi/repocpi/backend.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/blobcache.go b/pkg/contexts/ocm/cpi/repocpi/blobcache.go index b324c97bd1..3b6881c139 100644 --- a/pkg/contexts/ocm/cpi/repocpi/blobcache.go +++ b/pkg/contexts/ocm/cpi/repocpi/blobcache.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/bridge_c.go b/pkg/contexts/ocm/cpi/repocpi/bridge_c.go index c552832888..c3508e643a 100644 --- a/pkg/contexts/ocm/cpi/repocpi/bridge_c.go +++ b/pkg/contexts/ocm/cpi/repocpi/bridge_c.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/bridge_cv.go b/pkg/contexts/ocm/cpi/repocpi/bridge_cv.go index b50611bb05..1cf9eaf2ac 100644 --- a/pkg/contexts/ocm/cpi/repocpi/bridge_cv.go +++ b/pkg/contexts/ocm/cpi/repocpi/bridge_cv.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/bridge_r.go b/pkg/contexts/ocm/cpi/repocpi/bridge_r.go index c59a39fd3b..1fa0f87ce8 100644 --- a/pkg/contexts/ocm/cpi/repocpi/bridge_r.go +++ b/pkg/contexts/ocm/cpi/repocpi/bridge_r.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/doc.go b/pkg/contexts/ocm/cpi/repocpi/doc.go index 017ad14993..cecff6a738 100644 --- a/pkg/contexts/ocm/cpi/repocpi/doc.go +++ b/pkg/contexts/ocm/cpi/repocpi/doc.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 repocpi contains the implementation support // for repository backends. It offers three methods // to create component version, component and repository diff --git a/pkg/contexts/ocm/cpi/repocpi/helperinterfaces.go b/pkg/contexts/ocm/cpi/repocpi/helperinterfaces.go index aec5b364f0..4322bf2bd7 100644 --- a/pkg/contexts/ocm/cpi/repocpi/helperinterfaces.go +++ b/pkg/contexts/ocm/cpi/repocpi/helperinterfaces.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/view_c.go b/pkg/contexts/ocm/cpi/repocpi/view_c.go index fa6678c1a7..6bd46e2ec9 100644 --- a/pkg/contexts/ocm/cpi/repocpi/view_c.go +++ b/pkg/contexts/ocm/cpi/repocpi/view_c.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/view_cv.go b/pkg/contexts/ocm/cpi/repocpi/view_cv.go index 76b4bbe02e..45ea3c3518 100644 --- a/pkg/contexts/ocm/cpi/repocpi/view_cv.go +++ b/pkg/contexts/ocm/cpi/repocpi/view_cv.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/repocpi/view_r.go b/pkg/contexts/ocm/cpi/repocpi/view_r.go index a1fcfcbde5..b1eb6af885 100644 --- a/pkg/contexts/ocm/cpi/repocpi/view_r.go +++ b/pkg/contexts/ocm/cpi/repocpi/view_r.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 repocpi import ( diff --git a/pkg/contexts/ocm/cpi/view_rsc.go b/pkg/contexts/ocm/cpi/view_rsc.go index a88c2a5f40..3e451581e9 100644 --- a/pkg/contexts/ocm/cpi/view_rsc.go +++ b/pkg/contexts/ocm/cpi/view_rsc.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 cpi import ( diff --git a/pkg/contexts/ocm/digester/digesters/blob/digester.go b/pkg/contexts/ocm/digester/digesters/blob/digester.go index 80b20fbc5d..ec9f64469e 100644 --- a/pkg/contexts/ocm/digester/digesters/blob/digester.go +++ b/pkg/contexts/ocm/digester/digesters/blob/digester.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 blob import ( diff --git a/pkg/contexts/ocm/download/download.go b/pkg/contexts/ocm/download/download.go index accd538b9d..595590a66a 100644 --- a/pkg/contexts/ocm/download/download.go +++ b/pkg/contexts/ocm/download/download.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 download import ( diff --git a/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go b/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go index 64f39d3aac..72a57dfb8f 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go @@ -1,16 +1,9 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package blueprint_test import ( + "github.com/mandelsoft/vfs/pkg/projectionfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -22,6 +15,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers/blueprint" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" tenv "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/download/handlers/blueprint/extractor.go b/pkg/contexts/ocm/download/handlers/blueprint/extractor.go index 12f2d3b437..7b37837f48 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/extractor.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/extractor.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 blueprint import ( diff --git a/pkg/contexts/ocm/download/handlers/blueprint/suite_test.go b/pkg/contexts/ocm/download/handlers/blueprint/suite_test.go index 265023d37d..38ef89b0fa 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/suite_test.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/suite_test.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 blueprint_test import ( diff --git a/pkg/contexts/ocm/download/handlers/dirtree/handler.go b/pkg/contexts/ocm/download/handlers/dirtree/handler.go index cf061277eb..c6e766372f 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/handler.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/handler.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 dirtree import ( diff --git a/pkg/contexts/ocm/download/handlers/dirtree/registration.go b/pkg/contexts/ocm/download/handlers/dirtree/registration.go index 68240b74f8..6748bac475 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/registration.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/registration.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 dirtree import ( diff --git a/pkg/contexts/ocm/download/handlers/helm/download.go b/pkg/contexts/ocm/download/handlers/helm/download.go index 3f267242da..480e7ddbce 100644 --- a/pkg/contexts/ocm/download/handlers/helm/download.go +++ b/pkg/contexts/ocm/download/handlers/helm/download.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 helm import ( diff --git a/pkg/contexts/ocm/download/handlers/ocirepo/registration.go b/pkg/contexts/ocm/download/handlers/ocirepo/registration.go index e9f25f8d11..a98e1930ff 100644 --- a/pkg/contexts/ocm/download/handlers/ocirepo/registration.go +++ b/pkg/contexts/ocm/download/handlers/ocirepo/registration.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 ocirepo import ( diff --git a/pkg/contexts/ocm/download/logging.go b/pkg/contexts/ocm/download/logging.go index 7f855b2edf..a0f17ad5e1 100644 --- a/pkg/contexts/ocm/download/logging.go +++ b/pkg/contexts/ocm/download/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 download import ( diff --git a/pkg/contexts/ocm/download/registration.go b/pkg/contexts/ocm/download/registration.go index 55f08c0732..adcb6ea3d0 100644 --- a/pkg/contexts/ocm/download/registration.go +++ b/pkg/contexts/ocm/download/registration.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 download import ( diff --git a/pkg/contexts/ocm/download/setup.go b/pkg/contexts/ocm/download/setup.go index 5c7c2a1f27..7d83a00e22 100644 --- a/pkg/contexts/ocm/download/setup.go +++ b/pkg/contexts/ocm/download/setup.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 download import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/doc.go b/pkg/contexts/ocm/elements/artifactaccess/doc.go index 4dfede7159..43b8d0a456 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/doc.go +++ b/pkg/contexts/ocm/elements/artifactaccess/doc.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 artifactaccess hosts packages for // ResourceAccess and SourceAccess builders used to add // resources and sources referring to content in other repositories diff --git a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource.go b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource.go index 6e7f8ad42b..6831d29aa4 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource.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 genericaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go index ad960184f5..9c60cde4d0 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go +++ b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go @@ -1,24 +1,20 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericaccess_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" me "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactaccess/genericaccess" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/elements/artifactaccess/githubaccess/options.go b/pkg/contexts/ocm/elements/artifactaccess/githubaccess/options.go index 0bb2cdc825..4b8a5ad480 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/githubaccess/options.go +++ b/pkg/contexts/ocm/elements/artifactaccess/githubaccess/options.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 githubaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/githubaccess/resource.go b/pkg/contexts/ocm/elements/artifactaccess/githubaccess/resource.go index 8c2dfdb0a5..491d23ed70 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/githubaccess/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/githubaccess/resource.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 githubaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/helmaccess/resource.go b/pkg/contexts/ocm/elements/artifactaccess/helmaccess/resource.go index e7a7b35e29..b5aae98b78 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/helmaccess/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/helmaccess/resource.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 helmaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/npmaccess/resource.go b/pkg/contexts/ocm/elements/artifactaccess/npmaccess/resource.go index dd6bc3955b..594d50cadf 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/npmaccess/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/npmaccess/resource.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 npmaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/ociartifactaccess/resource.go b/pkg/contexts/ocm/elements/artifactaccess/ociartifactaccess/resource.go index 40b6086193..1e39c3efa6 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/ociartifactaccess/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/ociartifactaccess/resource.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 ociartifactaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/options.go b/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/options.go index 38f31c7950..06e1e66e0a 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/options.go +++ b/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/options.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 github import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/resource.go b/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/resource.go index a3c8171646..53ac2d7e7c 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/ociblobaccess/resource.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 github import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/s3access/options.go b/pkg/contexts/ocm/elements/artifactaccess/s3access/options.go index 48373cd978..bb7c98fe42 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/s3access/options.go +++ b/pkg/contexts/ocm/elements/artifactaccess/s3access/options.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 github import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/s3access/resource.go b/pkg/contexts/ocm/elements/artifactaccess/s3access/resource.go index c78ae899bc..fcd3dc33e6 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/s3access/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/s3access/resource.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 github import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/api/options.go b/pkg/contexts/ocm/elements/artifactblob/api/options.go index c9bf857cce..954e07f557 100644 --- a/pkg/contexts/ocm/elements/artifactblob/api/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/api/options.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 api import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/datablob/options.go b/pkg/contexts/ocm/elements/artifactblob/datablob/options.go index e5156e7862..176cf5bc0c 100644 --- a/pkg/contexts/ocm/elements/artifactblob/datablob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/datablob/options.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 datablob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/datablob/resource.go b/pkg/contexts/ocm/elements/artifactblob/datablob/resource.go index c481d032d3..44d9445d41 100644 --- a/pkg/contexts/ocm/elements/artifactblob/datablob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/datablob/resource.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 datablob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/options.go b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/options.go index f4248c6384..47e7479926 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/options.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 dirtreeblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource.go index 3fb282dc4b..7b51e50a5a 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource.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 dirtreeblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go index 8717bf7f2b..3b90ef4721 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go +++ b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtreeblob_test 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/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -17,6 +12,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" testenv "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/elements/artifactblob/doc.go b/pkg/contexts/ocm/elements/artifactblob/doc.go index 167d66ded7..4fd069ed61 100644 --- a/pkg/contexts/ocm/elements/artifactblob/doc.go +++ b/pkg/contexts/ocm/elements/artifactblob/doc.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 artifactblob hosts packages for // ResourceAccess and SourceAccess builders used to add // resources and sources as local blobs to a component version. diff --git a/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/options.go b/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/options.go index 097eb1d09f..98701fdabe 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/options.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 dockerdaemonblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/resource.go index 280050a058..997ca81815 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/dockerdaemonblob/resource.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 dockerdaemonblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/options.go b/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/options.go index e0c832ea01..a6412c14f1 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/options.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 dockermultiblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/resource.go index df824cf61a..a14f4fce6a 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/dockermultiblob/resource.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 dockermultiblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/externalblob/doc.go b/pkg/contexts/ocm/elements/artifactblob/externalblob/doc.go index 6aad2b9201..7a0eabb463 100644 --- a/pkg/contexts/ocm/elements/artifactblob/externalblob/doc.go +++ b/pkg/contexts/ocm/elements/artifactblob/externalblob/doc.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 ociartifact provides a way to provide ResourceAccess and SourceAccess // objects based on external access specification intended to be added as local access. // Those access objects can then directly be used to compose reource and source entries diff --git a/pkg/contexts/ocm/elements/artifactblob/externalblob/options.go b/pkg/contexts/ocm/elements/artifactblob/externalblob/options.go index e70a2c4271..c2a75ab354 100644 --- a/pkg/contexts/ocm/elements/artifactblob/externalblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/externalblob/options.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 externalblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/externalblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/externalblob/resource.go index 29c039f900..aa9be3aa9d 100644 --- a/pkg/contexts/ocm/elements/artifactblob/externalblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/externalblob/resource.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 externalblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/fileblob/options.go b/pkg/contexts/ocm/elements/artifactblob/fileblob/options.go index cd17e83953..5a1cdc6d37 100644 --- a/pkg/contexts/ocm/elements/artifactblob/fileblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/fileblob/options.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 fileblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/fileblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/fileblob/resource.go index 73b65fc0d6..ac6be767ae 100644 --- a/pkg/contexts/ocm/elements/artifactblob/fileblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/fileblob/resource.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 fileblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/genericblob/options.go b/pkg/contexts/ocm/elements/artifactblob/genericblob/options.go index 250a57adeb..93105221fe 100644 --- a/pkg/contexts/ocm/elements/artifactblob/genericblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/genericblob/options.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 genericblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/genericblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/genericblob/resource.go index ad32222f9c..01bcb8248c 100644 --- a/pkg/contexts/ocm/elements/artifactblob/genericblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/genericblob/resource.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 genericblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/helmblob/options.go b/pkg/contexts/ocm/elements/artifactblob/helmblob/options.go index 5ce989d2dd..69450c00cb 100644 --- a/pkg/contexts/ocm/elements/artifactblob/helmblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/helmblob/options.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 helmblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/helmblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/helmblob/resource.go index fa845e9c47..2e201aec31 100644 --- a/pkg/contexts/ocm/elements/artifactblob/helmblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/helmblob/resource.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 helmblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/options.go b/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/options.go index 36899b6b8c..2a9a36c65a 100644 --- a/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/options.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 ociartifactblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/resource.go index fb60604e56..9e33434d2d 100644 --- a/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/ociartifactblob/resource.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 ociartifactblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/textblob/options.go b/pkg/contexts/ocm/elements/artifactblob/textblob/options.go index 1176c6fc60..46e99a0035 100644 --- a/pkg/contexts/ocm/elements/artifactblob/textblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/textblob/options.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 textblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/textblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/textblob/resource.go index a161365aa2..8683676dce 100644 --- a/pkg/contexts/ocm/elements/artifactblob/textblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/textblob/resource.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 textblob import ( diff --git a/pkg/contexts/ocm/elements/artifacts.go b/pkg/contexts/ocm/elements/artifacts.go index 1bc8bdc05f..20c8607cb9 100644 --- a/pkg/contexts/ocm/elements/artifacts.go +++ b/pkg/contexts/ocm/elements/artifacts.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 elements type ArtifactOption interface { diff --git a/pkg/contexts/ocm/elements/common.go b/pkg/contexts/ocm/elements/common.go index 2ef428f00a..c4321bff1f 100644 --- a/pkg/contexts/ocm/elements/common.go +++ b/pkg/contexts/ocm/elements/common.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 elements import ( diff --git a/pkg/contexts/ocm/elements/digests.go b/pkg/contexts/ocm/elements/digests.go index 690d51971c..2a80de0ebc 100644 --- a/pkg/contexts/ocm/elements/digests.go +++ b/pkg/contexts/ocm/elements/digests.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 elements import ( diff --git a/pkg/contexts/ocm/elements/doc.go b/pkg/contexts/ocm/elements/doc.go index 1ef95561e2..3b1c03302e 100644 --- a/pkg/contexts/ocm/elements/doc.go +++ b/pkg/contexts/ocm/elements/doc.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 elements contains builders // for elements of a component version, // aka resources, sources and references. diff --git a/pkg/contexts/ocm/elements/references.go b/pkg/contexts/ocm/elements/references.go index cbdf953354..faac688586 100644 --- a/pkg/contexts/ocm/elements/references.go +++ b/pkg/contexts/ocm/elements/references.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 elements import ( diff --git a/pkg/contexts/ocm/elements/resources.go b/pkg/contexts/ocm/elements/resources.go index dbb329dfb4..e2e1dd0399 100644 --- a/pkg/contexts/ocm/elements/resources.go +++ b/pkg/contexts/ocm/elements/resources.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 elements import ( diff --git a/pkg/contexts/ocm/elements/resources_test.go b/pkg/contexts/ocm/elements/resources_test.go index 6c4a70dbbd..4a57c49be3 100644 --- a/pkg/contexts/ocm/elements/resources_test.go +++ b/pkg/contexts/ocm/elements/resources_test.go @@ -1,18 +1,14 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package elements_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/digester/digesters/blob" me "github.com/open-component-model/ocm/pkg/contexts/ocm/elements" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" + . "github.com/open-component-model/ocm/pkg/testutils" ) type value struct { diff --git a/pkg/contexts/ocm/elements/sources.go b/pkg/contexts/ocm/elements/sources.go index 30080dcc02..0ab8443c5a 100644 --- a/pkg/contexts/ocm/elements/sources.go +++ b/pkg/contexts/ocm/elements/sources.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 elements import ( diff --git a/pkg/contexts/ocm/internal/delegation.go b/pkg/contexts/ocm/internal/delegation.go index 917b3da48d..f95e08c133 100644 --- a/pkg/contexts/ocm/internal/delegation.go +++ b/pkg/contexts/ocm/internal/delegation.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/ocm/internal/hasher.go b/pkg/contexts/ocm/internal/hasher.go index 0ac5e5a976..a170d0c505 100644 --- a/pkg/contexts/ocm/internal/hasher.go +++ b/pkg/contexts/ocm/internal/hasher.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/ocm/internal/modopts.go b/pkg/contexts/ocm/internal/modopts.go index c509cbba1c..33ee9c0b98 100644 --- a/pkg/contexts/ocm/internal/modopts.go +++ b/pkg/contexts/ocm/internal/modopts.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/ocm/internal/resolver.go b/pkg/contexts/ocm/internal/resolver.go index 85665b2855..3bef59e78c 100644 --- a/pkg/contexts/ocm/internal/resolver.go +++ b/pkg/contexts/ocm/internal/resolver.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/ocm/labels/init.go b/pkg/contexts/ocm/labels/init.go index 178501f011..a4af271d86 100644 --- a/pkg/contexts/ocm/labels/init.go +++ b/pkg/contexts/ocm/labels/init.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 labels import ( diff --git a/pkg/contexts/ocm/labels/routingslip/entry.go b/pkg/contexts/ocm/labels/routingslip/entry.go index 6584a6b0b1..490c365f99 100644 --- a/pkg/contexts/ocm/labels/routingslip/entry.go +++ b/pkg/contexts/ocm/labels/routingslip/entry.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 routingslip import ( diff --git a/pkg/contexts/ocm/labels/routingslip/entrytypes_test.go b/pkg/contexts/ocm/labels/routingslip/entrytypes_test.go index 9ee0ad0deb..dabab83eb4 100644 --- a/pkg/contexts/ocm/labels/routingslip/entrytypes_test.go +++ b/pkg/contexts/ocm/labels/routingslip/entrytypes_test.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 routingslip_test import ( @@ -10,7 +6,6 @@ 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/contexts/ocm" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" @@ -18,6 +13,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/internal" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const TYPE = "my" diff --git a/pkg/contexts/ocm/labels/routingslip/init.go b/pkg/contexts/ocm/labels/routingslip/init.go index bfbb9e7def..f4d1901774 100644 --- a/pkg/contexts/ocm/labels/routingslip/init.go +++ b/pkg/contexts/ocm/labels/routingslip/init.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 routingslip import ( diff --git a/pkg/contexts/ocm/labels/routingslip/interface.go b/pkg/contexts/ocm/labels/routingslip/interface.go index 0e24f87ad6..1a97f0c6c5 100644 --- a/pkg/contexts/ocm/labels/routingslip/interface.go +++ b/pkg/contexts/ocm/labels/routingslip/interface.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 routingslip import ( diff --git a/pkg/contexts/ocm/labels/routingslip/internal/attr.go b/pkg/contexts/ocm/labels/routingslip/internal/attr.go index b729adc147..d77cd3f7a5 100644 --- a/pkg/contexts/ocm/labels/routingslip/internal/attr.go +++ b/pkg/contexts/ocm/labels/routingslip/internal/attr.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/ocm/labels/routingslip/internal/entrytypes.go b/pkg/contexts/ocm/labels/routingslip/internal/entrytypes.go index bf6b232287..e500ce1174 100644 --- a/pkg/contexts/ocm/labels/routingslip/internal/entrytypes.go +++ b/pkg/contexts/ocm/labels/routingslip/internal/entrytypes.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/ocm/labels/routingslip/label.go b/pkg/contexts/ocm/labels/routingslip/label.go index 9ab4b93044..d01714c0b3 100644 --- a/pkg/contexts/ocm/labels/routingslip/label.go +++ b/pkg/contexts/ocm/labels/routingslip/label.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 routingslip import ( diff --git a/pkg/contexts/ocm/labels/routingslip/slip.go b/pkg/contexts/ocm/labels/routingslip/slip.go index 2d6e887de6..d6673deede 100644 --- a/pkg/contexts/ocm/labels/routingslip/slip.go +++ b/pkg/contexts/ocm/labels/routingslip/slip.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 routingslip import ( diff --git a/pkg/contexts/ocm/labels/routingslip/slip_test.go b/pkg/contexts/ocm/labels/routingslip/slip_test.go index 16615f87af..82561eb83b 100644 --- a/pkg/contexts/ocm/labels/routingslip/slip_test.go +++ b/pkg/contexts/ocm/labels/routingslip/slip_test.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 routingslip_test import ( @@ -10,8 +6,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/opencontainers/go-digest" "sigs.k8s.io/yaml" @@ -20,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ORG = "acme.org" diff --git a/pkg/contexts/ocm/labels/routingslip/spi/entrytype_options.go b/pkg/contexts/ocm/labels/routingslip/spi/entrytype_options.go index ad727449c7..ce3c8fca09 100644 --- a/pkg/contexts/ocm/labels/routingslip/spi/entrytype_options.go +++ b/pkg/contexts/ocm/labels/routingslip/spi/entrytype_options.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 spi import ( diff --git a/pkg/contexts/ocm/labels/routingslip/spi/interface.go b/pkg/contexts/ocm/labels/routingslip/spi/interface.go index 9964466a3e..983132175e 100644 --- a/pkg/contexts/ocm/labels/routingslip/spi/interface.go +++ b/pkg/contexts/ocm/labels/routingslip/spi/interface.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 spi import ( diff --git a/pkg/contexts/ocm/labels/routingslip/spi/support.go b/pkg/contexts/ocm/labels/routingslip/spi/support.go index 2a0307208b..cd410de50f 100644 --- a/pkg/contexts/ocm/labels/routingslip/spi/support.go +++ b/pkg/contexts/ocm/labels/routingslip/spi/support.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 spi import ( diff --git a/pkg/contexts/ocm/labels/routingslip/transfer_test.go b/pkg/contexts/ocm/labels/routingslip/transfer_test.go index 097afa9d6b..352352ce69 100644 --- a/pkg/contexts/ocm/labels/routingslip/transfer_test.go +++ b/pkg/contexts/ocm/labels/routingslip/transfer_test.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 routingslip_test import ( @@ -9,7 +5,6 @@ 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/common/accessobj" @@ -23,6 +18,7 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/labels/routingslip/types/comment/entry.go b/pkg/contexts/ocm/labels/routingslip/types/comment/entry.go index 984f9ce4b5..740c07fc10 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/comment/entry.go +++ b/pkg/contexts/ocm/labels/routingslip/types/comment/entry.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 comment import ( diff --git a/pkg/contexts/ocm/labels/routingslip/types/init.go b/pkg/contexts/ocm/labels/routingslip/types/init.go index 5b1b9ac7b7..fcad65f3b9 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/init.go +++ b/pkg/contexts/ocm/labels/routingslip/types/init.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 types import ( diff --git a/pkg/contexts/ocm/labels/routingslip/usage.go b/pkg/contexts/ocm/labels/routingslip/usage.go index 513ce9ea4e..077c5b89e3 100644 --- a/pkg/contexts/ocm/labels/routingslip/usage.go +++ b/pkg/contexts/ocm/labels/routingslip/usage.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 routingslip import ( diff --git a/pkg/contexts/ocm/modopts.go b/pkg/contexts/ocm/modopts.go index a03eba5cc6..8b22858f15 100644 --- a/pkg/contexts/ocm/modopts.go +++ b/pkg/contexts/ocm/modopts.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 ocm import ( diff --git a/pkg/contexts/ocm/plugin/descriptor/const.go b/pkg/contexts/ocm/plugin/descriptor/const.go index b12d6057c9..0d32dc93cc 100644 --- a/pkg/contexts/ocm/plugin/descriptor/const.go +++ b/pkg/contexts/ocm/plugin/descriptor/const.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 descriptor import ( diff --git a/pkg/contexts/ocm/plugin/descriptor/keys.go b/pkg/contexts/ocm/plugin/descriptor/keys.go index 204c480d15..62b286f473 100644 --- a/pkg/contexts/ocm/plugin/descriptor/keys.go +++ b/pkg/contexts/ocm/plugin/descriptor/keys.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 descriptor import ( diff --git a/pkg/contexts/ocm/plugin/descriptor/suite_test.go b/pkg/contexts/ocm/plugin/descriptor/suite_test.go index f32349491d..67e1367d73 100644 --- a/pkg/contexts/ocm/plugin/descriptor/suite_test.go +++ b/pkg/contexts/ocm/plugin/descriptor/suite_test.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 descriptor_test import ( diff --git a/pkg/contexts/ocm/plugin/descriptor/utils.go b/pkg/contexts/ocm/plugin/descriptor/utils.go index f4c25166dd..e1f2536f55 100644 --- a/pkg/contexts/ocm/plugin/descriptor/utils.go +++ b/pkg/contexts/ocm/plugin/descriptor/utils.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 descriptor import ( diff --git a/pkg/contexts/ocm/plugin/descriptor/utils_test.go b/pkg/contexts/ocm/plugin/descriptor/utils_test.go index ea0a0f9ba3..22aae84b93 100644 --- a/pkg/contexts/ocm/plugin/descriptor/utils_test.go +++ b/pkg/contexts/ocm/plugin/descriptor/utils_test.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 descriptor import ( diff --git a/pkg/contexts/ocm/plugin/internal/action.go b/pkg/contexts/ocm/plugin/internal/action.go index 07bd34126d..afdff47264 100644 --- a/pkg/contexts/ocm/plugin/internal/action.go +++ b/pkg/contexts/ocm/plugin/internal/action.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 type ActionSpecInfo struct { diff --git a/pkg/contexts/ocm/plugin/internal/valueset.go b/pkg/contexts/ocm/plugin/internal/valueset.go index 8b025516b5..575e81e6ce 100644 --- a/pkg/contexts/ocm/plugin/internal/valueset.go +++ b/pkg/contexts/ocm/plugin/internal/valueset.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 type ValueSetInfo struct { diff --git a/pkg/contexts/ocm/registration/logging.go b/pkg/contexts/ocm/registration/logging.go index 0ecf52bafe..56ac8075db 100644 --- a/pkg/contexts/ocm/registration/logging.go +++ b/pkg/contexts/ocm/registration/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 registration import ( diff --git a/pkg/contexts/ocm/repositories/composition/repository.go b/pkg/contexts/ocm/repositories/composition/repository.go index a199ebd4f9..e388b071b2 100644 --- a/pkg/contexts/ocm/repositories/composition/repository.go +++ b/pkg/contexts/ocm/repositories/composition/repository.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 composition import ( diff --git a/pkg/contexts/ocm/repositories/composition/type.go b/pkg/contexts/ocm/repositories/composition/type.go index e472ada601..8e511a871c 100644 --- a/pkg/contexts/ocm/repositories/composition/type.go +++ b/pkg/contexts/ocm/repositories/composition/type.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 composition import ( diff --git a/pkg/contexts/ocm/repositories/composition/version.go b/pkg/contexts/ocm/repositories/composition/version.go index 0ebca3cbea..9983b04ef6 100644 --- a/pkg/contexts/ocm/repositories/composition/version.go +++ b/pkg/contexts/ocm/repositories/composition/version.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 composition import ( diff --git a/pkg/contexts/ocm/repositories/ctf/ctf_test.go b/pkg/contexts/ocm/repositories/ctf/ctf_test.go index 2602c36381..c3bf3de83a 100644 --- a/pkg/contexts/ocm/repositories/ctf/ctf_test.go +++ b/pkg/contexts/ocm/repositories/ctf/ctf_test.go @@ -1,16 +1,10 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ctf_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/datacontext" @@ -18,6 +12,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("access method", func() { diff --git a/pkg/contexts/ocm/repositories/genericocireg/excludes.go b/pkg/contexts/ocm/repositories/genericocireg/excludes.go index 8ecc16acd4..8ce480a1d5 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/excludes.go +++ b/pkg/contexts/ocm/repositories/genericocireg/excludes.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 genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/logging.go b/pkg/contexts/ocm/repositories/genericocireg/logging.go index 162225750f..21743870ad 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/logging.go +++ b/pkg/contexts/ocm/repositories/genericocireg/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 genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/semver_test.go b/pkg/contexts/ocm/repositories/genericocireg/semver_test.go index 081adf680d..067dd163d3 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/semver_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/semver_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package genericocireg_test import ( + "github.com/Masterminds/semver/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/Masterminds/semver/v3" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" + . "github.com/open-component-model/ocm/pkg/testutils" ) const META_SEPARATOR = genericocireg.META_SEPARATOR diff --git a/pkg/contexts/ocm/repositories/virtual/access.go b/pkg/contexts/ocm/repositories/virtual/access.go index 2eca7cb95f..3b8062ddf9 100644 --- a/pkg/contexts/ocm/repositories/virtual/access.go +++ b/pkg/contexts/ocm/repositories/virtual/access.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 virtual import ( diff --git a/pkg/contexts/ocm/repositories/virtual/example/doc.go b/pkg/contexts/ocm/repositories/virtual/example/doc.go index 07a1c1ca84..0d2123de9e 100644 --- a/pkg/contexts/ocm/repositories/virtual/example/doc.go +++ b/pkg/contexts/ocm/repositories/virtual/example/doc.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 example contains a simple implementation providing // a virtual OCM repository based on some opinionated // filesystem structure. diff --git a/pkg/contexts/ocm/repositories/virtual/example/example.go b/pkg/contexts/ocm/repositories/virtual/example/example.go index 912956fb53..09fb8a17a9 100644 --- a/pkg/contexts/ocm/repositories/virtual/example/example.go +++ b/pkg/contexts/ocm/repositories/virtual/example/example.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 example import ( diff --git a/pkg/contexts/ocm/repositories/virtual/index.go b/pkg/contexts/ocm/repositories/virtual/index.go index b0a0dc8fb6..f66aec38f1 100644 --- a/pkg/contexts/ocm/repositories/virtual/index.go +++ b/pkg/contexts/ocm/repositories/virtual/index.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 virtual import ( diff --git a/pkg/contexts/ocm/repositories/virtual/repo_test.go b/pkg/contexts/ocm/repositories/virtual/repo_test.go index e8dd0ce36f..b2cc10fd21 100644 --- a/pkg/contexts/ocm/repositories/virtual/repo_test.go +++ b/pkg/contexts/ocm/repositories/virtual/repo_test.go @@ -1,19 +1,11 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package virtual_test import ( - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - "github.com/mandelsoft/vfs/pkg/layerfs" "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/projectionfs" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -26,8 +18,11 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/virtual/example" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("virtual repo", func() { diff --git a/pkg/contexts/ocm/repositories/virtual/type.go b/pkg/contexts/ocm/repositories/virtual/type.go index 72f6698148..a802471b40 100644 --- a/pkg/contexts/ocm/repositories/virtual/type.go +++ b/pkg/contexts/ocm/repositories/virtual/type.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 virtual import ( diff --git a/pkg/contexts/ocm/resolver.go b/pkg/contexts/ocm/resolver.go index 80fdf347b5..ee78193376 100644 --- a/pkg/contexts/ocm/resolver.go +++ b/pkg/contexts/ocm/resolver.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 ocm import ( diff --git a/pkg/contexts/ocm/signing/convenience.go b/pkg/contexts/ocm/signing/convenience.go index a19013d395..c8491e0825 100644 --- a/pkg/contexts/ocm/signing/convenience.go +++ b/pkg/contexts/ocm/signing/convenience.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 signing import ( diff --git a/pkg/contexts/ocm/signing/digestctx.go b/pkg/contexts/ocm/signing/digestctx.go index f307dee066..039949dacd 100644 --- a/pkg/contexts/ocm/signing/digestctx.go +++ b/pkg/contexts/ocm/signing/digestctx.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 signing import ( diff --git a/pkg/contexts/ocm/signing/transport_test.go b/pkg/contexts/ocm/signing/transport_test.go index 894be6ca73..0e07931a4c 100644 --- a/pkg/contexts/ocm/signing/transport_test.go +++ b/pkg/contexts/ocm/signing/transport_test.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 signing_test import ( @@ -9,15 +5,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" - // . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" @@ -25,10 +17,14 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" + // . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ( diff --git a/pkg/contexts/ocm/testhelper/references.go b/pkg/contexts/ocm/testhelper/references.go index b9753b7396..2838193e11 100644 --- a/pkg/contexts/ocm/testhelper/references.go +++ b/pkg/contexts/ocm/testhelper/references.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 testhelper import ( diff --git a/pkg/contexts/ocm/testhelper/refmgmt.go b/pkg/contexts/ocm/testhelper/refmgmt.go index d086af3735..3c0ac77832 100644 --- a/pkg/contexts/ocm/testhelper/refmgmt.go +++ b/pkg/contexts/ocm/testhelper/refmgmt.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 testhelper import ( diff --git a/pkg/contexts/ocm/testhelper/resources.go b/pkg/contexts/ocm/testhelper/resources.go index b2b24fdb77..c43778bf2c 100644 --- a/pkg/contexts/ocm/testhelper/resources.go +++ b/pkg/contexts/ocm/testhelper/resources.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 - //nolint:gosec // digests of test manifests package testhelper diff --git a/pkg/contexts/ocm/transfer/autohandler.go b/pkg/contexts/ocm/transfer/autohandler.go index 2083c39d41..77d01bdac3 100644 --- a/pkg/contexts/ocm/transfer/autohandler.go +++ b/pkg/contexts/ocm/transfer/autohandler.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 transfer import ( diff --git a/pkg/contexts/ocm/transfer/autohandler_test.go b/pkg/contexts/ocm/transfer/autohandler_test.go index 60abf27ba1..780b89707d 100644 --- a/pkg/contexts/ocm/transfer/autohandler_test.go +++ b/pkg/contexts/ocm/transfer/autohandler_test.go @@ -1,19 +1,15 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test 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/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/spiff" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/testutils" ) type errorOption struct { diff --git a/pkg/contexts/ocm/transfer/convenience.go b/pkg/contexts/ocm/transfer/convenience.go index 397bdd389a..e30fbd14e9 100644 --- a/pkg/contexts/ocm/transfer/convenience.go +++ b/pkg/contexts/ocm/transfer/convenience.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 transfer import ( diff --git a/pkg/contexts/ocm/transfer/debug.go b/pkg/contexts/ocm/transfer/debug.go index 0a7db1e4ff..65cafbdbd7 100644 --- a/pkg/contexts/ocm/transfer/debug.go +++ b/pkg/contexts/ocm/transfer/debug.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 transfer var Breakpoints = false diff --git a/pkg/contexts/ocm/transfer/init.go b/pkg/contexts/ocm/transfer/init.go index 4ffce5463b..677b703415 100644 --- a/pkg/contexts/ocm/transfer/init.go +++ b/pkg/contexts/ocm/transfer/init.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 transfer import ( diff --git a/pkg/contexts/ocm/transfer/internal/merge.go b/pkg/contexts/ocm/transfer/internal/merge.go index 9d0d4e007e..0b50eb0322 100644 --- a/pkg/contexts/ocm/transfer/internal/merge.go +++ b/pkg/contexts/ocm/transfer/internal/merge.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/ocm/transfer/merge_test.go b/pkg/contexts/ocm/transfer/merge_test.go index a6dcc1a89e..4f1881c888 100644 --- a/pkg/contexts/ocm/transfer/merge_test.go +++ b/pkg/contexts/ocm/transfer/merge_test.go @@ -1,15 +1,9 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package transfer_test import ( + "github.com/go-test/deep" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/go-test/deep" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -21,6 +15,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/internal" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" + . "github.com/open-component-model/ocm/pkg/testutils" ) func TouchLabels(s, d, e *metav1.Labels) { diff --git a/pkg/contexts/ocm/transfer/needs.go b/pkg/contexts/ocm/transfer/needs.go index a6fe3d30e2..8a31c4a43b 100644 --- a/pkg/contexts/ocm/transfer/needs.go +++ b/pkg/contexts/ocm/transfer/needs.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 transfer import ( diff --git a/pkg/contexts/ocm/transfer/options.go b/pkg/contexts/ocm/transfer/options.go index 3b24d35ec7..679ac3250f 100644 --- a/pkg/contexts/ocm/transfer/options.go +++ b/pkg/contexts/ocm/transfer/options.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 transfer import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/doc.go b/pkg/contexts/ocm/transfer/transferhandler/doc.go index b294d57d8d..348ce7a5d1 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/doc.go +++ b/pkg/contexts/ocm/transfer/transferhandler/doc.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 transferhandler provides the API for transfer handlers used // during the transfer process of an OCM component. // There is a common generic transfer functionality in package transfer, diff --git a/pkg/contexts/ocm/transfer/transferhandler/registry.go b/pkg/contexts/ocm/transfer/transferhandler/registry.go index 70d44fa57b..ec67818a26 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/registry.go +++ b/pkg/contexts/ocm/transfer/transferhandler/registry.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 transferhandler import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/transferhandler.go b/pkg/contexts/ocm/transfer/transferhandler/transferhandler.go index 9dc5f1811f..264421e86c 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/transferhandler.go +++ b/pkg/contexts/ocm/transfer/transferhandler/transferhandler.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 transferhandler import ( diff --git a/pkg/contexts/ocm/utils/resource.go b/pkg/contexts/ocm/utils/resource.go index 559099f3ed..3fbb771d46 100644 --- a/pkg/contexts/ocm/utils/resource.go +++ b/pkg/contexts/ocm/utils/resource.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 utils import ( diff --git a/pkg/contexts/ocm/utils/walk.go b/pkg/contexts/ocm/utils/walk.go index 7937e2184e..2330a87aa6 100644 --- a/pkg/contexts/ocm/utils/walk.go +++ b/pkg/contexts/ocm/utils/walk.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 utils import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/config.go b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/config.go index f6fa947e81..33f855ada5 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/config.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/config.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 defaultmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler.go b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler.go index 7ef352cc7e..99d11bf43c 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler.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 defaultmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go index bc029be78e..2f3e181e3d 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package defaultmerge 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/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("list merge", func() { diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/init.go b/pkg/contexts/ocm/valuemergehandler/handlers/init.go index d7894f5a36..fb48f9b568 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/init.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/init.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 handlers import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/config.go b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/config.go index 223dd3bc92..226f192560 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/config.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/config.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 maplistmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler.go b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler.go index f97c0e4d74..c629ee09cd 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler.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 maplistmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go index b7b2057a23..eb57bbec1f 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go @@ -1,18 +1,14 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package maplistmerge_test 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/contexts/ocm" me "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" + . "github.com/open-component-model/ocm/pkg/testutils" ) type Value = me.Value diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/config.go b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/config.go index 067a48f22e..70f6559e18 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/config.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/config.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 plugin import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/config.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/config.go index 15e2a7ba4c..78492c28e1 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/config.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/config.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 simplelistmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler.go index e0f38f7cc4..0a30f4524e 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler.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 simplelistmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go index 6bfe97abc8..0da0a50283 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go @@ -1,16 +1,12 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package simplelistmerge_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" me "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" + . "github.com/open-component-model/ocm/pkg/testutils" ) type Value = me.Value diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/config.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/config.go index 25ce20bab2..9528370036 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/config.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/config.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 simplemapmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler.go index 8664759c43..03a0b3f278 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler.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 simplemapmerge import ( diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go index 60aee15304..a53ee114a5 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go @@ -1,17 +1,13 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package simplemapmerge_test 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/contexts/ocm" me "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" + . "github.com/open-component-model/ocm/pkg/testutils" ) type Value = me.Value diff --git a/pkg/contexts/ocm/valuemergehandler/hpi/interface.go b/pkg/contexts/ocm/valuemergehandler/hpi/interface.go index 81ad0fbf5c..5d22bc8b52 100644 --- a/pkg/contexts/ocm/valuemergehandler/hpi/interface.go +++ b/pkg/contexts/ocm/valuemergehandler/hpi/interface.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 hpi contains the Handler Programming Interface for // value merge handlers package hpi diff --git a/pkg/contexts/ocm/valuemergehandler/hpi/logging.go b/pkg/contexts/ocm/valuemergehandler/hpi/logging.go index 5994a150bc..f560651004 100644 --- a/pkg/contexts/ocm/valuemergehandler/hpi/logging.go +++ b/pkg/contexts/ocm/valuemergehandler/hpi/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 hpi import ( diff --git a/pkg/contexts/ocm/valuemergehandler/hpi/merge.go b/pkg/contexts/ocm/valuemergehandler/hpi/merge.go index 18e93f76f9..2a31c1bfbb 100644 --- a/pkg/contexts/ocm/valuemergehandler/hpi/merge.go +++ b/pkg/contexts/ocm/valuemergehandler/hpi/merge.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 hpi import ( diff --git a/pkg/contexts/ocm/valuemergehandler/hpi/setup.go b/pkg/contexts/ocm/valuemergehandler/hpi/setup.go index 6d98f1dc46..7b15395801 100644 --- a/pkg/contexts/ocm/valuemergehandler/hpi/setup.go +++ b/pkg/contexts/ocm/valuemergehandler/hpi/setup.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 hpi import ( diff --git a/pkg/contexts/ocm/valuemergehandler/hpi/support.go b/pkg/contexts/ocm/valuemergehandler/hpi/support.go index 1ec0d136d2..d22f91003c 100644 --- a/pkg/contexts/ocm/valuemergehandler/hpi/support.go +++ b/pkg/contexts/ocm/valuemergehandler/hpi/support.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 hpi import ( diff --git a/pkg/contexts/ocm/valuemergehandler/interface.go b/pkg/contexts/ocm/valuemergehandler/interface.go index 806e462e75..824d5e6fde 100644 --- a/pkg/contexts/ocm/valuemergehandler/interface.go +++ b/pkg/contexts/ocm/valuemergehandler/interface.go @@ -1,15 +1,10 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package valuemergehandler import ( - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/config" - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers" - "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/config" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/internal" ) diff --git a/pkg/contexts/ocm/valuemergehandler/internal/interface.go b/pkg/contexts/ocm/valuemergehandler/internal/interface.go index 49fce576bf..bf118e2c01 100644 --- a/pkg/contexts/ocm/valuemergehandler/internal/interface.go +++ b/pkg/contexts/ocm/valuemergehandler/internal/interface.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/ocm/valuemergehandler/internal/support.go b/pkg/contexts/ocm/valuemergehandler/internal/support.go index df88e64fe2..8200b3c603 100644 --- a/pkg/contexts/ocm/valuemergehandler/internal/support.go +++ b/pkg/contexts/ocm/valuemergehandler/internal/support.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/ocm/valuemergehandler/internal/valuemergehandler.go b/pkg/contexts/ocm/valuemergehandler/internal/valuemergehandler.go index fb38372738..764821f20a 100644 --- a/pkg/contexts/ocm/valuemergehandler/internal/valuemergehandler.go +++ b/pkg/contexts/ocm/valuemergehandler/internal/valuemergehandler.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/ocm/valuemergehandler/merge.go b/pkg/contexts/ocm/valuemergehandler/merge.go index 6260ffa5d5..a08c57ce9b 100644 --- a/pkg/contexts/ocm/valuemergehandler/merge.go +++ b/pkg/contexts/ocm/valuemergehandler/merge.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 valuemergehandler import ( diff --git a/pkg/contexts/ocm/valuemergehandler/usage.go b/pkg/contexts/ocm/valuemergehandler/usage.go index d8fc3bb70f..b8583a2f0d 100644 --- a/pkg/contexts/ocm/valuemergehandler/usage.go +++ b/pkg/contexts/ocm/valuemergehandler/usage.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 valuemergehandler import ( diff --git a/pkg/contexts/options/utils.go b/pkg/contexts/options/utils.go index 2ca1b25a4a..5be48cac2d 100644 --- a/pkg/contexts/options/utils.go +++ b/pkg/contexts/options/utils.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 options import ( diff --git a/pkg/dirtree/context.go b/pkg/dirtree/context.go index 7e6cf5caa6..24f47db734 100644 --- a/pkg/dirtree/context.go +++ b/pkg/dirtree/context.go @@ -1,14 +1,10 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtree import ( - "crypto/sha1" //nolint: gosec // required "fmt" "hash" "io" + "crypto/sha1" //nolint: gosec // required "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/vfs" diff --git a/pkg/dirtree/dirtree.go b/pkg/dirtree/dirtree.go index 1ff632b884..5fba1c09a7 100644 --- a/pkg/dirtree/dirtree.go +++ b/pkg/dirtree/dirtree.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 dirtree import ( diff --git a/pkg/dirtree/tar.go b/pkg/dirtree/tar.go index c82f8e6d24..e64b4fa28f 100644 --- a/pkg/dirtree/tar.go +++ b/pkg/dirtree/tar.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 dirtree import ( diff --git a/pkg/dirtree/utils.go b/pkg/dirtree/utils.go index b12720cd03..bf0b076cbc 100644 --- a/pkg/dirtree/utils.go +++ b/pkg/dirtree/utils.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 dirtree import ( diff --git a/pkg/dirtree/vfs.go b/pkg/dirtree/vfs.go index e32d95db13..97b2f04264 100644 --- a/pkg/dirtree/vfs.go +++ b/pkg/dirtree/vfs.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 dirtree import ( diff --git a/pkg/dirtree/vfs_test.go b/pkg/dirtree/vfs_test.go index bee35e6d72..61b634aff4 100644 --- a/pkg/dirtree/vfs_test.go +++ b/pkg/dirtree/vfs_test.go @@ -1,21 +1,16 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package dirtree_test import ( "archive/tar" "encoding/hex" + "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/logging" "github.com/open-component-model/ocm/pkg/dirtree" "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("file system", func() { diff --git a/pkg/encrypt/encrypt.go b/pkg/encrypt/encrypt.go index 5d810d225d..8f3890faa7 100644 --- a/pkg/encrypt/encrypt.go +++ b/pkg/encrypt/encrypt.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 encrypt import ( diff --git a/pkg/env/builder/blob.go b/pkg/env/builder/blob.go index eda656193f..17aa690e22 100644 --- a/pkg/env/builder/blob.go +++ b/pkg/env/builder/blob.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 builder import ( diff --git a/pkg/env/builder/builder_test.go b/pkg/env/builder/builder_test.go index 2fe3677e2c..9232c2be65 100644 --- a/pkg/env/builder/builder_test.go +++ b/pkg/env/builder/builder_test.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 builder import ( diff --git a/pkg/env/builder/oci_anno.go b/pkg/env/builder/oci_anno.go index e4debcac49..839ec42f20 100644 --- a/pkg/env/builder/oci_anno.go +++ b/pkg/env/builder/oci_anno.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 builder func (b *Builder) Annotation(name, value string) { diff --git a/pkg/env/builder/oci_platform.go b/pkg/env/builder/oci_platform.go index cbfae7e1ee..a4513cd780 100644 --- a/pkg/env/builder/oci_platform.go +++ b/pkg/env/builder/oci_platform.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 builder const T_OCIPLATFORM = "platform consumer" diff --git a/pkg/env/builder/ocm_version_test.go b/pkg/env/builder/ocm_version_test.go index 25509b2b88..253d69128c 100644 --- a/pkg/env/builder/ocm_version_test.go +++ b/pkg/env/builder/ocm_version_test.go @@ -1,22 +1,18 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package builder_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/compositionmodeattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/env/keypair.go b/pkg/env/keypair.go index 5354039001..f1b286b7be 100644 --- a/pkg/env/keypair.go +++ b/pkg/env/keypair.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 env import ( diff --git a/pkg/exception/exception.go b/pkg/exception/exception.go index dc73f937b0..907937d1ae 100644 --- a/pkg/exception/exception.go +++ b/pkg/exception/exception.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 exception provides a simple exception mechanism // to reduce boilerplate for trivial error forwarding in // a function. diff --git a/pkg/exception/exception_test.go b/pkg/exception/exception_test.go index 8de551471e..5861d55039 100644 --- a/pkg/exception/exception_test.go +++ b/pkg/exception/exception_test.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 exception_test import ( diff --git a/pkg/finalizer/closer.go b/pkg/finalizer/closer.go index 3910dc8167..774a8aa64c 100644 --- a/pkg/finalizer/closer.go +++ b/pkg/finalizer/closer.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 finalizer import ( diff --git a/pkg/finalizer/object.go b/pkg/finalizer/object.go index d092914916..04c37e30e7 100644 --- a/pkg/finalizer/object.go +++ b/pkg/finalizer/object.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 finalizer import ( diff --git a/pkg/generics/cast.go b/pkg/generics/cast.go index 3d6336b759..70b365a27c 100644 --- a/pkg/generics/cast.go +++ b/pkg/generics/cast.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 generics import ( diff --git a/pkg/generics/convert.go b/pkg/generics/convert.go index 13ff236dbd..20dcc6c7dd 100644 --- a/pkg/generics/convert.go +++ b/pkg/generics/convert.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 generics // ConvertSlice Converts the element typ of a slice. diff --git a/pkg/generics/map.go b/pkg/generics/map.go index 181cc9191c..b80852b46a 100644 --- a/pkg/generics/map.go +++ b/pkg/generics/map.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 generics func MapKeys[K comparable, V any](m map[K]V) Set[K] { diff --git a/pkg/generics/slice.go b/pkg/generics/slice.go index 935ca06d63..26ebc8d0da 100644 --- a/pkg/generics/slice.go +++ b/pkg/generics/slice.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 generics import ( diff --git a/pkg/generics/utils.go b/pkg/generics/utils.go index 3ba184a44d..74a45bb666 100644 --- a/pkg/generics/utils.go +++ b/pkg/generics/utils.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 generics func Pointer[T any](t T) *T { diff --git a/pkg/helm/chartaccess.go b/pkg/helm/chartaccess.go index 85ac6ad226..ca62fa1068 100644 --- a/pkg/helm/chartaccess.go +++ b/pkg/helm/chartaccess.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 helm import ( diff --git a/pkg/helm/downloader.go b/pkg/helm/downloader.go index 9c3850049a..f014f5666b 100644 --- a/pkg/helm/downloader.go +++ b/pkg/helm/downloader.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 helm import ( diff --git a/pkg/helm/identity/identity.go b/pkg/helm/identity/identity.go index 7a43618dee..6027b39ef2 100644 --- a/pkg/helm/identity/identity.go +++ b/pkg/helm/identity/identity.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 identity import ( diff --git a/pkg/helm/loader/access.go b/pkg/helm/loader/access.go index 75fd13a9a7..28c96f6693 100644 --- a/pkg/helm/loader/access.go +++ b/pkg/helm/loader/access.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 loader import ( diff --git a/pkg/helm/options.go b/pkg/helm/options.go index 9abe82a856..c6bd5a0198 100644 --- a/pkg/helm/options.go +++ b/pkg/helm/options.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 helm import ( diff --git a/pkg/iotools/countingreader.go b/pkg/iotools/countingreader.go index 64c2249a36..2fe7b93f98 100644 --- a/pkg/iotools/countingreader.go +++ b/pkg/iotools/countingreader.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 iotools import ( diff --git a/pkg/iotools/digestreader.go b/pkg/iotools/digestreader.go index da23c237b9..af1cf0571a 100644 --- a/pkg/iotools/digestreader.go +++ b/pkg/iotools/digestreader.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 iotools import ( diff --git a/pkg/iotools/digestwriter.go b/pkg/iotools/digestwriter.go index bfb51f82a9..b0a824ccb7 100644 --- a/pkg/iotools/digestwriter.go +++ b/pkg/iotools/digestwriter.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 iotools import ( diff --git a/pkg/iotools/files.go b/pkg/iotools/files.go index ef363bb92c..546fae5fde 100644 --- a/pkg/iotools/files.go +++ b/pkg/iotools/files.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 iotools import ( diff --git a/pkg/iotools/readerwriter.go b/pkg/iotools/readerwriter.go index 935f788431..85f404936e 100644 --- a/pkg/iotools/readerwriter.go +++ b/pkg/iotools/readerwriter.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 iotools import ( diff --git a/pkg/iotools/utils.go b/pkg/iotools/utils.go index 563fd7c996..2f6cd8c3ad 100644 --- a/pkg/iotools/utils.go +++ b/pkg/iotools/utils.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 iotools import ( diff --git a/pkg/listformat/listhelp.go b/pkg/listformat/listhelp.go index 4f8f772de3..99ce2d3ade 100644 --- a/pkg/listformat/listhelp.go +++ b/pkg/listformat/listhelp.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 listformat import ( diff --git a/pkg/logging/stdkeys.go b/pkg/logging/stdkeys.go index 74b36add21..e70b6073a8 100644 --- a/pkg/logging/stdkeys.go +++ b/pkg/logging/stdkeys.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 logging // standard logging value attribute names used in this library. diff --git a/pkg/optionutils/nested.go b/pkg/optionutils/nested.go index 04b28605c4..f10b2083b4 100644 --- a/pkg/optionutils/nested.go +++ b/pkg/optionutils/nested.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 optionutils // NestedOptionsProvider is the interface for a diff --git a/pkg/optionutils/options.go b/pkg/optionutils/options.go index 13f6e6402c..e079a390bb 100644 --- a/pkg/optionutils/options.go +++ b/pkg/optionutils/options.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 optionutils type Option[T any] interface { diff --git a/pkg/optionutils/pointer.go b/pkg/optionutils/pointer.go index 5b3e242902..ea00e2dd24 100644 --- a/pkg/optionutils/pointer.go +++ b/pkg/optionutils/pointer.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 optionutils import ( diff --git a/pkg/optionutils/target.go b/pkg/optionutils/target.go index 003cc69dae..7ffc76f136 100644 --- a/pkg/optionutils/target.go +++ b/pkg/optionutils/target.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 optionutils import ( diff --git a/pkg/refmgmt/doc.go b/pkg/refmgmt/doc.go index 7b08c8409b..a9d861f5d7 100644 --- a/pkg/refmgmt/doc.go +++ b/pkg/refmgmt/doc.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 refmgmt provides a simple wrapper, which can be used // to map a closable object type into an interface supporting reference // counting and supporting a Dup() method. diff --git a/pkg/refmgmt/finalized/finalized_test.go b/pkg/refmgmt/finalized/finalized_test.go index 09d9dce5a9..6fb8a778bd 100644 --- a/pkg/refmgmt/finalized/finalized_test.go +++ b/pkg/refmgmt/finalized/finalized_test.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 finalized_test import ( diff --git a/pkg/refmgmt/refcloser.go b/pkg/refmgmt/refcloser.go index 4b1e1fea20..4c1cfdebfc 100644 --- a/pkg/refmgmt/refcloser.go +++ b/pkg/refmgmt/refcloser.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 refmgmt import ( diff --git a/pkg/refmgmt/refmgmt.go b/pkg/refmgmt/refmgmt.go index 211d4b1654..889b6f3de9 100644 --- a/pkg/refmgmt/refmgmt.go +++ b/pkg/refmgmt/refmgmt.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 refmgmt import ( diff --git a/pkg/refmgmt/resource/doc.go b/pkg/refmgmt/resource/doc.go index e28e9a39a6..59a904082e 100644 --- a/pkg/refmgmt/resource/doc.go +++ b/pkg/refmgmt/resource/doc.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 resource provides support to implement // closeable backing resources featuring multiple // separately closeable references. The backing resource diff --git a/pkg/refmgmt/resource/resource.go b/pkg/refmgmt/resource/resource.go index 80626b44b7..1fb81dd2f3 100644 --- a/pkg/refmgmt/resource/resource.go +++ b/pkg/refmgmt/resource/resource.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 resource import ( diff --git a/pkg/refmgmt/resource/resource_test.go b/pkg/refmgmt/resource/resource_test.go index ecd5b38b00..8c693063e5 100644 --- a/pkg/refmgmt/resource/resource_test.go +++ b/pkg/refmgmt/resource/resource_test.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 resource_test import ( @@ -9,9 +5,9 @@ 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/refmgmt/resource" + . "github.com/open-component-model/ocm/pkg/testutils" ) // Resource is the intended resource interface. diff --git a/pkg/refmgmt/view.go b/pkg/refmgmt/view.go index 78f89237a4..178db148af 100644 --- a/pkg/refmgmt/view.go +++ b/pkg/refmgmt/view.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 refmgmt import ( diff --git a/pkg/refmgmt/view_test.go b/pkg/refmgmt/view_test.go index 923666767d..e0a8517bc3 100644 --- a/pkg/refmgmt/view_test.go +++ b/pkg/refmgmt/view_test.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 refmgmt_test import ( @@ -11,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" refmgmt2 "github.com/open-component-model/ocm/pkg/refmgmt" + . "github.com/open-component-model/ocm/pkg/testutils" ) // Objectbase is the base interface for the diff --git a/pkg/registrations/info.go b/pkg/registrations/info.go index 48e795fea6..98409eac7f 100644 --- a/pkg/registrations/info.go +++ b/pkg/registrations/info.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 registrations import ( diff --git a/pkg/registrations/registrations.go b/pkg/registrations/registrations.go index b9c93481aa..8151edbbde 100644 --- a/pkg/registrations/registrations.go +++ b/pkg/registrations/registrations.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 registrations provides a hierarchical namespace for // denoting any kind of handlers to be registered on some target. // Handlers are denoted by names evaluated by HandlerRegistrationHandler diff --git a/pkg/registrations/utils.go b/pkg/registrations/utils.go index ff1bc08314..1fc56ed9c5 100644 --- a/pkg/registrations/utils.go +++ b/pkg/registrations/utils.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 registrations import ( diff --git a/pkg/runtime/convert.go b/pkg/runtime/convert.go index 862d1a4ce2..efcc79883e 100644 --- a/pkg/runtime/convert.go +++ b/pkg/runtime/convert.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 runtime import ( diff --git a/pkg/runtime/datatypes.go b/pkg/runtime/datatypes.go index f1c0b6eb03..6daabc07b5 100644 --- a/pkg/runtime/datatypes.go +++ b/pkg/runtime/datatypes.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 runtime import ( diff --git a/pkg/runtime/descriptivetype/options.go b/pkg/runtime/descriptivetype/options.go index 6ed0bd372d..7b067bd62a 100644 --- a/pkg/runtime/descriptivetype/options.go +++ b/pkg/runtime/descriptivetype/options.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 descriptivetype import ( diff --git a/pkg/runtime/descriptivetype/type.go b/pkg/runtime/descriptivetype/type.go index ff5e3fb637..a1771e2f38 100644 --- a/pkg/runtime/descriptivetype/type.go +++ b/pkg/runtime/descriptivetype/type.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 descriptivetype import ( diff --git a/pkg/runtime/multi.go b/pkg/runtime/multi.go index 0b11d2c032..d60da8bfc0 100644 --- a/pkg/runtime/multi.go +++ b/pkg/runtime/multi.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 runtime import ( diff --git a/pkg/runtime/multi_test.go b/pkg/runtime/multi_test.go index 66b0af8b1a..bae85575bf 100644 --- a/pkg/runtime/multi_test.go +++ b/pkg/runtime/multi_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package runtime_test 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/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) type TestSpecType = runtime.VersionedTypedObjectType[TestSpecRealm] diff --git a/pkg/runtime/value.go b/pkg/runtime/value.go index 67c594a9ed..fd9170c64f 100644 --- a/pkg/runtime/value.go +++ b/pkg/runtime/value.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 runtime import ( diff --git a/pkg/runtime/version_test.go b/pkg/runtime/version_test.go index 98fd9e3de0..7eda90d80e 100644 --- a/pkg/runtime/version_test.go +++ b/pkg/runtime/version_test.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 runtime_test import ( @@ -9,9 +5,9 @@ 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/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) const ( diff --git a/pkg/semverutils/sort.go b/pkg/semverutils/sort.go index 895194d3e2..b5f91b7536 100644 --- a/pkg/semverutils/sort.go +++ b/pkg/semverutils/sort.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 semverutils import ( diff --git a/pkg/signing/deprecated.go b/pkg/signing/deprecated.go index ccfadd1a5c..8bbe888156 100644 --- a/pkg/signing/deprecated.go +++ b/pkg/signing/deprecated.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 signing import ( diff --git a/pkg/signing/encrypt.go b/pkg/signing/encrypt.go index 5da63f9c55..c44a4cbd79 100644 --- a/pkg/signing/encrypt.go +++ b/pkg/signing/encrypt.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 signing import ( diff --git a/pkg/signing/handlers/rsa/certhelper.go b/pkg/signing/handlers/rsa/certhelper.go index 3a3710e8ca..480b37fac0 100644 --- a/pkg/signing/handlers/rsa/certhelper.go +++ b/pkg/signing/handlers/rsa/certhelper.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 rsa import ( diff --git a/pkg/signing/hashfuncs.go b/pkg/signing/hashfuncs.go index 46bbb35322..fe0982c532 100644 --- a/pkg/signing/hashfuncs.go +++ b/pkg/signing/hashfuncs.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 signing import ( diff --git a/pkg/signing/norm/entry/norm.go b/pkg/signing/norm/entry/norm.go index 9173e559ad..d5e14ea82b 100644 --- a/pkg/signing/norm/entry/norm.go +++ b/pkg/signing/norm/entry/norm.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 entry import ( diff --git a/pkg/signing/norm/jcs/norm.go b/pkg/signing/norm/jcs/norm.go index ce9f3ba5ec..5322b23fef 100644 --- a/pkg/signing/norm/jcs/norm.go +++ b/pkg/signing/norm/jcs/norm.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 jcs import ( diff --git a/pkg/signing/signutils/certs.go b/pkg/signing/signutils/certs.go index c650f1a3ae..fd6ec858c7 100644 --- a/pkg/signing/signutils/certs.go +++ b/pkg/signing/signutils/certs.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 signutils import ( diff --git a/pkg/signing/signutils/names.go b/pkg/signing/signutils/names.go index 205a679d48..c05158188a 100644 --- a/pkg/signing/signutils/names.go +++ b/pkg/signing/signutils/names.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 signutils import ( diff --git a/pkg/signing/signutils/signature.go b/pkg/signing/signutils/signature.go index e6438613cf..7f888a8aef 100644 --- a/pkg/signing/signutils/signature.go +++ b/pkg/signing/signutils/signature.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 signutils import ( diff --git a/pkg/signing/signutils/types.go b/pkg/signing/signutils/types.go index e7a50e7e10..a21d56df39 100644 --- a/pkg/signing/signutils/types.go +++ b/pkg/signing/signutils/types.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 signutils // These types just indicate the intended use case for diff --git a/pkg/signing/tsa/pem.go b/pkg/signing/tsa/pem.go index 6baac6f307..4bcf8f3ed7 100644 --- a/pkg/signing/tsa/pem.go +++ b/pkg/signing/tsa/pem.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 tsa import ( diff --git a/pkg/signing/tsa/tsa.go b/pkg/signing/tsa/tsa.go index 9aa6dde0f1..8e7bbadda1 100644 --- a/pkg/signing/tsa/tsa.go +++ b/pkg/signing/tsa/tsa.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 tsa import ( diff --git a/pkg/signing/tsa/types.go b/pkg/signing/tsa/types.go index 8a2b5ba6e2..214b0be1df 100644 --- a/pkg/signing/tsa/types.go +++ b/pkg/signing/tsa/types.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 tsa import ( diff --git a/pkg/spiff/spiff_test.go b/pkg/spiff/spiff_test.go index 37327f64a6..d1d4f63025 100644 --- a/pkg/spiff/spiff_test.go +++ b/pkg/spiff/spiff_test.go @@ -1,17 +1,12 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package spiff_test import ( + "github.com/mandelsoft/spiff/spiffing" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/spiff/spiffing" "github.com/open-component-model/ocm/pkg/spiff" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("spiff", func() { diff --git a/pkg/testutils/object.go b/pkg/testutils/object.go index d8598b0c10..1bdbbe94a9 100644 --- a/pkg/testutils/object.go +++ b/pkg/testutils/object.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 testutils import ( diff --git a/pkg/toi/drivers/docker/opts.go b/pkg/toi/drivers/docker/opts.go index 1a9a4306e6..4589942841 100644 --- a/pkg/toi/drivers/docker/opts.go +++ b/pkg/toi/drivers/docker/opts.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 docker import ( diff --git a/pkg/toi/install/action_test.go b/pkg/toi/install/action_test.go index 96d01ece5d..ea4250aace 100644 --- a/pkg/toi/install/action_test.go +++ b/pkg/toi/install/action_test.go @@ -1,17 +1,9 @@ -// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package install_test import ( + "github.com/mandelsoft/vfs/pkg/memoryfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -20,7 +12,10 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/toi" "github.com/open-component-model/ocm/pkg/toi/drivers/mock" "github.com/open-component-model/ocm/pkg/toi/install" diff --git a/pkg/toi/install/functions.go b/pkg/toi/install/functions.go index e67552187e..bd928ceda7 100644 --- a/pkg/toi/install/functions.go +++ b/pkg/toi/install/functions.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 install import ( diff --git a/pkg/toi/logging.go b/pkg/toi/logging.go index 8ed9785d5d..c24abb05eb 100644 --- a/pkg/toi/logging.go +++ b/pkg/toi/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 toi import ( diff --git a/pkg/toi/spec.go b/pkg/toi/spec.go index d5916c1f8c..e5f4471695 100644 --- a/pkg/toi/spec.go +++ b/pkg/toi/spec.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 toi import ( diff --git a/pkg/utils/locator.go b/pkg/utils/locator.go index 71f6a0ed90..0acbae5b3a 100644 --- a/pkg/utils/locator.go +++ b/pkg/utils/locator.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 utils import ( diff --git a/pkg/utils/panics/panics_test.go b/pkg/utils/panics/panics_test.go index 6f14e21e96..5df55a1609 100644 --- a/pkg/utils/panics/panics_test.go +++ b/pkg/utils/panics/panics_test.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 panics_test import ( diff --git a/pkg/utils/tarutils/compress.go b/pkg/utils/tarutils/compress.go index 54049a5c1e..d9255ca706 100644 --- a/pkg/utils/tarutils/compress.go +++ b/pkg/utils/tarutils/compress.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 tarutils import ( diff --git a/pkg/utils/tarutils/extract.go b/pkg/utils/tarutils/extract.go index 280ef9cd43..53b3ce530c 100644 --- a/pkg/utils/tarutils/extract.go +++ b/pkg/utils/tarutils/extract.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 tarutils import ( diff --git a/pkg/utils/tarutils/list.go b/pkg/utils/tarutils/list.go index e61ff51e27..e7f0c13857 100644 --- a/pkg/utils/tarutils/list.go +++ b/pkg/utils/tarutils/list.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 tarutils import ( diff --git a/pkg/utils/template/merge.go b/pkg/utils/template/merge.go index db0fe59b4f..7c8da61625 100644 --- a/pkg/utils/template/merge.go +++ b/pkg/utils/template/merge.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 template import ( diff --git a/pkg/utils/time.go b/pkg/utils/time.go index e3df91e05e..13c97048e1 100644 --- a/pkg/utils/time.go +++ b/pkg/utils/time.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 utils import ( diff --git a/pkg/utils/unwrap.go b/pkg/utils/unwrap.go index 3a95a72c94..f88033ec42 100644 --- a/pkg/utils/unwrap.go +++ b/pkg/utils/unwrap.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 utils type Unwrappable interface { diff --git a/pkg/utils/validate.go b/pkg/utils/validate.go index 38276250aa..9edb46368d 100644 --- a/pkg/utils/validate.go +++ b/pkg/utils/validate.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 utils import ( From dfbd1e6b9b2694f5690e4303e7a3d621e8fdece6 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 11:21:14 +0200 Subject: [PATCH 05/16] rm SPDX-FileCopyrightText: 2024 in *.go --- .../ocmcmds/common/inputs/types/wget/input_test.go | 6 +----- .../ocmcmds/common/inputs/types/wget/suite_test.go | 4 ---- .../ocmcmds/plugins/tests/accessmethods/suite_test.go | 4 ---- .../ocmcmds/plugins/tests/routingslips/suite_test.go | 4 ---- pkg/blobaccess/dirtree/access.go | 4 ---- pkg/blobaccess/dirtree/options.go | 4 ---- pkg/blobaccess/doc.go | 4 ---- pkg/blobaccess/dockerdaemon/options.go | 4 ---- pkg/blobaccess/dockermulti/options.go | 4 ---- pkg/blobaccess/helm/options.go | 4 ---- pkg/blobaccess/ociartifact/options.go | 4 ---- pkg/blobaccess/standard.go | 4 ---- pkg/blobaccess/wget/access.go | 4 ---- pkg/blobaccess/wget/logging.go | 4 ---- pkg/blobaccess/wget/options.go | 4 ---- pkg/clisupport/labels.go | 4 ---- pkg/cobrautils/flag/string_colon_stringslice.go | 4 ---- pkg/cobrautils/flag/string_colon_stringslice_test.go | 4 ---- pkg/cobrautils/flag/string_to_stringslice.go | 4 ---- pkg/cobrautils/flag/string_to_stringslice_test.go | 4 ---- pkg/contexts/config/cpi/content.go | 4 ---- .../credentials/builtin/wget/identity/identity.go | 4 ---- .../builtin/wget/identity/identity_test.go | 6 +----- pkg/contexts/credentials/cpi/const.go | 4 ---- pkg/contexts/credentials/internal/const.go | 4 ---- .../credentials/repositories/dockerconfig/default.go | 4 ---- .../datacontext/attrs/rootcertsattr/config.go | 4 ---- pkg/contexts/datacontext/context_test.go | 4 ---- pkg/contexts/oci/cpi/mod.go | 4 ---- pkg/contexts/oci/transfer/filters/filter.go | 4 ---- pkg/contexts/ocm/accessmethods/options/doc.go | 4 ---- pkg/contexts/ocm/accessmethods/wget/cli.go | 4 ---- pkg/contexts/ocm/accessmethods/wget/method.go | 4 ---- pkg/contexts/ocm/accessmethods/wget/method_test.go | 8 ++------ pkg/contexts/ocm/accessmethods/wget/options.go | 4 ---- .../blobhandler/handlers/generic/npm/publish_test.go | 5 +---- .../blobhandler/handlers/generic/npm/registration.go | 4 ---- .../handlers/generic/npm/registration_test.go | 6 +----- .../blobhandler/handlers/generic/npm/suite_test.go | 4 ---- pkg/contexts/ocm/blobhandler/handlers/init.go | 4 ---- pkg/contexts/ocm/compdesc/copy_test.go | 9 ++------- .../download/handlers/blueprint/registration_test.go | 11 +++-------- .../ocm/elements/artifactaccess/wgetaccess/options.go | 4 ---- .../elements/artifactaccess/wgetaccess/resource.go | 4 ---- .../ocm/elements/artifactblob/wgetblob/options.go | 4 ---- .../ocm/elements/artifactblob/wgetblob/resource.go | 4 ---- .../ocm/repositories/genericocireg/specnorm.go | 4 ---- pkg/contexts/ocm/repositories/ocireg/specnorm.go | 4 ---- pkg/contexts/ocm/repositories/ocireg/specnorm_test.go | 6 +----- pkg/contexts/ocm/signing/handler_test.go | 6 +----- .../ocm/transfer/transferhandler/standard/utils.go | 4 ---- .../transfer/transferhandler/standard/utils_test.go | 4 ---- pkg/contexts/ocm/utils/check/check.go | 4 ---- pkg/contexts/ocm/utils/check/options.go | 4 ---- pkg/refmgmt/finalized/doc.go | 4 ---- pkg/refmgmt/finalized/finalizedref.go | 4 ---- .../handlers/rsa-pss-signingservice/handler.go | 4 ---- pkg/signing/handlers/rsa-pss/handler.go | 4 ---- pkg/signing/handlers/sigstore/attr/attr.go | 4 ---- pkg/signing/signutils/utils.go | 6 +----- pkg/tokens/github/main/main.go | 4 ---- pkg/utils/key.go | 4 ---- version.go | 4 ---- 63 files changed, 14 insertions(+), 267 deletions(-) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go index 5476ce5256..35454ceea5 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go @@ -1,17 +1,13 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package wget_test import ( "net/http" . "github.com/onsi/ginkgo/v2" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/wget" "github.com/open-component-model/ocm/pkg/mime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/suite_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/suite_test.go index bf7b09dda2..531313f2e9 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/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 wget_test import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/suite_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/suite_test.go index 29a58e6af1..1a9e8d9af4 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/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 accessmethods_test import ( diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/suite_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/suite_test.go index 025f19b67a..5da4a4a899 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/suite_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/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 routingslips_test import ( diff --git a/pkg/blobaccess/dirtree/access.go b/pkg/blobaccess/dirtree/access.go index e4cd5642a0..7bc7922df4 100644 --- a/pkg/blobaccess/dirtree/access.go +++ b/pkg/blobaccess/dirtree/access.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 dirtree import ( diff --git a/pkg/blobaccess/dirtree/options.go b/pkg/blobaccess/dirtree/options.go index 060785d269..5793b9e60d 100644 --- a/pkg/blobaccess/dirtree/options.go +++ b/pkg/blobaccess/dirtree/options.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 dirtree import ( diff --git a/pkg/blobaccess/doc.go b/pkg/blobaccess/doc.go index a58ac4e458..08b20b1e74 100644 --- a/pkg/blobaccess/doc.go +++ b/pkg/blobaccess/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 - // Package blobaccess provides the basic set of the most commonly needed BlobAccess implementations. package blobaccess diff --git a/pkg/blobaccess/dockerdaemon/options.go b/pkg/blobaccess/dockerdaemon/options.go index 81291b9976..f44bb884fa 100644 --- a/pkg/blobaccess/dockerdaemon/options.go +++ b/pkg/blobaccess/dockerdaemon/options.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 dockerdaemon import ( diff --git a/pkg/blobaccess/dockermulti/options.go b/pkg/blobaccess/dockermulti/options.go index 51c39227cd..309a6c507b 100644 --- a/pkg/blobaccess/dockermulti/options.go +++ b/pkg/blobaccess/dockermulti/options.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 dockermulti import ( diff --git a/pkg/blobaccess/helm/options.go b/pkg/blobaccess/helm/options.go index 2f72905de5..39930e06d7 100644 --- a/pkg/blobaccess/helm/options.go +++ b/pkg/blobaccess/helm/options.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 helm import ( diff --git a/pkg/blobaccess/ociartifact/options.go b/pkg/blobaccess/ociartifact/options.go index f305cfdd08..ccc0cd9c92 100644 --- a/pkg/blobaccess/ociartifact/options.go +++ b/pkg/blobaccess/ociartifact/options.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 ociartifact import ( diff --git a/pkg/blobaccess/standard.go b/pkg/blobaccess/standard.go index 6856cf0ff8..1283933458 100644 --- a/pkg/blobaccess/standard.go +++ b/pkg/blobaccess/standard.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 blobaccess import ( diff --git a/pkg/blobaccess/wget/access.go b/pkg/blobaccess/wget/access.go index fb2718a6e5..d02c45c0ac 100644 --- a/pkg/blobaccess/wget/access.go +++ b/pkg/blobaccess/wget/access.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 wget import ( diff --git a/pkg/blobaccess/wget/logging.go b/pkg/blobaccess/wget/logging.go index 98dc39bdd3..0814553e5e 100644 --- a/pkg/blobaccess/wget/logging.go +++ b/pkg/blobaccess/wget/logging.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 wget import ( diff --git a/pkg/blobaccess/wget/options.go b/pkg/blobaccess/wget/options.go index a3c827a4c1..8e6769eabe 100644 --- a/pkg/blobaccess/wget/options.go +++ b/pkg/blobaccess/wget/options.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 wget import ( diff --git a/pkg/clisupport/labels.go b/pkg/clisupport/labels.go index 57bd059200..082be2e83c 100644 --- a/pkg/clisupport/labels.go +++ b/pkg/clisupport/labels.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 clisupport import ( diff --git a/pkg/cobrautils/flag/string_colon_stringslice.go b/pkg/cobrautils/flag/string_colon_stringslice.go index c0e336bc70..1f7c67b6e1 100644 --- a/pkg/cobrautils/flag/string_colon_stringslice.go +++ b/pkg/cobrautils/flag/string_colon_stringslice.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 flag import ( diff --git a/pkg/cobrautils/flag/string_colon_stringslice_test.go b/pkg/cobrautils/flag/string_colon_stringslice_test.go index 699b617ae5..09f0a5ef1e 100644 --- a/pkg/cobrautils/flag/string_colon_stringslice_test.go +++ b/pkg/cobrautils/flag/string_colon_stringslice_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 flag_test import ( diff --git a/pkg/cobrautils/flag/string_to_stringslice.go b/pkg/cobrautils/flag/string_to_stringslice.go index cce9cd3603..8d6c3a5dd0 100644 --- a/pkg/cobrautils/flag/string_to_stringslice.go +++ b/pkg/cobrautils/flag/string_to_stringslice.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 flag import ( diff --git a/pkg/cobrautils/flag/string_to_stringslice_test.go b/pkg/cobrautils/flag/string_to_stringslice_test.go index cea8de65c8..589abb8bf7 100644 --- a/pkg/cobrautils/flag/string_to_stringslice_test.go +++ b/pkg/cobrautils/flag/string_to_stringslice_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 flag_test import ( diff --git a/pkg/contexts/config/cpi/content.go b/pkg/contexts/config/cpi/content.go index 9ea147b455..7bf827dbcc 100644 --- a/pkg/contexts/config/cpi/content.go +++ b/pkg/contexts/config/cpi/content.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 cpi import ( diff --git a/pkg/contexts/credentials/builtin/wget/identity/identity.go b/pkg/contexts/credentials/builtin/wget/identity/identity.go index 3b8119b53e..feac525e03 100644 --- a/pkg/contexts/credentials/builtin/wget/identity/identity.go +++ b/pkg/contexts/credentials/builtin/wget/identity/identity.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 identity import ( diff --git a/pkg/contexts/credentials/builtin/wget/identity/identity_test.go b/pkg/contexts/credentials/builtin/wget/identity/identity_test.go index 3545388a5b..a4f4668e84 100644 --- a/pkg/contexts/credentials/builtin/wget/identity/identity_test.go +++ b/pkg/contexts/credentials/builtin/wget/identity/identity_test.go @@ -1,15 +1,11 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package identity_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials" + . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity" ) var _ = Describe("wget credential management", func() { diff --git a/pkg/contexts/credentials/cpi/const.go b/pkg/contexts/credentials/cpi/const.go index 7374333381..0c65870f1d 100644 --- a/pkg/contexts/credentials/cpi/const.go +++ b/pkg/contexts/credentials/cpi/const.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 cpi import ( diff --git a/pkg/contexts/credentials/internal/const.go b/pkg/contexts/credentials/internal/const.go index 044e545e4a..cb14b92598 100644 --- a/pkg/contexts/credentials/internal/const.go +++ b/pkg/contexts/credentials/internal/const.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 internal const ( diff --git a/pkg/contexts/credentials/repositories/dockerconfig/default.go b/pkg/contexts/credentials/repositories/dockerconfig/default.go index 520fcc6c88..4cad158ae8 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/default.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/default.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 dockerconfig import ( diff --git a/pkg/contexts/datacontext/attrs/rootcertsattr/config.go b/pkg/contexts/datacontext/attrs/rootcertsattr/config.go index d562553964..8798128fa6 100644 --- a/pkg/contexts/datacontext/attrs/rootcertsattr/config.go +++ b/pkg/contexts/datacontext/attrs/rootcertsattr/config.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 rootcertsattr import ( diff --git a/pkg/contexts/datacontext/context_test.go b/pkg/contexts/datacontext/context_test.go index ecb1593e1d..11e97cf1b0 100644 --- a/pkg/contexts/datacontext/context_test.go +++ b/pkg/contexts/datacontext/context_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 datacontext_test import ( diff --git a/pkg/contexts/oci/cpi/mod.go b/pkg/contexts/oci/cpi/mod.go index b59e11bcfd..7e42781562 100644 --- a/pkg/contexts/oci/cpi/mod.go +++ b/pkg/contexts/oci/cpi/mod.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 cpi import ( diff --git a/pkg/contexts/oci/transfer/filters/filter.go b/pkg/contexts/oci/transfer/filters/filter.go index 37e9215664..406dc44059 100644 --- a/pkg/contexts/oci/transfer/filters/filter.go +++ b/pkg/contexts/oci/transfer/filters/filter.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 filters import ( diff --git a/pkg/contexts/ocm/accessmethods/options/doc.go b/pkg/contexts/ocm/accessmethods/options/doc.go index 49e3ed80ff..a67931f8fa 100644 --- a/pkg/contexts/ocm/accessmethods/options/doc.go +++ b/pkg/contexts/ocm/accessmethods/options/doc.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 options defines standard options and option types usable // to provide CLI options used to dynamically orchestrate arbitrary // access specifications. These options have a predefined meaning and diff --git a/pkg/contexts/ocm/accessmethods/wget/cli.go b/pkg/contexts/ocm/accessmethods/wget/cli.go index 77550c0a1e..ed72c4c694 100644 --- a/pkg/contexts/ocm/accessmethods/wget/cli.go +++ b/pkg/contexts/ocm/accessmethods/wget/cli.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 wget import ( diff --git a/pkg/contexts/ocm/accessmethods/wget/method.go b/pkg/contexts/ocm/accessmethods/wget/method.go index cf51cb5a55..5b1602f86d 100644 --- a/pkg/contexts/ocm/accessmethods/wget/method.go +++ b/pkg/contexts/ocm/accessmethods/wget/method.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 wget import ( diff --git a/pkg/contexts/ocm/accessmethods/wget/method_test.go b/pkg/contexts/ocm/accessmethods/wget/method_test.go index 2d7e589216..1ff84a5db9 100644 --- a/pkg/contexts/ocm/accessmethods/wget/method_test.go +++ b/pkg/contexts/ocm/accessmethods/wget/method_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 wget_test import ( @@ -17,16 +13,16 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/wget" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity" "github.com/open-component-model/ocm/pkg/contexts/ocm" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/wget" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" + . "github.com/open-component-model/ocm/pkg/testutils" ) var ( diff --git a/pkg/contexts/ocm/accessmethods/wget/options.go b/pkg/contexts/ocm/accessmethods/wget/options.go index 2cf7ebc37f..4693d6c697 100644 --- a/pkg/contexts/ocm/accessmethods/wget/options.go +++ b/pkg/contexts/ocm/accessmethods/wget/options.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 wget import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_test.go index 5a771e216a..940aac9398 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_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 npm import ( @@ -10,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration.go b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration.go index 0cf00aa30a..ba729fe4e4 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration.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 npm import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go index 17089f6aa7..d97f412c3a 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go @@ -1,16 +1,12 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package npm_test 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/contexts/ocm/blobhandler/handlers/generic/npm" "github.com/open-component-model/ocm/pkg/registrations" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Config deserialization Test Environment", func() { diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/suite_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/suite_test.go index 24af68d6bc..e4947738d0 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/suite_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/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 npm_test import ( diff --git a/pkg/contexts/ocm/blobhandler/handlers/init.go b/pkg/contexts/ocm/blobhandler/handlers/init.go index 433e3338be..d19447156c 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/init.go +++ b/pkg/contexts/ocm/blobhandler/handlers/init.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 handlers import ( diff --git a/pkg/contexts/ocm/compdesc/copy_test.go b/pkg/contexts/ocm/compdesc/copy_test.go index 19cf899c8e..7e8f41bb4e 100644 --- a/pkg/contexts/ocm/compdesc/copy_test.go +++ b/pkg/contexts/ocm/compdesc/copy_test.go @@ -1,21 +1,16 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package compdesc_test import ( + "github.com/go-test/deep" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/go-test/deep" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" "github.com/open-component-model/ocm/pkg/runtime" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Component Descripor Copy Test Suitet", func() { diff --git a/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go b/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go index 69e672e367..1e468b447a 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go @@ -1,16 +1,9 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package blueprint_test import ( + "github.com/mandelsoft/vfs/pkg/projectionfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" - - "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -22,6 +15,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers/blueprint" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" tenv "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/options.go b/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/options.go index 102f23a415..25c343671c 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/options.go +++ b/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/options.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 wgetaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/resource.go b/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/resource.go index 0b74633ac5..2018c1afe6 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/resource.go +++ b/pkg/contexts/ocm/elements/artifactaccess/wgetaccess/resource.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 wgetaccess import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/wgetblob/options.go b/pkg/contexts/ocm/elements/artifactblob/wgetblob/options.go index bb861981f2..ce8427ffb6 100644 --- a/pkg/contexts/ocm/elements/artifactblob/wgetblob/options.go +++ b/pkg/contexts/ocm/elements/artifactblob/wgetblob/options.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 wgetblob import ( diff --git a/pkg/contexts/ocm/elements/artifactblob/wgetblob/resource.go b/pkg/contexts/ocm/elements/artifactblob/wgetblob/resource.go index 628ad972b9..e2831194bc 100644 --- a/pkg/contexts/ocm/elements/artifactblob/wgetblob/resource.go +++ b/pkg/contexts/ocm/elements/artifactblob/wgetblob/resource.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 wgetblob import ( diff --git a/pkg/contexts/ocm/repositories/genericocireg/specnorm.go b/pkg/contexts/ocm/repositories/genericocireg/specnorm.go index c74f7d2d55..82aa8c3293 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/specnorm.go +++ b/pkg/contexts/ocm/repositories/genericocireg/specnorm.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 genericocireg import ( diff --git a/pkg/contexts/ocm/repositories/ocireg/specnorm.go b/pkg/contexts/ocm/repositories/ocireg/specnorm.go index babc96c088..7be83b465b 100644 --- a/pkg/contexts/ocm/repositories/ocireg/specnorm.go +++ b/pkg/contexts/ocm/repositories/ocireg/specnorm.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 ocireg import ( diff --git a/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go b/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go index 8c18bc78ad..7137370c80 100644 --- a/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go +++ b/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go @@ -1,16 +1,12 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package ocireg_test 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/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("ref parsing", func() { diff --git a/pkg/contexts/ocm/signing/handler_test.go b/pkg/contexts/ocm/signing/handler_test.go index 2f37054add..85c0202246 100644 --- a/pkg/contexts/ocm/signing/handler_test.go +++ b/pkg/contexts/ocm/signing/handler_test.go @@ -1,12 +1,7 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signing_test import ( . "github.com/onsi/ginkgo/v2" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -18,6 +13,7 @@ import ( "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" rsa_pss "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-pss" "github.com/open-component-model/ocm/pkg/signing/signutils" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Simple signing handlers", func() { diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/utils.go b/pkg/contexts/ocm/transfer/transferhandler/standard/utils.go index 9941025117..9fb9a53e06 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/standard/utils.go +++ b/pkg/contexts/ocm/transfer/transferhandler/standard/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 standard import ( diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/utils_test.go b/pkg/contexts/ocm/transfer/transferhandler/standard/utils_test.go index 114eac0512..b181690d9f 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/standard/utils_test.go +++ b/pkg/contexts/ocm/transfer/transferhandler/standard/utils_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 standard_test import ( diff --git a/pkg/contexts/ocm/utils/check/check.go b/pkg/contexts/ocm/utils/check/check.go index d2710e3cd0..12124d9b10 100644 --- a/pkg/contexts/ocm/utils/check/check.go +++ b/pkg/contexts/ocm/utils/check/check.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 check import ( diff --git a/pkg/contexts/ocm/utils/check/options.go b/pkg/contexts/ocm/utils/check/options.go index 8a7eede8c4..d263e693e9 100644 --- a/pkg/contexts/ocm/utils/check/options.go +++ b/pkg/contexts/ocm/utils/check/options.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 check import ( diff --git a/pkg/refmgmt/finalized/doc.go b/pkg/refmgmt/finalized/doc.go index 13b1e31d54..fc07108260 100644 --- a/pkg/refmgmt/finalized/doc.go +++ b/pkg/refmgmt/finalized/doc.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 finalized provided a view management for a backend object, // which is based on Go Garbage Collection and runtime finalizers. // Finalization is not possible in Go, if an object is involved in diff --git a/pkg/refmgmt/finalized/finalizedref.go b/pkg/refmgmt/finalized/finalizedref.go index c6262fb157..de67f9ad1f 100644 --- a/pkg/refmgmt/finalized/finalizedref.go +++ b/pkg/refmgmt/finalized/finalizedref.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 finalized import ( diff --git a/pkg/signing/handlers/rsa-pss-signingservice/handler.go b/pkg/signing/handlers/rsa-pss-signingservice/handler.go index 6f4158ea9d..0225ad2577 100644 --- a/pkg/signing/handlers/rsa-pss-signingservice/handler.go +++ b/pkg/signing/handlers/rsa-pss-signingservice/handler.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 rsa_pss_signingservice import ( diff --git a/pkg/signing/handlers/rsa-pss/handler.go b/pkg/signing/handlers/rsa-pss/handler.go index 97f37ef4da..a4e6ddd0d7 100644 --- a/pkg/signing/handlers/rsa-pss/handler.go +++ b/pkg/signing/handlers/rsa-pss/handler.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 rsa_pss import ( diff --git a/pkg/signing/handlers/sigstore/attr/attr.go b/pkg/signing/handlers/sigstore/attr/attr.go index 2d0c04af63..a65cbc7214 100644 --- a/pkg/signing/handlers/sigstore/attr/attr.go +++ b/pkg/signing/handlers/sigstore/attr/attr.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 attr import ( diff --git a/pkg/signing/signutils/utils.go b/pkg/signing/signutils/utils.go index c49fb37c5b..a716901f48 100644 --- a/pkg/signing/signutils/utils.go +++ b/pkg/signing/signutils/utils.go @@ -1,13 +1,8 @@ -// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Open Component Model contributors. -// -// SPDX-License-Identifier: Apache-2.0 - package signutils import ( "bytes" "crypto" - "crypto/dsa" //nolint: staticcheck // yes "crypto/ecdsa" "crypto/rsa" "crypto/x509" @@ -17,6 +12,7 @@ import ( "runtime" "strings" "time" + "crypto/dsa" //nolint: staticcheck // yes "github.com/mandelsoft/vfs/pkg/vfs" "github.com/modern-go/reflect2" diff --git a/pkg/tokens/github/main/main.go b/pkg/tokens/github/main/main.go index 8309caf503..dc271eb7a3 100644 --- a/pkg/tokens/github/main/main.go +++ b/pkg/tokens/github/main/main.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 main import ( diff --git a/pkg/utils/key.go b/pkg/utils/key.go index d2abb73e9b..cb8a9f3b2e 100644 --- a/pkg/utils/key.go +++ b/pkg/utils/key.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 utils import ( diff --git a/version.go b/version.go index c22302ad07..7ea730bd12 100644 --- a/version.go +++ b/version.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 ocm import _ "embed" From eb0917dcf5cd4fa8b844c41350e3c3165d9573fd Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 11:25:28 +0200 Subject: [PATCH 06/16] rm SPDX-FileCopyrightText leftovers --- flake.nix | 5 ----- pkg/contexts/ocm/download/handlers/blueprint/registration.go | 3 --- .../comparch/testdata/common/component-descriptor.yaml | 4 ---- .../comparch/testdata/directory/component-descriptor.yaml | 4 ---- 4 files changed, 16 deletions(-) diff --git a/flake.nix b/flake.nix index 960c788eb3..f27a550d44 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,3 @@ -/* -SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Gardener contributors - -SPDX-License-Identifier: Apache-2.0 -*/ { description = "Nix flake for ocm"; diff --git a/pkg/contexts/ocm/download/handlers/blueprint/registration.go b/pkg/contexts/ocm/download/handlers/blueprint/registration.go index cfd4168e63..1bf5c3318a 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/registration.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/registration.go @@ -1,6 +1,3 @@ -// // SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Open Component Model contributors. -// // -// // SPDX-License-Identifier: Apache-2.0 package blueprint import ( diff --git a/pkg/contexts/ocm/repositories/comparch/testdata/common/component-descriptor.yaml b/pkg/contexts/ocm/repositories/comparch/testdata/common/component-descriptor.yaml index 07072fb894..2f294aa961 100755 --- a/pkg/contexts/ocm/repositories/comparch/testdata/common/component-descriptor.yaml +++ b/pkg/contexts/ocm/repositories/comparch/testdata/common/component-descriptor.yaml @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: 2020 SAP SE or an SAP affiliate company and Gardener contributors -# -# SPDX-License-Identifier: Apache-2.0 - meta: schemaVersion: v2 component: diff --git a/pkg/contexts/ocm/repositories/comparch/testdata/directory/component-descriptor.yaml b/pkg/contexts/ocm/repositories/comparch/testdata/directory/component-descriptor.yaml index 4064c96c40..ec40c4441a 100644 --- a/pkg/contexts/ocm/repositories/comparch/testdata/directory/component-descriptor.yaml +++ b/pkg/contexts/ocm/repositories/comparch/testdata/directory/component-descriptor.yaml @@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: 2020 SAP SE or an SAP affiliate company and Gardener contributors -# -# SPDX-License-Identifier: Apache-2.0 - meta: schemaVersion: v2 From 45d4f3f562a8bc86074f055d62035852e0940bcb Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 12:15:36 +0200 Subject: [PATCH 07/16] fix make generate --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8d66c88c15..00c9834904 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ test: .PHONY: generate generate: - @$(REPO_ROOT)/hack/generate.sh $(REPO_ROOT)/pkg... $(REPO_ROOT)/cmds/ocm/... $(REPO_ROOT)/cmds/helminst/... $(REPO_ROOT)/examples/... + @$(REPO_ROOT)/hack/generate.sh $(REPO_ROOT)/pkg... $(REPO_ROOT)/cmds/ocm/... $(REPO_ROOT)/cmds/helminstaller/... $(REPO_ROOT)/examples/... .PHONY: generate-deepcopy generate-deepcopy: controller-gen From 547185d4504f17b37f156ebbb982c1e2f1e262f6 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 12:16:26 +0200 Subject: [PATCH 08/16] format --- pkg/dirtree/context.go | 2 +- pkg/signing/signutils/utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/dirtree/context.go b/pkg/dirtree/context.go index 24f47db734..d31e78086c 100644 --- a/pkg/dirtree/context.go +++ b/pkg/dirtree/context.go @@ -1,10 +1,10 @@ package dirtree import ( + "crypto/sha1" //nolint: gosec // required "fmt" "hash" "io" - "crypto/sha1" //nolint: gosec // required "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/vfs" diff --git a/pkg/signing/signutils/utils.go b/pkg/signing/signutils/utils.go index a716901f48..cdc9cfcfcd 100644 --- a/pkg/signing/signutils/utils.go +++ b/pkg/signing/signutils/utils.go @@ -3,6 +3,7 @@ package signutils import ( "bytes" "crypto" + "crypto/dsa" //nolint: staticcheck // yes "crypto/ecdsa" "crypto/rsa" "crypto/x509" @@ -12,7 +13,6 @@ import ( "runtime" "strings" "time" - "crypto/dsa" //nolint: staticcheck // yes "github.com/mandelsoft/vfs/pkg/vfs" "github.com/modern-go/reflect2" From df3c2d3f85ee9623d2affe6676db8852e0f228b0 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 12:16:45 +0200 Subject: [PATCH 09/16] generate --- .../ocm_add_resource-configuration.md | 54 ++++++++++++++++++- docs/reference/ocm_add_resources.md | 54 ++++++++++++++++++- docs/reference/ocm_add_routingslips.md | 2 - .../reference/ocm_add_source-configuration.md | 54 ++++++++++++++++++- docs/reference/ocm_add_sources.md | 54 ++++++++++++++++++- docs/reference/ocm_bootstrap_configuration.md | 2 - docs/reference/ocm_bootstrap_package.md | 2 - docs/reference/ocm_check_componentversions.md | 2 - docs/reference/ocm_describe_artifacts.md | 1 - docs/reference/ocm_describe_package.md | 2 - docs/reference/ocm_download_artifacts.md | 1 - docs/reference/ocm_download_cli.md | 2 - .../ocm_download_componentversions.md | 2 - docs/reference/ocm_download_resources.md | 2 - docs/reference/ocm_get_artifacts.md | 1 - docs/reference/ocm_get_componentversions.md | 2 - docs/reference/ocm_get_references.md | 2 - docs/reference/ocm_get_resources.md | 2 - docs/reference/ocm_get_routingslips.md | 2 - docs/reference/ocm_get_sources.md | 2 - docs/reference/ocm_hash_componentversions.md | 2 - docs/reference/ocm_install_plugins.md | 2 - docs/reference/ocm_ocm-accessmethods.md | 45 ++++++++++++++++ docs/reference/ocm_ocm-references.md | 14 +++++ docs/reference/ocm_show_tags.md | 1 - docs/reference/ocm_show_versions.md | 2 - docs/reference/ocm_sign_componentversions.md | 2 - docs/reference/ocm_transfer_artifacts.md | 1 - .../ocm_transfer_componentversions.md | 2 - .../reference/ocm_verify_componentversions.md | 2 - .../lib/tour/01-getting-started/README.md | 22 ++++++-- 31 files changed, 284 insertions(+), 56 deletions(-) diff --git a/docs/reference/ocm_add_resource-configuration.md b/docs/reference/ocm_add_resource-configuration.md index c94306f90d..fdc3daaee8 100644 --- a/docs/reference/ocm_add_resource-configuration.md +++ b/docs/reference/ocm_add_resource-configuration.md @@ -30,15 +30,20 @@ resource-configuration, resourceconfig, rsccfg, rcfg --accessRepository string repository URL --accessType string type of blob access specification --accessVersion string version for access specification + --body string body of a http request --bucket string bucket name --commit string git commit id --digest string blob digest --globalAccess YAML access specification for global access + --header :,,... http headers (default {}) --hint string (repository) hint for local artifacts --mediaType string media type for artifact blob representation + --noredirect http redirect behavior --reference string reference name --region string region name --size int blob size + --url string artifact or server url + --verb string http request method ``` @@ -473,7 +478,7 @@ with the field type in the input field: This REQUIRED property describes the url from which the resource is to be downloaded. - - **mediaType *string* + - **mediaType** *string* This OPTIONAL property describes the media type of the resource to be downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header @@ -494,7 +499,7 @@ with the field type in the input field: This OPTIONAL property describes the http body to be included in the request. - - **noredirect** *bool* + - **noredirect** *bool* This OPTIONAL property describes whether http redirects should be disabled. If omitted, it is defaulted to false (so, per default, redirects are enabled). @@ -802,6 +807,51 @@ shown below. Options used to configure fields: --accessVersion, --bucket, --mediaType, --reference, --region +- Access type wget + + This method implements access to resources stored on an http server. + + The following versions are supported: + - Version v1 + + The url is the url pointing to the http endpoint from which a resource is + downloaded. The mimeType can be used to specify the MIME type of the + resource. + + This blob type specification supports the following fields: + - **url** *string* + + This REQUIRED property describes the url from which the resource is to be + downloaded. + + - **mediaType** *string* + + This OPTIONAL property describes the media type of the resource to be + downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header + of the http response. If the mediaType cannot be set from the Content-Type header as well, + ocm tries to deduct the mediaType from the URL. If that is not possible either, the default + media type is defaulted to application/octet-stream. + + - **header** *map[string][]string* + + This OPTIONAL property describes the http headers to be set in the http request to the server. + + - **verb** *string* + + This OPTIONAL property describes the http verb (also known as http request method) for the http + request. If omitted, the http verb is defaulted to GET. + + - **body** *[]byte* + + This OPTIONAL property describes the http body to be included in the request. + + - **noredirect** *bool* + + This OPTIONAL property describes whether http redirects should be disabled. If omitted, + it is defaulted to false (so, per default, redirects are enabled). + + Options used to configure fields: --body, --header, --mediaType, --noredirect, --url, --verb + All yaml/json defined resources can be templated. Variables are specified as regular arguments following the syntax <name>=<value>. diff --git a/docs/reference/ocm_add_resources.md b/docs/reference/ocm_add_resources.md index fac8d5cda0..d755180f4e 100644 --- a/docs/reference/ocm_add_resources.md +++ b/docs/reference/ocm_add_resources.md @@ -36,15 +36,20 @@ resources, resource, res, r --accessRepository string repository URL --accessType string type of blob access specification --accessVersion string version for access specification + --body string body of a http request --bucket string bucket name --commit string git commit id --digest string blob digest --globalAccess YAML access specification for global access + --header :,,... http headers (default {}) --hint string (repository) hint for local artifacts --mediaType string media type for artifact blob representation + --noredirect http redirect behavior --reference string reference name --region string region name --size int blob size + --url string artifact or server url + --verb string http request method ``` @@ -483,7 +488,7 @@ with the field type in the input field: This REQUIRED property describes the url from which the resource is to be downloaded. - - **mediaType *string* + - **mediaType** *string* This OPTIONAL property describes the media type of the resource to be downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header @@ -504,7 +509,7 @@ with the field type in the input field: This OPTIONAL property describes the http body to be included in the request. - - **noredirect** *bool* + - **noredirect** *bool* This OPTIONAL property describes whether http redirects should be disabled. If omitted, it is defaulted to false (so, per default, redirects are enabled). @@ -812,6 +817,51 @@ shown below. Options used to configure fields: --accessVersion, --bucket, --mediaType, --reference, --region +- Access type wget + + This method implements access to resources stored on an http server. + + The following versions are supported: + - Version v1 + + The url is the url pointing to the http endpoint from which a resource is + downloaded. The mimeType can be used to specify the MIME type of the + resource. + + This blob type specification supports the following fields: + - **url** *string* + + This REQUIRED property describes the url from which the resource is to be + downloaded. + + - **mediaType** *string* + + This OPTIONAL property describes the media type of the resource to be + downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header + of the http response. If the mediaType cannot be set from the Content-Type header as well, + ocm tries to deduct the mediaType from the URL. If that is not possible either, the default + media type is defaulted to application/octet-stream. + + - **header** *map[string][]string* + + This OPTIONAL property describes the http headers to be set in the http request to the server. + + - **verb** *string* + + This OPTIONAL property describes the http verb (also known as http request method) for the http + request. If omitted, the http verb is defaulted to GET. + + - **body** *[]byte* + + This OPTIONAL property describes the http body to be included in the request. + + - **noredirect** *bool* + + This OPTIONAL property describes whether http redirects should be disabled. If omitted, + it is defaulted to false (so, per default, redirects are enabled). + + Options used to configure fields: --body, --header, --mediaType, --noredirect, --url, --verb + All yaml/json defined resources can be templated. Variables are specified as regular arguments following the syntax <name>=<value>. diff --git a/docs/reference/ocm_add_routingslips.md b/docs/reference/ocm_add_routingslips.md index dd10010bf6..ce8478ffa4 100644 --- a/docs/reference/ocm_add_routingslips.md +++ b/docs/reference/ocm_add_routingslips.md @@ -97,12 +97,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_add_source-configuration.md b/docs/reference/ocm_add_source-configuration.md index 67d3bbcfce..25a8f5f5a0 100644 --- a/docs/reference/ocm_add_source-configuration.md +++ b/docs/reference/ocm_add_source-configuration.md @@ -30,15 +30,20 @@ source-configuration, sourceconfig, srccfg, scfg --accessRepository string repository URL --accessType string type of blob access specification --accessVersion string version for access specification + --body string body of a http request --bucket string bucket name --commit string git commit id --digest string blob digest --globalAccess YAML access specification for global access + --header :,,... http headers (default {}) --hint string (repository) hint for local artifacts --mediaType string media type for artifact blob representation + --noredirect http redirect behavior --reference string reference name --region string region name --size int blob size + --url string artifact or server url + --verb string http request method ``` @@ -473,7 +478,7 @@ with the field type in the input field: This REQUIRED property describes the url from which the resource is to be downloaded. - - **mediaType *string* + - **mediaType** *string* This OPTIONAL property describes the media type of the resource to be downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header @@ -494,7 +499,7 @@ with the field type in the input field: This OPTIONAL property describes the http body to be included in the request. - - **noredirect** *bool* + - **noredirect** *bool* This OPTIONAL property describes whether http redirects should be disabled. If omitted, it is defaulted to false (so, per default, redirects are enabled). @@ -802,6 +807,51 @@ shown below. Options used to configure fields: --accessVersion, --bucket, --mediaType, --reference, --region +- Access type wget + + This method implements access to resources stored on an http server. + + The following versions are supported: + - Version v1 + + The url is the url pointing to the http endpoint from which a resource is + downloaded. The mimeType can be used to specify the MIME type of the + resource. + + This blob type specification supports the following fields: + - **url** *string* + + This REQUIRED property describes the url from which the resource is to be + downloaded. + + - **mediaType** *string* + + This OPTIONAL property describes the media type of the resource to be + downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header + of the http response. If the mediaType cannot be set from the Content-Type header as well, + ocm tries to deduct the mediaType from the URL. If that is not possible either, the default + media type is defaulted to application/octet-stream. + + - **header** *map[string][]string* + + This OPTIONAL property describes the http headers to be set in the http request to the server. + + - **verb** *string* + + This OPTIONAL property describes the http verb (also known as http request method) for the http + request. If omitted, the http verb is defaulted to GET. + + - **body** *[]byte* + + This OPTIONAL property describes the http body to be included in the request. + + - **noredirect** *bool* + + This OPTIONAL property describes whether http redirects should be disabled. If omitted, + it is defaulted to false (so, per default, redirects are enabled). + + Options used to configure fields: --body, --header, --mediaType, --noredirect, --url, --verb + All yaml/json defined resources can be templated. Variables are specified as regular arguments following the syntax <name>=<value>. diff --git a/docs/reference/ocm_add_sources.md b/docs/reference/ocm_add_sources.md index 0270fae913..ed829fb938 100644 --- a/docs/reference/ocm_add_sources.md +++ b/docs/reference/ocm_add_sources.md @@ -35,15 +35,20 @@ sources, source, src, s --accessRepository string repository URL --accessType string type of blob access specification --accessVersion string version for access specification + --body string body of a http request --bucket string bucket name --commit string git commit id --digest string blob digest --globalAccess YAML access specification for global access + --header :,,... http headers (default {}) --hint string (repository) hint for local artifacts --mediaType string media type for artifact blob representation + --noredirect http redirect behavior --reference string reference name --region string region name --size int blob size + --url string artifact or server url + --verb string http request method ``` @@ -481,7 +486,7 @@ with the field type in the input field: This REQUIRED property describes the url from which the resource is to be downloaded. - - **mediaType *string* + - **mediaType** *string* This OPTIONAL property describes the media type of the resource to be downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header @@ -502,7 +507,7 @@ with the field type in the input field: This OPTIONAL property describes the http body to be included in the request. - - **noredirect** *bool* + - **noredirect** *bool* This OPTIONAL property describes whether http redirects should be disabled. If omitted, it is defaulted to false (so, per default, redirects are enabled). @@ -810,6 +815,51 @@ shown below. Options used to configure fields: --accessVersion, --bucket, --mediaType, --reference, --region +- Access type wget + + This method implements access to resources stored on an http server. + + The following versions are supported: + - Version v1 + + The url is the url pointing to the http endpoint from which a resource is + downloaded. The mimeType can be used to specify the MIME type of the + resource. + + This blob type specification supports the following fields: + - **url** *string* + + This REQUIRED property describes the url from which the resource is to be + downloaded. + + - **mediaType** *string* + + This OPTIONAL property describes the media type of the resource to be + downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header + of the http response. If the mediaType cannot be set from the Content-Type header as well, + ocm tries to deduct the mediaType from the URL. If that is not possible either, the default + media type is defaulted to application/octet-stream. + + - **header** *map[string][]string* + + This OPTIONAL property describes the http headers to be set in the http request to the server. + + - **verb** *string* + + This OPTIONAL property describes the http verb (also known as http request method) for the http + request. If omitted, the http verb is defaulted to GET. + + - **body** *[]byte* + + This OPTIONAL property describes the http body to be included in the request. + + - **noredirect** *bool* + + This OPTIONAL property describes whether http redirects should be disabled. If omitted, + it is defaulted to false (so, per default, redirects are enabled). + + Options used to configure fields: --body, --header, --mediaType, --noredirect, --url, --verb + All yaml/json defined resources can be templated. Variables are specified as regular arguments following the syntax <name>=<value>. diff --git a/docs/reference/ocm_bootstrap_configuration.md b/docs/reference/ocm_bootstrap_configuration.md index 142e8d2202..e7609ec4cb 100644 --- a/docs/reference/ocm_bootstrap_configuration.md +++ b/docs/reference/ocm_bootstrap_configuration.md @@ -78,12 +78,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_bootstrap_package.md b/docs/reference/ocm_bootstrap_package.md index bef6e13a14..ed44d538b5 100644 --- a/docs/reference/ocm_bootstrap_package.md +++ b/docs/reference/ocm_bootstrap_package.md @@ -159,12 +159,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_check_componentversions.md b/docs/reference/ocm_check_componentversions.md index db42cf0858..66af32da98 100644 --- a/docs/reference/ocm_check_componentversions.md +++ b/docs/reference/ocm_check_componentversions.md @@ -66,12 +66,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_describe_artifacts.md b/docs/reference/ocm_describe_artifacts.md index 5c5728682a..218a74ba85 100644 --- a/docs/reference/ocm_describe_artifacts.md +++ b/docs/reference/ocm_describe_artifacts.md @@ -60,7 +60,6 @@ linked library can be used: - DockerDaemon: v1 - Empty: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_describe_package.md b/docs/reference/ocm_describe_package.md index 1790bd2a77..60eb15f23a 100644 --- a/docs/reference/ocm_describe_package.md +++ b/docs/reference/ocm_describe_package.md @@ -69,12 +69,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_download_artifacts.md b/docs/reference/ocm_download_artifacts.md index 101dea7314..c2a2e85abe 100644 --- a/docs/reference/ocm_download_artifacts.md +++ b/docs/reference/ocm_download_artifacts.md @@ -62,7 +62,6 @@ linked library can be used: - DockerDaemon: v1 - Empty: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_download_cli.md b/docs/reference/ocm_download_cli.md index 01dc462c08..fc7a0ee462 100644 --- a/docs/reference/ocm_download_cli.md +++ b/docs/reference/ocm_download_cli.md @@ -76,12 +76,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_download_componentversions.md b/docs/reference/ocm_download_componentversions.md index de66681659..82487f63b6 100644 --- a/docs/reference/ocm_download_componentversions.md +++ b/docs/reference/ocm_download_componentversions.md @@ -65,12 +65,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_download_resources.md b/docs/reference/ocm_download_resources.md index 2754454a4f..b48beb3071 100644 --- a/docs/reference/ocm_download_resources.md +++ b/docs/reference/ocm_download_resources.md @@ -101,12 +101,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_get_artifacts.md b/docs/reference/ocm_get_artifacts.md index a1f370c2c9..2eb9447cb9 100644 --- a/docs/reference/ocm_get_artifacts.md +++ b/docs/reference/ocm_get_artifacts.md @@ -60,7 +60,6 @@ linked library can be used: - DockerDaemon: v1 - Empty: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_get_componentversions.md b/docs/reference/ocm_get_componentversions.md index 8d225c75b9..3f33d7d644 100644 --- a/docs/reference/ocm_get_componentversions.md +++ b/docs/reference/ocm_get_componentversions.md @@ -75,12 +75,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_get_references.md b/docs/reference/ocm_get_references.md index 0807414767..aaf24e7728 100644 --- a/docs/reference/ocm_get_references.md +++ b/docs/reference/ocm_get_references.md @@ -76,12 +76,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_get_resources.md b/docs/reference/ocm_get_resources.md index 8abddf2f05..cf9ef134d3 100644 --- a/docs/reference/ocm_get_resources.md +++ b/docs/reference/ocm_get_resources.md @@ -76,12 +76,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_get_routingslips.md b/docs/reference/ocm_get_routingslips.md index d0adb0de32..518d9d3c0c 100644 --- a/docs/reference/ocm_get_routingslips.md +++ b/docs/reference/ocm_get_routingslips.md @@ -75,12 +75,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_get_sources.md b/docs/reference/ocm_get_sources.md index 51b4bfe545..f3bc6f3c1f 100644 --- a/docs/reference/ocm_get_sources.md +++ b/docs/reference/ocm_get_sources.md @@ -76,12 +76,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_hash_componentversions.md b/docs/reference/ocm_hash_componentversions.md index f9fd49fc13..7999825f90 100644 --- a/docs/reference/ocm_hash_componentversions.md +++ b/docs/reference/ocm_hash_componentversions.md @@ -109,12 +109,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_install_plugins.md b/docs/reference/ocm_install_plugins.md index 72777db8db..5e27180a96 100644 --- a/docs/reference/ocm_install_plugins.md +++ b/docs/reference/ocm_install_plugins.md @@ -68,12 +68,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_ocm-accessmethods.md b/docs/reference/ocm_ocm-accessmethods.md index 5d971f5d1e..f94353937d 100644 --- a/docs/reference/ocm_ocm-accessmethods.md +++ b/docs/reference/ocm_ocm-accessmethods.md @@ -310,6 +310,51 @@ shown below. Options used to configure fields: --accessVersion, --bucket, --mediaType, --reference, --region +- Access type wget + + This method implements access to resources stored on an http server. + + The following versions are supported: + - Version v1 + + The url is the url pointing to the http endpoint from which a resource is + downloaded. The mimeType can be used to specify the MIME type of the + resource. + + This blob type specification supports the following fields: + - **url** *string* + + This REQUIRED property describes the url from which the resource is to be + downloaded. + + - **mediaType** *string* + + This OPTIONAL property describes the media type of the resource to be + downloaded. If omitted, ocm tries to read the mediaType from the Content-Type header + of the http response. If the mediaType cannot be set from the Content-Type header as well, + ocm tries to deduct the mediaType from the URL. If that is not possible either, the default + media type is defaulted to application/octet-stream. + + - **header** *map[string][]string* + + This OPTIONAL property describes the http headers to be set in the http request to the server. + + - **verb** *string* + + This OPTIONAL property describes the http verb (also known as http request method) for the http + request. If omitted, the http verb is defaulted to GET. + + - **body** *[]byte* + + This OPTIONAL property describes the http body to be included in the request. + + - **noredirect** *bool* + + This OPTIONAL property describes whether http redirects should be disabled. If omitted, + it is defaulted to false (so, per default, redirects are enabled). + + Options used to configure fields: --body, --header, --mediaType, --noredirect, --url, --verb + ### SEE ALSO diff --git a/docs/reference/ocm_ocm-references.md b/docs/reference/ocm_ocm-references.md index 9b486b596e..7610fa2e14 100644 --- a/docs/reference/ocm_ocm-references.md +++ b/docs/reference/ocm_ocm-references.md @@ -67,6 +67,8 @@ character. The following formats are supported: directory, ta ### Examples ``` +Complete Component Reference Specifications (including all optional arguments): + +ctf+directory::./ocm/ctf//ocm.software/ocmcli:0.7.0 oci::{"baseUrl":"ghcr.io","componentNameMapping":"urlPath","subPath":"open-component-model"}//ocm.software/ocmcli.0.7.0 @@ -74,6 +76,18 @@ oci::{"baseUrl":"ghcr.io","componentNameMapping":"urlPath","subPath":"open-compo oci::https://ghcr.io:443/open-component-model//ocm.software/ocmcli:0.7.0 oci::http://localhost:8080/local-component-repository//ocm.software/ocmcli:0.7.0 + +--- + +Short-Hand Component Reference Specifications (omitting optional arguments): + +./ocm/ctf//ocm.software/ocmcli:0.7.0 + +ghcr.io/open-component-model//ocm.software/ocmcli:0.7.0 + +localhost:8080/local-component-repository//ocm.software/ocmcli:0.7.0 (defaulting to https) + +http://localhost:8080/local-component-repository//ocm.software/ocmcli:0.7.0 ``` ### SEE ALSO diff --git a/docs/reference/ocm_show_tags.md b/docs/reference/ocm_show_tags.md index 3fd0a36d29..886ee7a49f 100644 --- a/docs/reference/ocm_show_tags.md +++ b/docs/reference/ocm_show_tags.md @@ -52,7 +52,6 @@ linked library can be used: - DockerDaemon: v1 - Empty: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_show_versions.md b/docs/reference/ocm_show_versions.md index 309f09b1e0..344a20baff 100644 --- a/docs/reference/ocm_show_versions.md +++ b/docs/reference/ocm_show_versions.md @@ -62,12 +62,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_sign_componentversions.md b/docs/reference/ocm_sign_componentversions.md index a19b73c505..f349615e29 100644 --- a/docs/reference/ocm_sign_componentversions.md +++ b/docs/reference/ocm_sign_componentversions.md @@ -84,12 +84,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_transfer_artifacts.md b/docs/reference/ocm_transfer_artifacts.md index 3a57c7b4f2..b650382015 100644 --- a/docs/reference/ocm_transfer_artifacts.md +++ b/docs/reference/ocm_transfer_artifacts.md @@ -71,7 +71,6 @@ linked library can be used: - DockerDaemon: v1 - Empty: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_transfer_componentversions.md b/docs/reference/ocm_transfer_componentversions.md index 5e75f7db5b..cbbae63fe8 100644 --- a/docs/reference/ocm_transfer_componentversions.md +++ b/docs/reference/ocm_transfer_componentversions.md @@ -87,12 +87,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/docs/reference/ocm_verify_componentversions.md b/docs/reference/ocm_verify_componentversions.md index 08997e38ef..e34ae26685 100644 --- a/docs/reference/ocm_verify_componentversions.md +++ b/docs/reference/ocm_verify_componentversions.md @@ -81,12 +81,10 @@ linked library can be used: Dedicated OCM repository types: - ComponentArchive: v1 - - ca: v1 OCI Repository types (using standard component repository to OCI mapping): - CommonTransportFormat: v1 - OCIRegistry: v1 - - ctf: v1 - oci: v1 - ociRegistry diff --git a/examples/lib/tour/01-getting-started/README.md b/examples/lib/tour/01-getting-started/README.md index 6f84079274..76423db018 100644 --- a/examples/lib/tour/01-getting-started/README.md +++ b/examples/lib/tour/01-getting-started/README.md @@ -164,20 +164,32 @@ differ, because the code always describes the latest version): ``` resources of the latest version: - version: 0.8.0 + version: 0.9.0 provider: ocm.software 1: name: ocmcli extra identity: "architecture"="amd64","os"="linux" resource type: executable - access: Local blob sha256:6672528b57fd77cefa4c5a3395431b6a5aa14dc3ddad3ffe52343a7a518c2cd3[] + access: Local blob sha256:1de1c90f23d0a3dbb8d8646f09380f1da257f9d10796b42dc4ef85e8df93a135[] 2: name: ocmcli extra identity: "architecture"="arm64","os"="linux" resource type: executable - access: Local blob sha256:9088cb8bbef1593b905d6bd3af6652165ff82cebd0d86540a7be9637324d036b[] - 3: name: ocmcli-image + access: Local blob sha256:ca049bb09399020ce0822fd18c0a534ae0d02c3e0180f05dd4faccf61176a267[] + 3: name: ocmcli + extra identity: "architecture"="arm64","os"="darwin" + resource type: executable + access: Local blob sha256:1e32b3f1a08c72e3187b247f8931ea9d0554240fd452a4df129d6036c62b0476[] + 4: name: ocmcli + extra identity: "architecture"="amd64","os"="darwin" + resource type: executable + access: Local blob sha256:04708d2f9845dd6d52f2b8f94e930f3a74a1a098b7ee401e001307d4b4fcc703[] + 5: name: ocmcli + extra identity: "architecture"="amd64","os"="windows" + resource type: executable + access: Local blob sha256:e8cf5dfd1ab02ab982e6f1a425d426fc1f7dc83e6385d26d0477525a4a66c629[] + 6: name: ocmcli-image extra identity: resource type: ociImage - access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.8.0 + access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.9.0 ``` Resources have some metadata, like their identity and a resource type. From b2b15d1d2c126ff105a4d36058aa782917afd36c Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 15:13:37 +0200 Subject: [PATCH 10/16] gci lint --- pkg/contexts/ocm/compdesc/testutils/compnametest.go | 1 + pkg/contexts/ocm/grammar/grammar.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/contexts/ocm/compdesc/testutils/compnametest.go b/pkg/contexts/ocm/compdesc/testutils/compnametest.go index c0b350d9d8..0c6fdff42d 100644 --- a/pkg/contexts/ocm/compdesc/testutils/compnametest.go +++ b/pkg/contexts/ocm/compdesc/testutils/compnametest.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/sirupsen/logrus" "github.com/open-component-model/ocm/pkg/runtime" diff --git a/pkg/contexts/ocm/grammar/grammar.go b/pkg/contexts/ocm/grammar/grammar.go index ead99aff9a..d92d177d14 100644 --- a/pkg/contexts/ocm/grammar/grammar.go +++ b/pkg/contexts/ocm/grammar/grammar.go @@ -1,8 +1,9 @@ package grammar import ( - "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" . "github.com/open-component-model/ocm/pkg/regex" + + "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" ) const ( From 2625f68dac78208a7fceaf44e48d3593977102df Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 May 2024 15:35:58 +0200 Subject: [PATCH 11/16] gci lint --- pkg/contexts/oci/repositories/artifactset/utils_synthesis.go | 3 ++- pkg/testutils/utils.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go index 42a7b164cf..c4bed9fc58 100644 --- a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go +++ b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go @@ -3,6 +3,8 @@ package artifactset import ( "fmt" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" @@ -14,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/transfer" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" ) const SynthesizedBlobFormat = "+tar+gzip" diff --git a/pkg/testutils/utils.go b/pkg/testutils/utils.go index 28633021a7..ab71d423db 100644 --- a/pkg/testutils/utils.go +++ b/pkg/testutils/utils.go @@ -7,6 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/onsi/gomega/types" "github.com/open-component-model/ocm/pkg/runtime" From 67e852302f9eb7990ed4c8887d79f7775651f18c Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 7 May 2024 11:41:27 +0200 Subject: [PATCH 12/16] gci `gci write --custom-order --skip-generated -s standard -s blank -s dot -s default -s localmodule` --- cmds/demoplugin/valuesets/check_test.go | 1 + cmds/ocm/app/app_test.go | 5 +++-- cmds/ocm/commands/controllercmds/install/cmd_test.go | 3 ++- .../commands/controllercmds/install/install_cert_manager.go | 4 +++- cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go | 1 + .../commands/ocmcmds/common/inputs/testutils/testutils.go | 1 + .../ocmcmds/common/inputs/types/ociartifact/input_test.go | 1 + .../ocm/commands/ocmcmds/common/options/optutils/reg_test.go | 1 + .../ocmcmds/common/options/uploaderoption/uploader_test.go | 1 + cmds/ocm/commands/ocmcmds/components/download/cmd_test.go | 3 ++- cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go | 3 ++- cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go | 1 + cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go | 5 +++-- cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go | 3 ++- cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go | 3 ++- cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go | 3 ++- cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go | 3 ++- cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go | 5 +++-- cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go | 3 ++- cmds/ocm/pkg/options/options_test.go | 1 + cmds/ocm/pkg/processing/buffer_test.go | 3 ++- cmds/ocm/pkg/processing/processing_test.go | 3 ++- cmds/ocm/testhelper/testhelper_test.go | 3 ++- pkg/blobaccess/blobaccess_test.go | 5 +++-- pkg/blobaccess/temp_test.go | 5 +++-- pkg/cobrautils/flag/labelledstring_test.go | 1 + pkg/cobrautils/flag/labelledvalue_test.go | 1 + pkg/cobrautils/flag/path_array_test.go | 3 ++- pkg/cobrautils/flag/path_array_win_test.go | 3 ++- pkg/cobrautils/flag/path_test.go | 3 ++- pkg/cobrautils/flag/path_win_test.go | 3 ++- pkg/cobrautils/flag/string_to_value_test.go | 1 + pkg/cobrautils/flag/yaml_test.go | 1 + pkg/cobrautils/flagsets/configure_test.go | 1 + pkg/cobrautils/flagsets/flags_test.go | 1 + pkg/cobrautils/logopts/options_test.go | 5 +++-- pkg/common/accessio/cache_test.go | 5 +++-- pkg/common/accessio/resettablereader_test.go | 5 +++-- pkg/common/accessobj/cachedblob_test.go | 5 +++-- pkg/common/printer_test.go | 3 ++- pkg/contexts/config/config/context_test.go | 1 + pkg/contexts/config/configutils/configure.go | 3 +-- .../credentials/repositories/gardenerconfig/repo_test.go | 3 ++- .../credentials/repositories/memory/config/config_test.go | 3 ++- pkg/contexts/credentials/repositories/npm/config_test.go | 2 +- pkg/contexts/credentials/repositories/npm/repository_test.go | 2 +- pkg/contexts/datacontext/config/logging/config_test.go | 3 ++- pkg/contexts/oci/art_test.go | 1 + pkg/contexts/oci/ociutils/helm/art_test.go | 5 +++-- pkg/contexts/oci/ref_test.go | 1 + .../oci/repositories/artifactset/artifactset_test.go | 5 +++-- pkg/contexts/oci/repositories/artifactset/utils_synthesis.go | 3 +-- pkg/contexts/oci/repositories/ctf/ctf_test.go | 5 +++-- pkg/contexts/oci/repositories/ctf/synthesis_test.go | 5 +++-- pkg/contexts/oci/repositories/ctf/testhelper/fill.go | 1 + pkg/contexts/ocm/accessmethods/github/method_test.go | 5 +++-- pkg/contexts/ocm/accessmethods/helm/method_test.go | 1 + pkg/contexts/ocm/accessmethods/plugin/cmd_test.go | 5 +++-- pkg/contexts/ocm/accessmethods/s3/method_test.go | 5 +++-- .../ocm/blobhandler/handlers/generic/plugin/upload_test.go | 5 +++-- .../blobhandler/handlers/ocm/comparch/blobhandler_test.go | 3 ++- pkg/contexts/ocm/compdesc/copy_test.go | 3 ++- pkg/contexts/ocm/compdesc/logging_test.go | 5 +++-- .../versions/ocm.software/v3alpha1/validation_test.go | 1 + pkg/contexts/ocm/compdesc/versions/v2/validation_test.go | 1 + pkg/contexts/ocm/cpi/compose_test.go | 5 +++-- .../ocm/download/handlers/blueprint/blueprint_test.go | 3 ++- .../ocm/download/handlers/blueprint/registration_test.go | 3 ++- pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go | 5 +++-- .../ocm/download/handlers/dirtree/registration_test.go | 5 +++-- pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go | 1 + pkg/contexts/ocm/download/handlers/plugin/download_test.go | 3 ++- pkg/contexts/ocm/grammar/grammar.go | 3 +-- pkg/contexts/ocm/labels/routingslip/slip_test.go | 1 + pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go | 5 +++-- .../ocm/labels/routingslip/types/plugin/entry_test.go | 1 + pkg/contexts/ocm/repositories/comparch/comparch_test.go | 5 +++-- pkg/contexts/ocm/repositories/composition/repository_test.go | 3 ++- pkg/contexts/ocm/repositories/ctf/ctf_test.go | 5 +++-- pkg/contexts/ocm/repositories/ctf/repo_test.go | 5 +++-- pkg/contexts/ocm/repositories/genericocireg/repo_test.go | 5 +++-- pkg/contexts/ocm/repositories/genericocireg/semver_test.go | 3 ++- pkg/contexts/ocm/repositories/virtual/repo_test.go | 5 +++-- pkg/contexts/ocm/transfer/merge_test.go | 3 ++- pkg/contexts/ocm/utils/localize/config_test.go | 3 ++- pkg/contexts/ocm/utils/localize/instantiate_test.go | 5 +++-- pkg/contexts/ocm/utils/localize/localize_test.go | 3 ++- pkg/contexts/ocm/utils/localize/subst_test.go | 5 +++-- pkg/contexts/ocm/utils/localize/target_test.go | 3 ++- pkg/contexts/ocm/utils/localize/utils_test.go | 3 ++- pkg/dirtree/vfs_test.go | 3 ++- pkg/env/env_test.go | 5 +++-- pkg/logging/config_test.go | 5 +++-- pkg/runtime/unstructured_test.go | 3 ++- pkg/semverutils/utils_test.go | 3 ++- pkg/spiff/spiff_test.go | 3 ++- pkg/toi/install/action_test.go | 3 ++- pkg/utils/tarutils/pack_test.go | 3 ++- pkg/utils/template/template_test.go | 3 ++- 99 files changed, 201 insertions(+), 109 deletions(-) diff --git a/cmds/demoplugin/valuesets/check_test.go b/cmds/demoplugin/valuesets/check_test.go index 19be5d0baa..3e2e17a2ea 100644 --- a/cmds/demoplugin/valuesets/check_test.go +++ b/cmds/demoplugin/valuesets/check_test.go @@ -5,6 +5,7 @@ package valuesets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr" diff --git a/cmds/ocm/app/app_test.go b/cmds/ocm/app/app_test.go index 5605655283..fd1d6f78ed 100644 --- a/cmds/ocm/app/app_test.go +++ b/cmds/ocm/app/app_test.go @@ -6,10 +6,11 @@ import ( "fmt" "strings" - "github.com/mandelsoft/logging" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/logging" + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/spf13/cobra" "github.com/tonglil/buflogr" diff --git a/cmds/ocm/commands/controllercmds/install/cmd_test.go b/cmds/ocm/commands/controllercmds/install/cmd_test.go index 6135cfbe62..cb1767dfdc 100644 --- a/cmds/ocm/commands/controllercmds/install/cmd_test.go +++ b/cmds/ocm/commands/controllercmds/install/cmd_test.go @@ -8,10 +8,11 @@ import ( "os" "strings" - "github.com/mandelsoft/filepath/pkg/filepath" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/controllercmds/install/install_cert_manager.go b/cmds/ocm/commands/controllercmds/install/install_cert_manager.go index e24766d770..f44c168054 100644 --- a/cmds/ocm/commands/controllercmds/install/install_cert_manager.go +++ b/cmds/ocm/commands/controllercmds/install/install_cert_manager.go @@ -2,12 +2,14 @@ package install import ( "context" - _ "embed" "fmt" "os" + _ "embed" + "github.com/fluxcd/pkg/ssa" "github.com/mandelsoft/filepath/pkg/filepath" + "github.com/open-component-model/ocm/pkg/out" ) diff --git a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go index 125996fdc0..d48486d76a 100644 --- a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go +++ b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go @@ -7,6 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/opencontainers/go-digest" . "github.com/open-component-model/ocm/cmds/ocm/testhelper" diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go b/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go index ead682b84b..3276ec4029 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/testutils/testutils.go @@ -4,6 +4,7 @@ import ( "encoding/json" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go index 5f46cd0c08..25bc7717de 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" diff --git a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go index 580d41d553..b411bd5ddc 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" diff --git a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go index a580f2df6c..159e3b492f 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" diff --git a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go index df504723b0..d0275ae230 100644 --- a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go @@ -3,10 +3,11 @@ package download_test import ( "bytes" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" diff --git a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go index 31891633e5..02730b740f 100644 --- a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go @@ -4,10 +4,11 @@ import ( "bytes" "os" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go index 01b850dff8..f0e4ae1d18 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/cobra" . "github.com/open-component-model/ocm/cmds/ocm/testhelper" diff --git a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go index 22003bf54a..2c1cb7eea6 100644 --- a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go @@ -4,11 +4,12 @@ import ( "bytes" "os" - "github.com/mandelsoft/logging" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" + "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go index 76287a68fd..d4fb1f99ac 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go @@ -5,10 +5,11 @@ package describe_test import ( "bytes" - "github.com/mandelsoft/filepath/pkg/filepath" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go index 26f7f9a075..9824d9aa25 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go @@ -5,10 +5,11 @@ package get_test import ( "bytes" - "github.com/mandelsoft/filepath/pkg/filepath" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go index e728a61e42..116d155d26 100644 --- a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go @@ -5,9 +5,10 @@ import ( "net/http" "reflect" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" "helm.sh/helm/v3/pkg/chart/loader" diff --git a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go index c4b08dbad4..b849908ab7 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go @@ -3,10 +3,11 @@ package download_test import ( "bytes" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" diff --git a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go index b6ef6b2452..b533f8df50 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go @@ -4,10 +4,11 @@ import ( "bytes" "encoding/json" - "github.com/mandelsoft/vfs/pkg/projectionfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/projectionfs" + "github.com/mandelsoft/vfs/pkg/vfs" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" . "github.com/open-component-model/ocm/cmds/ocm/testhelper" diff --git a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go index b7a81efb47..f03f4c9cf3 100644 --- a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go +++ b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go @@ -3,10 +3,11 @@ package bootstrap_test import ( "bytes" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/config/bootstrap" . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" diff --git a/cmds/ocm/pkg/options/options_test.go b/cmds/ocm/pkg/options/options_test.go index fd7c1a08cb..24d31ccee2 100644 --- a/cmds/ocm/pkg/options/options_test.go +++ b/cmds/ocm/pkg/options/options_test.go @@ -3,6 +3,7 @@ package options_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/pkg/options" diff --git a/cmds/ocm/pkg/processing/buffer_test.go b/cmds/ocm/pkg/processing/buffer_test.go index bfab4932c4..b3aea9ea6d 100644 --- a/cmds/ocm/pkg/processing/buffer_test.go +++ b/cmds/ocm/pkg/processing/buffer_test.go @@ -3,10 +3,11 @@ package processing import ( "sync" - "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" + "github.com/open-component-model/ocm/cmds/ocm/pkg/data" ocmlog "github.com/open-component-model/ocm/pkg/logging" ) diff --git a/cmds/ocm/pkg/processing/processing_test.go b/cmds/ocm/pkg/processing/processing_test.go index 20d317a31e..cd0cfe6e0b 100644 --- a/cmds/ocm/pkg/processing/processing_test.go +++ b/cmds/ocm/pkg/processing/processing_test.go @@ -4,10 +4,11 @@ import ( "bytes" "strings" - "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" + "github.com/open-component-model/ocm/cmds/ocm/pkg/data" ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/testutils" diff --git a/cmds/ocm/testhelper/testhelper_test.go b/cmds/ocm/testhelper/testhelper_test.go index 4e919df274..dcb6c18dc2 100644 --- a/cmds/ocm/testhelper/testhelper_test.go +++ b/cmds/ocm/testhelper/testhelper_test.go @@ -1,9 +1,10 @@ package testhelper import ( - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/vfs" ) var _ = Describe("Test Environment", func() { diff --git a/pkg/blobaccess/blobaccess_test.go b/pkg/blobaccess/blobaccess_test.go index 4ea99a80f4..391d8679d7 100644 --- a/pkg/blobaccess/blobaccess_test.go +++ b/pkg/blobaccess/blobaccess_test.go @@ -3,11 +3,12 @@ package blobaccess_test import ( "os" - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/blobaccess/bpi" "github.com/open-component-model/ocm/pkg/mime" diff --git a/pkg/blobaccess/temp_test.go b/pkg/blobaccess/temp_test.go index 7ed780dca1..b467eba1c8 100644 --- a/pkg/blobaccess/temp_test.go +++ b/pkg/blobaccess/temp_test.go @@ -1,11 +1,12 @@ package blobaccess_test import ( - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/blobaccess" ) diff --git a/pkg/cobrautils/flag/labelledstring_test.go b/pkg/cobrautils/flag/labelledstring_test.go index bcf4640f70..aaa9ee1bf0 100644 --- a/pkg/cobrautils/flag/labelledstring_test.go +++ b/pkg/cobrautils/flag/labelledstring_test.go @@ -3,6 +3,7 @@ package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" ) diff --git a/pkg/cobrautils/flag/labelledvalue_test.go b/pkg/cobrautils/flag/labelledvalue_test.go index e84031e09b..6edef1e0e0 100644 --- a/pkg/cobrautils/flag/labelledvalue_test.go +++ b/pkg/cobrautils/flag/labelledvalue_test.go @@ -3,6 +3,7 @@ package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" ) diff --git a/pkg/cobrautils/flag/path_array_test.go b/pkg/cobrautils/flag/path_array_test.go index 79bc5352bc..e58bfd7c57 100644 --- a/pkg/cobrautils/flag/path_array_test.go +++ b/pkg/cobrautils/flag/path_array_test.go @@ -6,9 +6,10 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" + + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flag/path_array_win_test.go b/pkg/cobrautils/flag/path_array_win_test.go index a0fd2bf1ad..38448ae381 100644 --- a/pkg/cobrautils/flag/path_array_win_test.go +++ b/pkg/cobrautils/flag/path_array_win_test.go @@ -6,9 +6,10 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" + + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flag/path_test.go b/pkg/cobrautils/flag/path_test.go index 8440a9ce96..47b124509d 100644 --- a/pkg/cobrautils/flag/path_test.go +++ b/pkg/cobrautils/flag/path_test.go @@ -6,9 +6,10 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" + + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flag/path_win_test.go b/pkg/cobrautils/flag/path_win_test.go index 4220aa270c..56f77efdd3 100644 --- a/pkg/cobrautils/flag/path_win_test.go +++ b/pkg/cobrautils/flag/path_win_test.go @@ -6,9 +6,10 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" + + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flag/string_to_value_test.go b/pkg/cobrautils/flag/string_to_value_test.go index 58bd487558..07bf3f7adc 100644 --- a/pkg/cobrautils/flag/string_to_value_test.go +++ b/pkg/cobrautils/flag/string_to_value_test.go @@ -3,6 +3,7 @@ package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/testutils" diff --git a/pkg/cobrautils/flag/yaml_test.go b/pkg/cobrautils/flag/yaml_test.go index cdfda22b25..457cdb207a 100644 --- a/pkg/cobrautils/flag/yaml_test.go +++ b/pkg/cobrautils/flag/yaml_test.go @@ -3,6 +3,7 @@ package flag import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" ) diff --git a/pkg/cobrautils/flagsets/configure_test.go b/pkg/cobrautils/flagsets/configure_test.go index cbecaefdc4..c3edfd5c29 100644 --- a/pkg/cobrautils/flagsets/configure_test.go +++ b/pkg/cobrautils/flagsets/configure_test.go @@ -3,6 +3,7 @@ package flagsets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" diff --git a/pkg/cobrautils/flagsets/flags_test.go b/pkg/cobrautils/flagsets/flags_test.go index 19e84470be..110ba911a6 100644 --- a/pkg/cobrautils/flagsets/flags_test.go +++ b/pkg/cobrautils/flagsets/flags_test.go @@ -3,6 +3,7 @@ package flagsets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" diff --git a/pkg/cobrautils/logopts/options_test.go b/pkg/cobrautils/logopts/options_test.go index 5bbbe5ea3b..4507f43072 100644 --- a/pkg/cobrautils/logopts/options_test.go +++ b/pkg/cobrautils/logopts/options_test.go @@ -3,10 +3,11 @@ package logopts import ( "fmt" - "github.com/mandelsoft/logging" - "github.com/mandelsoft/logging/config" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/logging" + "github.com/mandelsoft/logging/config" "sigs.k8s.io/yaml" "github.com/open-component-model/ocm/pkg/contexts/clictx" diff --git a/pkg/common/accessio/cache_test.go b/pkg/common/accessio/cache_test.go index ceaa756f37..9d14bb58d1 100644 --- a/pkg/common/accessio/cache_test.go +++ b/pkg/common/accessio/cache_test.go @@ -1,10 +1,11 @@ package accessio_test import ( - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/common/accessio/resettablereader_test.go b/pkg/common/accessio/resettablereader_test.go index 38a23d4e9a..3f6e646d8d 100644 --- a/pkg/common/accessio/resettablereader_test.go +++ b/pkg/common/accessio/resettablereader_test.go @@ -3,10 +3,11 @@ package accessio import ( "io" - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" ) const testData = "test data" diff --git a/pkg/common/accessobj/cachedblob_test.go b/pkg/common/accessobj/cachedblob_test.go index 4bf670e50b..4a66137bb8 100644 --- a/pkg/common/accessobj/cachedblob_test.go +++ b/pkg/common/accessobj/cachedblob_test.go @@ -3,11 +3,12 @@ package accessobj_test import ( "io" - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/common/printer_test.go b/pkg/common/printer_test.go index 534580c4d4..b520fc6cb8 100644 --- a/pkg/common/printer_test.go +++ b/pkg/common/printer_test.go @@ -3,10 +3,11 @@ package common import ( "bytes" - "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" + ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/config/config/context_test.go b/pkg/contexts/config/config/context_test.go index d876e83eea..a779a50bd3 100644 --- a/pkg/contexts/config/config/context_test.go +++ b/pkg/contexts/config/config/context_test.go @@ -8,6 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "sigs.k8s.io/yaml" "github.com/open-component-model/ocm/pkg/contexts/config" diff --git a/pkg/contexts/config/configutils/configure.go b/pkg/contexts/config/configutils/configure.go index 29fb04d3ed..ef7c80bd3e 100644 --- a/pkg/contexts/config/configutils/configure.go +++ b/pkg/contexts/config/configutils/configure.go @@ -1,11 +1,10 @@ package configutils import ( - _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config" - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/open-component-model/ocm/pkg/contexts/config" + _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" ) diff --git a/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go b/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go index c6747a5051..5c51f5ed28 100644 --- a/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go +++ b/pkg/contexts/credentials/repositories/gardenerconfig/repo_test.go @@ -9,10 +9,11 @@ import ( "reflect" "strings" - "github.com/mandelsoft/vfs/pkg/memoryfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/open-component-model/ocm/pkg/contexts/credentials" ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi" diff --git a/pkg/contexts/credentials/repositories/memory/config/config_test.go b/pkg/contexts/credentials/repositories/memory/config/config_test.go index a4133b994c..26a0768930 100644 --- a/pkg/contexts/credentials/repositories/memory/config/config_test.go +++ b/pkg/contexts/credentials/repositories/memory/config/config_test.go @@ -1,10 +1,11 @@ package config_test import ( - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" diff --git a/pkg/contexts/credentials/repositories/npm/config_test.go b/pkg/contexts/credentials/repositories/npm/config_test.go index e2c2fcfea9..e8cc8e28b3 100644 --- a/pkg/contexts/credentials/repositories/npm/config_test.go +++ b/pkg/contexts/credentials/repositories/npm/config_test.go @@ -3,12 +3,12 @@ package npm_test 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" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/npm/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/npm" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Config deserialization Test Environment", func() { diff --git a/pkg/contexts/credentials/repositories/npm/repository_test.go b/pkg/contexts/credentials/repositories/npm/repository_test.go index b628c82ce7..8de30de2b9 100644 --- a/pkg/contexts/credentials/repositories/npm/repository_test.go +++ b/pkg/contexts/credentials/repositories/npm/repository_test.go @@ -6,7 +6,6 @@ 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" @@ -14,6 +13,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi" local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/npm" "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("NPM config - .npmrc", func() { diff --git a/pkg/contexts/datacontext/config/logging/config_test.go b/pkg/contexts/datacontext/config/logging/config_test.go index d81a51553e..fba7d39cb4 100644 --- a/pkg/contexts/datacontext/config/logging/config_test.go +++ b/pkg/contexts/datacontext/config/logging/config_test.go @@ -3,9 +3,10 @@ package logging_test import ( "bytes" - "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/logging" "github.com/tonglil/buflogr" "github.com/open-component-model/ocm/pkg/contexts/config" diff --git a/pkg/contexts/oci/art_test.go b/pkg/contexts/oci/art_test.go index 3a4abb21d1..c0bf38dfae 100644 --- a/pkg/contexts/oci/art_test.go +++ b/pkg/contexts/oci/art_test.go @@ -3,6 +3,7 @@ package oci_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/contexts/oci" diff --git a/pkg/contexts/oci/ociutils/helm/art_test.go b/pkg/contexts/oci/ociutils/helm/art_test.go index af92e2b7cc..a3371117cf 100644 --- a/pkg/contexts/oci/ociutils/helm/art_test.go +++ b/pkg/contexts/oci/ociutils/helm/art_test.go @@ -6,10 +6,11 @@ import ( "sort" "strings" - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" diff --git a/pkg/contexts/oci/ref_test.go b/pkg/contexts/oci/ref_test.go index 4ea9ea31f6..a1a1128fd8 100644 --- a/pkg/contexts/oci/ref_test.go +++ b/pkg/contexts/oci/ref_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + godigest "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/common/accessio" diff --git a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go index e2d7d55005..e9af978c1f 100644 --- a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go +++ b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go @@ -5,11 +5,12 @@ import ( "compress/gzip" "io" - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" diff --git a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go index c4bed9fc58..42a7b164cf 100644 --- a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go +++ b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go @@ -3,8 +3,6 @@ package artifactset import ( "fmt" - . "github.com/open-component-model/ocm/pkg/finalizer" - "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" @@ -16,6 +14,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/transfer" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters" "github.com/open-component-model/ocm/pkg/errors" + . "github.com/open-component-model/ocm/pkg/finalizer" ) const SynthesizedBlobFormat = "+tar+gzip" diff --git a/pkg/contexts/oci/repositories/ctf/ctf_test.go b/pkg/contexts/oci/repositories/ctf/ctf_test.go index 7bbc758bef..4fe2b70bd5 100644 --- a/pkg/contexts/oci/repositories/ctf/ctf_test.go +++ b/pkg/contexts/oci/repositories/ctf/ctf_test.go @@ -5,11 +5,12 @@ import ( "compress/gzip" "io" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/contexts/oci/repositories/ctf/synthesis_test.go b/pkg/contexts/oci/repositories/ctf/synthesis_test.go index f24bf25eb9..26c5b3fc89 100644 --- a/pkg/contexts/oci/repositories/ctf/synthesis_test.go +++ b/pkg/contexts/oci/repositories/ctf/synthesis_test.go @@ -1,11 +1,12 @@ package ctf_test import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/contexts/oci/repositories/ctf/testhelper/fill.go b/pkg/contexts/oci/repositories/ctf/testhelper/fill.go index 19cf83bdd7..14e952224e 100644 --- a/pkg/contexts/oci/repositories/ctf/testhelper/fill.go +++ b/pkg/contexts/oci/repositories/ctf/testhelper/fill.go @@ -2,6 +2,7 @@ package testhelper import ( . "github.com/onsi/gomega" + "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/contexts/ocm/accessmethods/github/method_test.go b/pkg/contexts/ocm/accessmethods/github/method_test.go index df6b50e003..c9d38b22eb 100644 --- a/pkg/contexts/ocm/accessmethods/github/method_test.go +++ b/pkg/contexts/ocm/accessmethods/github/method_test.go @@ -7,11 +7,12 @@ import ( "net/http" "os" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/github/identity" diff --git a/pkg/contexts/ocm/accessmethods/helm/method_test.go b/pkg/contexts/ocm/accessmethods/helm/method_test.go index 497865a238..3f6749fb51 100644 --- a/pkg/contexts/ocm/accessmethods/helm/method_test.go +++ b/pkg/contexts/ocm/accessmethods/helm/method_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "helm.sh/helm/v3/pkg/chart/loader" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/helm" diff --git a/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go b/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go index 126b32bb86..dfc2b96d45 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go +++ b/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go @@ -1,10 +1,11 @@ package plugin_test import ( - "github.com/mandelsoft/goutils/sliceutils" - "github.com/mandelsoft/goutils/transformer" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/goutils/sliceutils" + "github.com/mandelsoft/goutils/transformer" "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" diff --git a/pkg/contexts/ocm/accessmethods/s3/method_test.go b/pkg/contexts/ocm/accessmethods/s3/method_test.go index e5f5de1dc1..9119c324af 100644 --- a/pkg/contexts/ocm/accessmethods/s3/method_test.go +++ b/pkg/contexts/ocm/accessmethods/s3/method_test.go @@ -7,11 +7,12 @@ import ( "os" "reflect" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common/accessio/downloader" "github.com/open-component-model/ocm/pkg/contexts/credentials" diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go index 0f4aaa7633..f0e9e7e653 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go @@ -7,11 +7,12 @@ import ( "fmt" "os" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go index 7d21e33cd4..0c53bf1cbd 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go @@ -4,10 +4,11 @@ import ( "encoding/json" "reflect" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localfsblob" diff --git a/pkg/contexts/ocm/compdesc/copy_test.go b/pkg/contexts/ocm/compdesc/copy_test.go index 7e8f41bb4e..7e08cd3905 100644 --- a/pkg/contexts/ocm/compdesc/copy_test.go +++ b/pkg/contexts/ocm/compdesc/copy_test.go @@ -1,10 +1,11 @@ package compdesc_test import ( - "github.com/go-test/deep" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/go-test/deep" + "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" diff --git a/pkg/contexts/ocm/compdesc/logging_test.go b/pkg/contexts/ocm/compdesc/logging_test.go index caa6b815ea..71d7a2d2c2 100644 --- a/pkg/contexts/ocm/compdesc/logging_test.go +++ b/pkg/contexts/ocm/compdesc/logging_test.go @@ -3,10 +3,11 @@ package compdesc_test import ( "bytes" - "github.com/go-logr/logr" - "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/go-logr/logr" + "github.com/mandelsoft/logging" "github.com/tonglil/buflogr" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go index 55ed39a05d..d7b3687c1e 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" + "k8s.io/apimachinery/pkg/util/validation/field" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" diff --git a/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go b/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go index d4ee39a991..3aedf924f5 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go @@ -9,6 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" + "k8s.io/apimachinery/pkg/util/validation/field" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" diff --git a/pkg/contexts/ocm/cpi/compose_test.go b/pkg/contexts/ocm/cpi/compose_test.go index 40140567c1..eedddc4f06 100644 --- a/pkg/contexts/ocm/cpi/compose_test.go +++ b/pkg/contexts/ocm/cpi/compose_test.go @@ -1,11 +1,12 @@ package cpi_test import ( - "github.com/mandelsoft/vfs/pkg/memoryfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go b/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go index 72a57dfb8f..99ed7dbe6f 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go @@ -1,10 +1,11 @@ package blueprint_test import ( - "github.com/mandelsoft/vfs/pkg/projectionfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/projectionfs" + "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go b/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go index 1e468b447a..d9bc5f076f 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go @@ -1,10 +1,11 @@ package blueprint_test import ( - "github.com/mandelsoft/vfs/pkg/projectionfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/projectionfs" + "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go b/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go index 81ee15d28e..220542aaf4 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go @@ -3,10 +3,11 @@ package dirtree_test import ( "encoding/json" - "github.com/mandelsoft/vfs/pkg/projectionfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/projectionfs" + "github.com/mandelsoft/vfs/pkg/vfs" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/open-component-model/ocm/pkg/common" diff --git a/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go b/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go index 678620b747..cf54d64901 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go @@ -1,11 +1,12 @@ package dirtree_test import ( - "github.com/mandelsoft/vfs/pkg/projectionfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/projectionfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go b/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go index 7ed608fac2..9b4ab9d775 100644 --- a/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go +++ b/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/open-component-model/ocm/pkg/common/accessio" diff --git a/pkg/contexts/ocm/download/handlers/plugin/download_test.go b/pkg/contexts/ocm/download/handlers/plugin/download_test.go index 5cd3f52e38..fd0737bc2b 100644 --- a/pkg/contexts/ocm/download/handlers/plugin/download_test.go +++ b/pkg/contexts/ocm/download/handlers/plugin/download_test.go @@ -6,10 +6,11 @@ import ( "fmt" "os" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/grammar/grammar.go b/pkg/contexts/ocm/grammar/grammar.go index d92d177d14..ead99aff9a 100644 --- a/pkg/contexts/ocm/grammar/grammar.go +++ b/pkg/contexts/ocm/grammar/grammar.go @@ -1,9 +1,8 @@ package grammar import ( - . "github.com/open-component-model/ocm/pkg/regex" - "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" + . "github.com/open-component-model/ocm/pkg/regex" ) const ( diff --git a/pkg/contexts/ocm/labels/routingslip/slip_test.go b/pkg/contexts/ocm/labels/routingslip/slip_test.go index 82561eb83b..bcfa8fb8c2 100644 --- a/pkg/contexts/ocm/labels/routingslip/slip_test.go +++ b/pkg/contexts/ocm/labels/routingslip/slip_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/opencontainers/go-digest" "sigs.k8s.io/yaml" diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go index 79eeb87583..122125453b 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go @@ -1,10 +1,11 @@ package plugin_test import ( - "github.com/mandelsoft/goutils/sliceutils" - "github.com/mandelsoft/goutils/transformer" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/goutils/sliceutils" + "github.com/mandelsoft/goutils/transformer" "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go index b42f15632b..1b56c5141e 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go @@ -5,6 +5,7 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" diff --git a/pkg/contexts/ocm/repositories/comparch/comparch_test.go b/pkg/contexts/ocm/repositories/comparch/comparch_test.go index 3e2f24aa9d..42105e132e 100644 --- a/pkg/contexts/ocm/repositories/comparch/comparch_test.go +++ b/pkg/contexts/ocm/repositories/comparch/comparch_test.go @@ -3,12 +3,13 @@ package comparch_test import ( "encoding/json" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" diff --git a/pkg/contexts/ocm/repositories/composition/repository_test.go b/pkg/contexts/ocm/repositories/composition/repository_test.go index 7ff7eaa25d..95d8939fe3 100644 --- a/pkg/contexts/ocm/repositories/composition/repository_test.go +++ b/pkg/contexts/ocm/repositories/composition/repository_test.go @@ -1,10 +1,11 @@ package composition_test import ( - "github.com/mandelsoft/vfs/pkg/memoryfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/blobaccess/bpi" "github.com/open-component-model/ocm/pkg/common/accessio" diff --git a/pkg/contexts/ocm/repositories/ctf/ctf_test.go b/pkg/contexts/ocm/repositories/ctf/ctf_test.go index c3bf3de83a..8f0d00d831 100644 --- a/pkg/contexts/ocm/repositories/ctf/ctf_test.go +++ b/pkg/contexts/ocm/repositories/ctf/ctf_test.go @@ -1,11 +1,12 @@ package ctf_test import ( - "github.com/mandelsoft/vfs/pkg/memoryfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr" diff --git a/pkg/contexts/ocm/repositories/ctf/repo_test.go b/pkg/contexts/ocm/repositories/ctf/repo_test.go index d3925a3433..36a8f0af53 100644 --- a/pkg/contexts/ocm/repositories/ctf/repo_test.go +++ b/pkg/contexts/ocm/repositories/ctf/repo_test.go @@ -3,11 +3,12 @@ package ctf_test import ( "bytes" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/tonglil/buflogr" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/contexts/ocm/repositories/genericocireg/repo_test.go b/pkg/contexts/ocm/repositories/genericocireg/repo_test.go index 50ab789483..c414af5ab5 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/repo_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/repo_test.go @@ -5,10 +5,11 @@ import ( "path" "reflect" - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" diff --git a/pkg/contexts/ocm/repositories/genericocireg/semver_test.go b/pkg/contexts/ocm/repositories/genericocireg/semver_test.go index 067dd163d3..262b4185f9 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/semver_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/semver_test.go @@ -1,10 +1,11 @@ package genericocireg_test import ( - "github.com/Masterminds/semver/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/Masterminds/semver/v3" + "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/ocm/repositories/virtual/repo_test.go b/pkg/contexts/ocm/repositories/virtual/repo_test.go index b2cc10fd21..f8680efdeb 100644 --- a/pkg/contexts/ocm/repositories/virtual/repo_test.go +++ b/pkg/contexts/ocm/repositories/virtual/repo_test.go @@ -1,11 +1,12 @@ package virtual_test import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/layerfs" "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/projectionfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/pkg/contexts/ocm/transfer/merge_test.go b/pkg/contexts/ocm/transfer/merge_test.go index 4f1881c888..e8b9e2ba18 100644 --- a/pkg/contexts/ocm/transfer/merge_test.go +++ b/pkg/contexts/ocm/transfer/merge_test.go @@ -1,10 +1,11 @@ package transfer_test import ( - "github.com/go-test/deep" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/go-test/deep" + "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" diff --git a/pkg/contexts/ocm/utils/localize/config_test.go b/pkg/contexts/ocm/utils/localize/config_test.go index de1701d439..3b79594285 100644 --- a/pkg/contexts/ocm/utils/localize/config_test.go +++ b/pkg/contexts/ocm/utils/localize/config_test.go @@ -1,10 +1,11 @@ package localize_test import ( - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/pkg/contexts/ocm/utils/localize/instantiate_test.go b/pkg/contexts/ocm/utils/localize/instantiate_test.go index 7ea39c1de5..d60528f22e 100644 --- a/pkg/contexts/ocm/utils/localize/instantiate_test.go +++ b/pkg/contexts/ocm/utils/localize/instantiate_test.go @@ -4,11 +4,12 @@ import ( "bytes" "compress/gzip" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/contexts/ocm/utils/localize/localize_test.go b/pkg/contexts/ocm/utils/localize/localize_test.go index 4b9dd784ac..0d5b261f00 100644 --- a/pkg/contexts/ocm/utils/localize/localize_test.go +++ b/pkg/contexts/ocm/utils/localize/localize_test.go @@ -1,10 +1,11 @@ package localize_test import ( - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/pkg/contexts/ocm/utils/localize/subst_test.go b/pkg/contexts/ocm/utils/localize/subst_test.go index 185593581f..74b3c6aa2a 100644 --- a/pkg/contexts/ocm/utils/localize/subst_test.go +++ b/pkg/contexts/ocm/utils/localize/subst_test.go @@ -1,11 +1,12 @@ package localize_test import ( - "github.com/mandelsoft/vfs/pkg/projectionfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/projectionfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/localize" env2 "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" diff --git a/pkg/contexts/ocm/utils/localize/target_test.go b/pkg/contexts/ocm/utils/localize/target_test.go index 3ed73977c0..c2c048de5d 100644 --- a/pkg/contexts/ocm/utils/localize/target_test.go +++ b/pkg/contexts/ocm/utils/localize/target_test.go @@ -1,10 +1,11 @@ package localize_test import ( - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" diff --git a/pkg/contexts/ocm/utils/localize/utils_test.go b/pkg/contexts/ocm/utils/localize/utils_test.go index e003456407..974f496d6f 100644 --- a/pkg/contexts/ocm/utils/localize/utils_test.go +++ b/pkg/contexts/ocm/utils/localize/utils_test.go @@ -1,9 +1,10 @@ package localize_test import ( - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/localize" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/dirtree/vfs_test.go b/pkg/dirtree/vfs_test.go index 61b634aff4..9d3ca8ba18 100644 --- a/pkg/dirtree/vfs_test.go +++ b/pkg/dirtree/vfs_test.go @@ -4,10 +4,11 @@ import ( "archive/tar" "encoding/hex" - "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" + "github.com/open-component-model/ocm/pkg/dirtree" "github.com/open-component-model/ocm/pkg/env" . "github.com/open-component-model/ocm/pkg/testutils" diff --git a/pkg/env/env_test.go b/pkg/env/env_test.go index fc76fde32d..a0896094ca 100644 --- a/pkg/env/env_test.go +++ b/pkg/env/env_test.go @@ -1,11 +1,12 @@ package env import ( - "github.com/mandelsoft/vfs/pkg/osfs" - "github.com/mandelsoft/vfs/pkg/vfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/osfs" + "github.com/mandelsoft/vfs/pkg/vfs" + "github.com/open-component-model/ocm/pkg/contexts/ocm" ) diff --git a/pkg/logging/config_test.go b/pkg/logging/config_test.go index 2533530be1..9af1f727f1 100644 --- a/pkg/logging/config_test.go +++ b/pkg/logging/config_test.go @@ -3,10 +3,11 @@ package logging_test import ( "bytes" - "github.com/mandelsoft/logging" - logcfg "github.com/mandelsoft/logging/config" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/logging" + logcfg "github.com/mandelsoft/logging/config" "github.com/tonglil/buflogr" local "github.com/open-component-model/ocm/pkg/logging" diff --git a/pkg/runtime/unstructured_test.go b/pkg/runtime/unstructured_test.go index 925e4ea7f9..9c982ca79d 100644 --- a/pkg/runtime/unstructured_test.go +++ b/pkg/runtime/unstructured_test.go @@ -4,10 +4,11 @@ import ( "encoding/json" "reflect" - "github.com/mandelsoft/logging" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/logging" + ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/semverutils/utils_test.go b/pkg/semverutils/utils_test.go index b39bc9524f..a317726826 100644 --- a/pkg/semverutils/utils_test.go +++ b/pkg/semverutils/utils_test.go @@ -1,10 +1,11 @@ package semverutils import ( - "github.com/Masterminds/semver/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/Masterminds/semver/v3" + . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/spiff/spiff_test.go b/pkg/spiff/spiff_test.go index d1d4f63025..aecd5e768a 100644 --- a/pkg/spiff/spiff_test.go +++ b/pkg/spiff/spiff_test.go @@ -1,10 +1,11 @@ package spiff_test import ( - "github.com/mandelsoft/spiff/spiffing" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/spiff/spiffing" + "github.com/open-component-model/ocm/pkg/spiff" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/toi/install/action_test.go b/pkg/toi/install/action_test.go index ea4250aace..394bd3e086 100644 --- a/pkg/toi/install/action_test.go +++ b/pkg/toi/install/action_test.go @@ -1,10 +1,11 @@ package install_test import ( - "github.com/mandelsoft/vfs/pkg/memoryfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/memoryfs" + "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" diff --git a/pkg/utils/tarutils/pack_test.go b/pkg/utils/tarutils/pack_test.go index a089da1e94..ad4581c91b 100644 --- a/pkg/utils/tarutils/pack_test.go +++ b/pkg/utils/tarutils/pack_test.go @@ -3,10 +3,11 @@ package tarutils_test import ( "os" - "github.com/mandelsoft/vfs/pkg/osfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/vfs/pkg/osfs" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/utils/template/template_test.go b/pkg/utils/template/template_test.go index 9fe8910aca..9bcfe89de3 100644 --- a/pkg/utils/template/template_test.go +++ b/pkg/utils/template/template_test.go @@ -3,9 +3,10 @@ package template_test import ( "testing" - "github.com/mandelsoft/vfs/pkg/osfs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + "github.com/mandelsoft/vfs/pkg/osfs" "gopkg.in/yaml.v3" . "github.com/open-component-model/ocm/pkg/testutils" From 6bf718b0f72b8926a1ad2ed1b793e537a0326841 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 7 May 2024 12:03:52 +0200 Subject: [PATCH 13/16] gci `gci write --custom-order --skip-generated -s standard -s blank -s dot -s default -s "Prefix(github.com/open-component-model/ocm)"` --- cmds/demoplugin/valuesets/check_test.go | 6 +++--- cmds/helminstaller/app/execute.go | 5 +++-- cmds/ocm/app/app.go | 5 +++-- cmds/ocm/app/app_test.go | 4 ++-- cmds/ocm/commands/controllercmds/install/cmd_test.go | 5 ++--- .../commands/misccmds/credentials/get/cmd_test.go | 4 ++-- cmds/ocm/commands/misccmds/hash/sign/cmd_test.go | 1 - cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go | 4 ++-- .../commands/ocicmds/artifacts/download/cmd_test.go | 4 ++-- cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go | 4 ++-- .../commands/ocicmds/artifacts/transfer/cmd_test.go | 4 ++-- cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go | 2 +- cmds/ocm/commands/ocicmds/tags/show/cmd_test.go | 4 ++-- cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go | 4 ++-- .../ocmcmds/common/addhdlrs/comp/elements.go | 3 ++- .../common/inputs/types/binary/inputtype_test.go | 2 +- .../common/inputs/types/directory/inputtype_test.go | 2 +- .../ocmcmds/common/inputs/types/dockermulti/spec.go | 3 ++- .../common/inputs/types/ociartifact/input_test.go | 6 +++--- .../ocmcmds/common/inputs/types/spiff/spiff_test.go | 2 +- .../common/inputs/types/utf8/inputtype_test.go | 4 ++-- .../ocmcmds/common/inputs/types/wget/input_test.go | 2 +- .../common/options/downloaderoption/option.go | 3 ++- .../ocmcmds/common/options/optutils/reg_test.go | 2 +- .../common/options/uploaderoption/uploader_test.go | 2 +- cmds/ocm/commands/ocmcmds/common/resources.go | 3 ++- .../ocmcmds/componentarchive/create/cmd_test.go | 2 +- cmds/ocm/commands/ocmcmds/components/add/cmd_test.go | 6 +++--- .../commands/ocmcmds/components/check/cmd_test.go | 4 ++-- .../commands/ocmcmds/components/download/cmd_test.go | 6 +++--- cmds/ocm/commands/ocmcmds/components/get/cmd_test.go | 4 ++-- .../ocm/commands/ocmcmds/components/hash/cmd_test.go | 4 ++-- .../ocm/commands/ocmcmds/components/list/cmd_test.go | 4 ++-- .../ocm/commands/ocmcmds/components/sign/cmd_test.go | 8 ++++---- .../commands/ocmcmds/components/transfer/cmd_test.go | 6 +++--- .../components/transfer/disableupload_test.go | 6 +++--- .../ocmcmds/components/transfer/upload_test.go | 6 +++--- .../commands/ocmcmds/components/verify/cmd_test.go | 8 ++++---- cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go | 6 +++--- .../commands/ocmcmds/plugins/describe/cmd_test.go | 5 ++--- cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go | 5 ++--- .../ocmcmds/plugins/tests/accessmethods/cmd_test.go | 4 ++-- .../ocmcmds/plugins/tests/routingslips/cmd_test.go | 4 ++-- cmds/ocm/commands/ocmcmds/references/add/cmd_test.go | 2 +- cmds/ocm/commands/ocmcmds/references/get/cmd_test.go | 4 ++-- .../commands/ocmcmds/resourceconfig/add/cmd_test.go | 2 +- cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go | 6 +++--- .../commands/ocmcmds/resources/download/cmd_test.go | 4 ++-- .../ocmcmds/resources/download/dirtree_test.go | 4 ++-- cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go | 4 ++-- cmds/ocm/commands/ocmcmds/resources/get/deep_test.go | 4 ++-- .../commands/ocmcmds/routingslips/add/cmd_test.go | 4 ++-- .../commands/ocmcmds/routingslips/get/cmd_test.go | 4 ++-- .../commands/ocmcmds/sourceconfig/add/cmd_test.go | 2 +- cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go | 2 +- cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go | 4 ++-- cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go | 4 ++-- .../commands/toicmds/config/bootstrap/cmd_test.go | 4 ++-- cmds/ocm/pkg/output/attroutput.go | 3 ++- cmds/ocm/pkg/output/complexoutput.go | 5 +++-- cmds/ocm/pkg/output/elementoutput.go | 5 +++-- cmds/ocm/pkg/output/output.go | 3 ++- cmds/ocm/pkg/output/stringoutput.go | 3 ++- cmds/ocm/pkg/output/tableoutput.go | 3 ++- pkg/blobaccess/blobaccess_test.go | 2 +- pkg/blobaccess/compress_test.go | 2 +- pkg/blobaccess/dockermulti/access.go | 3 ++- pkg/cobrautils/cleanup_test.go | 2 +- pkg/cobrautils/flag/path_array_test.go | 3 +-- pkg/cobrautils/flag/path_array_win_test.go | 3 +-- pkg/cobrautils/flag/path_test.go | 3 +-- pkg/cobrautils/flag/path_win_test.go | 3 +-- pkg/cobrautils/flagsets/configure_test.go | 2 +- pkg/cobrautils/logopts/options_test.go | 2 +- pkg/cobrautils/tweak.go | 3 ++- pkg/common/accessio/retry_test.go | 2 +- pkg/contexts/config/config/context_test.go | 2 +- pkg/contexts/config/configutils/configure.go | 3 ++- .../builtin/helm/identity/identity_test.go | 2 +- .../builtin/wget/identity/identity_test.go | 2 +- .../repositories/dockerconfig/repo_test.go | 2 +- .../repositories/memory/config/config_test.go | 2 +- .../credentials/repositories/npm/config_test.go | 2 +- .../credentials/repositories/npm/repository_test.go | 2 +- pkg/contexts/datacontext/action/api/registry_test.go | 2 +- .../datacontext/config/logging/config_test.go | 4 ++-- pkg/contexts/oci/ociutils/helm/art_test.go | 2 +- pkg/contexts/oci/ref_test.go | 2 +- .../oci/repositories/artifactset/artifactset_test.go | 6 +++--- .../oci/repositories/artifactset/repo_test.go | 2 +- .../oci/repositories/artifactset/utils_synthesis.go | 3 ++- pkg/contexts/oci/repositories/ctf/ctf_test.go | 4 ++-- .../oci/repositories/ctf/index/index_test.go | 1 - pkg/contexts/oci/repositories/ctf/synthesis_test.go | 4 ++-- pkg/contexts/oci/transfer/transfer_test.go | 6 +++--- pkg/contexts/ocm/accessmethods/github/method_test.go | 3 ++- pkg/contexts/ocm/accessmethods/helm/method_test.go | 4 ++-- pkg/contexts/ocm/accessmethods/localblob/method.go | 3 ++- .../ocm/accessmethods/localblob/method_test.go | 4 ++-- pkg/contexts/ocm/accessmethods/localfsblob/method.go | 3 ++- .../ocm/accessmethods/localfsblob/method_test.go | 2 +- .../ocm/accessmethods/localociblob/method.go | 3 ++- .../ocm/accessmethods/localociblob/method_test.go | 2 +- pkg/contexts/ocm/accessmethods/npm/method_test.go | 6 +++--- pkg/contexts/ocm/accessmethods/ociartifact/method.go | 3 ++- .../ocm/accessmethods/ociartifact/method_test.go | 4 ++-- .../ocm/accessmethods/ociblob/method_test.go | 4 ++-- .../ocm/accessmethods/options/registry_test.go | 1 - pkg/contexts/ocm/accessmethods/plugin/cmd_test.go | 4 ++-- pkg/contexts/ocm/accessmethods/plugin/method_test.go | 4 ++-- .../ocm/accessmethods/relativeociref/method_test.go | 6 +++--- .../accessmethods/relativeociref/transfer_test.go | 6 +++--- pkg/contexts/ocm/accessmethods/s3/method.go | 3 ++- pkg/contexts/ocm/accessmethods/s3/method_test.go | 4 ++-- pkg/contexts/ocm/accessmethods/s3/v1.go | 3 ++- pkg/contexts/ocm/accessmethods/s3/v2.go | 3 ++- pkg/contexts/ocm/accessmethods/wget/method_test.go | 4 ++-- pkg/contexts/ocm/actionhandler/plugin/action_test.go | 4 ++-- pkg/contexts/ocm/attrs/hashattr/attr_test.go | 2 +- .../blobhandler/handlers/generic/npm/publish_test.go | 1 - .../handlers/generic/npm/registration_test.go | 2 +- .../handlers/generic/ocirepo/upload_test.go | 6 +++--- .../handlers/generic/plugin/upload_test.go | 4 ++-- .../blobhandler/handlers/oci/ocirepo/blobhandler.go | 3 ++- .../blobhandler/handlers/oci/ocirepo/handler_test.go | 6 +++--- .../handlers/ocm/comparch/blobhandler_test.go | 2 +- pkg/contexts/ocm/compdesc/compdesc_test.go | 2 +- pkg/contexts/ocm/compdesc/copy_test.go | 2 +- pkg/contexts/ocm/compdesc/equal_test.go | 2 +- pkg/contexts/ocm/compdesc/helper_test.go | 2 +- pkg/contexts/ocm/compdesc/meta/v1/identity_test.go | 2 +- pkg/contexts/ocm/compdesc/meta/v1/labels_test.go | 4 ++-- pkg/contexts/ocm/compdesc/meta/v1/types_test.go | 2 +- pkg/contexts/ocm/compdesc/norm_test.go | 7 ++++--- .../ocm.software/v3alpha1/validation_test.go | 2 +- .../ocm/compdesc/versions/v2/validation_test.go | 4 ++-- pkg/contexts/ocm/cpi/compose_test.go | 6 +++--- .../download/handlers/blueprint/blueprint_test.go | 4 ++-- .../download/handlers/blueprint/registration_test.go | 4 ++-- .../ocm/download/handlers/dirtree/dirtree_test.go | 2 +- .../download/handlers/dirtree/registration_test.go | 2 +- .../ocm/download/handlers/ocirepo/upload_test.go | 4 ++-- .../ocm/download/handlers/plugin/download_test.go | 4 ++-- .../artifactaccess/genericaccess/resource_test.go | 6 +++--- .../artifactblob/dirtreeblob/resource_test.go | 2 +- pkg/contexts/ocm/elements/resources_test.go | 2 +- pkg/contexts/ocm/grammar/grammar.go | 3 ++- pkg/contexts/ocm/internal/blobhandler_test.go | 2 +- pkg/contexts/ocm/internal/context.go | 3 ++- pkg/contexts/ocm/internal/digesthandler_test.go | 2 +- .../ocm/labels/routingslip/entrytypes_test.go | 2 +- pkg/contexts/ocm/labels/routingslip/slip_test.go | 2 +- pkg/contexts/ocm/labels/routingslip/transfer_test.go | 2 +- .../ocm/labels/routingslip/types/plugin/cmd_test.go | 4 ++-- .../labels/routingslip/types/plugin/entry_test.go | 4 ++-- pkg/contexts/ocm/plugin/plugin_test.go | 2 +- pkg/contexts/ocm/ref_test.go | 2 +- .../ocm/repositories/comparch/accessmethod_test.go | 2 +- .../ocm/repositories/comparch/comparch_test.go | 4 ++-- .../ocm/repositories/composition/close_test.go | 4 ++-- pkg/contexts/ocm/repositories/composition/gc_test.go | 2 +- .../ocm/repositories/composition/repository_test.go | 2 +- .../ocm/repositories/composition/version_test.go | 2 +- pkg/contexts/ocm/repositories/ctf/ctf_test.go | 2 +- pkg/contexts/ocm/repositories/ctf/repo_test.go | 6 +++--- .../ocm/repositories/genericocireg/cred_test.go | 2 +- .../ocm/repositories/genericocireg/repo_test.go | 2 +- .../ocm/repositories/genericocireg/semver_test.go | 2 +- .../ocm/repositories/genericocireg/spec_test.go | 2 +- .../ocm/repositories/ocireg/specnorm_test.go | 2 +- pkg/contexts/ocm/repositories/virtual/repo_test.go | 6 +++--- pkg/contexts/ocm/resolver_test.go | 4 ++-- pkg/contexts/ocm/session_test.go | 2 +- pkg/contexts/ocm/signing/handler_test.go | 2 +- pkg/contexts/ocm/signing/options_test.go | 2 +- pkg/contexts/ocm/signing/signing_test.go | 12 ++++++------ pkg/contexts/ocm/signing/transport_test.go | 10 +++++----- pkg/contexts/ocm/transfer/autohandler_test.go | 2 +- pkg/contexts/ocm/transfer/merge_test.go | 2 +- .../transfer/transferhandler/spiff/handler_test.go | 4 ++-- .../transferhandler/standard/handler_test.go | 8 ++++---- pkg/contexts/ocm/utils/check/check_test.go | 4 ++-- pkg/contexts/ocm/utils/resourceref.go | 3 ++- pkg/contexts/ocm/utils/resourceref_test.go | 4 ++-- .../ocm/valuemergehandler/config/config_test.go | 2 +- .../handlers/defaultmerge/handler_test.go | 2 +- .../handlers/maplistmerge/handler_test.go | 2 +- .../handlers/plugin/handler_test.go | 4 ++-- .../handlers/simplelistmerge/handler_test.go | 2 +- .../handlers/simplemapmerge/handler_test.go | 2 +- pkg/contexts/ocm/valuemergehandler/interface.go | 5 +++-- pkg/dirtree/vfs_test.go | 2 +- pkg/env/builder/ocm_version_test.go | 6 +++--- pkg/finalizer/finalizer_test.go | 2 +- pkg/logging/config_test.go | 4 ++-- pkg/refmgmt/resource/resource_test.go | 2 +- pkg/refmgmt/view_test.go | 2 +- pkg/registrations/registrations_test.go | 2 +- pkg/runtime/multi_test.go | 2 +- pkg/runtime/scheme_test.go | 2 +- pkg/runtime/version_test.go | 2 +- pkg/semverutils/utils_test.go | 3 +-- pkg/signing/handlers/init.go | 3 +-- pkg/signing/normalization_test.go | 2 +- pkg/signing/signutils/certs_test.go | 2 +- pkg/signing/signutils/names_test.go | 2 +- pkg/spiff/spiff_test.go | 2 +- pkg/toi/install/action.go | 3 ++- pkg/toi/install/action_test.go | 6 +++--- pkg/toi/install/credentials_test.go | 2 +- pkg/toi/support/app.go | 3 ++- pkg/utils/tarutils/pack_test.go | 2 +- pkg/utils/template/template_test.go | 2 +- 213 files changed, 367 insertions(+), 348 deletions(-) diff --git a/cmds/demoplugin/valuesets/check_test.go b/cmds/demoplugin/valuesets/check_test.go index 3e2e17a2ea..e7ab2e6a0c 100644 --- a/cmds/demoplugin/valuesets/check_test.go +++ b/cmds/demoplugin/valuesets/check_test.go @@ -5,6 +5,9 @@ package valuesets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/pflag" @@ -14,10 +17,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/cache" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/helminstaller/app/execute.go b/cmds/helminstaller/app/execute.go index 690d9d4058..7f8ee7872f 100644 --- a/cmds/helminstaller/app/execute.go +++ b/cmds/helminstaller/app/execute.go @@ -5,6 +5,9 @@ import ( "fmt" "strings" + . "github.com/open-component-model/ocm/pkg/exception" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -17,8 +20,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/exception" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/helm/loader" "github.com/open-component-model/ocm/pkg/out" "github.com/open-component-model/ocm/pkg/runtime" diff --git a/cmds/ocm/app/app.go b/cmds/ocm/app/app.go index ca7025d487..d110f67bf7 100644 --- a/cmds/ocm/app/app.go +++ b/cmds/ocm/app/app.go @@ -7,6 +7,9 @@ import ( "strings" "unicode" + _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -59,12 +62,10 @@ import ( "github.com/open-component-model/ocm/pkg/cobrautils/logopts" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/clictx" - _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr" datacfg "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/attrs" - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" diff --git a/cmds/ocm/app/app_test.go b/cmds/ocm/app/app_test.go index fd1d6f78ed..013296e001 100644 --- a/cmds/ocm/app/app_test.go +++ b/cmds/ocm/app/app_test.go @@ -8,18 +8,18 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/vfs" "github.com/spf13/cobra" "github.com/tonglil/buflogr" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/clictx" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/mapocirepoattr" ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/logging/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" ) var realm = logging.NewRealm("test") diff --git a/cmds/ocm/commands/controllercmds/install/cmd_test.go b/cmds/ocm/commands/controllercmds/install/cmd_test.go index cb1767dfdc..9b8f5a31e3 100644 --- a/cmds/ocm/commands/controllercmds/install/cmd_test.go +++ b/cmds/ocm/commands/controllercmds/install/cmd_test.go @@ -10,11 +10,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "github.com/mandelsoft/filepath/pkg/filepath" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" + + "github.com/mandelsoft/filepath/pkg/filepath" ) var _ = Describe("Test Environment", func() { diff --git a/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go b/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go index 8527e85b1e..6c2566d391 100644 --- a/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go +++ b/cmds/ocm/commands/misccmds/credentials/get/cmd_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Test Environment", func() { diff --git a/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go b/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go index 8eb0c6e2b5..0c542f75ab 100644 --- a/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go +++ b/cmds/ocm/commands/misccmds/hash/sign/cmd_test.go @@ -5,7 +5,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go index d48486d76a..1748244a13 100644 --- a/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go +++ b/cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go @@ -7,17 +7,17 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/opencontainers/go-digest" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" "github.com/open-component-model/ocm/pkg/encrypt" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" - . "github.com/open-component-model/ocm/pkg/testutils" ) var ISSUER = &pkix.Name{CommonName: "mandelsoft"} diff --git a/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go index 99f89cef79..ed54c68414 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/download/cmd_test.go @@ -5,13 +5,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go index 00e643ac7b..0fd0a8f957 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/get/cmd_test.go @@ -5,13 +5,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocicmds/common/handlers/artifacthdlr" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go index dad7e8c97c..5fa95cb888 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/transfer/cmd_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go b/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go index ccf08780bc..da85ae1808 100644 --- a/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/ctf/create/cmd_test.go @@ -3,8 +3,8 @@ package create_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" ) diff --git a/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go b/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go index 2775aa33de..de55d8a26f 100644 --- a/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go +++ b/cmds/ocm/commands/ocicmds/tags/show/cmd_test.go @@ -5,11 +5,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go index df8a421d0a..bb194fc70e 100644 --- a/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/cli/download/cmd_test.go @@ -8,16 +8,16 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/cli/download" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/extraid" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" env2 "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const CTF = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go index 735c010995..9a6b1bcdcc 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go @@ -3,6 +3,8 @@ package comp import ( "fmt" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common" @@ -19,7 +21,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go index 763501a8b9..ee4e761fcc 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/binary/inputtype_test.go @@ -2,10 +2,10 @@ package binary import ( . "github.com/onsi/ginkgo/v2" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go index eac9e9042b..8045da8a6b 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/directory/inputtype_test.go @@ -2,10 +2,10 @@ package directory import ( . "github.com/onsi/ginkgo/v2" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" ) var _ = Describe("Input Type", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go index 697271e2b1..0ab9e15e6f 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/dockermulti/spec.go @@ -3,6 +3,8 @@ package dockermulti import ( "fmt" + . "github.com/open-component-model/ocm/pkg/finalizer" + "k8s.io/apimachinery/pkg/util/validation/field" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" @@ -14,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go index 25bc7717de..c9799f3638 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact/input_test.go @@ -6,22 +6,22 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" me "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go index 2756e24efd..f3ef038177 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff/spiff_test.go @@ -3,10 +3,10 @@ package spiff_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/spiff" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common" ) diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go index ccc076e05d..073f72401f 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/utf8/inputtype_test.go @@ -3,13 +3,13 @@ package utf8 import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/cpi" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/pkg/contexts/clictx" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Input Type", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go index 35454ceea5..30bb607f0a 100644 --- a/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go +++ b/cmds/ocm/commands/ocmcmds/common/inputs/types/wget/input_test.go @@ -4,10 +4,10 @@ import ( "net/http" . "github.com/onsi/ginkgo/v2" + . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/options" - . "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/testutils" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/wget" "github.com/open-component-model/ocm/pkg/mime" ) diff --git a/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go index 24c20037fd..4f8cb8353f 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go +++ b/cmds/ocm/commands/ocmcmds/common/options/downloaderoption/option.go @@ -1,11 +1,12 @@ package downloaderoption import ( + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers" + "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" "github.com/open-component-model/ocm/cmds/ocm/pkg/options" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/download" - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers" "github.com/open-component-model/ocm/pkg/listformat" ) diff --git a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go index b411bd5ddc..e983644215 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/optutils/reg_test.go @@ -5,13 +5,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" "github.com/open-component-model/ocm/pkg/contexts/clictx" "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("registration options", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go index 159e3b492f..2591895b54 100644 --- a/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go +++ b/cmds/ocm/commands/ocmcmds/common/options/uploaderoption/uploader_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/pflag" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/optutils" "github.com/open-component-model/ocm/pkg/contexts/clictx" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("uploader option", func() { diff --git a/cmds/ocm/commands/ocmcmds/common/resources.go b/cmds/ocm/commands/ocmcmds/common/resources.go index a5ae2e61c2..45c5d60d88 100644 --- a/cmds/ocm/commands/ocmcmds/common/resources.go +++ b/cmds/ocm/commands/ocmcmds/common/resources.go @@ -4,6 +4,8 @@ import ( "encoding/json" "fmt" + _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types" + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/spf13/pflag" "golang.org/x/text/cases" @@ -11,7 +13,6 @@ import ( "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs" - _ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/dryrunoption" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption" "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/templateroption" diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go index 0e234a474a..9f542f7ff6 100644 --- a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd_test.go @@ -3,8 +3,8 @@ package create_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" diff --git a/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go index 4349ee6ced..d570b0b176 100644 --- a/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/add/cmd_test.go @@ -3,13 +3,14 @@ package add_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -20,7 +21,6 @@ import ( ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go index f7908bd747..f658fdb47e 100644 --- a/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/check/cmd_test.go @@ -5,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go index d0275ae230..34cc369f66 100644 --- a/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/download/cmd_test.go @@ -5,18 +5,18 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/grammar" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go index 62860f67b9..8fa20be932 100644 --- a/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/get/cmd_test.go @@ -6,11 +6,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go index 5a6fd15f04..ee121232bb 100644 --- a/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/hash/cmd_test.go @@ -5,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go index 520284c430..8a501ca65c 100644 --- a/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/list/cmd_test.go @@ -6,10 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - "github.com/open-component-model/ocm/pkg/common/accessio" . "github.com/open-component-model/ocm/pkg/testutils" + + "github.com/open-component-model/ocm/pkg/common/accessio" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go index 02730b740f..79e683ae6c 100644 --- a/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/sign/cmd_test.go @@ -6,24 +6,24 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" - . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go index f0e4ae1d18..53bc0cb9e0 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go @@ -6,10 +6,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/cobra" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/clictx" @@ -17,7 +19,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" @@ -26,7 +27,6 @@ import ( handlercfg "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/config" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go index 73be600adf..4782cf0ca2 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/disableupload_test.go @@ -5,14 +5,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" ocictf "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" storagecontext "github.com/open-component-model/ocm/pkg/contexts/ocm/blobhandler/handlers/oci" @@ -21,7 +22,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/testutils" ) const BASEURL = "baseurl.io" diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go index 11e9f331d4..8005df7f92 100644 --- a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go +++ b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go @@ -7,14 +7,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" ctfoci "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/ociuploadattr" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" @@ -24,7 +25,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const COMP = "github.com/compa" diff --git a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go index 2c1cb7eea6..d500ea47a4 100644 --- a/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/components/verify/cmd_test.go @@ -6,26 +6,26 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go index 82761ad601..0b55125a30 100644 --- a/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/ctf/transfer/cmd_test.go @@ -6,19 +6,19 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go index d4fb1f99ac..2dc4707514 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/describe/cmd_test.go @@ -7,11 +7,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "github.com/mandelsoft/filepath/pkg/filepath" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" + + "github.com/mandelsoft/filepath/pkg/filepath" ) const PLUGINS = "/testdata" diff --git a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go index 9824d9aa25..739327d3ef 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/get/cmd_test.go @@ -7,11 +7,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "github.com/mandelsoft/filepath/pkg/filepath" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" . "github.com/open-component-model/ocm/pkg/testutils" + + "github.com/mandelsoft/filepath/pkg/filepath" ) const PLUGINS = "/testdata" diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go index 5926ff4215..dbba590d97 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/accessmethods/cmd_test.go @@ -5,8 +5,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" @@ -16,7 +17,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" - . "github.com/open-component-model/ocm/pkg/testutils" ) const CA = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go index 91e1b09090..039cc03c61 100644 --- a/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/plugins/tests/routingslips/cmd_test.go @@ -5,8 +5,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugincacheattr" @@ -14,7 +15,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go index 9ead886b1c..586a87b60d 100644 --- a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go @@ -5,8 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" diff --git a/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go index 6bd0236787..3deb2538b7 100644 --- a/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/references/get/cmd_test.go @@ -5,10 +5,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - "github.com/open-component-model/ocm/pkg/common/accessio" . "github.com/open-component-model/ocm/pkg/testutils" + + "github.com/open-component-model/ocm/pkg/common/accessio" ) const CA = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go index 3f111a10f9..dd6805e198 100644 --- a/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resourceconfig/add/cmd_test.go @@ -3,8 +3,8 @@ package add_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go index 116d155d26..779b270294 100644 --- a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go @@ -7,18 +7,19 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" "helm.sh/helm/v3/pkg/chart/loader" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/options" @@ -27,7 +28,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go index b849908ab7..c170782d54 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/cmd_test.go @@ -5,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/vfs" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go index b533f8df50..8f7a6677b6 100644 --- a/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/download/dirtree_test.go @@ -6,18 +6,18 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" env2 "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go index 4275b6d934..8c7e389201 100644 --- a/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/get/cmd_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go b/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go index 26aefa0c21..aea2298126 100644 --- a/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go +++ b/cmds/ocm/commands/ocmcmds/resources/get/deep_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const C1 = "github.com/gardener/landscaper" diff --git a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go index ce7bf783af..84676d6051 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/add/cmd_test.go @@ -5,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go index de393df9dc..72326b0e3e 100644 --- a/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/routingslips/get/cmd_test.go @@ -6,8 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" @@ -15,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go index f649626e2d..633b194b8b 100644 --- a/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/sourceconfig/add/cmd_test.go @@ -3,8 +3,8 @@ package add_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go index 21ce42d629..631c1b125e 100644 --- a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" diff --git a/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go b/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go index d24e2847eb..a2c126f6a7 100644 --- a/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/sources/get/cmd_test.go @@ -5,11 +5,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" + "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/ocm" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go b/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go index 5f2558b714..330a8945e1 100644 --- a/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go +++ b/cmds/ocm/commands/ocmcmds/versions/show/cmd_test.go @@ -5,10 +5,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" - "github.com/open-component-model/ocm/pkg/common/accessio" . "github.com/open-component-model/ocm/pkg/testutils" + + "github.com/open-component-model/ocm/pkg/common/accessio" ) const ARCH = "/tmp/ctf" diff --git a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go index f03f4c9cf3..9d0ebc014c 100644 --- a/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go +++ b/cmds/ocm/commands/toicmds/config/bootstrap/cmd_test.go @@ -5,15 +5,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/cmds/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/vfs" "github.com/open-component-model/ocm/cmds/ocm/commands/toicmds/config/bootstrap" - . "github.com/open-component-model/ocm/cmds/ocm/testhelper" "github.com/open-component-model/ocm/pkg/common/accessio" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/toi" ) diff --git a/cmds/ocm/pkg/output/attroutput.go b/cmds/ocm/pkg/output/attroutput.go index ac5ee0dc17..4f55074554 100644 --- a/cmds/ocm/pkg/output/attroutput.go +++ b/cmds/ocm/pkg/output/attroutput.go @@ -2,8 +2,9 @@ package output import ( . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" - "github.com/open-component-model/ocm/pkg/errors" . "github.com/open-component-model/ocm/pkg/out" + + "github.com/open-component-model/ocm/pkg/errors" ) type AttrProcessingOutput struct { diff --git a/cmds/ocm/pkg/output/complexoutput.go b/cmds/ocm/pkg/output/complexoutput.go index 8fc93da04e..b44f9f8e17 100644 --- a/cmds/ocm/pkg/output/complexoutput.go +++ b/cmds/ocm/pkg/output/complexoutput.go @@ -3,10 +3,11 @@ package output import ( "fmt" - "sigs.k8s.io/yaml" - . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" . "github.com/open-component-model/ocm/pkg/out" + + "sigs.k8s.io/yaml" + "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/cmds/ocm/pkg/output/elementoutput.go b/cmds/ocm/pkg/output/elementoutput.go index a859534e6d..0c3adb3338 100644 --- a/cmds/ocm/pkg/output/elementoutput.go +++ b/cmds/ocm/pkg/output/elementoutput.go @@ -1,11 +1,12 @@ package output import ( + . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" + . "github.com/open-component-model/ocm/pkg/out" + "github.com/mandelsoft/logging" "github.com/open-component-model/ocm/cmds/ocm/pkg/data" - . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" - . "github.com/open-component-model/ocm/pkg/out" ) type ElementOutput struct { diff --git a/cmds/ocm/pkg/output/output.go b/cmds/ocm/pkg/output/output.go index 1c46513e6c..dc25739d14 100644 --- a/cmds/ocm/pkg/output/output.go +++ b/cmds/ocm/pkg/output/output.go @@ -5,11 +5,12 @@ import ( "encoding/json" "fmt" + . "github.com/open-component-model/ocm/pkg/out" + "sigs.k8s.io/yaml" "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/out" ) type Object = interface{} diff --git a/cmds/ocm/pkg/output/stringoutput.go b/cmds/ocm/pkg/output/stringoutput.go index c3b91b6c4c..ee50e1a5ec 100644 --- a/cmds/ocm/pkg/output/stringoutput.go +++ b/cmds/ocm/pkg/output/stringoutput.go @@ -3,8 +3,9 @@ package output import ( "strings" - "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" . "github.com/open-component-model/ocm/pkg/out" + + "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" ) type StringOutput struct { diff --git a/cmds/ocm/pkg/output/tableoutput.go b/cmds/ocm/pkg/output/tableoutput.go index b2fa3b7ba8..95d1ee8e5a 100644 --- a/cmds/ocm/pkg/output/tableoutput.go +++ b/cmds/ocm/pkg/output/tableoutput.go @@ -3,8 +3,9 @@ package output import ( "strings" - "github.com/open-component-model/ocm/cmds/ocm/pkg/data" . "github.com/open-component-model/ocm/cmds/ocm/pkg/processing" + + "github.com/open-component-model/ocm/cmds/ocm/pkg/data" "github.com/open-component-model/ocm/pkg/errors" "github.com/open-component-model/ocm/pkg/out" "github.com/open-component-model/ocm/pkg/semverutils" diff --git a/pkg/blobaccess/blobaccess_test.go b/pkg/blobaccess/blobaccess_test.go index 391d8679d7..04957730b0 100644 --- a/pkg/blobaccess/blobaccess_test.go +++ b/pkg/blobaccess/blobaccess_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -12,7 +13,6 @@ import ( "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/blobaccess/bpi" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("blob access ref counting", func() { diff --git a/pkg/blobaccess/compress_test.go b/pkg/blobaccess/compress_test.go index 37eaf6f92d..9face394c2 100644 --- a/pkg/blobaccess/compress_test.go +++ b/pkg/blobaccess/compress_test.go @@ -7,10 +7,10 @@ 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/blobaccess" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("temp file management", func() { diff --git a/pkg/blobaccess/dockermulti/access.go b/pkg/blobaccess/dockermulti/access.go index 0a475733eb..4e09b7b7cb 100644 --- a/pkg/blobaccess/dockermulti/access.go +++ b/pkg/blobaccess/dockermulti/access.go @@ -3,6 +3,8 @@ package dockermulti import ( "fmt" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -14,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/docker" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/optionutils" ) diff --git a/pkg/cobrautils/cleanup_test.go b/pkg/cobrautils/cleanup_test.go index 4dc2b16b8a..368c28e76b 100644 --- a/pkg/cobrautils/cleanup_test.go +++ b/pkg/cobrautils/cleanup_test.go @@ -3,9 +3,9 @@ package cobrautils_test 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/cobrautils" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("processing buffer", func() { diff --git a/pkg/cobrautils/flag/path_array_test.go b/pkg/cobrautils/flag/path_array_test.go index e58bfd7c57..79bc5352bc 100644 --- a/pkg/cobrautils/flag/path_array_test.go +++ b/pkg/cobrautils/flag/path_array_test.go @@ -6,10 +6,9 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" - - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flag/path_array_win_test.go b/pkg/cobrautils/flag/path_array_win_test.go index 38448ae381..a0fd2bf1ad 100644 --- a/pkg/cobrautils/flag/path_array_win_test.go +++ b/pkg/cobrautils/flag/path_array_win_test.go @@ -6,10 +6,9 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" - - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flag/path_test.go b/pkg/cobrautils/flag/path_test.go index 47b124509d..8440a9ce96 100644 --- a/pkg/cobrautils/flag/path_test.go +++ b/pkg/cobrautils/flag/path_test.go @@ -6,10 +6,9 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" - - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flag/path_win_test.go b/pkg/cobrautils/flag/path_win_test.go index 56f77efdd3..4220aa270c 100644 --- a/pkg/cobrautils/flag/path_win_test.go +++ b/pkg/cobrautils/flag/path_win_test.go @@ -6,10 +6,9 @@ package flag_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/cobrautils/flag" "github.com/spf13/pflag" - - . "github.com/open-component-model/ocm/pkg/cobrautils/flag" ) var _ = Describe("path flags", func() { diff --git a/pkg/cobrautils/flagsets/configure_test.go b/pkg/cobrautils/flagsets/configure_test.go index c3edfd5c29..c2326b41dd 100644 --- a/pkg/cobrautils/flagsets/configure_test.go +++ b/pkg/cobrautils/flagsets/configure_test.go @@ -3,11 +3,11 @@ package flagsets_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/pflag" "github.com/open-component-model/ocm/pkg/cobrautils/flagsets" - . "github.com/open-component-model/ocm/pkg/testutils" ) func adder(opts flagsets.ConfigOptions, data flagsets.Config) error { diff --git a/pkg/cobrautils/logopts/options_test.go b/pkg/cobrautils/logopts/options_test.go index 4507f43072..428f8bef31 100644 --- a/pkg/cobrautils/logopts/options_test.go +++ b/pkg/cobrautils/logopts/options_test.go @@ -5,13 +5,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" "github.com/mandelsoft/logging/config" "sigs.k8s.io/yaml" "github.com/open-component-model/ocm/pkg/contexts/clictx" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("log configuration", func() { diff --git a/pkg/cobrautils/tweak.go b/pkg/cobrautils/tweak.go index 3ce7bea83f..59948423e0 100644 --- a/pkg/cobrautils/tweak.go +++ b/pkg/cobrautils/tweak.go @@ -4,9 +4,10 @@ import ( "regexp" "strings" + _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" + "github.com/spf13/cobra" - _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" "github.com/open-component-model/ocm/pkg/out" ) diff --git a/pkg/common/accessio/retry_test.go b/pkg/common/accessio/retry_test.go index 4d72e9423b..d643d54b2d 100644 --- a/pkg/common/accessio/retry_test.go +++ b/pkg/common/accessio/retry_test.go @@ -6,10 +6,10 @@ 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/accessio" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/testutils" ) var Retry = accessio.Retry diff --git a/pkg/contexts/config/config/context_test.go b/pkg/contexts/config/config/context_test.go index a779a50bd3..c11385f6a5 100644 --- a/pkg/contexts/config/config/context_test.go +++ b/pkg/contexts/config/config/context_test.go @@ -8,6 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "sigs.k8s.io/yaml" @@ -15,7 +16,6 @@ import ( local "github.com/open-component-model/ocm/pkg/contexts/config/config" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/generics" - . "github.com/open-component-model/ocm/pkg/testutils" ) func CheckRefs(ctx config.Context, n int) { diff --git a/pkg/contexts/config/configutils/configure.go b/pkg/contexts/config/configutils/configure.go index ef7c80bd3e..29fb04d3ed 100644 --- a/pkg/contexts/config/configutils/configure.go +++ b/pkg/contexts/config/configutils/configure.go @@ -1,10 +1,11 @@ package configutils import ( + _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config" + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/open-component-model/ocm/pkg/contexts/config" - _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" ) diff --git a/pkg/contexts/credentials/builtin/helm/identity/identity_test.go b/pkg/contexts/credentials/builtin/helm/identity/identity_test.go index 60469dec0e..752637555c 100644 --- a/pkg/contexts/credentials/builtin/helm/identity/identity_test.go +++ b/pkg/contexts/credentials/builtin/helm/identity/identity_test.go @@ -3,10 +3,10 @@ package identity_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/helm/identity" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/credentials" - . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/helm/identity" ociidentity "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/oci/identity" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" diff --git a/pkg/contexts/credentials/builtin/wget/identity/identity_test.go b/pkg/contexts/credentials/builtin/wget/identity/identity_test.go index a4f4668e84..56c32c1fcb 100644 --- a/pkg/contexts/credentials/builtin/wget/identity/identity_test.go +++ b/pkg/contexts/credentials/builtin/wget/identity/identity_test.go @@ -3,9 +3,9 @@ package identity_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials" - . "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity" ) var _ = Describe("wget credential management", func() { diff --git a/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go b/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go index fc39bf1d46..2170d75eb1 100644 --- a/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go +++ b/pkg/contexts/credentials/repositories/dockerconfig/repo_test.go @@ -9,6 +9,7 @@ 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" @@ -17,7 +18,6 @@ import ( local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/dockerconfig" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("docker config", func() { diff --git a/pkg/contexts/credentials/repositories/memory/config/config_test.go b/pkg/contexts/credentials/repositories/memory/config/config_test.go index 26a0768930..ff1b2b48be 100644 --- a/pkg/contexts/credentials/repositories/memory/config/config_test.go +++ b/pkg/contexts/credentials/repositories/memory/config/config_test.go @@ -3,6 +3,7 @@ package config_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" "github.com/mandelsoft/vfs/pkg/vfs" @@ -10,7 +11,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory" - . "github.com/open-component-model/ocm/pkg/env" ) var _ = Describe("configure credentials", func() { diff --git a/pkg/contexts/credentials/repositories/npm/config_test.go b/pkg/contexts/credentials/repositories/npm/config_test.go index e8cc8e28b3..e2c2fcfea9 100644 --- a/pkg/contexts/credentials/repositories/npm/config_test.go +++ b/pkg/contexts/credentials/repositories/npm/config_test.go @@ -3,12 +3,12 @@ package npm_test 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" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/npm/identity" "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/npm" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Config deserialization Test Environment", func() { diff --git a/pkg/contexts/credentials/repositories/npm/repository_test.go b/pkg/contexts/credentials/repositories/npm/repository_test.go index 8de30de2b9..b628c82ce7 100644 --- a/pkg/contexts/credentials/repositories/npm/repository_test.go +++ b/pkg/contexts/credentials/repositories/npm/repository_test.go @@ -6,6 +6,7 @@ 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" @@ -13,7 +14,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/cpi" local "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/npm" "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("NPM config - .npmrc", func() { diff --git a/pkg/contexts/datacontext/action/api/registry_test.go b/pkg/contexts/datacontext/action/api/registry_test.go index a466951fe2..a4ba5366f2 100644 --- a/pkg/contexts/datacontext/action/api/registry_test.go +++ b/pkg/contexts/datacontext/action/api/registry_test.go @@ -3,13 +3,13 @@ package api_test 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/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/api" "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) type Handler struct { diff --git a/pkg/contexts/datacontext/config/logging/config_test.go b/pkg/contexts/datacontext/config/logging/config_test.go index fba7d39cb4..9ec56b733a 100644 --- a/pkg/contexts/datacontext/config/logging/config_test.go +++ b/pkg/contexts/datacontext/config/logging/config_test.go @@ -5,6 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/logging/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" "github.com/tonglil/buflogr" @@ -13,8 +15,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/datacontext" logcfg "github.com/open-component-model/ocm/pkg/contexts/datacontext/config/logging" log "github.com/open-component-model/ocm/pkg/logging" - . "github.com/open-component-model/ocm/pkg/logging/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("logging configuration", func() { diff --git a/pkg/contexts/oci/ociutils/helm/art_test.go b/pkg/contexts/oci/ociutils/helm/art_test.go index a3371117cf..bccd7b7425 100644 --- a/pkg/contexts/oci/ociutils/helm/art_test.go +++ b/pkg/contexts/oci/ociutils/helm/art_test.go @@ -8,6 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -21,7 +22,6 @@ import ( "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/helm/loader" - . "github.com/open-component-model/ocm/pkg/testutils" ) type Files []*chart.File diff --git a/pkg/contexts/oci/ref_test.go b/pkg/contexts/oci/ref_test.go index a1a1128fd8..f964ceda8d 100644 --- a/pkg/contexts/oci/ref_test.go +++ b/pkg/contexts/oci/ref_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" godigest "github.com/opencontainers/go-digest" @@ -14,7 +15,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) func Type(t string) string { diff --git a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go index e9af978c1f..834dd4a40f 100644 --- a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go +++ b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go @@ -7,6 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -14,11 +17,8 @@ import ( "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset/testhelper" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) func defaultManifestFill(a *artifactset.ArtifactSet) { diff --git a/pkg/contexts/oci/repositories/artifactset/repo_test.go b/pkg/contexts/oci/repositories/artifactset/repo_test.go index aad177f539..f32674e6a5 100644 --- a/pkg/contexts/oci/repositories/artifactset/repo_test.go +++ b/pkg/contexts/oci/repositories/artifactset/repo_test.go @@ -3,6 +3,7 @@ package artifactset_test 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/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -10,7 +11,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("", func() { diff --git a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go index 42a7b164cf..c4bed9fc58 100644 --- a/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go +++ b/pkg/contexts/oci/repositories/artifactset/utils_synthesis.go @@ -3,6 +3,8 @@ package artifactset import ( "fmt" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/mandelsoft/vfs/pkg/vfs" "github.com/opencontainers/go-digest" @@ -14,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/transfer" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" ) const SynthesizedBlobFormat = "+tar+gzip" diff --git a/pkg/contexts/oci/repositories/ctf/ctf_test.go b/pkg/contexts/oci/repositories/ctf/ctf_test.go index 4fe2b70bd5..78373764b5 100644 --- a/pkg/contexts/oci/repositories/ctf/ctf_test.go +++ b/pkg/contexts/oci/repositories/ctf/ctf_test.go @@ -7,6 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/osfs" @@ -20,12 +22,10 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/cpi" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" "github.com/open-component-model/ocm/pkg/errors" "github.com/open-component-model/ocm/pkg/finalizer" ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/refmgmt" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("ctf management", func() { diff --git a/pkg/contexts/oci/repositories/ctf/index/index_test.go b/pkg/contexts/oci/repositories/ctf/index/index_test.go index 2be8577c98..e0a0df01ad 100644 --- a/pkg/contexts/oci/repositories/ctf/index/index_test.go +++ b/pkg/contexts/oci/repositories/ctf/index/index_test.go @@ -3,7 +3,6 @@ package index_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/index" ) diff --git a/pkg/contexts/oci/repositories/ctf/synthesis_test.go b/pkg/contexts/oci/repositories/ctf/synthesis_test.go index 26c5b3fc89..b4277e69cc 100644 --- a/pkg/contexts/oci/repositories/ctf/synthesis_test.go +++ b/pkg/contexts/oci/repositories/ctf/synthesis_test.go @@ -3,6 +3,8 @@ package ctf_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" @@ -16,7 +18,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" @@ -26,7 +27,6 @@ import ( "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" - . "github.com/open-component-model/ocm/pkg/testutils" ) type dummyMethod struct { diff --git a/pkg/contexts/oci/transfer/transfer_test.go b/pkg/contexts/oci/transfer/transfer_test.go index f1c8bb23eb..c16e1e2164 100644 --- a/pkg/contexts/oci/transfer/transfer_test.go +++ b/pkg/contexts/oci/transfer/transfer_test.go @@ -3,17 +3,17 @@ package transfer_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer" "github.com/open-component-model/ocm/pkg/contexts/oci/transfer/filters" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" ) const OUT = "/tmp/res" diff --git a/pkg/contexts/ocm/accessmethods/github/method_test.go b/pkg/contexts/ocm/accessmethods/github/method_test.go index c9d38b22eb..bc285b8a41 100644 --- a/pkg/contexts/ocm/accessmethods/github/method_test.go +++ b/pkg/contexts/ocm/accessmethods/github/method_test.go @@ -7,6 +7,8 @@ import ( "net/http" "os" + _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -19,7 +21,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/tmpcache" "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr" - _ "github.com/open-component-model/ocm/pkg/contexts/datacontext/config" "github.com/open-component-model/ocm/pkg/contexts/ocm" me "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/github" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" diff --git a/pkg/contexts/ocm/accessmethods/helm/method_test.go b/pkg/contexts/ocm/accessmethods/helm/method_test.go index 3f6749fb51..7f4e2903b8 100644 --- a/pkg/contexts/ocm/accessmethods/helm/method_test.go +++ b/pkg/contexts/ocm/accessmethods/helm/method_test.go @@ -6,14 +6,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "helm.sh/helm/v3/pkg/chart/loader" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/helm" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" - . "github.com/open-component-model/ocm/pkg/env/builder" helm2 "github.com/open-component-model/ocm/pkg/helm" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Method", func() { diff --git a/pkg/contexts/ocm/accessmethods/localblob/method.go b/pkg/contexts/ocm/accessmethods/localblob/method.go index 6de833810c..5ebc235261 100644 --- a/pkg/contexts/ocm/accessmethods/localblob/method.go +++ b/pkg/contexts/ocm/accessmethods/localblob/method.go @@ -4,8 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" . "github.com/open-component-model/ocm/pkg/exception" + + "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/localblob/method_test.go b/pkg/contexts/ocm/accessmethods/localblob/method_test.go index d038d1b6c0..c2b0f52efa 100644 --- a/pkg/contexts/ocm/accessmethods/localblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/localblob/method_test.go @@ -5,6 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -14,10 +16,8 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const CTF = "ctf" diff --git a/pkg/contexts/ocm/accessmethods/localfsblob/method.go b/pkg/contexts/ocm/accessmethods/localfsblob/method.go index 25f5d9ca97..ecf9f4b51b 100644 --- a/pkg/contexts/ocm/accessmethods/localfsblob/method.go +++ b/pkg/contexts/ocm/accessmethods/localfsblob/method.go @@ -1,9 +1,10 @@ package localfsblob import ( + . "github.com/open-component-model/ocm/pkg/exception" + "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" - . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go b/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go index beeb5e30e2..64d4413217 100644 --- a/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/localfsblob/method_test.go @@ -5,10 +5,10 @@ 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/contexts/ocm/accessmethods/localfsblob" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Method", func() { diff --git a/pkg/contexts/ocm/accessmethods/localociblob/method.go b/pkg/contexts/ocm/accessmethods/localociblob/method.go index a093ec56ec..b5165f1639 100644 --- a/pkg/contexts/ocm/accessmethods/localociblob/method.go +++ b/pkg/contexts/ocm/accessmethods/localociblob/method.go @@ -1,11 +1,12 @@ package localociblob import ( + . "github.com/open-component-model/ocm/pkg/exception" + "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" - . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/localociblob/method_test.go b/pkg/contexts/ocm/accessmethods/localociblob/method_test.go index 0767b2ad75..0c4fc97483 100644 --- a/pkg/contexts/ocm/accessmethods/localociblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/localociblob/method_test.go @@ -5,9 +5,9 @@ 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/contexts/ocm/accessmethods/localociblob" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Method", func() { diff --git a/pkg/contexts/ocm/accessmethods/npm/method_test.go b/pkg/contexts/ocm/accessmethods/npm/method_test.go index 961209df79..dc4dbd2513 100644 --- a/pkg/contexts/ocm/accessmethods/npm/method_test.go +++ b/pkg/contexts/ocm/accessmethods/npm/method_test.go @@ -5,15 +5,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/npm" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/iotools" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const NPMPATH = "/testdata/registry" diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/method.go b/pkg/contexts/ocm/accessmethods/ociartifact/method.go index 328dad7b62..6e08b7cff1 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/method.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/method.go @@ -6,6 +6,8 @@ import ( "strings" "sync" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -19,7 +21,6 @@ import ( ocmcpi "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go b/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go index 83e74e85d8..e1a97ccd5a 100644 --- a/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go +++ b/pkg/contexts/ocm/accessmethods/ociartifact/method_test.go @@ -3,16 +3,16 @@ package ociartifact_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/oci" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" - . "github.com/open-component-model/ocm/pkg/env/builder" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/accessmethods/ociblob/method_test.go b/pkg/contexts/ocm/accessmethods/ociblob/method_test.go index 514fa1a26a..6f8c92eb7d 100644 --- a/pkg/contexts/ocm/accessmethods/ociblob/method_test.go +++ b/pkg/contexts/ocm/accessmethods/ociblob/method_test.go @@ -3,14 +3,14 @@ package ociblob_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" - . "github.com/open-component-model/ocm/pkg/env/builder" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/accessmethods/options/registry_test.go b/pkg/contexts/ocm/accessmethods/options/registry_test.go index baddee31b3..b31435cf85 100644 --- a/pkg/contexts/ocm/accessmethods/options/registry_test.go +++ b/pkg/contexts/ocm/accessmethods/options/registry_test.go @@ -3,7 +3,6 @@ package options import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go b/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go index dfc2b96d45..48b74f4e02 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go +++ b/pkg/contexts/ocm/accessmethods/plugin/cmd_test.go @@ -3,6 +3,8 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/goutils/sliceutils" "github.com/mandelsoft/goutils/transformer" @@ -15,8 +17,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" ) const CA = "/tmp/ca" diff --git a/pkg/contexts/ocm/accessmethods/plugin/method_test.go b/pkg/contexts/ocm/accessmethods/plugin/method_test.go index 0a08ac6a5d..f8cf71e1bc 100644 --- a/pkg/contexts/ocm/accessmethods/plugin/method_test.go +++ b/pkg/contexts/ocm/accessmethods/plugin/method_test.go @@ -5,6 +5,8 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -15,8 +17,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "ctf" diff --git a/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go b/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go index 6661d30665..a0bffd84d3 100644 --- a/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go +++ b/pkg/contexts/ocm/accessmethods/relativeociref/method_test.go @@ -3,19 +3,19 @@ package relativeociref_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/relativeociref" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go b/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go index 72a35a0256..f99f078ee0 100644 --- a/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go +++ b/pkg/contexts/ocm/accessmethods/relativeociref/transfer_test.go @@ -6,6 +6,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -13,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" ocictf "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/relativeociref" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/keepblobattr" @@ -25,8 +27,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const OUT = "/tmp/res" diff --git a/pkg/contexts/ocm/accessmethods/s3/method.go b/pkg/contexts/ocm/accessmethods/s3/method.go index 4fd15460b8..8a1ffc45a9 100644 --- a/pkg/contexts/ocm/accessmethods/s3/method.go +++ b/pkg/contexts/ocm/accessmethods/s3/method.go @@ -3,6 +3,8 @@ package s3 import ( "fmt" + . "github.com/open-component-model/ocm/pkg/exception" + "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessio/downloader" @@ -12,7 +14,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/s3/identity" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" - . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" diff --git a/pkg/contexts/ocm/accessmethods/s3/method_test.go b/pkg/contexts/ocm/accessmethods/s3/method_test.go index 9119c324af..086fd27697 100644 --- a/pkg/contexts/ocm/accessmethods/s3/method_test.go +++ b/pkg/contexts/ocm/accessmethods/s3/method_test.go @@ -9,6 +9,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" @@ -23,9 +25,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/s3" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/s3/identity" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/generics" - . "github.com/open-component-model/ocm/pkg/testutils" ) type mockDownloader struct { diff --git a/pkg/contexts/ocm/accessmethods/s3/v1.go b/pkg/contexts/ocm/accessmethods/s3/v1.go index 7be29d42ae..e683e8ceb5 100644 --- a/pkg/contexts/ocm/accessmethods/s3/v1.go +++ b/pkg/contexts/ocm/accessmethods/s3/v1.go @@ -1,9 +1,10 @@ package s3 import ( + . "github.com/open-component-model/ocm/pkg/exception" + "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" - . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/s3/v2.go b/pkg/contexts/ocm/accessmethods/s3/v2.go index 89a0ccbb21..03be159842 100644 --- a/pkg/contexts/ocm/accessmethods/s3/v2.go +++ b/pkg/contexts/ocm/accessmethods/s3/v2.go @@ -1,9 +1,10 @@ package s3 import ( + . "github.com/open-component-model/ocm/pkg/exception" + "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" - . "github.com/open-component-model/ocm/pkg/exception" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/accessmethods/wget/method_test.go b/pkg/contexts/ocm/accessmethods/wget/method_test.go index 1ff84a5db9..e3cd73d59b 100644 --- a/pkg/contexts/ocm/accessmethods/wget/method_test.go +++ b/pkg/contexts/ocm/accessmethods/wget/method_test.go @@ -13,16 +13,16 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/wget" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/credentials/builtin/wget/identity" "github.com/open-component-model/ocm/pkg/contexts/ocm" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/wget" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" - . "github.com/open-component-model/ocm/pkg/testutils" ) var ( diff --git a/pkg/contexts/ocm/actionhandler/plugin/action_test.go b/pkg/contexts/ocm/actionhandler/plugin/action_test.go index dbb3e39040..6ec69b3da8 100644 --- a/pkg/contexts/ocm/actionhandler/plugin/action_test.go +++ b/pkg/contexts/ocm/actionhandler/plugin/action_test.go @@ -5,6 +5,8 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/datacontext/action/handlers" oci_repository_prepare "github.com/open-component-model/ocm/pkg/contexts/oci/actions/oci-repository-prepare" @@ -14,8 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "test" diff --git a/pkg/contexts/ocm/attrs/hashattr/attr_test.go b/pkg/contexts/ocm/attrs/hashattr/attr_test.go index 6173904471..83efe93680 100644 --- a/pkg/contexts/ocm/attrs/hashattr/attr_test.go +++ b/pkg/contexts/ocm/attrs/hashattr/attr_test.go @@ -5,6 +5,7 @@ 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/contexts/config" "github.com/open-component-model/ocm/pkg/contexts/datacontext" @@ -12,7 +13,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/hashattr" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/hasher/sha512" - . "github.com/open-component-model/ocm/pkg/testutils" ) const NAME = "test" diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_test.go index 940aac9398..c15250205d 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/publish_test.go @@ -6,7 +6,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go index d97f412c3a..89aae1d6e9 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/npm/registration_test.go @@ -3,10 +3,10 @@ package npm_test 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/contexts/ocm/blobhandler/handlers/generic/npm" "github.com/open-component-model/ocm/pkg/registrations" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Config deserialization Test Environment", func() { diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go index 9b413b88c4..fa154b1a35 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/ocirepo/upload_test.go @@ -3,13 +3,15 @@ package ocirepo_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" ctfoci "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/ociuploadattr" @@ -20,8 +22,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const COMP = "github.com/compa" diff --git a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go index f0e9e7e653..783cce1afb 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/generic/plugin/upload_test.go @@ -9,6 +9,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/osfs" @@ -29,9 +31,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "test" diff --git a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go index aac15de281..9eaabfa6bf 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go +++ b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/blobhandler.go @@ -5,6 +5,8 @@ import ( "path" "strings" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/opencontainers/go-digest" "github.com/open-component-model/ocm/pkg/blobaccess" @@ -26,7 +28,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/generics" ) diff --git a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go index 315e805c55..8da5991625 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/oci/ocirepo/handler_test.go @@ -6,13 +6,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" ocictf "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/keepblobattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/mapocirepoattr" @@ -25,9 +27,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go index 0c53bf1cbd..55048390f9 100644 --- a/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go +++ b/pkg/contexts/ocm/blobhandler/handlers/ocm/comparch/blobhandler_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/vfs" @@ -18,7 +19,6 @@ import ( "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCHIVE = "archive" diff --git a/pkg/contexts/ocm/compdesc/compdesc_test.go b/pkg/contexts/ocm/compdesc/compdesc_test.go index 5ac7761f4c..4f80c6c2a2 100644 --- a/pkg/contexts/ocm/compdesc/compdesc_test.go +++ b/pkg/contexts/ocm/compdesc/compdesc_test.go @@ -5,10 +5,10 @@ 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/contexts/ocm/compdesc" compdescv3 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" - . "github.com/open-component-model/ocm/pkg/testutils" ) func NormalizeYAML(y string) string { diff --git a/pkg/contexts/ocm/compdesc/copy_test.go b/pkg/contexts/ocm/compdesc/copy_test.go index 7e08cd3905..33aeb5a54b 100644 --- a/pkg/contexts/ocm/compdesc/copy_test.go +++ b/pkg/contexts/ocm/compdesc/copy_test.go @@ -3,6 +3,7 @@ package compdesc_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/go-test/deep" @@ -11,7 +12,6 @@ import ( v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Component Descripor Copy Test Suitet", func() { diff --git a/pkg/contexts/ocm/compdesc/equal_test.go b/pkg/contexts/ocm/compdesc/equal_test.go index bafe5cb349..9acf26d466 100644 --- a/pkg/contexts/ocm/compdesc/equal_test.go +++ b/pkg/contexts/ocm/compdesc/equal_test.go @@ -3,13 +3,13 @@ package compdesc_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/none" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ) diff --git a/pkg/contexts/ocm/compdesc/helper_test.go b/pkg/contexts/ocm/compdesc/helper_test.go index 3ac8ffd3c2..6e65664530 100644 --- a/pkg/contexts/ocm/compdesc/helper_test.go +++ b/pkg/contexts/ocm/compdesc/helper_test.go @@ -3,11 +3,11 @@ package compdesc_test 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/contexts/ocm/compdesc" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("helper", func() { diff --git a/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go b/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go index b33d13029d..16538a8e29 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/identity_test.go @@ -3,8 +3,8 @@ package v1_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" + v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ) diff --git a/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go b/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go index d2fa4376f0..24478a2302 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/labels_test.go @@ -3,10 +3,10 @@ package v1_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" - v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" . "github.com/open-component-model/ocm/pkg/testutils" + + v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ) var _ = Describe("labels", func() { diff --git a/pkg/contexts/ocm/compdesc/meta/v1/types_test.go b/pkg/contexts/ocm/compdesc/meta/v1/types_test.go index a2596ea218..1693b79c0e 100644 --- a/pkg/contexts/ocm/compdesc/meta/v1/types_test.go +++ b/pkg/contexts/ocm/compdesc/meta/v1/types_test.go @@ -4,8 +4,8 @@ import ( "time" . "github.com/onsi/ginkgo/v2" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/equivalent/testhelper" + v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" ) diff --git a/pkg/contexts/ocm/compdesc/norm_test.go b/pkg/contexts/ocm/compdesc/norm_test.go index 8ec6924594..a0a7d4547d 100644 --- a/pkg/contexts/ocm/compdesc/norm_test.go +++ b/pkg/contexts/ocm/compdesc/norm_test.go @@ -1,16 +1,17 @@ package compdesc_test import ( + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/normalizations" + _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/none" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/normalizations" - _ "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" - . "github.com/open-component-model/ocm/pkg/testutils" ) var CD1 = ` diff --git a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go index d7b3687c1e..c466a3cfbf 100644 --- a/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go +++ b/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/validation_test.go @@ -6,13 +6,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" "k8s.io/apimachinery/pkg/util/validation/field" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" meta "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/testutils" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1/jsonscheme" "github.com/open-component-model/ocm/pkg/runtime" ) diff --git a/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go b/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go index 3aedf924f5..63d61279a7 100644 --- a/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go +++ b/pkg/contexts/ocm/compdesc/versions/v2/validation_test.go @@ -9,6 +9,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2" + . "github.com/open-component-model/ocm/pkg/testutils" "k8s.io/apimachinery/pkg/util/validation/field" @@ -16,10 +18,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" meta "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/testutils" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2/jsonscheme" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) func TestConfig(t *testing.T) { diff --git a/pkg/contexts/ocm/cpi/compose_test.go b/pkg/contexts/ocm/cpi/compose_test.go index eedddc4f06..d95194395d 100644 --- a/pkg/contexts/ocm/cpi/compose_test.go +++ b/pkg/contexts/ocm/cpi/compose_test.go @@ -3,6 +3,9 @@ package cpi_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -17,10 +20,7 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPONENT = "github.com/mandelsoft/ocm" diff --git a/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go b/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go index 99ed7dbe6f..82c5caba90 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/blueprint_test.go @@ -3,6 +3,8 @@ package blueprint_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/projectionfs" @@ -16,8 +18,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers/blueprint" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" tenv "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go b/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go index d9bc5f076f..464f7edac1 100644 --- a/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go +++ b/pkg/contexts/ocm/download/handlers/blueprint/registration_test.go @@ -3,6 +3,8 @@ package blueprint_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/projectionfs" @@ -16,8 +18,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers/blueprint" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" tenv "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go b/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go index 220542aaf4..6e2a662be0 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/dirtree_test.go @@ -5,6 +5,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -23,7 +24,6 @@ import ( env2 "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go b/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go index cf54d64901..ebda2ed63c 100644 --- a/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go +++ b/pkg/contexts/ocm/download/handlers/dirtree/registration_test.go @@ -3,6 +3,7 @@ package dirtree_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/projectionfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -19,7 +20,6 @@ import ( env2 "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go b/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go index 9b4ab9d775..93a3ea1a0d 100644 --- a/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go +++ b/pkg/contexts/ocm/download/handlers/ocirepo/upload_test.go @@ -5,6 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" @@ -20,9 +22,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/download/handlers/ocirepo" ctfocm "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const COMP = "github.com/compa" diff --git a/pkg/contexts/ocm/download/handlers/plugin/download_test.go b/pkg/contexts/ocm/download/handlers/plugin/download_test.go index fd0737bc2b..60e9c3c91f 100644 --- a/pkg/contexts/ocm/download/handlers/plugin/download_test.go +++ b/pkg/contexts/ocm/download/handlers/plugin/download_test.go @@ -8,6 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/vfs" @@ -23,10 +25,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/config" "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/out" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "test" diff --git a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go index 9c60cde4d0..5ab081a54d 100644 --- a/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go +++ b/pkg/contexts/ocm/elements/artifactaccess/genericaccess/resource_test.go @@ -3,18 +3,18 @@ package genericaccess_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" me "github.com/open-component-model/ocm/pkg/contexts/ocm/elements/artifactaccess/genericaccess" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go index 3b90ef4721..d18ed8e499 100644 --- a/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go +++ b/pkg/contexts/ocm/elements/artifactblob/dirtreeblob/resource_test.go @@ -3,6 +3,7 @@ package dirtreeblob_test 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/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -12,7 +13,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" testenv "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/elements/resources_test.go b/pkg/contexts/ocm/elements/resources_test.go index 4a57c49be3..27e13e8184 100644 --- a/pkg/contexts/ocm/elements/resources_test.go +++ b/pkg/contexts/ocm/elements/resources_test.go @@ -3,12 +3,12 @@ package elements_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/digester/digesters/blob" me "github.com/open-component-model/ocm/pkg/contexts/ocm/elements" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" - . "github.com/open-component-model/ocm/pkg/testutils" ) type value struct { diff --git a/pkg/contexts/ocm/grammar/grammar.go b/pkg/contexts/ocm/grammar/grammar.go index ead99aff9a..d92d177d14 100644 --- a/pkg/contexts/ocm/grammar/grammar.go +++ b/pkg/contexts/ocm/grammar/grammar.go @@ -1,8 +1,9 @@ package grammar import ( - "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" . "github.com/open-component-model/ocm/pkg/regex" + + "github.com/open-component-model/ocm/pkg/contexts/oci/grammar" ) const ( diff --git a/pkg/contexts/ocm/internal/blobhandler_test.go b/pkg/contexts/ocm/internal/blobhandler_test.go index 06470cd418..21690cfb1f 100644 --- a/pkg/contexts/ocm/internal/blobhandler_test.go +++ b/pkg/contexts/ocm/internal/blobhandler_test.go @@ -5,11 +5,11 @@ 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/contexts/ocm/internal" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/registrations" - . "github.com/open-component-model/ocm/pkg/testutils" ) const REPO = "repo" diff --git a/pkg/contexts/ocm/internal/context.go b/pkg/contexts/ocm/internal/context.go index 83b5635b1a..da863ab5a1 100644 --- a/pkg/contexts/ocm/internal/context.go +++ b/pkg/contexts/ocm/internal/context.go @@ -5,6 +5,8 @@ import ( "reflect" "strings" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/modern-go/reflect2" "github.com/open-component-model/ocm/pkg/contexts/config" @@ -14,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/contexts/ocm/internal/digesthandler_test.go b/pkg/contexts/ocm/internal/digesthandler_test.go index d3e02c3270..6dbdbd2477 100644 --- a/pkg/contexts/ocm/internal/digesthandler_test.go +++ b/pkg/contexts/ocm/internal/digesthandler_test.go @@ -5,13 +5,13 @@ 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/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/internal" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" - . "github.com/open-component-model/ocm/pkg/testutils" ) type DigestHandler struct { diff --git a/pkg/contexts/ocm/labels/routingslip/entrytypes_test.go b/pkg/contexts/ocm/labels/routingslip/entrytypes_test.go index dabab83eb4..db925debb2 100644 --- a/pkg/contexts/ocm/labels/routingslip/entrytypes_test.go +++ b/pkg/contexts/ocm/labels/routingslip/entrytypes_test.go @@ -6,6 +6,7 @@ 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/contexts/ocm" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" @@ -13,7 +14,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/internal" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const TYPE = "my" diff --git a/pkg/contexts/ocm/labels/routingslip/slip_test.go b/pkg/contexts/ocm/labels/routingslip/slip_test.go index bcfa8fb8c2..8b04c41cac 100644 --- a/pkg/contexts/ocm/labels/routingslip/slip_test.go +++ b/pkg/contexts/ocm/labels/routingslip/slip_test.go @@ -6,6 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/opencontainers/go-digest" "sigs.k8s.io/yaml" @@ -15,7 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/types/comment" "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ORG = "acme.org" diff --git a/pkg/contexts/ocm/labels/routingslip/transfer_test.go b/pkg/contexts/ocm/labels/routingslip/transfer_test.go index 352352ce69..a222c4c8df 100644 --- a/pkg/contexts/ocm/labels/routingslip/transfer_test.go +++ b/pkg/contexts/ocm/labels/routingslip/transfer_test.go @@ -5,6 +5,7 @@ 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/common/accessobj" @@ -18,7 +19,6 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go index 122125453b..0302bd62c1 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/cmd_test.go @@ -3,6 +3,8 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/goutils/sliceutils" "github.com/mandelsoft/goutils/transformer" @@ -14,8 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go index 1b56c5141e..4350c38adf 100644 --- a/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go +++ b/pkg/contexts/ocm/labels/routingslip/types/plugin/entry_test.go @@ -5,6 +5,8 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/spf13/pflag" @@ -15,8 +17,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/labels/routingslip/spi" "github.com/open-component-model/ocm/pkg/contexts/ocm/plugin/plugins" "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("setup plugin cache", func() { diff --git a/pkg/contexts/ocm/plugin/plugin_test.go b/pkg/contexts/ocm/plugin/plugin_test.go index 2f40db5571..f8bd1e97c5 100644 --- a/pkg/contexts/ocm/plugin/plugin_test.go +++ b/pkg/contexts/ocm/plugin/plugin_test.go @@ -5,6 +5,7 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" common2 "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/credentials" @@ -21,7 +22,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/registration" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("setup plugin cache", func() { diff --git a/pkg/contexts/ocm/ref_test.go b/pkg/contexts/ocm/ref_test.go index ad0899651a..0319f2e12f 100644 --- a/pkg/contexts/ocm/ref_test.go +++ b/pkg/contexts/ocm/ref_test.go @@ -3,10 +3,10 @@ package ocm_test 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/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go b/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go index a52e071a3d..0472e1a0ed 100644 --- a/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go +++ b/pkg/contexts/ocm/repositories/comparch/accessmethod_test.go @@ -7,6 +7,7 @@ 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/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -17,7 +18,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi/accspeccpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var DefaultContext = ocm.New() diff --git a/pkg/contexts/ocm/repositories/comparch/comparch_test.go b/pkg/contexts/ocm/repositories/comparch/comparch_test.go index 42105e132e..628db42bc6 100644 --- a/pkg/contexts/ocm/repositories/comparch/comparch_test.go +++ b/pkg/contexts/ocm/repositories/comparch/comparch_test.go @@ -5,6 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/filepath/pkg/filepath" "github.com/mandelsoft/vfs/pkg/memoryfs" @@ -20,13 +22,11 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/digester/digesters/blob" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/env" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/contexts/ocm/repositories/composition/close_test.go b/pkg/contexts/ocm/repositories/composition/close_test.go index 91ead25087..f66bc2bf25 100644 --- a/pkg/contexts/ocm/repositories/composition/close_test.go +++ b/pkg/contexts/ocm/repositories/composition/close_test.go @@ -3,10 +3,11 @@ package composition_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/relativeociref" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" @@ -16,7 +17,6 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" - . "github.com/open-component-model/ocm/pkg/testutils" ) const OCIPATH = "/tmp/oci" diff --git a/pkg/contexts/ocm/repositories/composition/gc_test.go b/pkg/contexts/ocm/repositories/composition/gc_test.go index 51f2367e9f..58e625c6b9 100644 --- a/pkg/contexts/ocm/repositories/composition/gc_test.go +++ b/pkg/contexts/ocm/repositories/composition/gc_test.go @@ -6,12 +6,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/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/ocm" me "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition" "github.com/open-component-model/ocm/pkg/refmgmt" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("repository", func() { diff --git a/pkg/contexts/ocm/repositories/composition/repository_test.go b/pkg/contexts/ocm/repositories/composition/repository_test.go index 95d8939fe3..f0d8eae07d 100644 --- a/pkg/contexts/ocm/repositories/composition/repository_test.go +++ b/pkg/contexts/ocm/repositories/composition/repository_test.go @@ -3,6 +3,7 @@ package composition_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/memoryfs" @@ -20,7 +21,6 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" - . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPONENT = "acme.org/testcomp" diff --git a/pkg/contexts/ocm/repositories/composition/version_test.go b/pkg/contexts/ocm/repositories/composition/version_test.go index 8b31436a66..1b25605511 100644 --- a/pkg/contexts/ocm/repositories/composition/version_test.go +++ b/pkg/contexts/ocm/repositories/composition/version_test.go @@ -3,6 +3,7 @@ package composition_test 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/blobaccess" "github.com/open-component-model/ocm/pkg/blobaccess/bpi" @@ -14,7 +15,6 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("version", func() { diff --git a/pkg/contexts/ocm/repositories/ctf/ctf_test.go b/pkg/contexts/ocm/repositories/ctf/ctf_test.go index 8f0d00d831..02ea5e0c5f 100644 --- a/pkg/contexts/ocm/repositories/ctf/ctf_test.go +++ b/pkg/contexts/ocm/repositories/ctf/ctf_test.go @@ -3,6 +3,7 @@ package ctf_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/memoryfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -13,7 +14,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("access method", func() { diff --git a/pkg/contexts/ocm/repositories/ctf/repo_test.go b/pkg/contexts/ocm/repositories/ctf/repo_test.go index 36a8f0af53..3205f41c4b 100644 --- a/pkg/contexts/ocm/repositories/ctf/repo_test.go +++ b/pkg/contexts/ocm/repositories/ctf/repo_test.go @@ -5,6 +5,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" "github.com/mandelsoft/vfs/pkg/memoryfs" @@ -20,12 +23,9 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" - . "github.com/open-component-model/ocm/pkg/finalizer" ocmlog "github.com/open-component-model/ocm/pkg/logging" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/refmgmt" - . "github.com/open-component-model/ocm/pkg/testutils" ) const COMPONENT = "github.com/mandelsoft/ocm" diff --git a/pkg/contexts/ocm/repositories/genericocireg/cred_test.go b/pkg/contexts/ocm/repositories/genericocireg/cred_test.go index f4dea6fc4b..69a3de0907 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/cred_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/cred_test.go @@ -3,6 +3,7 @@ package genericocireg_test 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" @@ -11,7 +12,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("consumer id handling", func() { diff --git a/pkg/contexts/ocm/repositories/genericocireg/repo_test.go b/pkg/contexts/ocm/repositories/genericocireg/repo_test.go index c414af5ab5..77b1220609 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/repo_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/repo_test.go @@ -7,6 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -45,7 +46,6 @@ import ( "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" - . "github.com/open-component-model/ocm/pkg/testutils" ) var DefaultContext = ocm.New() diff --git a/pkg/contexts/ocm/repositories/genericocireg/semver_test.go b/pkg/contexts/ocm/repositories/genericocireg/semver_test.go index 262b4185f9..b12da61a98 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/semver_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/semver_test.go @@ -3,11 +3,11 @@ package genericocireg_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/Masterminds/semver/v3" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" - . "github.com/open-component-model/ocm/pkg/testutils" ) const META_SEPARATOR = genericocireg.META_SEPARATOR diff --git a/pkg/contexts/ocm/repositories/genericocireg/spec_test.go b/pkg/contexts/ocm/repositories/genericocireg/spec_test.go index 88e098d6d7..9d322f693d 100644 --- a/pkg/contexts/ocm/repositories/genericocireg/spec_test.go +++ b/pkg/contexts/ocm/repositories/genericocireg/spec_test.go @@ -6,13 +6,13 @@ 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/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ocireg" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/genericocireg" ocmreg "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var DefaultOCIContext = oci.New() diff --git a/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go b/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go index 7137370c80..91ce6b020b 100644 --- a/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go +++ b/pkg/contexts/ocm/repositories/ocireg/specnorm_test.go @@ -3,10 +3,10 @@ package ocireg_test 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/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("ref parsing", func() { diff --git a/pkg/contexts/ocm/repositories/virtual/repo_test.go b/pkg/contexts/ocm/repositories/virtual/repo_test.go index f8680efdeb..0305409e1e 100644 --- a/pkg/contexts/ocm/repositories/virtual/repo_test.go +++ b/pkg/contexts/ocm/repositories/virtual/repo_test.go @@ -3,6 +3,9 @@ package virtual_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/layerfs" "github.com/mandelsoft/vfs/pkg/memoryfs" @@ -19,11 +22,8 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/virtual/example" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("virtual repo", func() { diff --git a/pkg/contexts/ocm/resolver_test.go b/pkg/contexts/ocm/resolver_test.go index 4d7edaf351..4289b85987 100644 --- a/pkg/contexts/ocm/resolver_test.go +++ b/pkg/contexts/ocm/resolver_test.go @@ -6,6 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -13,8 +15,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/internal" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "ctf" diff --git a/pkg/contexts/ocm/session_test.go b/pkg/contexts/ocm/session_test.go index 159b78df22..69b865b600 100644 --- a/pkg/contexts/ocm/session_test.go +++ b/pkg/contexts/ocm/session_test.go @@ -5,9 +5,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" ocmreg "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ocireg" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/contexts/ocm/signing/handler_test.go b/pkg/contexts/ocm/signing/handler_test.go index 85c0202246..cc38a79c67 100644 --- a/pkg/contexts/ocm/signing/handler_test.go +++ b/pkg/contexts/ocm/signing/handler_test.go @@ -2,6 +2,7 @@ package signing_test import ( . "github.com/onsi/ginkgo/v2" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -13,7 +14,6 @@ import ( "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" rsa_pss "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-pss" "github.com/open-component-model/ocm/pkg/signing/signutils" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("Simple signing handlers", func() { diff --git a/pkg/contexts/ocm/signing/options_test.go b/pkg/contexts/ocm/signing/options_test.go index 8ddeba8593..e4459887ee 100644 --- a/pkg/contexts/ocm/signing/options_test.go +++ b/pkg/contexts/ocm/signing/options_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" "github.com/open-component-model/ocm/pkg/contexts/ocm" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" diff --git a/pkg/contexts/ocm/signing/signing_test.go b/pkg/contexts/ocm/signing/signing_test.go index 9af54ea88a..43d8a31140 100644 --- a/pkg/contexts/ocm/signing/signing_test.go +++ b/pkg/contexts/ocm/signing/signing_test.go @@ -7,13 +7,18 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/finalizer" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/oci" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/none" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -24,18 +29,13 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/composition" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" tenv "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/hasher/sha256" "github.com/open-component-model/ocm/pkg/signing/hasher/sha512" "github.com/open-component-model/ocm/pkg/signing/signutils" - . "github.com/open-component-model/ocm/pkg/testutils" ) var DefaultContext = ocm.New() diff --git a/pkg/contexts/ocm/signing/transport_test.go b/pkg/contexts/ocm/signing/transport_test.go index 0e07931a4c..7ced4dd61e 100644 --- a/pkg/contexts/ocm/signing/transport_test.go +++ b/pkg/contexts/ocm/signing/transport_test.go @@ -5,11 +5,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + // . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/signingattr" @@ -17,14 +21,10 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" - // . "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ( diff --git a/pkg/contexts/ocm/transfer/autohandler_test.go b/pkg/contexts/ocm/transfer/autohandler_test.go index 780b89707d..7ccee7de85 100644 --- a/pkg/contexts/ocm/transfer/autohandler_test.go +++ b/pkg/contexts/ocm/transfer/autohandler_test.go @@ -3,13 +3,13 @@ package transfer_test 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/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/spiff" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/testutils" ) type errorOption struct { diff --git a/pkg/contexts/ocm/transfer/merge_test.go b/pkg/contexts/ocm/transfer/merge_test.go index e8b9e2ba18..e1fc075248 100644 --- a/pkg/contexts/ocm/transfer/merge_test.go +++ b/pkg/contexts/ocm/transfer/merge_test.go @@ -3,6 +3,7 @@ package transfer_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/go-test/deep" @@ -16,7 +17,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/internal" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" - . "github.com/open-component-model/ocm/pkg/testutils" ) func TouchLabels(s, d, e *metav1.Labels) { diff --git a/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go b/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go index 2a256183be..2b7eca4ea3 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go +++ b/pkg/contexts/ocm/transfer/transferhandler/spiff/handler_test.go @@ -6,13 +6,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" @@ -21,7 +22,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/spiff" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/testutils" ) diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go b/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go index 78e53d49b4..bc72fbd131 100644 --- a/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go +++ b/pkg/contexts/ocm/transfer/transferhandler/standard/handler_test.go @@ -6,6 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/blobaccess" "github.com/open-component-model/ocm/pkg/common" @@ -14,7 +18,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/oci" "github.com/open-component-model/ocm/pkg/contexts/oci/artdesc" "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset" - . "github.com/open-component-model/ocm/pkg/contexts/oci/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -25,16 +28,13 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" ocmsign "github.com/open-component-model/ocm/pkg/contexts/ocm/signing" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/utils/check/check_test.go b/pkg/contexts/ocm/utils/check/check_test.go index b46ba3842e..a7407bdeae 100644 --- a/pkg/contexts/ocm/utils/check/check_test.go +++ b/pkg/contexts/ocm/utils/check/check_test.go @@ -5,6 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/common/accessio" @@ -14,8 +16,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/resourcetypes" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils/check" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ca" diff --git a/pkg/contexts/ocm/utils/resourceref.go b/pkg/contexts/ocm/utils/resourceref.go index e32accf68b..7168a40f61 100644 --- a/pkg/contexts/ocm/utils/resourceref.go +++ b/pkg/contexts/ocm/utils/resourceref.go @@ -3,11 +3,12 @@ package utils import ( "fmt" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/open-component-model/ocm/pkg/common" "github.com/open-component-model/ocm/pkg/contexts/ocm" metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" ) func ResolveReferencePath(cv ocm.ComponentVersionAccess, path []metav1.Identity, resolver ocm.ComponentVersionResolver) (ocm.ComponentVersionAccess, error) { diff --git a/pkg/contexts/ocm/utils/resourceref_test.go b/pkg/contexts/ocm/utils/resourceref_test.go index d717db44ad..b54450432c 100644 --- a/pkg/contexts/ocm/utils/resourceref_test.go +++ b/pkg/contexts/ocm/utils/resourceref_test.go @@ -5,6 +5,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" @@ -12,10 +14,8 @@ import ( metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/contexts/ocm/valuemergehandler/config/config_test.go b/pkg/contexts/ocm/valuemergehandler/config/config_test.go index ed79e5dd15..4c0aabff90 100644 --- a/pkg/contexts/ocm/valuemergehandler/config/config_test.go +++ b/pkg/contexts/ocm/valuemergehandler/config/config_test.go @@ -5,6 +5,7 @@ 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/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/ocm" @@ -12,7 +13,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/config" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("merge config", func() { diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go index 2f3e181e3d..3c8a0fbd50 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge/handler_test.go @@ -3,9 +3,9 @@ package defaultmerge 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/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("list merge", func() { diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go index eb57bbec1f..0051765e86 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge/handler_test.go @@ -3,12 +3,12 @@ package maplistmerge_test 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/contexts/ocm" me "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/maplistmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" - . "github.com/open-component-model/ocm/pkg/testutils" ) type Value = me.Value diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go index ae771ba32e..f6c57d7a95 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/plugin/handler_test.go @@ -5,6 +5,8 @@ package plugin_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/contexts/ocm" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/plugindirattr" @@ -12,8 +14,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/defaultmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const PLUGIN = "merge" diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go index 0da0a50283..9b74b44b70 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge/handler_test.go @@ -3,10 +3,10 @@ package simplelistmerge_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" me "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/simplelistmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" - . "github.com/open-component-model/ocm/pkg/testutils" ) type Value = me.Value diff --git a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go index a53ee114a5..4bd475b681 100644 --- a/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go +++ b/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge/handler_test.go @@ -3,11 +3,11 @@ package simplemapmerge_test 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/contexts/ocm" me "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers/simplemapmerge" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" - . "github.com/open-component-model/ocm/pkg/testutils" ) type Value = me.Value diff --git a/pkg/contexts/ocm/valuemergehandler/interface.go b/pkg/contexts/ocm/valuemergehandler/interface.go index 824d5e6fde..13cd3ccda0 100644 --- a/pkg/contexts/ocm/valuemergehandler/interface.go +++ b/pkg/contexts/ocm/valuemergehandler/interface.go @@ -1,10 +1,11 @@ package valuemergehandler import ( - "github.com/open-component-model/ocm/pkg/contexts/datacontext" - "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" _ "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/config" _ "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/handlers" + + "github.com/open-component-model/ocm/pkg/contexts/datacontext" + "github.com/open-component-model/ocm/pkg/contexts/ocm/cpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/hpi" "github.com/open-component-model/ocm/pkg/contexts/ocm/valuemergehandler/internal" ) diff --git a/pkg/dirtree/vfs_test.go b/pkg/dirtree/vfs_test.go index 9d3ca8ba18..3a9189e7f9 100644 --- a/pkg/dirtree/vfs_test.go +++ b/pkg/dirtree/vfs_test.go @@ -6,12 +6,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" "github.com/open-component-model/ocm/pkg/dirtree" "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("file system", func() { diff --git a/pkg/env/builder/ocm_version_test.go b/pkg/env/builder/ocm_version_test.go index 253d69128c..8d00a689a1 100644 --- a/pkg/env/builder/ocm_version_test.go +++ b/pkg/env/builder/ocm_version_test.go @@ -3,16 +3,16 @@ package builder_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/common/accessio" "github.com/open-component-model/ocm/pkg/common/accessobj" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/attrs/compositionmodeattr" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/contexts/ocm/testhelper" ocmutils "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" - . "github.com/open-component-model/ocm/pkg/env/builder" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ARCH = "/tmp/ctf" diff --git a/pkg/finalizer/finalizer_test.go b/pkg/finalizer/finalizer_test.go index c71a97d5f7..ae8def723c 100644 --- a/pkg/finalizer/finalizer_test.go +++ b/pkg/finalizer/finalizer_test.go @@ -6,10 +6,10 @@ 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/exception" "github.com/open-component-model/ocm/pkg/finalizer" - . "github.com/open-component-model/ocm/pkg/testutils" ) type Order []string diff --git a/pkg/logging/config_test.go b/pkg/logging/config_test.go index 9af1f727f1..2c93704571 100644 --- a/pkg/logging/config_test.go +++ b/pkg/logging/config_test.go @@ -5,14 +5,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/logging/testhelper" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/logging" logcfg "github.com/mandelsoft/logging/config" "github.com/tonglil/buflogr" local "github.com/open-component-model/ocm/pkg/logging" - . "github.com/open-component-model/ocm/pkg/logging/testhelper" - . "github.com/open-component-model/ocm/pkg/testutils" ) //////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/refmgmt/resource/resource_test.go b/pkg/refmgmt/resource/resource_test.go index 8c693063e5..f17639aca3 100644 --- a/pkg/refmgmt/resource/resource_test.go +++ b/pkg/refmgmt/resource/resource_test.go @@ -5,9 +5,9 @@ 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/refmgmt/resource" - . "github.com/open-component-model/ocm/pkg/testutils" ) // Resource is the intended resource interface. diff --git a/pkg/refmgmt/view_test.go b/pkg/refmgmt/view_test.go index e0a8517bc3..f030dc1c96 100644 --- a/pkg/refmgmt/view_test.go +++ b/pkg/refmgmt/view_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" refmgmt2 "github.com/open-component-model/ocm/pkg/refmgmt" - . "github.com/open-component-model/ocm/pkg/testutils" ) // Objectbase is the base interface for the diff --git a/pkg/registrations/registrations_test.go b/pkg/registrations/registrations_test.go index c49e3bb12a..31f34ea9c4 100644 --- a/pkg/registrations/registrations_test.go +++ b/pkg/registrations/registrations_test.go @@ -3,9 +3,9 @@ package registrations_test 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/registrations" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/runtime/multi_test.go b/pkg/runtime/multi_test.go index bae85575bf..e7cd8367a4 100644 --- a/pkg/runtime/multi_test.go +++ b/pkg/runtime/multi_test.go @@ -3,9 +3,9 @@ package runtime_test 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/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) type TestSpecType = runtime.VersionedTypedObjectType[TestSpecRealm] diff --git a/pkg/runtime/scheme_test.go b/pkg/runtime/scheme_test.go index 12f4e80fc1..3b03ee7fed 100644 --- a/pkg/runtime/scheme_test.go +++ b/pkg/runtime/scheme_test.go @@ -3,9 +3,9 @@ package runtime_test 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/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils" ) diff --git a/pkg/runtime/version_test.go b/pkg/runtime/version_test.go index 7eda90d80e..c248b93fba 100644 --- a/pkg/runtime/version_test.go +++ b/pkg/runtime/version_test.go @@ -5,9 +5,9 @@ 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/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" ) const ( diff --git a/pkg/semverutils/utils_test.go b/pkg/semverutils/utils_test.go index a317726826..bdb9b3c8ca 100644 --- a/pkg/semverutils/utils_test.go +++ b/pkg/semverutils/utils_test.go @@ -3,10 +3,9 @@ package semverutils import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/Masterminds/semver/v3" - - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("filter", func() { diff --git a/pkg/signing/handlers/init.go b/pkg/signing/handlers/init.go index 42cb45536c..e9042f9a76 100644 --- a/pkg/signing/handlers/init.go +++ b/pkg/signing/handlers/init.go @@ -1,11 +1,10 @@ package handlers import ( - _ "github.com/sigstore/cosign/v2/pkg/providers/all" - _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-pss" _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-pss-signingservice" _ "github.com/open-component-model/ocm/pkg/signing/handlers/rsa-signingservice" _ "github.com/open-component-model/ocm/pkg/signing/handlers/sigstore" + _ "github.com/sigstore/cosign/v2/pkg/providers/all" ) diff --git a/pkg/signing/normalization_test.go b/pkg/signing/normalization_test.go index 717c689e28..dcfbe90b49 100644 --- a/pkg/signing/normalization_test.go +++ b/pkg/signing/normalization_test.go @@ -6,6 +6,7 @@ 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/contexts/ocm/accessmethods/localblob" "github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact" @@ -17,7 +18,6 @@ import ( "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/norm/entry" "github.com/open-component-model/ocm/pkg/signing/norm/jcs" - . "github.com/open-component-model/ocm/pkg/testutils" ) var CDExcludes = signing.MapExcludes{ diff --git a/pkg/signing/signutils/certs_test.go b/pkg/signing/signutils/certs_test.go index 46b82f0667..b0d5d13d71 100644 --- a/pkg/signing/signutils/certs_test.go +++ b/pkg/signing/signutils/certs_test.go @@ -8,12 +8,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/blobaccess" "github.com/open-component-model/ocm/pkg/signing" "github.com/open-component-model/ocm/pkg/signing/handlers/rsa" "github.com/open-component-model/ocm/pkg/signing/signutils" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("normalization", func() { diff --git a/pkg/signing/signutils/names_test.go b/pkg/signing/signutils/names_test.go index 4406e502e8..27e7f8d53d 100644 --- a/pkg/signing/signutils/names_test.go +++ b/pkg/signing/signutils/names_test.go @@ -5,9 +5,9 @@ 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/signing/signutils" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("normalization", func() { diff --git a/pkg/spiff/spiff_test.go b/pkg/spiff/spiff_test.go index aecd5e768a..6e0ce20d3f 100644 --- a/pkg/spiff/spiff_test.go +++ b/pkg/spiff/spiff_test.go @@ -3,11 +3,11 @@ package spiff_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/spiff/spiffing" "github.com/open-component-model/ocm/pkg/spiff" - . "github.com/open-component-model/ocm/pkg/testutils" ) var _ = Describe("spiff", func() { diff --git a/pkg/toi/install/action.go b/pkg/toi/install/action.go index 2ccf46b876..06b3ea1e62 100644 --- a/pkg/toi/install/action.go +++ b/pkg/toi/install/action.go @@ -5,6 +5,8 @@ import ( "fmt" "sort" + . "github.com/open-component-model/ocm/pkg/finalizer" + "github.com/ghodss/yaml" "github.com/mandelsoft/vfs/pkg/osfs" "github.com/mandelsoft/vfs/pkg/vfs" @@ -26,7 +28,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/ocm/transfer/transferhandler/standard" "github.com/open-component-model/ocm/pkg/contexts/ocm/utils" "github.com/open-component-model/ocm/pkg/errors" - . "github.com/open-component-model/ocm/pkg/finalizer" "github.com/open-component-model/ocm/pkg/mime" "github.com/open-component-model/ocm/pkg/runtime" "github.com/open-component-model/ocm/pkg/spiff" diff --git a/pkg/toi/install/action_test.go b/pkg/toi/install/action_test.go index 394bd3e086..97d6aeb2b8 100644 --- a/pkg/toi/install/action_test.go +++ b/pkg/toi/install/action_test.go @@ -3,6 +3,9 @@ package install_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/env" + . "github.com/open-component-model/ocm/pkg/env/builder" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/memoryfs" @@ -13,10 +16,7 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/identity/hostpath" v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1" "github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/ctf" - . "github.com/open-component-model/ocm/pkg/env" - . "github.com/open-component-model/ocm/pkg/env/builder" "github.com/open-component-model/ocm/pkg/mime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/toi" "github.com/open-component-model/ocm/pkg/toi/drivers/mock" "github.com/open-component-model/ocm/pkg/toi/install" diff --git a/pkg/toi/install/credentials_test.go b/pkg/toi/install/credentials_test.go index 2b067f5700..c81a06734f 100644 --- a/pkg/toi/install/credentials_test.go +++ b/pkg/toi/install/credentials_test.go @@ -3,6 +3,7 @@ package install_test 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/config" @@ -12,7 +13,6 @@ import ( "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/directcreds" "github.com/open-component-model/ocm/pkg/contexts/credentials/repositories/memory" "github.com/open-component-model/ocm/pkg/runtime" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/toi/install" ) diff --git a/pkg/toi/support/app.go b/pkg/toi/support/app.go index 1b03692cb8..d1a409e029 100644 --- a/pkg/toi/support/app.go +++ b/pkg/toi/support/app.go @@ -4,6 +4,8 @@ import ( "fmt" "strings" + _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" + "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -11,7 +13,6 @@ import ( "github.com/open-component-model/ocm/pkg/cobrautils" "github.com/open-component-model/ocm/pkg/cobrautils/logopts" "github.com/open-component-model/ocm/pkg/common" - _ "github.com/open-component-model/ocm/pkg/contexts/clictx/config" "github.com/open-component-model/ocm/pkg/contexts/credentials" "github.com/open-component-model/ocm/pkg/contexts/datacontext" "github.com/open-component-model/ocm/pkg/contexts/datacontext/attrs/vfsattr" diff --git a/pkg/utils/tarutils/pack_test.go b/pkg/utils/tarutils/pack_test.go index ad4581c91b..0ff84d662d 100644 --- a/pkg/utils/tarutils/pack_test.go +++ b/pkg/utils/tarutils/pack_test.go @@ -5,10 +5,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/osfs" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/tarutils" ) diff --git a/pkg/utils/template/template_test.go b/pkg/utils/template/template_test.go index 9bcfe89de3..95c9b24929 100644 --- a/pkg/utils/template/template_test.go +++ b/pkg/utils/template/template_test.go @@ -5,11 +5,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + . "github.com/open-component-model/ocm/pkg/testutils" "github.com/mandelsoft/vfs/pkg/osfs" "gopkg.in/yaml.v3" - . "github.com/open-component-model/ocm/pkg/testutils" "github.com/open-component-model/ocm/pkg/utils/template" ) From c087f87c3412a5728ed3584ca75f7ce8f8978fa5 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 7 May 2024 12:04:10 +0200 Subject: [PATCH 14/16] comment on gci --- hack/format.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/format.sh b/hack/format.sh index 4afbc81089..c8267b2a16 100755 --- a/hack/format.sh +++ b/hack/format.sh @@ -10,7 +10,7 @@ log() { pkgprefix="github.com/open-component-model/ocm" -log "Format with gci" +log "Format with gci" # gci write --custom-order --skip-generated -s standard -s blank -s dot -s default -s "Prefix(github.com/open-component-model/ocm)" GCIFMT=( -s standard -s blank -s dot -s default -s="prefix(${pkgprefix})" --custom-order ) gci diff --skip-generated "${GCIFMT[@]}" $@ Date: Tue, 7 May 2024 12:32:12 +0200 Subject: [PATCH 15/16] controller-gen object --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 00c9834904..78a0609f3b 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ generate: .PHONY: generate-deepcopy generate-deepcopy: controller-gen - $(CONTROLLER_GEN) paths=./pkg/contexts/ocm/compdesc/versions/... paths=./pkg/contexts/ocm/compdesc/meta/... + $(CONTROLLER_GEN) object paths=./pkg/contexts/ocm/compdesc/versions/... paths=./pkg/contexts/ocm/compdesc/meta/... .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. From e73a3d739866587ebd72514e5abc0dfb8d06415b Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 7 May 2024 13:53:31 +0200 Subject: [PATCH 16/16] line numbers have changed --- pkg/env/builder/builder_test.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkg/env/builder/builder_test.go b/pkg/env/builder/builder_test.go index 9232c2be65..eb75115391 100644 --- a/pkg/env/builder/builder_test.go +++ b/pkg/env/builder/builder_test.go @@ -24,7 +24,7 @@ var _ = Describe("Builder", func() { err := env.Build(func(e *Builder) { e.ExtraIdentity("a", "b") }) - Expect(err).To(MatchError("builder.(*Builder).ExtraIdentity(29): element with metadata required")) + Expect(err).To(MatchError("builder.(*Builder).ExtraIdentity(25): element with metadata required")) }) It("catches explicit error", func() { @@ -38,27 +38,21 @@ var _ = Describe("Builder", func() { err := env.Build(func(e *Builder) { env.Fail("dedicated") }) - Expect(err).To(MatchError("env.(*Environment).Fail(43): dedicated")) + Expect(err).To(MatchError("env.(*Environment).Fail(39): dedicated")) }) It("catches explicit env error", func() { err := env.Build(func(e *Builder) { env.FailOnErr(fmt.Errorf("dedicated"), "context") }) - Expect(err).To(MatchError("env.(*Environment).FailOnErr(50): context: dedicated")) + Expect(err).To(MatchError("env.(*Environment).FailOnErr(46): context: dedicated")) }) It("catches outer error", func() { Expect(Build(func(e *Builder) { e.ExtraIdentity("a", "b") - })).To(MatchError("builder.(*Builder).ExtraIdentity(57): element with metadata required")) + })).To(MatchError("builder.(*Builder).ExtraIdentity(53): element with metadata required")) }) - - /* - It("catches outer error", func() { - NewBuilder().ExtraIdentity("a", "b") - }) - */ }) func Build(funcs ...func(e *Builder)) (err error) {