undo make target change, more lint fixes

Author: jmhbh

Makefile

@@ -180,13 +180,13 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
-.PHONY: deploy-controller
-deploy-controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+.PHONY: deploy
+deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
 
-.PHONY: undeploy-controller
-undeploy-controller: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+.PHONY: undeploy
+undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/default | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
 ##@ Dependencies

cmd/kmcp/cmd/add_tool.go

@@ -115,15 +115,26 @@ func isValidPythonIdentifier(name string) bool {
 	}
 
 	// First character must be letter or underscore
-	if !((name[0] >= 'a' && name[0] <= 'z') || (name[0] >= 'A' && name[0] <= 'Z') || name[0] == '_') {
-		return false
+	firstChar := name[0]
+	if firstChar < 'a' || firstChar > 'z' {
+		if firstChar < 'A' || firstChar > 'Z' {
+			if firstChar != '_' {
+				return false
+			}
+		}
 	}
 
 	// Remaining characters must be letters, digits, or underscores
 	for i := 1; i < len(name); i++ {
 		c := name[i]
-		if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_') {
-			return false
+		if c < 'a' || c > 'z' {
+			if c < 'A' || c > 'Z' {
+				if c < '0' || c > '9' {
+					if c != '_' {
+						return false
+					}
+				}
+			}
 		}
 	}
 

cmd/kmcp/cmd/deploy.go

@@ -197,11 +197,12 @@ func generateMCPServer(projectManifest *manifest.ProjectManifest, deploymentName
 	// Determine transport type
 	transportType := v1alpha1.TransportTypeStdio
 	if deployTransport != "" {
-		if deployTransport == transportHTTP {
+		switch deployTransport {
+		case transportHTTP:
 			transportType = v1alpha1.TransportTypeHTTP
-		} else if deployTransport == transportStdio {
+		case transportStdio:
 			transportType = v1alpha1.TransportTypeStdio
-		} else {
+		default:
 			return nil, fmt.Errorf("invalid transport type: %s (must be 'stdio' or 'http')", deployTransport)
 		}
 	}
@@ -329,13 +330,14 @@ func applyToCluster(yamlContent, deploymentName string) error {
 	if err != nil {
 		return fmt.Errorf("failed to create temp file: %w", err)
 	}
-	defer os.Remove(tmpFile.Name())
 
 	// Write YAML content to temp file
 	if _, err := tmpFile.Write([]byte(yamlContent)); err != nil {
 		return fmt.Errorf("failed to write to temp file: %w", err)
 	}
-	tmpFile.Close()
+	if err := tmpFile.Close(); err != nil {
+		return fmt.Errorf("failed to close temp file: %w", err)
+	}
 
 	// Apply using kubectl
 	if err := runKubectl("apply", "-f", tmpFile.Name()); err != nil {
@@ -346,6 +348,9 @@ func applyToCluster(yamlContent, deploymentName string) error {
 	fmt.Printf("💡 Check status with: kubectl get mcpserver %s -n %s\n", deploymentName, deployNamespace)
 	fmt.Printf("💡 View logs with: kubectl logs -l app.kubernetes.io/name=%s -n %s\n", deploymentName, deployNamespace)
 
+	if err := os.Remove(tmpFile.Name()); err != nil {
+		fmt.Printf("failed to remove temp file: %v\n", err)
+	}
 	return nil
 }
 

internal/controller/mcpserver_controller_test.go

@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+
 	"github.com/onsi/gomega"
 
 	ginkgo "github.com/onsi/ginkgo/v2"

internal/controller/suite_test.go

@@ -18,12 +18,13 @@ package controller
 
 import (
 	"context"
-	"github.com/onsi/ginkgo/v2"
-	"github.com/onsi/gomega"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"

pkg/build/build.go

@@ -140,13 +140,13 @@ func (b *Builder) buildDockerImage(opts Options, projectType string) error {
 
 	// Check if Docker is available
 	if err := b.checkDockerAvailable(); err != nil {
-		return fmt.Errorf("Docker not available: %w", err)
+		return fmt.Errorf("docker not available: %w", err)
 	}
 
 	// Check if Dockerfile exists
 	dockerfilePath := filepath.Join(opts.ProjectDir, "Dockerfile")
 	if !b.fileExists(dockerfilePath) {
-		return fmt.Errorf("Dockerfile not found at %s", dockerfilePath)
+		return fmt.Errorf("dockerfile not found at %s", dockerfilePath)
 	}
 
 	// Generate image name if not provided
@@ -194,7 +194,7 @@ func (b *Builder) buildDockerImage(opts Options, projectType string) error {
 func (b *Builder) checkDockerAvailable() error {
 	cmd := exec.Command("docker", "version", "--format", "{{.Server.Version}}")
 	if err := cmd.Run(); err != nil {
-		return fmt.Errorf("Docker is not available or not running. Please ensure Docker is installed and running")
+		return fmt.Errorf("docker is not available or not running. Please ensure Docker is installed and running")
 	}
 	return nil
 }

pkg/tools/generator.go

@@ -53,7 +53,6 @@ func (g *Generator) GenerateToolFile(filePath, toolName string, config map[strin
 	if err != nil {
 		return fmt.Errorf("failed to create file: %w", err)
 	}
-	defer file.Close()
 
 	// Execute the template
 	if err := tmpl.Execute(file, data); err != nil {
@@ -66,6 +65,10 @@ func (g *Generator) GenerateToolFile(filePath, toolName string, config map[strin
 		return fmt.Errorf("failed to regenerate __init__.py: %w", err)
 	}
 
+	if err := file.Close(); err != nil {
+		return fmt.Errorf("failed to close file: %w", err)
+	}
+
 	return nil
 }
 

test/e2e/e2e_test.go

@@ -20,15 +20,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/onsi/ginkgo/v2"
-	"github.com/onsi/gomega"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"kagent.dev/kmcp/api/v1alpha1"