Skip to content

Commit

Permalink
let's get rid of reuse PendingDeprecationWarning (#765)
Browse files Browse the repository at this point in the history 
## Description

```
Copyright and licensing information for 'xyz.go' has been found in both 'xyz.go' and in the DEP5 file located at '.reuse/dep5'.
```

You might want to take a look at the individual
[commits.](https://github.com/open-component-model/ocm/pull/765/commits)


## What type of PR is this? (check all applicable)

- [ ] 🍕 Feature
- [ ] 🎇 Restructuring
- [ ] 🐛 Bug Fix
- [ ] 📝 Documentation Update
- [x] 🎨 Style
- [ ] 🧑‍💻 Code Refactor
- [ ] 🔥 Performance Improvements
- [ ] ✅ Test
- [ ] 🤖 Build
- [ ] 🔁 CI
- [ ] 📦 Chore (Release)
- [ ] ⏩ Revert

## Related Tickets & Documents

<!-- 
Please use this format link issue numbers: Fixes #123

https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
-->
- Related Issue # (issue)
- Closes # (issue)
- Fixes # (issue)
> Remove if not applicable

## Screenshots

<!-- Visual changes require screenshots -->


## Added tests?

- [ ] 👍 yes
- [x] 🙅 no, because they aren't needed
- [ ] 🙋 no, because I need help
- [ ] Separate ticket for tests # (issue/pr)

Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration


## Added to documentation?

- [ ] 📜 README.md
- [x] 🙅 no documentation needed

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
  • Loading branch information
@hilmarf
hilmarf authored May 8, 2024
1 parent 7f589f7 commit b44a489
Show file tree
Hide file tree
Showing 1,806 changed files with 358 additions and 7,196 deletions.
15 changes: 2 additions & 13 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,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
Expand Down Expand Up @@ -69,11 +65,11 @@ 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
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" 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.
Expand Down Expand Up @@ -111,13 +107,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 $@
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/accessmethods/demo.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/common/const.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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"
4 changes: 0 additions & 4 deletions cmds/demoplugin/config/config.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/uploaders/demo.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/uploaders/writer.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/valuesets/check.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/valuesets/check_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,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
Expand Down
4 changes: 0 additions & 4 deletions cmds/demoplugin/valuesets/suite_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ecrplugin/actions/action.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ecrplugin/config/config.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ecrplugin/config/tweak.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ecrplugin/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/app.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/config.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/driver/driver.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/driver/helm/driver.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/driver/helm/install.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/driver/helm/uninstall.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/execute.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/executor.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/app/set.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/helminstaller/testhelper/env.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
6 changes: 1 addition & 5 deletions cmds/ocm/app/app.go
View file
Original file line number Diff line number Diff line change
@@ -1,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
Expand All @@ -11,7 +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"

Expand Down Expand Up @@ -62,6 +57,7 @@ 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"
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/app/app_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/app/prepare.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/app/suite_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
10 changes: 10 additions & 0 deletions cmds/ocm/ca/component-descriptor.yaml
View file
Original file line number Diff line number Diff line change
@@ -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: {}
4 changes: 0 additions & 4 deletions cmds/ocm/commands/cachecmds/clean/cmd.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/cachecmds/cmd.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/cachecmds/describe/cmd.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/cachecmds/names/names.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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"}
4 changes: 0 additions & 4 deletions cmds/ocm/commands/common/elements/components/cmd.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/common/options/closureoption/option.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/common/options/destoption/option.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/common/options/failonerroroption/option.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/common/options/formatoption/option.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/common/options/keyoption/option.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/controllercmds/common/applyer.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/controllercmds/common/fetcher.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/controllercmds/common/manifests.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
4 changes: 0 additions & 4 deletions cmds/ocm/commands/controllercmds/install/cmd.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +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 (
Expand Down
Loading

0 comments on commit b44a489

Please sign in to comment.