sjakl

Author: elliotcourant

.gitignore

@@ -16,4 +16,5 @@ tmp
 local
 values.local.yaml
 Notes.md
-*terraform*
+*terraform*
+rest-api.xml

Makefile

@@ -70,12 +70,12 @@ build: $(GO) dependencies $(APP_GO_FILES)
 	$(call infoMsg,Building rest-api binary)
 	$(GO) build -o $(LOCAL_BIN)/monetr $(MONETR_CLI_PACKAGE)
 
-test: $(GO) dependencies $(ALL_GO_FILES)
+test: $(GO) dependencies $(ALL_GO_FILES) $(GOTESTSUM)
 	$(call infoMsg,Running go tests for monetr rest-api)
 ifndef CI
 	$(GO) run $(MONETR_CLI_PACKAGE) database migrate -d $(POSTGRES_DB) -U $(POSTGRES_USER) -H $(POSTGRES_HOST)
 endif
-	$(GO) test -race -v -coverprofile=$(COVERAGE_TXT) -covermode=atomic $(GO_SRC_DIR)/...
+	$(GOTESTSUM) --junitfile $(PWD)/rest-api.xml -- -race -v -coverprofile=$(COVERAGE_TXT) -covermode=atomic $(GO_SRC_DIR)/...
 	$(GO) tool cover -func=$(COVERAGE_TXT)
 
 clean:
@@ -182,3 +182,4 @@ migrate: $(GO)
 beta-code: $(GO) migrate
 	@$(GO) run $(MONETR_CLI_PACKAGE) beta new-code -d $(POSTGRES_DB) -U $(POSTGRES_USER) -H $(POSTGRES_HOST) -P $(POSTGRES_PORT) -W $(POSTGRES_PASSWORD)
 
+all: build test generate lint

scripts/Dependencies.mk

@@ -159,6 +159,24 @@ install-$(GCLOUD): $(LOCAL_BIN) $(LOCAL_TMP) $(CURL)
 	tar -xzf $(GCLOUD_TAR) -C $(LOCAL_BIN)
 	rm -rf $(GCLOUD_TAR)
 
+GOTESTSUM=$(LOCAL_BIN)/gotestsum
+$(GOTESTSUM):
+	@if [ ! -f "$(GOTESTSUM)" ]; then $(MAKE) install-$(GOTESTSUM); fi
+
+install-$(GOTESTSUM): GOTESTSUM_VERSION=1.7.0
+install-$(GOTESTSUM): GOTESTSUM_URL="https://github.com/gotestyourself/gotestsum/releases/download/v$(GOTESTSUM_VERSION)/gotestsum_$(GOTESTSUM_VERSION)_$(OS)_$(ARCH).tar.gz"
+install-$(GOTESTSUM): GOTESTSUM_DIR=$(LOCAL_TMP)/gotestsum
+install-$(GOTESTSUM): GOTESTSUM_TAR=$(GOTESTSUM_DIR).tar.gz
+install-$(GOTESTSUM): $(LOCAL_BIN) $(LOCAL_TMP) $(CURL)
+	$(call infoMsg,Installing gotestsum to $(GOTESTSUM))
+	-rm -rf $(GOTESTSUM_DIR)
+	mkdir -p $(GOTESTSUM_DIR)
+	curl -SsL $(GOTESTSUM_URL) --output $(GOTESTSUM_TAR)
+	tar -xzf $(GOTESTSUM_TAR) -C $(GOTESTSUM_DIR)
+	cp $(GOTESTSUM_DIR)/gotestsum $(GOTESTSUM)
+	rm -rf $(GOTESTSUM_DIR)
+	rm -rf $(GOTESTSUM_TAR)
+
 ifneq ($(ENV_LOWER),local)
 KUBECTL=$(LOCAL_BIN)/kubectl
 $(KUBECTL):