russell@unturf.com
ed6c52b001
--account N was silently ignored when UNSANDBOX_PUBLIC_KEY/SECRET_KEY env vars were set. The credential resolution checked env vars at tier 2 before ever reaching the CSV lookup, so the explicit flag had no effect. Correct priority order (all 8 SDKs): 1. CLI -p/-k flags (explicit key args) 2. --account N → direct CSV row lookup (bypasses env vars) 3. UNSANDBOX_PUBLIC_KEY / UNSANDBOX_SECRET_KEY env vars 4. ~/.unsandbox/accounts.csv default (row 0 or UNSANDBOX_ACCOUNT) SDKs updated: C, Python, Go, JavaScript, Ruby, PHP, Java, Rust Also adds: - --account N flag to CLI parsers in all 8 SDKs (Go, PHP, Java, Rust previously had no flag at all; Python/JS/Ruby had the parameter but never wired it to the CLI) - test_account_flag.sh integration test for each SDK verifying the priority behavior with real and garbage credentials - test-integration Makefile target for the C SDK
151 lines
4.8 KiB
Makefile
151 lines
4.8 KiB
Makefile
# UN C Client - Build and Test
|
|
#
|
|
# Usage:
|
|
# make # Build un binary
|
|
# make test # Run all 4 test modes
|
|
# make test-cli # CLI mode only
|
|
# make test-library # Library mode only
|
|
# make test-integration # Integration mode only
|
|
# make test-functional # Functional mode only
|
|
# make clean # Remove build artifacts
|
|
#
|
|
# Dependencies:
|
|
# apt install build-essential libcurl4-openssl-dev libwebsockets-dev libssl-dev
|
|
|
|
.PHONY: all build test test-cli test-library test-integration test-functional clean help examples
|
|
|
|
# Paths
|
|
ROOT_DIR := $(shell cd ../.. && pwd)
|
|
SRC_DIR := src
|
|
SRC := $(SRC_DIR)/un.c
|
|
HEADER := $(SRC_DIR)/un.h
|
|
BIN := un
|
|
TEST_DIR := tests
|
|
EXAMPLES_DIR := examples
|
|
|
|
# Compiler settings
|
|
CC := gcc
|
|
CFLAGS := -O2 -Wall -Wextra -I$(SRC_DIR)
|
|
CFLAGS_LIB := $(CFLAGS) -DUNSANDBOX_LIBRARY
|
|
LDFLAGS := -lcurl -lwebsockets -lssl -lcrypto
|
|
|
|
# Colors
|
|
GREEN := \033[32m
|
|
RED := \033[31m
|
|
YELLOW := \033[33m
|
|
NC := \033[0m
|
|
|
|
# CLI binary (for inception testing)
|
|
CLI := un
|
|
|
|
.DEFAULT_GOAL := build
|
|
|
|
help:
|
|
@echo "UN C Client - Build and Test"
|
|
@echo ""
|
|
@echo "Build:"
|
|
@echo " make Build library and examples"
|
|
@echo " make build Same as above"
|
|
@echo " make lib Build just the library"
|
|
@echo " make examples Build example programs"
|
|
@echo ""
|
|
@echo "Test:"
|
|
@echo " make test Run all tests"
|
|
@echo " make test-library Test library functions"
|
|
@echo ""
|
|
@echo "Utility:"
|
|
@echo " make clean Remove build artifacts"
|
|
@echo " make deps Show required dependencies"
|
|
@echo ""
|
|
|
|
all: build
|
|
|
|
build: cli lib examples
|
|
|
|
cli: $(CLI)
|
|
@echo "$(GREEN)✓$(NC) CLI binary built: $(CLI)"
|
|
|
|
$(CLI): $(SRC) $(HEADER)
|
|
@echo "Building CLI binary..."
|
|
$(CC) $(CFLAGS) -o $@ $(SRC) $(LDFLAGS)
|
|
@echo "$(GREEN)✓$(NC) Built: $@"
|
|
|
|
lib: $(SRC) $(HEADER)
|
|
@echo "$(GREEN)✓$(NC) Library files ready:"
|
|
@echo " - $(SRC_DIR)/un.c (implementation)"
|
|
@echo " - $(SRC_DIR)/un.h (header)"
|
|
|
|
examples: $(EXAMPLES_DIR)/hello_world $(EXAMPLES_DIR)/fibonacci
|
|
@echo "$(GREEN)✓$(NC) Examples built"
|
|
|
|
$(EXAMPLES_DIR)/hello_world: $(EXAMPLES_DIR)/hello_world.c $(SRC) $(HEADER)
|
|
@mkdir -p $(EXAMPLES_DIR)
|
|
@echo "Building hello_world example..."
|
|
$(CC) $(CFLAGS_LIB) -o $@ $< $(SRC) $(LDFLAGS)
|
|
@echo "$(GREEN)✓$(NC) Built: $@"
|
|
|
|
$(EXAMPLES_DIR)/fibonacci: $(EXAMPLES_DIR)/fibonacci.c $(SRC) $(HEADER)
|
|
@mkdir -p $(EXAMPLES_DIR)
|
|
@echo "Building fibonacci example..."
|
|
$(CC) $(CFLAGS_LIB) -o $@ $< $(SRC) $(LDFLAGS)
|
|
@echo "$(GREEN)✓$(NC) Built: $@"
|
|
|
|
deps:
|
|
@echo "Required packages:"
|
|
@echo " apt install build-essential libcurl4-openssl-dev libwebsockets-dev libssl-dev"
|
|
|
|
# ============================================================================
|
|
# TEST
|
|
# ============================================================================
|
|
|
|
test: build $(TEST_DIR)/test_library
|
|
@echo ""
|
|
@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
@echo "LIBRARY MODE: Testing un.c functions"
|
|
@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
@echo ""
|
|
@./$(TEST_DIR)/test_library
|
|
|
|
test-library: test
|
|
|
|
test-integration: build
|
|
@echo ""
|
|
@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
@echo "INTEGRATION: Testing --account flag priority"
|
|
@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
@echo ""
|
|
@bash $(TEST_DIR)/test_account_flag.sh
|
|
|
|
test-functional: build $(TEST_DIR)/test_functional
|
|
@echo ""
|
|
@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
@echo "FUNCTIONAL MODE: Testing against real API"
|
|
@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
@echo ""
|
|
@./$(TEST_DIR)/test_functional
|
|
|
|
$(TEST_DIR)/test_library: $(TEST_DIR)/test_library.c $(SRC) $(HEADER)
|
|
@mkdir -p $(TEST_DIR)
|
|
@echo "Building test suite..."
|
|
$(CC) $(CFLAGS_LIB) -o $@ $< $(SRC) $(LDFLAGS)
|
|
@echo "$(GREEN)✓$(NC) Test binary ready"
|
|
|
|
$(TEST_DIR)/test_functional: $(TEST_DIR)/test_functional.c $(SRC) $(HEADER)
|
|
@mkdir -p $(TEST_DIR)
|
|
@echo "Building functional test suite..."
|
|
$(CC) $(CFLAGS_LIB) -o $@ $< $(SRC) $(LDFLAGS)
|
|
@echo "$(GREEN)✓$(NC) Functional test binary ready"
|
|
|
|
# ============================================================================
|
|
# Clean
|
|
# ============================================================================
|
|
|
|
clean:
|
|
rm -f $(CLI)
|
|
rm -f $(TEST_DIR)/test_library
|
|
rm -f $(TEST_DIR)/test_functional
|
|
rm -f $(EXAMPLES_DIR)/hello_world
|
|
rm -f $(EXAMPLES_DIR)/fibonacci
|
|
rm -f $(EXAMPLES_DIR)/*.o
|
|
rm -f $(TEST_DIR)/*.o
|
|
@echo "$(GREEN)✓$(NC) Cleaned build artifacts"
|