From 17e622ebc30835c8678fb93b922d9629ac56ff4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Fri, 25 Feb 2022 16:08:08 +0100
Subject: [PATCH] Some build & filename tweaks to allow building from scratch
 again

The build chain got a bit confused when doing things from scratch, as
`test_support.go` was used in the non-test builds. Renaming it to
`support_test.go` was the easiest way to avoid that.
---
 Makefile                                      |  9 ++++---
 .../{test_support.go => support_test.go}      | 25 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)
 rename internal/manager/api_impl/{test_support.go => support_test.go} (86%)

diff --git a/Makefile b/Makefile
index 33f83645..00c34387 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all: application
 with-deps:
 	go get github.com/deepmap/oapi-codegen/cmd/oapi-codegen@v1.9.0
 	go get github.com/golang/mock/mockgen@v1.6.0
-	make -s application
+	$(MAKE) application
 
 application: ${RESOURCES} generate flamenco-manager-poc flamenco-worker-poc socketio-poc
 
@@ -43,7 +43,7 @@ socketio-poc:
 	go build -v ${BUILD_FLAGS} ${PKG}/cmd/socketio-poc
 
 generate:
-	go generate ./pkg/...
+	go generate ./pkg/api/...
 	go generate ./internal/...
 
 # resource.syso: resource/thermogui.ico resource/versioninfo.json
@@ -81,7 +81,8 @@ lint:
 
 clean:
 	@go clean -i -x
-	rm -f flamenco*-poc-v* flamenco*-poc *.exe resource.syso pkg/api/*.gen.go
+	rm -f flamenco*-poc-v* flamenco*-poc *.exe resource.syso
+	rm -f pkg/api/*.gen.go internal/*/mocks/*.gen.go internal/*/*/mocks/*.gen.go
 	@$(MAKE) generate
 
 # static: vet lint resource.syso
@@ -147,4 +148,4 @@ _package_zip: static
 	cd $(dir ${PACKAGE_PATH}) && zip -9 -r -q $(notdir ${PACKAGE_PATH})-${GOOS}.zip $(notdir ${PACKAGE_PATH})
 	rm ${STATIC_OUT}
 
-.PHONY: run application version static vet lint deploy package release prepare flamenco-manager-poc flamenco-worker-poc socketio-poc generate
+.PHONY: run application version static vet lint deploy package release prepare flamenco-manager-poc flamenco-worker-poc socketio-poc generate with-deps
diff --git a/internal/manager/api_impl/test_support.go b/internal/manager/api_impl/support_test.go
similarity index 86%
rename from internal/manager/api_impl/test_support.go
rename to internal/manager/api_impl/support_test.go
index d36793f3..08dfdf6a 100644
--- a/internal/manager/api_impl/test_support.go
+++ b/internal/manager/api_impl/support_test.go
@@ -36,11 +36,12 @@ import (
 )
 
 type mockedFlamenco struct {
-	flamenco    *Flamenco
-	jobCompiler *mocks.MockJobCompiler
-	persistence *mocks.MockPersistenceService
-	logStorage  *mocks.MockLogStorage
-	config      *mocks.MockConfigService
+	flamenco     *Flamenco
+	jobCompiler  *mocks.MockJobCompiler
+	persistence  *mocks.MockPersistenceService
+	logStorage   *mocks.MockLogStorage
+	config       *mocks.MockConfigService
+	stateMachine *mocks.MockTaskStateMachine
 }
 
 func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco {
@@ -48,14 +49,16 @@ func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco {
 	ps := mocks.NewMockPersistenceService(mockCtrl)
 	ls := mocks.NewMockLogStorage(mockCtrl)
 	cs := mocks.NewMockConfigService(mockCtrl)
-	f := NewFlamenco(jc, ps, ls, cs)
+	sm := mocks.NewMockTaskStateMachine(mockCtrl)
+	f := NewFlamenco(jc, ps, ls, cs, sm)
 
 	return mockedFlamenco{
-		flamenco:    f,
-		jobCompiler: jc,
-		persistence: ps,
-		logStorage:  ls,
-		config:      cs,
+		flamenco:     f,
+		jobCompiler:  jc,
+		persistence:  ps,
+		logStorage:   ls,
+		config:       cs,
+		stateMachine: sm,
 	}
 }