fix: [CCM-24794]: Fix handling of string array parameters (#131)

* Add support for a separate client for Commitment Orchestrator

* fix: [CCM-24794]: Fix handling of string array parameters (#132)

* harness-auto-fix created this fix

* Fix handling of string array parameters

Author: sandyydk

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

@@ -33,6 +33,8 @@ type Config struct {
 	ArtifactRegistrySecret  string
 	NextgenCEBaseURL        string
 	NextgenCESecret         string
+	CCMCommOrchBaseURL      string
+	CCMCommOrchSecret       string
 	IDPSvcBaseURL           string
 	IDPSvcSecret            string
 	McpSvcSecret            string

cmd/harness-mcp-server/main.go

@@ -162,6 +162,8 @@ var (
 				ArtifactRegistrySecret:  viper.GetString("artifact_registry_secret"),
 				NextgenCEBaseURL:        viper.GetString("nextgen_ce_base_url"),
 				NextgenCESecret:         viper.GetString("nextgen_ce_secret"),
+				CCMCommOrchBaseURL:      viper.GetString("ccm_comm_orch_base_url"),
+				CCMCommOrchSecret:       viper.GetString("ccm_comm_orch_secret"),
 				IDPSvcBaseURL:           viper.GetString("idp_svc_base_url"),
 				IDPSvcSecret:            viper.GetString("idp_svc_secret"),
 				McpSvcSecret:            viper.GetString("mcp_svc_secret"),

pkg/harness/tools/ccmcosts.go

@@ -496,12 +496,10 @@ func FetchCommitmentUtilisationTool(config *config.Config, client *client.CloudC
 				mcp.Description("Optional service to filter commitment utilisation"),
 			),
 			mcp.WithArray("cloud_account_ids",
+				mcp.WithStringItems(),
 				mcp.Description("Optional cloud account IDs to filter commitment utilisation"),
-				mcp.Items(map[string]any{
-					"type": "string",
-				}),
-			),
-			WithScope(config, false),
+		),
+		WithScope(config, false),
 		),
 		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 			accountId, err := getAccountID(config, request)
@@ -522,11 +520,11 @@ func FetchCommitmentUtilisationTool(config *config.Config, client *client.CloudC
 			}
 
 			// Handle cloud account IDs parameter
-			cloudAccountIDs, ok, err := OptionalParamOK[[]string](request, "cloud_account_ids")
+			cloudAccountIDs, err := OptionalStringArrayParam(request, "cloud_account_ids")
 			if err != nil {
 				return mcp.NewToolResultError(err.Error()), nil
 			}
-			if ok && len(cloudAccountIDs) > 0 {
+			if len(cloudAccountIDs) > 0 {
 				params.CloudAccountIDs = cloudAccountIDs
 			}
 

pkg/modules/ccm.go

@@ -77,6 +77,19 @@ func RegisterCloudCostManagement(config *config.Config, tsg *toolsets.ToolsetGro
 		Client: c,
 	}
 
+	commOrchBaseURL := utils.BuildServiceURL(config, config.CCMCommOrchBaseURL, config.BaseURL, "")
+	commOrchSecret := config.CCMCommOrchSecret
+
+	// Create base client for CCM
+	commOrchClient, err := utils.CreateClient(commOrchBaseURL, config, commOrchSecret)
+	if err != nil {
+		return err
+	}
+
+	ccmCommOrchClient := &client.CloudCostManagementService{
+		Client: commOrchClient,
+	}
+
 	// Create the CCM toolset
 	ccm := toolsets.NewToolset("ccm", "Harness Cloud Cost Management related tools").
 		AddReadTools(
@@ -105,11 +118,11 @@ func RegisterCloudCostManagement(config *config.Config, tsg *toolsets.ToolsetGro
 			toolsets.NewServerTool(tools.GetCcmRecommendationsStatsTool(config, ccmClient)),
 			toolsets.NewServerTool(tools.UpdateCcmRecommendationStateTool(config, ccmClient)),
 			toolsets.NewServerTool(tools.OverrideCcmRecommendationSavingsTool(config, ccmClient)),
-			toolsets.NewServerTool(tools.FetchCommitmentCoverageTool(config, ccmClient)),
-			toolsets.NewServerTool(tools.FetchCommitmentSavingsTool(config, ccmClient)),
-			toolsets.NewServerTool(tools.FetchCommitmentUtilisationTool(config, ccmClient)),
-			toolsets.NewServerTool(tools.FetchEstimatedSavingsTool(config, ccmClient)),
-			toolsets.NewServerTool(tools.FetchEC2AnalysisTool(config, ccmClient)),
+			toolsets.NewServerTool(tools.FetchCommitmentCoverageTool(config, ccmCommOrchClient)),
+			toolsets.NewServerTool(tools.FetchCommitmentSavingsTool(config, ccmCommOrchClient)),
+			toolsets.NewServerTool(tools.FetchCommitmentUtilisationTool(config, ccmCommOrchClient)),
+			toolsets.NewServerTool(tools.FetchEstimatedSavingsTool(config, ccmCommOrchClient)),
+			toolsets.NewServerTool(tools.FetchEC2AnalysisTool(config, ccmCommOrchClient)),
 		)
 
 	// Add toolset to the group