align types with base branch

Author: mattdholloway

pkg/http/handler.go

@@ -19,9 +19,9 @@ import (
 type InventoryFactoryFunc func(r *http.Request) (*inventory.Inventory, error)
 type GitHubMCPServerFactoryFunc func(r *http.Request, deps github.ToolDependencies, inventory *inventory.Inventory, cfg *github.MCPServerConfig) (*mcp.Server, error)
 
-type HTTPMcpHandler struct {
+type Handler struct {
 	ctx                    context.Context
-	config                 *HTTPServerConfig
+	config                 *ServerConfig
 	deps                   github.ToolDependencies
 	logger                 *slog.Logger
 	t                      translations.TranslationHelperFunc
@@ -30,40 +30,40 @@ type HTTPMcpHandler struct {
 	oauthCfg               *oauth.Config
 }
 
-type HTTPMcpHandlerOptions struct {
+type HandlerOptions struct {
 	GitHubMcpServerFactory GitHubMCPServerFactoryFunc
 	InventoryFactory       InventoryFactoryFunc
 	OAuthConfig            *oauth.Config
 }
 
-type HTTPMcpHandlerOption func(*HTTPMcpHandlerOptions)
+type HandlerOption func(*HandlerOptions)
 
-func WithGitHubMCPServerFactory(f GitHubMCPServerFactoryFunc) HTTPMcpHandlerOption {
-	return func(o *HTTPMcpHandlerOptions) {
+func WithGitHubMCPServerFactory(f GitHubMCPServerFactoryFunc) HandlerOption {
+	return func(o *HandlerOptions) {
 		o.GitHubMcpServerFactory = f
 	}
 }
 
-func WithInventoryFactory(f InventoryFactoryFunc) HTTPMcpHandlerOption {
-	return func(o *HTTPMcpHandlerOptions) {
+func WithInventoryFactory(f InventoryFactoryFunc) HandlerOption {
+	return func(o *HandlerOptions) {
 		o.InventoryFactory = f
 	}
 }
 
-func WithOAuthConfig(cfg *oauth.Config) HTTPMcpHandlerOption {
-	return func(o *HTTPMcpHandlerOptions) {
+func WithOAuthConfig(cfg *oauth.Config) HandlerOption {
+	return func(o *HandlerOptions) {
 		o.OAuthConfig = cfg
 	}
 }
 
 func NewHTTPMcpHandler(
 	ctx context.Context,
-	cfg *HTTPServerConfig,
+	cfg *ServerConfig,
 	deps github.ToolDependencies,
 	t translations.TranslationHelperFunc,
 	logger *slog.Logger,
-	options ...HTTPMcpHandlerOption) *HTTPMcpHandler {
-	opts := &HTTPMcpHandlerOptions{}
+	options ...HandlerOption) *Handler {
+	opts := &HandlerOptions{}
 	for _, o := range options {
 		o(opts)
 	}
@@ -78,7 +78,7 @@ func NewHTTPMcpHandler(
 		inventoryFactory = DefaultInventoryFactory(cfg, t, nil)
 	}
 
-	return &HTTPMcpHandler{
+	return &Handler{
 		ctx:                    ctx,
 		config:                 cfg,
 		deps:                   deps,
@@ -92,7 +92,7 @@ func NewHTTPMcpHandler(
 
 // RegisterRoutes registers the routes for the MCP server
 // URL-based values take precedence over header-based values
-func (h *HTTPMcpHandler) RegisterRoutes(r chi.Router) {
+func (h *Handler) RegisterRoutes(r chi.Router) {
 	r.Use(middleware.WithRequestConfig)
 
 	r.Mount("/", h)
@@ -119,7 +119,7 @@ func withToolset(next http.Handler) http.Handler {
 	})
 }
 
-func (h *HTTPMcpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	inventory, err := h.inventoryFactoryFunc(r)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -157,7 +157,7 @@ func DefaultGitHubMCPServerFactory(r *http.Request, deps github.ToolDependencies
 	}, deps, inventory)
 }
 
-func DefaultInventoryFactory(cfg *HTTPServerConfig, t translations.TranslationHelperFunc, staticChecker inventory.FeatureFlagChecker) InventoryFactoryFunc {
+func DefaultInventoryFactory(cfg *ServerConfig, t translations.TranslationHelperFunc, staticChecker inventory.FeatureFlagChecker) InventoryFactoryFunc {
 	return func(r *http.Request) (*inventory.Inventory, error) {
 		b := github.NewInventory(t).WithDeprecatedAliases(github.DeprecatedToolAliases)
 

pkg/http/server.go

@@ -19,7 +19,7 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-type HTTPServerConfig struct {
+type ServerConfig struct {
 	// Version of the server
 	Version string
 
@@ -53,7 +53,7 @@ type HTTPServerConfig struct {
 	RepoAccessCacheTTL *time.Duration
 }
 
-func RunHTTPServer(cfg HTTPServerConfig) error {
+func RunHTTPServer(cfg ServerConfig) error {
 	// Create app context
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 	defer stop()