Merge pull request #8 from flatrun/feat/deployment-improvements

fix(deployments): Ensure deployment work & tests

Author: nfebe

.github/workflows/ci.yml

@@ -25,8 +25,8 @@ jobs:
           GOOS=linux GOARCH=amd64 go build -o flatrun-linux-amd64 ./cmd/agent
           GOOS=linux GOARCH=arm64 go build -o flatrun-linux-arm64 ./cmd/agent
 
-      - name: Test
-        run: go test -v ./...
+      - name: Unit Tests
+        run: make test-unit
 
       - name: Upload Linux AMD64 binary
         uses: actions/upload-artifact@v4
@@ -56,3 +56,27 @@ jobs:
         uses: golangci/golangci-lint-action@v4
         with:
           version: latest
+
+  e2e-tests:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Start E2E environment
+        run: make test-e2e-setup
+
+      - name: Run E2E tests
+        run: make test-e2e-run
+
+      - name: Cleanup E2E environment
+        if: always()
+        run: make test-e2e-cleanup

.github/workflows/release.yml

@@ -19,11 +19,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Read version from file
+        id: version
+        run: echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
+
       - name: Create Release
         uses: whilesmart/workflows/go/release@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           binary_name: flatrun-agent
           build_path: ./cmd/agent
-          version: ${{ github.event.inputs.version }}
+          version: ${{ github.event.inputs.version || steps.version.outputs.version }}
           platforms: '["linux/amd64", "linux/arm64", "darwin/amd64", "darwin/arm64"]'
+          ldflags: "-X github.com/flatrun/agent/pkg/version.Version=${{ github.event.inputs.version || steps.version.outputs.version }} -X github.com/flatrun/agent/pkg/version.BuildTime=$(date -u +%Y-%m-%d_%H:%M:%S) -X github.com/flatrun/agent/pkg/version.GitCommit=${{ github.sha }}"

.gitignore

@@ -8,9 +8,6 @@ flatrun-linux-*
 *.so
 *.dylib
 
-# Test binary
-*.test
-
 # Output of the go coverage tool
 *.out
 

Makefile

@@ -1,23 +1,34 @@
-.PHONY: help build run test clean deps lint lint-install fmt vet
+.PHONY: help build run test test-unit test-e2e test-e2e-docker test-e2e-setup test-e2e-run test-e2e-short test-e2e-cleanup test-coverage clean deps lint lint-install fmt vet
 
 BINARY_NAME=flatrun-agent
-VERSION?=dev
+VERSION?=$(shell cat VERSION 2>/dev/null || echo "dev")
 BUILD_TIME=$(shell date -u '+%Y-%m-%d_%H:%M:%S')
 GIT_COMMIT=$(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
-LDFLAGS=-ldflags "-X main.Version=$(VERSION) -X main.BuildTime=$(BUILD_TIME) -X main.GitCommit=$(GIT_COMMIT)"
+LDFLAGS=-ldflags "-X github.com/flatrun/agent/pkg/version.Version=$(VERSION) -X github.com/flatrun/agent/pkg/version.BuildTime=$(BUILD_TIME) -X github.com/flatrun/agent/pkg/version.GitCommit=$(GIT_COMMIT)"
+
+E2E_API_URL?=http://localhost:18090/api
+E2E_DEPLOYMENTS_PATH?=/tmp/flatrun-e2e-deployments
 
 help:
 	@echo "FlatRun Agent - Build commands"
 	@echo ""
-	@echo "make deps         - Install dependencies"
-	@echo "make build        - Build binary"
-	@echo "make run          - Run in development mode"
-	@echo "make test         - Run tests"
-	@echo "make lint         - Run golangci-lint"
-	@echo "make lint-install - Install golangci-lint"
-	@echo "make fmt          - Format code with gofmt"
-	@echo "make vet          - Run go vet"
-	@echo "make clean        - Clean build artifacts"
+	@echo "make deps               - Install dependencies"
+	@echo "make build              - Build binary"
+	@echo "make run                - Run in development mode"
+	@echo "make test               - Run unit tests"
+	@echo "make test-unit          - Run unit tests only"
+	@echo "make test-e2e           - Run E2E tests (requires running agent)"
+	@echo "make test-e2e-docker    - Run full E2E tests in Docker (setup + run + cleanup)"
+	@echo "make test-e2e-setup     - Start E2E Docker test environment"
+	@echo "make test-e2e-run       - Run E2E tests against Docker environment"
+	@echo "make test-e2e-short     - Run E2E tests (skip long-running)"
+	@echo "make test-e2e-cleanup   - Clean up Docker test environment"
+	@echo "make test-coverage      - Run tests with coverage report"
+	@echo "make lint               - Run golangci-lint"
+	@echo "make lint-install       - Install golangci-lint"
+	@echo "make fmt                - Format code with gofmt"
+	@echo "make vet                - Run go vet"
+	@echo "make clean              - Clean build artifacts"
 
 deps:
 	go mod download
@@ -29,8 +40,58 @@ build: deps
 run: deps
 	go run cmd/agent/main.go --config config.example.yml
 
-test:
-	go test -v ./...
+test: test-unit
+
+test-unit:
+	@echo "Running unit tests..."
+	go test -v ./templates/...
+	go test -v ./internal/...
+	go test -v ./pkg/...
+
+test-e2e:
+	@echo "Running E2E tests (requires running agent on port 8090)..."
+	go test -v ./test/e2e/...
+
+test-e2e-setup:
+	@echo "Setting up E2E Docker test environment..."
+	@mkdir -p $(E2E_DEPLOYMENTS_PATH)/nginx/conf.d
+	@mkdir -p $(E2E_DEPLOYMENTS_PATH)/nginx/certs
+	@chmod -R 777 $(E2E_DEPLOYMENTS_PATH) 2>/dev/null || true
+	@docker network create web 2>/dev/null || true
+	cd test/e2e && docker compose -f docker-compose.test.yml up -d --build
+	@echo "Waiting for services to be healthy..."
+	@timeout 120 bash -c 'until docker exec flatrun-e2e-agent wget -q -O /dev/null http://127.0.0.1:8090/api/health 2>/dev/null; do sleep 2; done' || (echo "Agent failed to start" && exit 1)
+	@chmod -R 777 $(E2E_DEPLOYMENTS_PATH) 2>/dev/null || true
+	@echo "E2E environment ready at $(E2E_API_URL)"
+
+test-e2e-run:
+	@echo "Running E2E tests against Docker environment..."
+	FLATRUN_API_URL=$(E2E_API_URL) FLATRUN_DEPLOYMENTS_PATH=$(E2E_DEPLOYMENTS_PATH) go test -v -timeout 10m ./test/e2e/...
+
+test-e2e-docker: test-e2e-setup test-e2e-run
+	@echo "E2E tests completed. Run 'make test-e2e-cleanup' to remove containers."
+
+test-e2e-docker-full: test-e2e-setup test-e2e-run test-e2e-cleanup
+	@echo "E2E tests completed and cleaned up."
+
+test-e2e-short:
+	@echo "Running E2E tests (short mode)..."
+	FLATRUN_API_URL=$(E2E_API_URL) FLATRUN_DEPLOYMENTS_PATH=$(E2E_DEPLOYMENTS_PATH) go test -v -short -timeout 5m ./test/e2e/...
+
+test-e2e-cleanup:
+	@echo "Cleaning up E2E test environment..."
+	cd test/e2e && docker compose -f docker-compose.test.yml down -v --remove-orphans 2>/dev/null || true
+	@docker network rm web 2>/dev/null || true
+	@rm -rf $(E2E_DEPLOYMENTS_PATH)/* 2>/dev/null || true
+	@echo "Cleanup complete"
+
+test-coverage:
+	@echo "Running tests with coverage..."
+	go test -coverprofile=coverage.out ./...
+	go tool cover -html=coverage.out -o coverage.html
+	@echo "Coverage report generated: coverage.html"
+
+test-all: test-unit test-e2e
 
 lint:
 	@command -v golangci-lint > /dev/null 2>&1 && golangci-lint run ./... || \

VERSION

@@ -0,0 +1 @@
+0.1.3

cmd/agent/main.go

@@ -11,24 +11,20 @@ import (
 	"github.com/flatrun/agent/internal/api"
 	"github.com/flatrun/agent/internal/watcher"
 	"github.com/flatrun/agent/pkg/config"
-)
-
-var (
-	Version   = "dev"
-	BuildTime = "unknown"
-	GitCommit = "unknown"
+	"github.com/flatrun/agent/pkg/version"
 )
 
 func main() {
 	configPath := flag.String("config", "config.yml", "Path to configuration file")
-	version := flag.Bool("version", false, "Print version information")
+	showVersion := flag.Bool("version", false, "Print version information")
 	flag.Parse()
 
-	if *version {
+	if *showVersion {
+		info := version.Get()
 		fmt.Printf("Flatrun Agent\n")
-		fmt.Printf("Version:    %s\n", Version)
-		fmt.Printf("Build Time: %s\n", BuildTime)
-		fmt.Printf("Git Commit: %s\n", GitCommit)
+		fmt.Printf("Version:    %s\n", info.Version)
+		fmt.Printf("Build Time: %s\n", info.BuildTime)
+		fmt.Printf("Git Commit: %s\n", info.GitCommit)
 		os.Exit(0)
 	}
 
@@ -37,7 +33,7 @@ func main() {
 		log.Fatalf("Failed to load config: %v", err)
 	}
 
-	log.Printf("Starting Flatrun Agent v%s", Version)
+	log.Printf("Starting Flatrun Agent v%s", version.Version)
 	log.Printf("Deployments path: %s", cfg.DeploymentsPath)
 	log.Printf("API listening on: %s:%d", cfg.API.Host, cfg.API.Port)