make a monorepo

Author: jirfag

.circleci/config.yml

@@ -7,15 +7,16 @@ jobs:
       - image: circleci/postgres:9.4
         environment:
           POSTGRES_USER: postgres
-          POSTGRES_DB: api_prod
+          POSTGRES_DB: api_test
 
     working_directory: /go/src/github.com/golangci/golangci-api
     steps:
       - checkout
       - run: GO111MODULE=on go mod vendor
       - run: go get github.com/golangci/golangci-lint/cmd/golangci-lint
       - run: echo 'REDIS_URL="redis://localhost:6379"' >.env
-      - run: echo 'DATABASE_URL="postgresql://postgres:test@localhost:5432/api_prod?sslmode=disable"' >.env.test
+      - run: echo 'WEB_ROOT="https://golangci.com"' >>.env
+      - run: echo 'DATABASE_URL="postgresql://postgres:test@localhost:5432/api_test?sslmode=disable"' >.env.test
       - run:
           name: install dockerize
           command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz

Makefile

@@ -1,8 +1,5 @@
 .PHONY: test
 
-build:
-	go build -v ./app/cmd/...
-
 gen: gen_services
 	go generate ./...
 
@@ -16,16 +13,39 @@ prepare_env:
 	awslocal sqs create-queue --queue-name primary
 	awslocal sqs list-queues
 
-run_dev:
+run_api:
 	godotenv go run cmd/golangci-api/main.go
 
+run_worker:
+	godotenv go run cmd/golangci-worker/main.go
+
 migrate_force_version:
 	godotenv -f .env.test sh -c 'migrate -database $${DATABASE_URL} -path ./migrations force $${V}'
 
-test:
+test_api:
 	go test -v -parallel 1 -p 1 ./test/
+
+test_lint:
 	golangci-lint run -v
 
+test_lint_dev:
+	go run ../golangci-lint/cmd/golangci-lint/main.go run -v
+
+test_api_dev:
+	echo "DROP DATABASE api_test;" | docker-compose exec -T pg psql -U postgres
+	echo "CREATE DATABASE api_test;" | docker-compose exec -T pg psql -U postgres
+	make test_api
+
+test_worker:
+	go test -v -parallel 1 -p 1 ./pkg/worker/...
+
+test_worker_dev:
+	echo "FLUSHALL" | docker-compose exec -T redis redis-cli
+	make test_worker
+
+test: test_api test_worker test_lint
+test_dev: test_api_dev test_worker_dev test_lint_dev
+
 connect_to_local_db:
 	dc exec pg psql -U postgres -d api_prod
 
@@ -38,3 +58,15 @@ deploy_lambda: build_lambda
 
 deploy_cloudformation:
 	aws cloudformation deploy --template ./deployments/cloudformation.yml --region us-east-1 --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM --stack-name golangci
+
+worker_test_repo:
+	# set env vars PR, REPO
+	SLOW_TESTS_ENABLED=1 go test -v ./analyze -run TestAnalyzeRepo
+
+worker_test_repo_fake_github:
+	# set env vars PR, REPO
+	SLOW_TESTS_ENABLED=1 go test -v ./analyze/processors -count=1 -run TestProcessRepoWithFakeGithub
+
+mod_update:
+	GO111MODULE=on go mod verify
+	GO111MODULE=on go mod tidy

Procfile

@@ -1 +1,2 @@
 web: golangci-api
+worker: golangci-worker

README.md

@@ -34,13 +34,13 @@ PORT=3000
 
 Tests need `.env.test` file, overriding options from `.env`. There can be something like this:
 ```
-DATABASE_URL="postgresql://postgres:test@localhost:5432/api_prod?sslmode=disable"
+DATABASE_URL="postgresql://postgres:test@localhost:5432/api_test?sslmode=disable"
 DATABASE_DEBUG=1
 ```
 
 ### How to run tests
 ```
-echo "CREATE DATABASE api_prod;" | docker-compose exec -T pg psql -U postgres
+echo "CREATE DATABASE api_test;" | docker-compose exec -T pg psql -U postgres
 make test
 ```
 

cmd/buildrunner/main.go

@@ -3,9 +3,9 @@ package main
 import (
 	"time"
 
-	"github.com/golangci/golangci-api/pkg/app/buildagent/build"
-	"github.com/golangci/golangci-shared/pkg/config"
-	"github.com/golangci/golangci-shared/pkg/logutil"
+	"github.com/golangci/golangci-api/internal/shared/config"
+	"github.com/golangci/golangci-api/internal/shared/logutil"
+	"github.com/golangci/golangci-api/pkg/buildagent/build"
 )
 
 func main() {

cmd/containers_orchestrator/main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/golangci/golangci-api/pkg/app/buildagent/containers"
-	"github.com/golangci/golangci-shared/pkg/config"
-	"github.com/golangci/golangci-shared/pkg/logutil"
+	"github.com/golangci/golangci-api/internal/shared/config"
+	"github.com/golangci/golangci-api/internal/shared/logutil"
+	"github.com/golangci/golangci-api/pkg/buildagent/containers"
 )
 
 func main() {

cmd/ensuredeps/main.go

@@ -7,11 +7,11 @@ import (
 	"log"
 	"os"
 
-	"github.com/golangci/golangci-api/pkg/goenv/command"
-	"github.com/golangci/golangci-api/pkg/goenv/result"
-	"github.com/golangci/golangci-shared/pkg/logutil"
+	"github.com/golangci/golangci-api/internal/shared/logutil"
+	"github.com/golangci/golangci-api/pkg/goenvbuild/command"
+	"github.com/golangci/golangci-api/pkg/goenvbuild/result"
 
-	"github.com/golangci/golangci-api/pkg/goenv/ensuredeps"
+	"github.com/golangci/golangci-api/pkg/goenvbuild/ensuredeps"
 )
 
 func main() {

cmd/genservices/main.go

@@ -160,7 +160,7 @@ func encode{{.Name}}Response(ctx context.Context, w http.ResponseWriter, respons
 `
 
 func main() {
-	root := flag.String("root", "pkg/app/services", "root of services")
+	root := flag.String("root", "pkg/api/services", "root of services")
 	flag.Parse()
 
 	if err := generate(*root); err != nil {

cmd/getrepoinfo/main.go

@@ -6,9 +6,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/golangci/golangci-shared/pkg/logutil"
+	"github.com/golangci/golangci-api/internal/shared/logutil"
 
-	"github.com/golangci/golangci-api/pkg/goenv/repoinfo"
+	"github.com/golangci/golangci-api/pkg/goenvbuild/repoinfo"
 	"github.com/pkg/errors"
 )
 

cmd/goenvbuild/main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/golangci/golangci-api/pkg/goenv"
-	"github.com/golangci/golangci-shared/pkg/config"
-	"github.com/golangci/golangci-shared/pkg/logutil"
+	"github.com/golangci/golangci-api/internal/shared/config"
+	"github.com/golangci/golangci-api/internal/shared/logutil"
+	"github.com/golangci/golangci-api/pkg/goenvbuild"
 )
 
 func main() {