Drazen Urch
af9f6e5ca0
* feat(db): add SQL query wrapper for PostgreSQL placeholder conversion - Created query_wrapper module with functions to automatically convert SQLite ? placeholders to PostgreSQL $1, $2, ... format - Updated build.rs to handle mutually exclusive feature flags - Modified one query in mixnodes.rs as proof of concept - Added type conversions for PostgreSQL compatibility (u32->i64, u16->i32) This is a checkpoint commit before converting all queries to use the wrapper. * feat(nym-node-status-api): add PostgreSQL database support via feature flags Implement dual database support for SQLite and PostgreSQL through Cargo feature flags. The implementation uses a query wrapper that automatically converts SQLite-style ? placeholders to PostgreSQL-style $1, $2, ... placeholders at runtime. Key changes: - Add query wrapper functions that handle placeholder conversion - Convert all sqlx::query\! macros to use wrapper functions - Handle type conversions between databases (i64 vs i32) - Add feature-gated implementations for database-specific SQL syntax - Update Makefile with clippy targets for both database features - Document database support in README * feat(nym-node-status-agent): add multi-API support with random selection Agents can now connect to multiple APIs and randomly select one for each testrun: - Accept multiple --server arguments in format "address:port:auth_key" - Randomly shuffle server list before attempting connections - Try each server until a testrun is obtained - Submit results back only to the API that provided the testrun - Continue to next server if one is down or has no testruns available * feat(nym-node-status): implement primary/secondary server architecture - Agent now requests testruns only from primary server (first in list) - Results are submitted to all configured servers in parallel - Secondary servers accept external testruns via new v2 endpoint - Added auto-creation of gateway and testrun records on secondary servers - New database queries: get_or_create_gateway, insert_external_testrun - Client library enhanced with submit_results_with_context method * Bump Node status API version * Fix build workdir * Bump to 3.1.4 * Fix types and queries * 3.1.6 * Fix gateway perf, bump 3.1.7 * NodeId -> i32, 3.1.8 * Bump agent version * i64 -> i32 * Use image yq * Migration and more types * Update remaining JSONB columns * Simplify server config * Update build path * Change delimiter * bump agent * Split up pg and sqlite builds * More typing fixes, build-and-push script * Fix Dockerfile-pg * Bump node-status-api * TYping * Agent build script * More logging around testruns * Fail loudly on read errors * Cleanup * Debug get gateways query * Fix get_gateways query * Use pg cert, 3.1.16 * Submit regular results to primary server * Bump freshenss cutoff * Update Cargo.lock * fix: resolve rebase conflicts and compilation errors After rebasing onto develop, fixed several issues: - Fixed borrowed data escapes error by using sqlx::query directly in transaction functions - Removed unused imports and cleaned up code - Maintained database-specific implementations for transaction functions * fmt * Make PG default to make lives easier * Performance improvements for Explorer v2 * Fix sqlite build * Fix PG migration * Tests round 1 * DB tests * More tests * And some more tests * And some more, more tests * cargo fmt * Fix some failing lints * Fix lioness version problems * Clippy in tests --------- Co-authored-by: dynco-nym <173912580+dynco-nym@users.noreply.github.com>
118 lines
4.0 KiB
Makefile
118 lines
4.0 KiB
Makefile
# Makefile for nym-node-status-api database management
|
|
|
|
# --- Configuration ---
|
|
TEST_DATABASE_URL := postgres://testuser:testpass@localhost:5433/nym_node_status_api_test
|
|
|
|
# Docker compose service names
|
|
DB_SERVICE_NAME := postgres-test
|
|
DB_CONTAINER_NAME := nym_node_status_api_postgres_test
|
|
|
|
# Default target
|
|
.PHONY: default
|
|
default: help
|
|
|
|
# --- Main Targets ---
|
|
.PHONY: prepare-pg
|
|
prepare-pg: test-db-up test-db-wait test-db-migrate test-db-prepare test-db-down ## Setup PostgreSQL and prepare SQLx offline cache
|
|
|
|
.PHONY: test-db
|
|
test-db: test-db-up test-db-wait test-db-migrate test-db-run test-db-down ## Run tests with PostgreSQL database
|
|
|
|
.PHONY: dev-db
|
|
dev-db: test-db-up test-db-wait test-db-migrate ## Start PostgreSQL for development (keeps running)
|
|
@echo "PostgreSQL is running on port 5433"
|
|
@echo "Connection string: $(TEST_DATABASE_URL)"
|
|
|
|
# --- Docker Compose Targets ---
|
|
.PHONY: test-db-up
|
|
test-db-up: ## Start the PostgreSQL test database in the background
|
|
@echo "Starting PostgreSQL test database..."
|
|
docker compose up -d $(DB_SERVICE_NAME)
|
|
|
|
.PHONY: test-db-wait
|
|
test-db-wait: ## Wait for the PostgreSQL database to be healthy
|
|
@echo "Waiting for PostgreSQL database..."
|
|
@while ! docker inspect --format='{{.State.Health.Status}}' $(DB_CONTAINER_NAME) 2>/dev/null | grep -q 'healthy'; do \
|
|
echo -n "."; \
|
|
sleep 1; \
|
|
done; \
|
|
echo " Database is healthy!"
|
|
|
|
.PHONY: test-db-down
|
|
test-db-down: ## Stop and remove the test database
|
|
@echo "Stopping PostgreSQL test database..."
|
|
docker compose down
|
|
|
|
# --- SQLx Targets ---
|
|
.PHONY: test-db-migrate
|
|
test-db-migrate: ## Run database migrations against PostgreSQL
|
|
@echo "Running PostgreSQL migrations..."
|
|
DATABASE_URL="$(TEST_DATABASE_URL)" sqlx migrate run --source migrations_pg
|
|
|
|
.PHONY: test-db-prepare
|
|
test-db-prepare: ## Run sqlx prepare for compile-time query verification
|
|
@echo "Running sqlx prepare for PostgreSQL..."
|
|
DATABASE_URL="$(TEST_DATABASE_URL)" cargo sqlx prepare -- --features pg
|
|
|
|
# --- Build and Test Targets ---
|
|
.PHONY: test-db-run
|
|
test-db-run: ## Run tests with PostgreSQL feature
|
|
@echo "Running tests with PostgreSQL..."
|
|
DATABASE_URL="$(TEST_DATABASE_URL)" cargo test --features pg --no-default-features
|
|
|
|
.PHONY: build-pg
|
|
build-pg: ## Build with PostgreSQL feature
|
|
@echo "Building with PostgreSQL feature..."
|
|
cargo build --features pg --no-default-features
|
|
|
|
.PHONY: build-sqlite
|
|
build-sqlite: ## Build with SQLite feature (default)
|
|
@echo "Building with SQLite feature..."
|
|
cargo build --features sqlite --no-default-features
|
|
|
|
.PHONY: check-pg
|
|
check-pg: ## Check code with PostgreSQL feature
|
|
@echo "Checking code with PostgreSQL feature..."
|
|
cargo check --features pg --no-default-features
|
|
|
|
.PHONY: check-sqlite
|
|
check-sqlite: ## Check code with SQLite feature
|
|
@echo "Checking code with SQLite feature..."
|
|
cargo check --features sqlite --no-default-features
|
|
|
|
.PHONY: clippy
|
|
clippy: clippy-pg clippy-sqlite
|
|
|
|
.PHONY: clippy-pg
|
|
clippy-pg: ## Run clippy with PostgreSQL feature
|
|
@echo "Running clippy with PostgreSQL feature..."
|
|
cargo clippy --features pg --no-default-features -- -D warnings
|
|
|
|
.PHONY: clippy-sqlite
|
|
clippy-sqlite: ## Run clippy with SQLite feature (default)
|
|
@echo "Running clippy with SQLite feature..."
|
|
cargo clippy --features sqlite --no-default-features -- -D warnings
|
|
|
|
# --- Cleanup Targets ---
|
|
.PHONY: clean
|
|
clean: ## Clean build artifacts and SQLx cache
|
|
cargo clean
|
|
rm -rf .sqlx
|
|
|
|
.PHONY: clean-db
|
|
clean-db: test-db-down ## Stop database and clean volumes
|
|
docker volume rm -f nym-node-status-api_postgres_test_data 2>/dev/null || true
|
|
|
|
# --- Utility Targets ---
|
|
.PHONY: sqlx-cli
|
|
sqlx-cli: ## Install sqlx-cli if not already installed
|
|
@command -v sqlx >/dev/null 2>&1 || cargo install sqlx-cli --features postgres,sqlite
|
|
|
|
.PHONY: psql
|
|
psql: ## Connect to the running PostgreSQL database with psql
|
|
@docker exec -it $(DB_CONTAINER_NAME) psql -U testuser -d nym_node_status_api_test
|
|
|
|
.PHONY: help
|
|
help: ## Show help for Makefile targets
|
|
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
|