Skip to content

Commit 757ab59

Browse files
afritzlerafritzler
committed
Update license ref in readme
Update license ref in readme and other project housekeeping changes.
1 parent f441258 commit 757ab59

File tree

5 files changed

+111
-96
lines changed

5 files changed

+111
-96
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "weekly"
8-
reviewers:
9-
- "ironcore-dev/core"
108
# Ignore K8 packages as these are done manually
119
ignore:
1210
- dependency-name: "k8s.io/api"
@@ -22,5 +20,3 @@ updates:
2220
directory: "/"
2321
schedule:
2422
interval: "weekly"
25-
reviewers:
26-
- "ironcore-dev/core"

‎Makefile‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ vet: ## Run go vet against code.
3737
go vet ./...
3838

3939
.PHONY: lint
40-
lint: golangci-lint ## Run golangci-lint on the code.
41-
$(GOLANGCILINT) run ./...
40+
lint: golangci-lint ## Run golangci-lint linter
41+
$(GOLANGCI_LINT) run
4242

4343
.PHONY: check-license
4444
check-license: addlicense ## Check that every file has a license header present.
@@ -69,30 +69,46 @@ $(LOCALBIN):
6969
ADDLICENSE ?= $(LOCALBIN)/addlicense
7070
GOIMPORTS ?= $(LOCALBIN)/goimports
7171
MOCKGEN ?= $(LOCALBIN)/mockgen
72-
GOLANGCILINT ?= $(LOCALBIN)/golangci-lint
72+
GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
7373

7474
## Tool Versions
7575
ADDLICENSE_VERSION ?= v1.1.1
76-
GOIMPORTS_VERSION ?= v0.31.0
76+
GOIMPORTS_VERSION ?= v0.34.0
7777
MOCKGEN_VERSION ?= v0.5.2
78-
GOLANGCILINT_VERSION ?= v2.1
78+
GOLANGCI_LINT_VERSION ?= v2.1
7979

8080
.PHONY: addlicense
8181
addlicense: $(ADDLICENSE) ## Download addlicense locally if necessary.
8282
$(ADDLICENSE): $(LOCALBIN)
83-
test -s $(LOCALBIN)/addlicense || GOBIN=$(LOCALBIN) go install github.com/google/addlicense@$(ADDLICENSE_VERSION)
83+
$(call go-install-tool,$(ADDLICENSE),github.com/google/addlicense,$(ADDLICENSE_VERSION))
8484

8585
.PHONY: goimports
8686
goimports: $(GOIMPORTS) ## Download goimports locally if necessary.
8787
$(GOIMPORTS): $(LOCALBIN)
88-
test -s $(LOCALBIN)/goimports || GOBIN=$(LOCALBIN) go install golang.org/x/tools/cmd/goimports@$(GOIMPORTS_VERSION)
88+
$(call go-install-tool,$(GOIMPORTS),golang.org/x/tools/cmd/goimports,$(GOIMPORTS_VERSION))
8989

9090
.PHONY: mockgen
9191
mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
9292
$(MOCKGEN): $(LOCALBIN)
93-
test -s $(LOCALBIN)/mockgen || GOBIN=$(LOCALBIN) go install go.uber.org/mock/mockgen@$(MOCKGEN_VERSION)
94-
95-
.PHONY: goimports
96-
golangci-lint: $(GOLANGCILINT) ## Download golangci-lint locally if necessary.
97-
$(GOLANGCILINT): $(LOCALBIN)
98-
test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCILINT_VERSION)
93+
$(call go-install-tool,$(MOCKGEN),go.uber.org/mock/mockgen,$(MOCKGEN_VERSION))
94+
95+
.PHONY: golangci-lint
96+
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
97+
$(GOLANGCI_LINT): $(LOCALBIN)
98+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,${GOLANGCI_LINT_VERSION})
99+
100+
# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
101+
# $1 - target path with name of binary
102+
# $2 - package url which can be installed
103+
# $3 - specific version of package
104+
define go-install-tool
105+
@[ -f "$(1)-$(3)" ] || { \
106+
set -e; \
107+
package=$(2)@$(3) ;\
108+
echo "Downloading $${package}" ;\
109+
rm -f $(1) || true ;\
110+
GOBIN=$(LOCALBIN) go install $${package} ;\
111+
mv $(1) $(1)-$(3) ;\
112+
} ;\
113+
ln -sf $(1)-$(3) $(1)
114+
endef

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ To use the library in your project, just run
1919
go get github.com/ironcore-dev/controller-utils
2020
```
2121

22-
## License
22+
## Licensing
23+
24+
Copyright 2025 SAP SE or an SAP affiliate company and IronCore contributors. Please see our [LICENSE](LICENSE) for
25+
copyright and license information. Detailed information including third-party components and their licensing/copyright
26+
information is available [via the REUSE tool](https://api.reuse.software/info/github.com/ironcore-dev/controller-utils).
2327

24-
[Apache-2.0](LICENSE)

‎go.mod‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
require (
66
github.com/onsi/ginkgo/v2 v2.23.4
77
github.com/onsi/gomega v1.37.0
8-
github.com/spf13/pflag v1.0.6
8+
github.com/spf13/pflag v1.0.7
99
github.com/stretchr/testify v1.10.0
1010
go.uber.org/mock v0.5.2
1111
k8s.io/api v0.33.1
@@ -31,7 +31,7 @@ require (
3131
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3232
github.com/felixge/httpsnoop v1.0.4 // indirect
3333
github.com/fsnotify/fsnotify v1.9.0 // indirect
34-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
34+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3535
github.com/go-errors/errors v1.4.2 // indirect
3636
github.com/go-logr/logr v1.4.3 // indirect
3737
github.com/go-logr/stdr v1.2.2 // indirect
@@ -41,11 +41,11 @@ require (
4141
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4242
github.com/gogo/protobuf v1.3.2 // indirect
4343
github.com/google/btree v1.1.3 // indirect
44-
github.com/google/gnostic-models v0.6.9 // indirect
44+
github.com/google/gnostic-models v0.7.0 // indirect
4545
github.com/google/go-cmp v0.7.0 // indirect
46-
github.com/google/pprof v0.0.0-20250602020802-c6617b811d0e // indirect
46+
github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 // indirect
4747
github.com/google/uuid v1.6.0 // indirect
48-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
48+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
4949
github.com/josharian/intern v1.0.0 // indirect
5050
github.com/json-iterator/go v1.1.12 // indirect
5151
github.com/mailru/easyjson v0.9.0 // indirect
@@ -57,35 +57,35 @@ require (
5757
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5858
github.com/prometheus/client_golang v1.22.0 // indirect
5959
github.com/prometheus/client_model v0.6.2 // indirect
60-
github.com/prometheus/common v0.64.0 // indirect
61-
github.com/prometheus/procfs v0.16.1 // indirect
60+
github.com/prometheus/common v0.65.0 // indirect
61+
github.com/prometheus/procfs v0.17.0 // indirect
6262
github.com/stretchr/objx v0.5.2 // indirect
6363
github.com/x448/float16 v0.8.4 // indirect
6464
github.com/xlab/treeprint v1.2.0 // indirect
6565
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
66-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
67-
go.opentelemetry.io/otel v1.36.0 // indirect
68-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
69-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
70-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
71-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
72-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
66+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
67+
go.opentelemetry.io/otel v1.37.0 // indirect
68+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
69+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
70+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
71+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
72+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
7373
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
7474
go.uber.org/automaxprocs v1.6.0 // indirect
7575
go.yaml.in/yaml/v2 v2.4.2 // indirect
76-
go.yaml.in/yaml/v3 v3.0.3 // indirect
77-
golang.org/x/net v0.40.0 // indirect
76+
go.yaml.in/yaml/v3 v3.0.4 // indirect
77+
golang.org/x/net v0.42.0 // indirect
7878
golang.org/x/oauth2 v0.30.0 // indirect
79-
golang.org/x/sync v0.14.0 // indirect
80-
golang.org/x/sys v0.33.0 // indirect
81-
golang.org/x/term v0.32.0 // indirect
82-
golang.org/x/text v0.25.0 // indirect
83-
golang.org/x/time v0.11.0 // indirect
84-
golang.org/x/tools v0.33.0 // indirect
79+
golang.org/x/sync v0.16.0 // indirect
80+
golang.org/x/sys v0.34.0 // indirect
81+
golang.org/x/term v0.33.0 // indirect
82+
golang.org/x/text v0.27.0 // indirect
83+
golang.org/x/time v0.12.0 // indirect
84+
golang.org/x/tools v0.35.0 // indirect
8585
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
86-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
87-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
88-
google.golang.org/grpc v1.72.2 // indirect
86+
google.golang.org/genproto/googleapis/api v0.0.0-20250715232539-7130f93afb79 // indirect
87+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
88+
google.golang.org/grpc v1.74.0 // indirect
8989
google.golang.org/protobuf v1.36.6 // indirect
9090
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9191
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)