Support registry_url in mcpjungle config file (#121)

Author: duaraghav8

client/client.go

@@ -24,6 +24,11 @@ func NewClient(baseURL string, accessToken string, httpClient *http.Client) *Cli
 	}
 }
 
+// BaseURL returns the base URL of the MCPJungle server
+func (c *Client) BaseURL() string {
+	return c.baseURL
+}
+
 // constructAPIEndpoint constructs the full API endpoint URL where a request must be sent
 func (c *Client) constructAPIEndpoint(suffixPath string) (string, error) {
 	return url.JoinPath(c.baseURL, api.V0ApiPathPrefix, suffixPath)

cmd/config/config.go

@@ -13,6 +13,9 @@ const ClientConfigFileName = ".mcpjungle.conf"
 // ClientConfig represents the MCPJungle client configuration stored in the user's home directory.
 // It can contain configuration for both a standard user and an admin user.
 type ClientConfig struct {
+	// RegistryURL is the URL of the MCPJungle server.
+	RegistryURL string `yaml:"registry_url"`
+	// AccessToken is the access token used for authentication with the MCPJungle server.
 	AccessToken string `yaml:"access_token"`
 }
 

cmd/config/config_test.go

@@ -8,15 +8,6 @@ import (
 	"github.com/mcpjungle/mcpjungle/pkg/testhelpers"
 )
 
-func TestClientConfigFileName(t *testing.T) {
-	t.Run("ClientConfigFileName has expected value", func(t *testing.T) {
-		expected := ".mcpjungle.conf"
-		if ClientConfigFileName != expected {
-			t.Errorf("Expected ClientConfigFileName to be '%s', got '%s'", expected, ClientConfigFileName)
-		}
-	})
-}
-
 func TestClientConfig(t *testing.T) {
 	t.Run("ClientConfig struct has AccessToken field", func(t *testing.T) {
 		cfg := &ClientConfig{}

cmd/init_server.go

@@ -37,6 +37,7 @@ func runInitServer(cmd *cobra.Command, args []string) error {
 
 	// Create new client configuration
 	cfg := &config.ClientConfig{
+		RegistryURL: apiClient.BaseURL(),
 		AccessToken: resp.AdminAccessToken,
 	}
 	if err := config.Save(cfg); err != nil {

cmd/root.go

@@ -110,7 +110,32 @@ func Execute() error {
 	// Initialize the API client with the registry server URL & client configuration (if any)
 	rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
 		cfg := config.Load()
-		apiClient = client.NewClient(registryServerURL, cfg.AccessToken, http.DefaultClient)
+
+		// determine the registry server URL to use
+		// precedence: command line flag explicitly set by user > config file > flag default value
+		var u string
+		if cmd.Flags().Changed("registry") {
+			u = registryServerURL
+
+			// if the user explicitly set the --registry flag, but the config file doesn't have
+			// a registry_url entry, print a tip to let them know they can set it in the config file
+			if cfg.RegistryURL == "" {
+				if cfgFilePath, err := config.AbsPath(); err == nil {
+					cmd.Printf(
+						"TIP: You can set `registry_url: %s` in %s to avoid setting the --registry flag every time.\n\n",
+						registryServerURL,
+						cfgFilePath,
+					)
+				}
+			}
+
+		} else if cfg.RegistryURL != "" {
+			u = cfg.RegistryURL
+		} else {
+			u = registryServerURL
+		}
+
+		apiClient = client.NewClient(u, cfg.AccessToken, http.DefaultClient)
 	}
 
 	return rootCmd.Execute()

cmd/root_test.go

@@ -12,12 +12,3 @@ func TestRootCommandStructure(t *testing.T) {
 		t.Errorf("Expected root command Short to be 'MCP Gateway for AI Agents', got %s", rootCmd.Short)
 	}
 }
-
-func TestSubCommandGroups(t *testing.T) {
-	if subCommandGroupBasic != "basic" {
-		t.Errorf("Expected subCommandGroupBasic to be 'basic', got %s", subCommandGroupBasic)
-	}
-	if subCommandGroupAdvanced != "advanced" {
-		t.Errorf("Expected subCommandGroupAdvanced to be 'advanced', got %s", subCommandGroupAdvanced)
-	}
-}