Cleaner Makefile

Author: Joeavaikath

.gitignore

@@ -7,7 +7,6 @@
 
 # Built binaries
 kubectl-oadp
-oadp
 
 # Test binary, built with `go test -c`
 *.test

Makefile

@@ -1,13 +1,10 @@
 # Makefile for OADP CLI
 # 
-# This Makefile provides convenient targets for building, testing, and installing
-# the OADP CLI as a kubectl plugin.
+# Simple Makefile for building, testing, and installing the OADP CLI
 
 # Variables
 BINARY_NAME = kubectl-oadp
-LOCAL_BINARY = oadp
 INSTALL_PATH = /usr/local/bin
-GO_FILES = $(shell find . -name '*.go' -not -path './vendor/*')
 
 # Default target
 .PHONY: help
@@ -19,133 +16,46 @@ help: ## Show this help message
 
 # Build targets
 .PHONY: build
-build: ## Build the CLI binary for local development
-	@echo "Building $(LOCAL_BINARY) for local development..."
-	go build -o $(LOCAL_BINARY) .
-	@echo "✅ Built $(LOCAL_BINARY) successfully!"
-
-.PHONY: build-plugin
-build-plugin: ## Build the kubectl plugin binary
-	@echo "Building $(BINARY_NAME) kubectl plugin..."
+build: ## Build the kubectl plugin binary
+	@echo "Building $(BINARY_NAME)..."
 	go build -o $(BINARY_NAME) .
 	@echo "✅ Built $(BINARY_NAME) successfully!"
 
 # Installation targets
 .PHONY: install
-install: build-plugin ## Build and install the kubectl plugin (requires sudo)
+install: build ## Build and install the kubectl plugin
 	@echo "Installing $(BINARY_NAME) to $(INSTALL_PATH)..."
 	sudo mv $(BINARY_NAME) $(INSTALL_PATH)/
-	@echo "✅ $(BINARY_NAME) plugin installed successfully!"
-	@echo "You can now use: kubectl oadp --help"
-
-.PHONY: install-local
-install-local: build-plugin ## Install the kubectl plugin to ~/bin (no sudo required)
-	@echo "Installing $(BINARY_NAME) to ~/bin..."
-	@mkdir -p ~/bin
-	mv $(BINARY_NAME) ~/bin/
-	@echo "✅ $(BINARY_NAME) plugin installed to ~/bin!"
-	@echo "Make sure ~/bin is in your PATH"
+	@echo "✅ $(BINARY_NAME) installed successfully!"
 	@echo "You can now use: kubectl oadp --help"
 
 # Testing targets
 .PHONY: test
 test: ## Run all tests
 	@echo "Running tests..."
 	go test ./...
-	@echo "✅ All tests passed!"
-
-.PHONY: test-verbose
-test-verbose: ## Run tests with verbose output
-	@echo "Running tests with verbose output..."
-	go test -v ./...
-
-.PHONY: test-coverage
-test-coverage: ## Run tests with coverage report
-	@echo "Running tests with coverage..."
-	go test -cover ./...
-
-# Development targets
-.PHONY: fmt
-fmt: ## Format Go code
-	@echo "Formatting Go code..."
-	go fmt ./...
-	@echo "✅ Code formatted!"
-
-.PHONY: vet
-vet: ## Run go vet
-	@echo "Running go vet..."
-	go vet ./...
-	@echo "✅ Vet checks passed!"
-
-.PHONY: mod-tidy
-mod-tidy: ## Tidy up go.mod
-	@echo "Tidying go.mod..."
-	go mod tidy
-	@echo "✅ Dependencies tidied!"
-
-.PHONY: check
-check: fmt vet test ## Run formatting, vetting, and tests
+	@echo "✅ Tests completed!"
 
 # Cleanup targets
 .PHONY: clean
 clean: ## Remove built binaries
-	@echo "Cleaning up built binaries..."
-	@rm -f $(BINARY_NAME) $(LOCAL_BINARY)
+	@echo "Cleaning up..."
+	@rm -f $(BINARY_NAME)
 	@echo "✅ Cleanup complete!"
 
-.PHONY: uninstall
-uninstall: ## Remove the installed kubectl plugin
-	@echo "Removing $(BINARY_NAME) from $(INSTALL_PATH)..."
-	@sudo rm -f $(INSTALL_PATH)/$(BINARY_NAME)
-	@echo "✅ $(BINARY_NAME) plugin uninstalled!"
-
-.PHONY: uninstall-local
-uninstall-local: ## Remove the kubectl plugin from ~/bin
-	@echo "Removing $(BINARY_NAME) from ~/bin..."
-	@rm -f ~/bin/$(BINARY_NAME)
-	@echo "✅ $(BINARY_NAME) plugin uninstalled from ~/bin!"
-
-# Utility targets
-.PHONY: verify-install
-verify-install: ## Verify the kubectl plugin is installed and working
-	@echo "Verifying kubectl plugin installation..."
-	@if command -v kubectl oadp >/dev/null 2>&1; then \
-		echo "✅ kubectl oadp plugin is installed and accessible!"; \
-		kubectl oadp --help | head -5; \
-	else \
-		echo "❌ kubectl oadp plugin not found in PATH"; \
-		exit 1; \
-	fi
-
-.PHONY: dev-setup
-dev-setup: mod-tidy fmt vet build ## Set up development environment
-	@echo "✅ Development environment ready!"
-
-# File watching (requires 'entr' tool)
-.PHONY: watch
-watch: ## Watch for changes and rebuild (requires 'entr' tool)
-	@if command -v entr >/dev/null 2>&1; then \
-		echo "Watching for changes... (press Ctrl+C to stop)"; \
-		find . -name '*.go' | entr -r make build; \
-	else \
-		echo "❌ 'entr' tool not found. Install with: brew install entr (macOS) or apt install entr (Ubuntu)"; \
-		exit 1; \
-	fi
-
-# Show current status
+# Status and utility targets
 .PHONY: status
-status: ## Show build status and installed version
+status: ## Show build status and installation info
 	@echo "=== OADP CLI Status ==="
 	@echo ""
 	@echo "📁 Repository:"
 	@pwd
 	@echo ""
-	@echo "🔧 Local binaries:"
-	@ls -la $(LOCAL_BINARY) $(BINARY_NAME) 2>/dev/null || echo "  No local binaries found"
+	@echo "🔧 Local binary:"
+	@ls -la $(BINARY_NAME) 2>/dev/null || echo "  No local binary found"
 	@echo ""
 	@echo "📦 Installed plugin:"
-	@ls -la $(INSTALL_PATH)/$(BINARY_NAME) 2>/dev/null || echo "  Plugin not installed in $(INSTALL_PATH)"
-	@ls -la ~/bin/$(BINARY_NAME) 2>/dev/null || echo "  Plugin not installed in ~/bin"
+	@ls -la $(INSTALL_PATH)/$(BINARY_NAME) 2>/dev/null || echo "  Plugin not installed"
 	@echo ""
 	@echo "✅ Plugin accessibility:"
 	@if command -v kubectl oadp >/dev/null 2>&1; then \

README.md

@@ -30,26 +30,15 @@ oadp
 Use the Makefile for easy build and installation:
 
 ```sh
-# Quick install (equivalent to old quick-create.sh)
-make quick-install
-
-# Or step by step:
-make build-plugin
-sudo make install
+# Build and install the kubectl plugin
+make install
 ```
 
-### Alternative Installation Methods
-
-**Install to ~/bin (no sudo required):**
-```sh
-make install-local
-```
+### Manual Installation
 
-**Manual Installation:**
 1. **Build the CLI:**
    ```sh
-   make build-plugin
-   # or manually: go build -o kubectl-oadp .
+   make build
    ```
 
 2. **Install as kubectl plugin:**
@@ -59,24 +48,21 @@ make install-local
 
 3. **Verify installation:**
    ```sh
-   make verify-install
-   # or manually: kubectl oadp --help
+   kubectl oadp --help
    ```
 
 ### Development Workflow
 
 ```sh
-# Set up development environment
-make dev-setup
-
-# Build for local testing
+# Build and test locally
 make build
+./kubectl-oadp --help
 
 # Run tests
 make test
 
-# Format and check code
-make check
+# Check status
+make status
 
 # View all available commands
 make help
@@ -133,12 +119,6 @@ This project includes comprehensive CLI integration tests organized by functiona
 # Run all tests
 make test
 
-# Run tests with verbose output
-make test-verbose
-
-# Run tests with coverage
-make test-coverage
-
 # Standard Go pattern (also works)
 go test ./...
 ```