Merge pull request grafana#230 from aajisaka/use-jsonnetfmt

Upgrade jsonnet to 0.16.0 and use jsonnetfmt command for test

Makefile

@@ -1,3 +1,6 @@
+UID = $(shell id -u $(USER))
+GID = $(shell id -g $(USER))
+
 help:         # Show this message.
 	@echo "\nAvailable Targets:\n"
 	@sed -ne '/@sed/!s/# //p' $(MAKEFILE_LIST)
@@ -6,16 +9,18 @@ test:         # Run all unit tests.
 	@docker run --rm \
 		-w $$PWD \
 		-v $$PWD:$$PWD \
-		--entrypoint sh \
-		sparkprime/jsonnet \
+		-u $(UID):$(GID) \
+		--entrypoint bash \
+		bitnami/jsonnet:0.16.0 \
 		tests.sh
 
 test-update:  # Run all unit tests while copying test_output.json to compiled.json file.
 	@docker run --rm \
 		-w $$PWD \
 		-v $$PWD:$$PWD \
-		--entrypoint sh \
-		sparkprime/jsonnet \
+		-u $(UID):$(GID) \
+		--entrypoint bash \
+		bitnami/jsonnet:0.16.0 \
 		tests.sh update
 
 gen-api-docs: # Generate api-docs.md from source code comments.

tests.sh

@@ -7,9 +7,9 @@ for i in `find . -name '*.jsonnet' -or -name '*.libsonnet'`
 do
     t="Formatting $i..."
     if [[ "$1" == "update" ]]; then
-        jsonnet fmt -i $jsonnet_fmt $i
+        jsonnetfmt -i $jsonnet_fmt $i
     fi
-    if jsonnet fmt --test $jsonnet_fmt $i;
+    if jsonnetfmt --test $jsonnet_fmt $i;
     then
         echo $t OK
     else