derive account ID from api key, rename org/project so it's clear they are default values

Author: vistaarjuneja

README.md

@@ -50,7 +50,7 @@ go build -o cmd/harness-mcp-server/harness-mcp-server ./cmd/harness-mcp-server
 
 3. Run the server:
 ```bash
-HARNESS_API_KEY=your_api_key HARNESS_ACCOUNT_ID=your_account_id HARNESS_ORG_ID=your_org_id HARNESS_PROJECT_ID=your_project_id ./cmd/harness-mcp-server/harness-mcp-server stdio
+HARNESS_API_KEY=your_api_key HARNESS_DEFAULT_ORG_ID=your_org_id HARNESS_DEFAULT_PROJECT_ID=your_project_id ./cmd/harness-mcp-server/harness-mcp-server stdio
 ```
 
 ### Claude Desktop Configuration
@@ -69,9 +69,8 @@ On Windows: `%APPDATA%/Claude/claude_desktop_config.json`
         "args": ["stdio"],
         "env": {
           "HARNESS_API_KEY": "<YOUR_API_KEY>",
-          "HARNESS_ACCOUNT_ID": "<YOUR_ACCOUNT_ID>",
-          "HARNESS_ORG_ID": "<YOUR_ORG_ID>",
-          "HARNESS_PROJECT_ID": "<YOUR_PROJECT_ID>"
+          "HARNESS_DEFAULT_ORG_ID": "<YOUR_ORG_ID>",
+          "HARNESS_DEFAULT_PROJECT_ID": "<YOUR_PROJECT_ID>"
         }
       }
     }
@@ -99,10 +98,9 @@ To use the Harness MCP Server with Windsurf:
       "args": ["stdio"],
       "env": {
         "HARNESS_API_KEY": "<YOUR_API_KEY>",
-        "HARNESS_ACCOUNT_ID": "<YOUR_ACCOUNT_ID>",
-        "HARNESS_ORG_ID": "<YOUR_ORG_ID>",
-        "HARNESS_PROJECT_ID": "<YOUR_PROJECT_ID>",
-        "HARNESS_BASE_URL": "<YOUR_BASE_URL>",
+        "HARNESS_DEFAULT_ORG_ID": "<YOUR_ORG_ID>",
+        "HARNESS_DEFAULT_PROJECT_ID": "<YOUR_PROJECT_ID>",
+        "HARNESS_BASE_URL": "<YOUR_BASE_URL>"
       }
     }
   }
@@ -127,10 +125,9 @@ The Harness MCP Server supports the following command line arguments:
 
 Environment variables are prefixed with `HARNESS_`:
 
-- `HARNESS_API_KEY`: Harness API key (required)
-- `HARNESS_ACCOUNT_ID`: Harness account ID (required)
-- `HARNESS_ORG_ID`: Harness organization ID (optional, but required for some operations)
-- `HARNESS_PROJECT_ID`: Harness project ID (optional, but required for some operations)
+- `HARNESS_API_KEY`: Harness API key (required) - Account ID is automatically extracted from the API key
+- `HARNESS_DEFAULT_ORG_ID`: Default Harness organization ID (optional, if not specified it would need to be passed in the request if it's required for that operation)
+- `HARNESS_DEFAULT_PROJECT_ID`: Default Harness project ID (optional, if not specified it would need to be passed in the request if it's required for that operation)
 - `HARNESS_TOOLSETS`: Comma-separated list of toolsets to enable (default: "all")
 - `HARNESS_READ_ONLY`: Set to "true" to run in read-only mode
 - `HARNESS_LOG_FILE`: Path to log file

cmd/harness-mcp-server/config/config.go

@@ -1,14 +1,14 @@
 package config
 
 type Config struct {
-	Version     string
-	BaseURL     string
-	AccountID   string
-	OrgID       string
-	ProjectID   string
-	APIKey      string
-	ReadOnly    bool
-	Toolsets    []string
-	LogFilePath string
-	Debug       bool
+	Version          string
+	BaseURL          string
+	AccountID        string
+	DefaultOrgID     string
+	DefaultProjectID string
+	APIKey           string
+	ReadOnly         bool
+	Toolsets         []string
+	LogFilePath      string
+	Debug            bool
 }

cmd/harness-mcp-server/main.go

@@ -8,6 +8,7 @@ import (
 	"log/slog"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 
 	"github.com/harness/harness-mcp/client"
@@ -23,6 +24,16 @@ var version = "0.1.0"
 var commit = "dev"
 var date = "unknown"
 
+// extractAccountIDFromAPIKey extracts the account ID from a Harness API key
+// API key format: pat.ACCOUNT_ID.TOKEN_ID.<>
+func extractAccountIDFromAPIKey(apiKey string) (string, error) {
+	parts := strings.Split(apiKey, ".")
+	if len(parts) < 2 {
+		return "", fmt.Errorf("invalid API key format")
+	}
+	return parts[1], nil
+}
+
 var (
 	rootCmd = &cobra.Command{
 		Use:     "harness-mcp-server",
@@ -36,28 +47,34 @@ var (
 		Short: "Start stdio server",
 		Long:  `Start a server that communicates via standard input/output streams using JSON-RPC messages.`,
 		RunE: func(_ *cobra.Command, _ []string) error {
-			token := viper.GetString("api_key")
-			if token == "" {
+			apiKey := viper.GetString("api_key")
+			if apiKey == "" {
 				return fmt.Errorf("API key not provided")
 			}
 
+			// Extract account ID from API key
+			accountID, err := extractAccountIDFromAPIKey(apiKey)
+			if err != nil {
+				return fmt.Errorf("failed to extract account ID from API key: %w", err)
+			}
+
 			var toolsets []string
-			err := viper.UnmarshalKey("toolsets", &toolsets)
+			err = viper.UnmarshalKey("toolsets", &toolsets)
 			if err != nil {
 				return fmt.Errorf("Failed to unmarshal toolsets: %w", err)
 			}
 
 			cfg := config.Config{
-				Version:     version,
-				BaseURL:     viper.GetString("base_url"),
-				AccountID:   viper.GetString("account_id"),
-				OrgID:       viper.GetString("org_id"),
-				ProjectID:   viper.GetString("project_id"),
-				APIKey:      viper.GetString("api_key"),
-				ReadOnly:    viper.GetBool("read_only"),
-				Toolsets:    toolsets,
-				LogFilePath: viper.GetString("log_file"),
-				Debug:       viper.GetBool("debug"),
+				Version:          version,
+				BaseURL:          viper.GetString("base_url"),
+				AccountID:        accountID,
+				DefaultOrgID:     viper.GetString("default_org_id"),
+				DefaultProjectID: viper.GetString("default_project_id"),
+				APIKey:           apiKey,
+				ReadOnly:         viper.GetBool("read_only"),
+				Toolsets:         toolsets,
+				LogFilePath:      viper.GetString("log_file"),
+				Debug:            viper.GetBool("debug"),
 			}
 
 			if err := runStdioServer(cfg); err != nil {
@@ -80,9 +97,8 @@ func init() {
 	rootCmd.PersistentFlags().Bool("debug", false, "Enable debug logging")
 	rootCmd.PersistentFlags().String("base-url", "https://app.harness.io", "Base URL for Harness")
 	rootCmd.PersistentFlags().String("api-key", "", "API key for authentication")
-	rootCmd.PersistentFlags().String("account-id", "", "Account ID to use")
-	rootCmd.PersistentFlags().String("org-id", "", "(Optional) org ID to use")
-	rootCmd.PersistentFlags().String("project-id", "", "(Optional) project ID to use")
+	rootCmd.PersistentFlags().String("default-org-id", "", "Default org ID to use. If not specified, it would need to be passed in the query (if required)")
+	rootCmd.PersistentFlags().String("default-project-id", "", "Default project ID to use. If not specified, it would need to be passed in the query (if required)")
 
 	// Bind flags to viper
 	_ = viper.BindPFlag("toolsets", rootCmd.PersistentFlags().Lookup("toolsets"))
@@ -91,9 +107,8 @@ func init() {
 	_ = viper.BindPFlag("debug", rootCmd.PersistentFlags().Lookup("debug"))
 	_ = viper.BindPFlag("base_url", rootCmd.PersistentFlags().Lookup("base-url"))
 	_ = viper.BindPFlag("api_key", rootCmd.PersistentFlags().Lookup("api-key"))
-	_ = viper.BindPFlag("account_id", rootCmd.PersistentFlags().Lookup("account-id"))
-	_ = viper.BindPFlag("org_id", rootCmd.PersistentFlags().Lookup("org-id"))
-	_ = viper.BindPFlag("project_id", rootCmd.PersistentFlags().Lookup("project-id"))
+	_ = viper.BindPFlag("default_org_id", rootCmd.PersistentFlags().Lookup("default-org-id"))
+	_ = viper.BindPFlag("default_project_id", rootCmd.PersistentFlags().Lookup("default-project-id"))
 
 	// Add subcommands
 	rootCmd.AddCommand(stdioCmd)

pkg/harness/scope.go

@@ -8,24 +8,37 @@ import (
 	"github.com/mark3labs/mcp-go/mcp"
 )
 
-// WithScope adds org_id and project_id as optional parameters if they are not already defined in the
-// config.
+// NoopPropertyOption is a property option that does nothing.
+func NoopPropertyOption() mcp.PropertyOption {
+	return func(schema map[string]interface{}) {}
+}
+
+// WithScope adds org_id and project_id as optional/required parameters, based  on
+// what is set in the env variables.
 func WithScope(config *config.Config, required bool) mcp.ToolOption {
-	var opt mcp.PropertyOption
+	opt := NoopPropertyOption()
 	if required {
 		opt = mcp.Required()
 	}
 	return func(tool *mcp.Tool) {
+		defaultProjectOpt := NoopPropertyOption()
+		defaultOrgOpt := NoopPropertyOption()
+		if config.DefaultOrgID != "" {
+			defaultOrgOpt = mcp.DefaultString(config.DefaultOrgID)
+		}
+		if config.DefaultProjectID != "" {
+			defaultProjectOpt = mcp.DefaultString(config.DefaultProjectID)
+		}
 		mcp.WithString("org_id",
 			mcp.Description("The ID of the organization."),
-			mcp.DefaultString(config.OrgID),
+			defaultOrgOpt,
 			opt,
-		)
+		)(tool)
 		mcp.WithString("project_id",
 			mcp.Description("The ID of the project."),
-			mcp.DefaultString(config.ProjectID),
+			defaultProjectOpt,
 			opt,
-		)
+		)(tool)
 	}
 }
 
@@ -41,8 +54,8 @@ func fetchScope(config *config.Config, request mcp.CallToolRequest, required boo
 
 	scope := dto.Scope{
 		AccountID: config.AccountID,
-		OrgID:     config.OrgID,
-		ProjectID: config.ProjectID,
+		OrgID:     config.DefaultOrgID,
+		ProjectID: config.DefaultProjectID,
 	}
 
 	// try to fetch it from the MCP request
@@ -58,8 +71,11 @@ func fetchScope(config *config.Config, request mcp.CallToolRequest, required boo
 	// org ID and project ID may or may not be required for APIs. If they are required, we return an error
 	// if not present.
 	if required {
-		if scope.OrgID == "" || scope.ProjectID == "" {
-			return scope, fmt.Errorf("org ID and project ID are required")
+		if scope.OrgID == "" {
+			return scope, fmt.Errorf("org ID is required")
+		}
+		if scope.ProjectID == "" {
+			return scope, fmt.Errorf("project ID is required")
 		}
 	}