chore: refactor automation pt.2 (#150)

.github/workflows/build-and-publish-release.yml

@@ -39,6 +39,14 @@ jobs:
       - name: Build argo-watcher binary
         run: make build VERSION=${{ github.ref_name }}
 
+      - name: Install NodeJS
+        uses: actions/setup-node@v3
+        with:
+          node-version: '17'
+
+      - name: Build argo-watcher UI
+        run: make build-ui
+
       - name: Build and publish argo-watcher image
         uses: docker/build-push-action@v4
         with:

.github/workflows/run-tests-and-sonar-scan.yml

@@ -42,6 +42,9 @@ jobs:
       - name: Generate swagger docs
         run: make docs
 
+      - name: Install mockgen
+        run: go install github.com/golang/mock/mockgen@v1.6.0
+
       - name: Run tests
         env:
           DB_HOST: localhost

.gitignore

@@ -20,5 +20,6 @@ bin/
 # code coverage files
 **/coverage.*
 
-# docs that are generated automatically
+# dynamicly generated files
 cmd/argo-watcher/docs
+cmd/argo-watcher/mock

Dockerfile

@@ -1,27 +1,7 @@
-#######################
-# Frontend build
-#######################
-FROM node:17.7-alpine3.15 as builder-frontend
-
-WORKDIR /app
-
-COPY web/package.json .
-COPY web/package-lock.json .
-
-RUN npm ci --silent
-RUN npm install react-scripts --silent
-
-COPY web/ .
-
-RUN npm run build
-
-#######################
-# Final image
-#######################
 FROM alpine:3.18
 
 COPY ./bin/argo-watcher /argo-watcher
-COPY --from=builder-frontend /app/build /static
+COPY ./web/build /static
 
 RUN addgroup -S argo-watcher && adduser -S argo-watcher -G argo-watcher
 RUN apk add --no-cache ca-certificates

Makefile

@@ -11,8 +11,8 @@ help: ## Print this help
 	@grep -E '^[a-z.A-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST)  | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: test
-test: ## Run tests
-	@ARGO_TIMEOUT=1 go test -v ./... -count=1 -coverprofile coverage.out `go list ./... | egrep -v '(test|mocks)'`
+test: mocks ## Run tests
+	@ARGO_TIMEOUT=1 go test -v ./... -count=1 -coverprofile coverage.out `go list ./... | egrep -v '(test|mock)'`
 
 .PHONY: ensure-dirs
 ensure-dirs:
@@ -24,13 +24,20 @@ build: ensure-dirs docs ## Build the binaries
 	@CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=${VERSION}" -o bin/argo-watcher ./cmd/argo-watcher
 	@echo "===> Done"
 
+.PHONY: build-ui
+build-ui: ## Build the UI
+	@echo "===> Building UI"
+	@cd web && npm ci --silent && npm install react-scripts --silent && npm run build
+	@echo "===> Done"
+
 .PHONY: docs
 docs: ## Generate swagger docs
 	@echo "===> Generating swagger docs"
 	@cd cmd/argo-watcher && swag init --parseDependency --parseInternal
 
 .PHONY: mocks
 mocks:
+	@echo "===> Generating mocks"
 # generate API mock
 	@mockgen --source=cmd/argo-watcher/argo_api.go --destination=cmd/argo-watcher/mock/argo_api.go --package=mock
 # generate State mock

cmd/argo-watcher/argo_test.go

@@ -101,7 +101,7 @@ func TestArgoCheck(t *testing.T) {
 
 		// mock calls
 		state.EXPECT().Check().Return(true)
-		api.EXPECT().GetUserInfo().Return(nil, fmt.Errorf("Unexpected login error"))
+		api.EXPECT().GetUserInfo().Return(nil, fmt.Errorf("unexpected login error"))
 		metrics.EXPECT().SetArgoUnavailable(true)
 
 		// argo manager
@@ -127,7 +127,7 @@ func TestArgoAddTask(t *testing.T) {
 
 		// mock calls
 		state.EXPECT().Check().Return(true)
-		api.EXPECT().GetUserInfo().Return(nil, fmt.Errorf("Unexpected login error"))
+		api.EXPECT().GetUserInfo().Return(nil, fmt.Errorf("unexpected login error"))
 		metrics.EXPECT().SetArgoUnavailable(true)
 
 		// argo manager