scripts replaced with makefile

README.md

@@ -37,14 +37,17 @@ For deploing with helm `/etc/hosts` require `127.0.0.1 dev-wep-api.com` entry fo
 ## Up & Running
 
 From src folder:
-- `docker-compose up -d` - up dev environment
-- `run.sh` - run api application for local debuging
-- `build.sh` - build all workspaces
-- `build_images.sh` - build `acl` and `api` dev images
-- `docker-compose --profile dev-build up -d` - up `acl` and `api` dev images with compose
-- `format.sh` - format code
-- `analyze.sh` - static analysis
-- `run_tests.sh` - build and run tests
+- `make setup` - setup environment
+- `make up flag=e` - up environment only
+- `make up flag=a` - up all include applications
+- `make down flag=e` - down environment only
+- `make down flag=a` - down all include applications
+- `make build flag=l` - build local binaries
+- `make build flag=i` - build apps images
+- `make lint` - run clippy for static analysis
+- `make format` - run fmt for code formatting
+- `make tests` - run tests
+- `make run` - run local build
 
 From root folder:
 - `generate_cert.sh` - generate self signed cert and create kubernetes secret

src/Makefile

@@ -0,0 +1,44 @@
+setup:
+	rustup component add rustfmt
+	rustup component add clippy
+	rustup component add llvm-tools-preview
+	cargo install grcov
+
+up:
+ifeq ($(flag),e)
+	docker-compose up -d
+else ifeq ($(flag),a)
+	docker-compose --profile dev-build up -d
+else
+	$(warning "pass flag=e (environment only) or flag=a (all include applications)")
+endif
+
+down:
+ifeq ($(flag),e)
+	docker-compose down
+else ifeq ($(flag),a)
+	docker-compose --profile dev-build down
+else
+	$(warning "pass flag=e (environment only) or flag=a (all include applications)")
+endif
+
+build:
+ifeq ($(flag),l)
+	cargo build --workspace
+else ifeq ($(flag),i)
+	docker-compose --profile dev-build build
+else
+	$(warning "pass flag=l (for build local) or flag=i (for build images)")
+endif
+
+lint:
+	cargo clippy
+
+format:
+	cargo fmt
+
+run:
+	./target/debug/host
+
+tests:
+	./run_tests.sh

src/api/src/endpoints.rs

@@ -93,6 +93,6 @@ pub async fn track_activity(
 
     match result {
         Some(_) => HttpResponse::Ok().json(()),
-        None => HttpResponse::BadRequest().json(ErrorResponse { code: 103 })
+        None => HttpResponse::BadRequest().json(ErrorResponse { code: 103 }),
     }
 }

src/run_tests.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# install tools
-cargo install grcov
-rustup component add llvm-tools-preview
-
 # set coverage directory path
 timestamp="$(date '+%Y-%m-%d_%H-%M-%S')"
 directory_path="target/coverage/${timestamp}"