Skip to content

Commit 458f1d6

Browse files
committed
Makefile improvements
- make clean shouldn't print errors when files/directories have already been removed - add copyright header to generated api files to pass license check Signed-off-by: Paul Gier <[email protected]>
1 parent 538305b commit 458f1d6

File tree

101 files changed

+1387
-16
lines changed

Some content is hidden

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

101 files changed

+1387
-16
lines changed

COPYRIGHT.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Copyright Prometheus Team
2+
Licensed under the Apache License, Version 2.0 (the "License");
3+
you may not use this file except in compliance with the License.
4+
You may obtain a copy of the License at
5+
6+
http://www.apache.org/licenses/LICENSE-2.0
7+
8+
Unless required by applicable law or agreed to in writing, software
9+
distributed under the License is distributed on an "AS IS" BASIS,
10+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
See the License for the specific language governing permissions and
12+
limitations under the License.

Makefile

+7-5
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,19 @@ SWAGGER = docker run \
4545

4646
api/v2/models api/v2/restapi: api/v2/openapi.yaml
4747
-rm -r api/v2/{models,restapi}
48-
$(SWAGGER) generate server -f api/v2/openapi.yaml --exclude-main -A alertmanager --target api/v2/
48+
$(SWAGGER) generate server -f api/v2/openapi.yaml --copyright-file=COPYRIGHT.txt --exclude-main -A alertmanager --target api/v2/
4949

5050
test/with_api_v2/api_v2_client/models test/with_api_v2/api_v2_client/client: api/v2/openapi.yaml
5151
-rm -r test/with_api_v1/api_v2_client; mkdir -p test/with_api_v2/api_v2_client
52-
$(SWAGGER) generate client -f api/v2/openapi.yaml --target test/with_api_v2/api_v2_client
52+
$(SWAGGER) generate client -f api/v2/openapi.yaml --copyright-file=COPYRIGHT.txt --target test/with_api_v2/api_v2_client
5353

5454
.PHONY: clean
5555
clean:
56-
- rm -f asset/assets_vfsdata.go
57-
- rm -r api/v2/models api/v2/restapi test/with_api_v2/api_v2_client/models test/with_api_v2/api_v2_client/client
58-
- cd $(FRONTEND_DIR) && $(MAKE) clean
56+
- @rm -rf asset/assets_vfsdata.go \
57+
api/v2/models api/v2/restapi \
58+
test/with_api_v2/api_v2_client/models \
59+
test/with_api_v2/api_v2_client/client
60+
- @cd $(FRONTEND_DIR) && $(MAKE) clean
5961

6062
.PHONY: test
6163
test: common-test $(ERRCHECK_BINARY)

api/v2/models/alert.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/alert_status.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/alertmanager_config.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/alertmanager_status.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/cluster_status.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/gettable_alert.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/gettable_alerts.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/gettable_silence.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/gettable_silences.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/label_set.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/matcher.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/matchers.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/peer_status.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/postable_alert.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/postable_alerts.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/postable_silence.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/receiver.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v2/models/silence.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)