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]>
yanksyoon · Mar 11, 2019 · 458f1d6 · 458f1d6
1 parent 538305b
commit 458f1d6
Show file tree

Hide file tree

Showing 101 changed files with 1,387 additions and 16 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -0,0 +1,12 @@
+Copyright Prometheus Team
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/Makefile b/Makefile
@@ -45,17 +45,19 @@ SWAGGER = docker run \
 
 api/v2/models api/v2/restapi: api/v2/openapi.yaml
 	-rm -r api/v2/{models,restapi}
-	$(SWAGGER) generate server -f api/v2/openapi.yaml --exclude-main -A alertmanager --target api/v2/
+	$(SWAGGER) generate server -f api/v2/openapi.yaml --copyright-file=COPYRIGHT.txt --exclude-main -A alertmanager --target api/v2/
 
 test/with_api_v2/api_v2_client/models test/with_api_v2/api_v2_client/client: api/v2/openapi.yaml
 	-rm -r test/with_api_v1/api_v2_client; mkdir -p test/with_api_v2/api_v2_client
-	$(SWAGGER) generate client -f api/v2/openapi.yaml --target test/with_api_v2/api_v2_client
+	$(SWAGGER) generate client -f api/v2/openapi.yaml --copyright-file=COPYRIGHT.txt --target test/with_api_v2/api_v2_client
 
 .PHONY: clean
 clean:
-	- rm -f asset/assets_vfsdata.go
-	- rm -r api/v2/models api/v2/restapi test/with_api_v2/api_v2_client/models test/with_api_v2/api_v2_client/client
-	- cd $(FRONTEND_DIR) && $(MAKE) clean
+	- @rm -rf asset/assets_vfsdata.go \
+                  api/v2/models api/v2/restapi \
+                  test/with_api_v2/api_v2_client/models \
+                  test/with_api_v2/api_v2_client/client
+	- @cd $(FRONTEND_DIR) && $(MAKE) clean
 
 .PHONY: test
 test: common-test $(ERRCHECK_BINARY)

diff --git a/api/v2/models/alert.go b/api/v2/models/alert.go
diff --git a/api/v2/models/alert_status.go b/api/v2/models/alert_status.go
diff --git a/api/v2/models/alertmanager_config.go b/api/v2/models/alertmanager_config.go
diff --git a/api/v2/models/alertmanager_status.go b/api/v2/models/alertmanager_status.go
diff --git a/api/v2/models/cluster_status.go b/api/v2/models/cluster_status.go
diff --git a/api/v2/models/gettable_alert.go b/api/v2/models/gettable_alert.go
diff --git a/api/v2/models/gettable_alerts.go b/api/v2/models/gettable_alerts.go
diff --git a/api/v2/models/gettable_silence.go b/api/v2/models/gettable_silence.go
diff --git a/api/v2/models/gettable_silences.go b/api/v2/models/gettable_silences.go
diff --git a/api/v2/models/label_set.go b/api/v2/models/label_set.go
diff --git a/api/v2/models/matcher.go b/api/v2/models/matcher.go
diff --git a/api/v2/models/matchers.go b/api/v2/models/matchers.go
diff --git a/api/v2/models/peer_status.go b/api/v2/models/peer_status.go
diff --git a/api/v2/models/postable_alert.go b/api/v2/models/postable_alert.go
diff --git a/api/v2/models/postable_alerts.go b/api/v2/models/postable_alerts.go
diff --git a/api/v2/models/postable_silence.go b/api/v2/models/postable_silence.go
diff --git a/api/v2/models/receiver.go b/api/v2/models/receiver.go
diff --git a/api/v2/models/silence.go b/api/v2/models/silence.go