Skip to content

Commit eb7840b

Browse files
authored
Use a better maintained and more flexible license checker tool (#267)
Signed-off-by: Ignasi Barrera <ignasi@tetrate.io>
1 parent af1e088 commit eb7840b

File tree

5 files changed

+38
-19
lines changed

5 files changed

+38
-19
lines changed

.licenserc.yaml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Copyright 2024 Tetrate
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
header:
16+
license:
17+
spdx-id: Apache-2.0
18+
copyright-owner: Tetrate
19+
paths-ignore:
20+
- '**/go.mod'
21+
- '**/go.sum'
22+
- '**/*.md'
23+
- '**/*.lock'
24+
- '**/*.txt'
25+
- '**/*.json'
26+
- '**/*.crt'
27+
- '**/*.csr'
28+
- '**/*.srl'
29+
- '**/*.key'
30+
- '**/.gitignore'
31+
- '**/kubeconfig'
32+
- '**/bin/*'
33+
- LICENSE
34+
- CODEOWNERS
35+
- 'config/**/*.go'

.licenserignore

-16
This file was deleted.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ lint: $(GOLANGCI_LINT_CONFIG) config/lint ## Lint checks for all Go code
203203
.PHONY: format
204204
format: go.mod ## Format all Go code
205205
@echo "Formatting code"
206-
@go run $(LICENSER) apply -r "Tetrate"
206+
@@go run $(SWEYES) header fix
207207
@go run $(GOSIMPORTS) -local $(GO_MODULE) -w .
208208
@gofmt -w .
209209

e2e/istio/cluster/istiogw-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 Tetrate
1+
# Copyright 2024 Tetrate
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

env.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ NAME ?= authservice
2020

2121
GOLANGCI_LINT ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
2222
GOSIMPORTS ?= github.com/rinchsan/gosimports/cmd/gosimports@v0.3.8
23-
LICENSER ?= github.com/liamawhite/licenser@v0.6.1-0.20210729145742-be6c77bf6a1f
23+
SWEYES ?= github.com/apache/skywalking-eyes/cmd/license-eye@v0.6.0
2424
KIND ?= sigs.k8s.io/kind@v0.18.0
2525
ENVTEST ?= sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
2626

0 commit comments

Comments
 (0)