From 194422d9facc5ad2a99b722a648ff5304bc61e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Mon, 28 Feb 2022 13:01:13 +0100
Subject: [PATCH] Remove `-poc` suffix from Manager and Worker

The code is mature enough to no longer be a proof-of-concept.
---
 .gitignore                                      |  2 ++
 Makefile                                        | 17 +++++++++--------
 .../main.go                                     |  0
 .../main.go                                     |  0
 4 files changed, 11 insertions(+), 8 deletions(-)
 rename cmd/{flamenco-manager-poc => flamenco-manager}/main.go (100%)
 rename cmd/{flamenco-worker-poc => flamenco-worker}/main.go (100%)

diff --git a/.gitignore b/.gitignore
index 8f203294..2919aec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 *.db
 *.blend[0-9]
 
+/flamenco-manager
+/flamenco-worker
 /flamenco-worker.yaml
 /flamenco-worker-credentials.yaml
 node_modules/
diff --git a/Makefile b/Makefile
index 856b82cf..d8dc086d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
 LDFLAGS := -X ${PKG}/internal/appinfo.ApplicationVersion=${VERSION}
 BUILD_FLAGS = -ldflags="${LDFLAGS}"
 
+# Prevent any dependency that requires a C compiler, i.e. only work with pure-Go libraries.
 export CGO_ENABLED=0
 
 all: application
@@ -15,13 +16,13 @@ with-deps:
 	go get github.com/golang/mock/mockgen@v1.6.0
 	$(MAKE) application
 
-application: ${RESOURCES} generate flamenco-manager-poc flamenco-worker-poc socketio-poc
+application: ${RESOURCES} generate flamenco-manager flamenco-worker socketio-poc
 
-flamenco-manager-poc:
-	go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-manager-poc
+flamenco-manager:
+	go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-manager
 
-flamenco-worker-poc:
-	go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-worker-poc
+flamenco-worker:
+	go build -v ${BUILD_FLAGS} ${PKG}/cmd/flamenco-worker
 
 socketio-poc:
 	go build -v ${BUILD_FLAGS} ${PKG}/cmd/socketio-poc
@@ -64,12 +65,12 @@ lint:
 
 clean:
 	@go clean -i -x
-	rm -f flamenco*-poc-v* flamenco*-poc *.exe resource.syso
+	rm -f flamenco*-v* flamenco-manager flamenco-worker socketio-poc *.exe
 	rm -f pkg/api/*.gen.go internal/*/mocks/*.gen.go internal/*/*/mocks/*.gen.go
 	@$(MAKE) generate
 
 static: vet lint generate
-	go build -v -o flamenco-manager-poc-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-manager-poc
-	go build -v -o flamenco-worker-poc-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-worker-poc
+	go build -v -o flamenco-manager-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-manager
+	go build -v -o flamenco-worker-static -tags netgo -ldflags="-extldflags \"-static\" -w -s ${LDFLAGS}" ${PKG}/cmd/flamenco-worker
 
 .PHONY: run application version static vet lint deploy  flamenco-manager flamenco-worker socketio-poc generate with-deps
diff --git a/cmd/flamenco-manager-poc/main.go b/cmd/flamenco-manager/main.go
similarity index 100%
rename from cmd/flamenco-manager-poc/main.go
rename to cmd/flamenco-manager/main.go
diff --git a/cmd/flamenco-worker-poc/main.go b/cmd/flamenco-worker/main.go
similarity index 100%
rename from cmd/flamenco-worker-poc/main.go
rename to cmd/flamenco-worker/main.go