Skip to content

Commit 37d81d2

Browse files
Zen-cronicyurishkuro
authored andcommitted
Add copyright/license headers to script files (jaegertracing#5829)
## Which problem is this PR solving? - Resolves jaegertracing#5827 ## Description of the changes - Update the `update_go_license` function to handle the `.sh` files and makefiles - Update the [ALL_SRC](https://github.com/jaegertracing/jaeger/blob/dc49b1faaeee15c2498c562309bab4fc0525bd56/Makefile#L32) variable in the main `Makefile` to include the new file types, which in turn updates the `lint` and `fmt` targets ## How was this change tested? - ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Kaung Zin Hein <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Signed-off-by: Jared Tan <[email protected]>
1 parent b847d65 commit 37d81d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+210
-11
lines changed

Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ ALL_SRC = $(shell find . -name '*.go' \
4242
-type f | \
4343
sort)
4444

45+
# All .sh or .py or Makefile or .mk files that should be auto-formatted and linted.
46+
SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name '*.mk' -o -name 'Makefile*' -o -name 'Dockerfile*' \) \
47+
-not -path './.git/*' \
48+
-not -path './idl/*' \
49+
-not -path './jaeger-ui/*' \
50+
-type f | \
51+
sort)
52+
4553
# ALL_PKGS is used with 'nocover' and 'goleak'
4654
ALL_PKGS = $(shell echo $(dir $(ALL_SRC)) | tr ' ' '\n' | sort -u)
4755

@@ -185,11 +193,11 @@ fmt: $(GOFUMPT)
185193
@echo Running gofumpt on ALL_SRC ...
186194
@$(GOFUMPT) -e -l -w $(ALL_SRC)
187195
@echo Running updateLicense.py on ALL_SRC ...
188-
@./scripts/updateLicense.py $(ALL_SRC)
196+
@./scripts/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC)
189197

190198
.PHONY: lint
191199
lint: $(LINT) goleak
192-
@./scripts/updateLicense.py $(ALL_SRC) > $(FMT_LOG)
200+
@./scripts/updateLicense.py $(ALL_SRC) $(SCRIPTS_SRC) > $(FMT_LOG)
193201
@./scripts/import-order-cleanup.py -o stdout -t $(ALL_SRC) > $(IMPORT_LOG)
194202
@[ ! -s "$(FMT_LOG)" -a ! -s "$(IMPORT_LOG)" ] || (echo "License check or import ordering failures, run 'make fmt'" | cat - $(FMT_LOG) $(IMPORT_LOG) && false)
195203
./scripts/check-semconv-version.sh

cmd/agent/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25
ARG debug_image
36

cmd/all-in-one/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25
ARG debug_image
36

cmd/anonymizer/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
FROM scratch
25
ARG TARGETARCH
36
ARG USER_UID=10001

cmd/collector/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25
ARG debug_image
36

cmd/es-index-cleaner/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25

36
FROM $base_image AS release

cmd/es-rollover/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25

36
FROM $base_image AS release

cmd/ingester/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25
ARG debug_image
36

cmd/jaeger/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25
ARG debug_image
36

cmd/query/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2024 The Jaeger Authors.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
ARG base_image
25
ARG debug_image
36

0 commit comments

Comments
 (0)