feat:[CCM-24222]: MCP integration for Savings Data for Commitment (#48)

* feat:[CCM-24222]: MCP integration for Savings Data for Commitment

* feat:[CCM-24222]: MCP integration for Savings Data for Commitment

* feat:[CCM-24222]: MCP integration for Savings Data for Commitment

* feat:[CCM-24222]: MCP integration for Savings Data for Commitment

* feat:[CCM-24222]: MCP integration for Savings Data for Commitment - README

* feat:[CCM-24222]: MCP integration for Savings Data for Commitment

Author: sribalij

README.md

@@ -101,6 +101,7 @@ Toolset Name: `cloudcostmanagement`
 - `get_ccm_metadata`: Retrieves metadata about available cloud connectors, cost data sources, default perspectives, and currency preferences in Harness Cloud Cost Management.
 - `ccm_perspective_recommendations`: PerspectiveRecommendations: Returns monthly cost, savings, and a list of open recommendations for a perspective in Harness Cloud Cost Management.
 - `get_ccm_commitment_coverage`: Get commitment coverage information for an account in Harness Cloud Cost Management
+- `get_ccm_commitment_savings`: Get commitment savings information for an account in Harness Cloud Cost Management
 
 #### Chaos Engineering Toolset
 

client/ccmcosts.go

@@ -18,6 +18,7 @@ const (
 	ccmCostCategoryDetailListPath    = ccmBasePath + "/business-mapping?accountIdentifier=%s"    // This endpoint lists cost categories
 	ccmGetCostCategoryPath           = ccmBasePath + "/business-mapping/%s?accountIdentifier=%s" // This endpoint lists cost categories
 	ccmCommitmentCoverageDetailsPath = ccmCommitmentBasePath + "/accounts/%s/v1/detail/compute_coverage?accountIdentifier=%s"
+	ccmCommitmentSavingsDetailsPath  = ccmCommitmentBasePath + "/accounts/%s/v1/detail/savings?accountIdentifier=%s"
 
 	ccmCommitmentComputeService string = "Amazon Elastic Compute Cloud - Compute"
 )
@@ -185,3 +186,54 @@ func (r *CloudCostManagementService) GetComputeCoverage(ctx context.Context, sco
 
 	return coverageRespone, nil
 }
+
+func (r *CloudCostManagementService) GetCommitmentSavings(ctx context.Context, scope dto.Scope, opts *dto.CCMCommitmentOptions) (*dto.CCMCommitmentBaseResponse, error) {
+	path := fmt.Sprintf(ccmCommitmentSavingsDetailsPath, scope.AccountID, scope.AccountID)
+	params := make(map[string]string)
+	addScope(scope, params)
+
+	// Handle nil options by creating default options
+	if opts == nil {
+		opts = &dto.CCMCommitmentOptions{}
+	}
+
+	if opts.StartDate != nil && *opts.StartDate != "" {
+		params["start_date"] = *opts.StartDate
+	} else {
+		// Default to last 30 days
+		params["start_date"] = utils.FormatUnixToMMDDYYYY(time.Now().AddDate(0, 0, -30).Unix())
+	}
+	if opts.EndDate != nil && *opts.EndDate != "" {
+		params["end_date"] = *opts.EndDate
+	} else {
+		// Default to last 30 days
+		params["end_date"] = utils.CurrentMMDDYYYY()
+	}
+
+	var requestPayload = dto.CCMCommitmentAPIFilter{
+		Service: ccmCommitmentComputeService, // Default value
+
+	}
+
+	if opts.Service != nil && *opts.Service != "" {
+		requestPayload.Service = *opts.Service
+	}
+
+	if len(opts.CloudAccountIDs) > 0 {
+		requestPayload.CloudAccounts = opts.CloudAccountIDs
+	}
+
+	// Handle is_harness_managed parameter
+	if opts.IsHarnessManaged != nil {
+		requestPayload.IsHarnessManaged = opts.IsHarnessManaged
+	}
+
+	savingsResponse := new(dto.CCMCommitmentBaseResponse)
+
+	err := r.Client.Post(ctx, path, params, requestPayload, savingsResponse)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get cloud cost management compute savings with path %s: %w", path, err)
+	}
+
+	return savingsResponse, nil
+}

client/dto/ccmcosts.go

@@ -86,6 +86,7 @@ type CCMCommitmentOptions struct {
 	Service           *string  `json:"service,omitempty"`
 	StartDate         *string  `json:"startDate,omitempty"`
 	EndDate           *string  `json:"endDate,omitempty"`
+	IsHarnessManaged  *bool    `json:"isHarnessManaged,omitempty"`
 }
 
 // CcmCostCategoryList represents a list of cost categories in CCM
@@ -227,6 +228,7 @@ type CCMCommitmentBaseResponse struct {
 }
 
 type CCMCommitmentAPIFilter struct {
-	CloudAccounts []string `json:"cloud_account_ids,omitempty"`
-	Service       string   `json:"service,omitempty"`
+	CloudAccounts    []string `json:"cloud_account_ids,omitempty"`
+	Service          string   `json:"service,omitempty"`
+	IsHarnessManaged *bool    `json:"is_harness_managed,omitempty"`
 }

pkg/harness/ccmcosts.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"time"
 	"github.com/harness/harness-mcp/client"
 	"github.com/harness/harness-mcp/client/dto"
 	"github.com/harness/harness-mcp/cmd/harness-mcp-server/config"
 	"github.com/harness/harness-mcp/pkg/utils"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
+	"time"
 )
 
 // GetCcmOverview creates a tool for getting a ccm overview from an account
@@ -368,3 +368,100 @@ func FetchCommitmentCoverageTool(config *config.Config, client *client.CloudCost
 			return mcp.NewToolResultText(string(r)), nil
 		}
 }
+
+func FetchCommitmentSavingsTool(config *config.Config, client *client.CloudCostManagementService) (tool mcp.Tool, handler server.ToolHandlerFunc) {
+	return mcp.NewTool("get_ccm_commitment_savings",
+			mcp.WithDescription("Get commitment savings information for an account in Harness Cloud Cost Management"),
+			mcp.WithString("start_date",
+				mcp.Required(),
+				mcp.Description("Start date to filter commitment savings"),
+			),
+			mcp.WithString("end_date",
+				mcp.Required(),
+				mcp.Description("End date to filter commitment savings"),
+			),
+			mcp.WithBoolean("is_harness_managed",
+				mcp.Description("Filter results to show only Harness-managed commitments when set to true. When false or omitted, shows all commitments including both Harness-managed and non-Harness-managed ones."),
+			),
+			mcp.WithString("service",
+				mcp.Description("Optional service to filter commitment savings"),
+			),
+			mcp.WithArray("cloud_account_ids",
+				mcp.Description("Optional cloud account IDs to filter commitment savings"),
+				mcp.Items(map[string]any{
+					"type": "string",
+				}),
+			),
+			WithScope(config, false),
+		),
+		func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+			accountId, err := getAccountID(config, request)
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+
+			params := &dto.CCMCommitmentOptions{}
+			params.AccountIdentifier = &accountId
+
+			// Handle service parameter
+			service, ok, err := OptionalParamOK[string](request, "service")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			if ok && service != "" {
+				params.Service = &service
+			}
+
+			// Handle cloud account IDs parameter
+			cloudAccountIDs, ok, err := OptionalParamOK[[]string](request, "cloud_account_ids")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			if ok && len(cloudAccountIDs) > 0 {
+				params.CloudAccountIDs = cloudAccountIDs
+			}
+
+			// Handle start date parameter
+			startDate, ok, err := OptionalParamOK[string](request, "start_date")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			if ok && startDate != "" {
+				params.StartDate = &startDate
+			}
+
+			// Handle end date parameter
+			endDate, ok, err := OptionalParamOK[string](request, "end_date")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			if ok && endDate != "" {
+				params.EndDate = &endDate
+			}
+			// Handle is_harness_managed parameter
+			isHarnessManaged, ok, err := OptionalParamOK[bool](request, "is_harness_managed")
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+			if ok {
+				params.IsHarnessManaged = &isHarnessManaged
+			}
+
+			scope, err := fetchScope(config, request, false)
+			if err != nil {
+				return mcp.NewToolResultError(err.Error()), nil
+			}
+
+			data, err := client.GetCommitmentSavings(ctx, scope, params)
+			if err != nil {
+				return nil, fmt.Errorf("failed to get commitment savings: %w", err)
+			}
+
+			r, err := json.Marshal(data)
+			if err != nil {
+				return nil, fmt.Errorf("failed to marshal commitment savings: %w", err)
+			}
+
+			return mcp.NewToolResultText(string(r)), nil
+		}
+}

pkg/harness/tools.go

@@ -584,6 +584,7 @@ func registerCloudCostManagement(config *config.Config, tsg *toolsets.ToolsetGro
 			toolsets.NewServerTool(CcmMetadataTool(config, ccmClient)),
 			toolsets.NewServerTool(CcmPerspectiveRecommendationsTool(config, ccmClient)),
 			toolsets.NewServerTool(FetchCommitmentCoverageTool(config, ccmClient)),
+			toolsets.NewServerTool(FetchCommitmentSavingsTool(config, ccmClient)),
 		)
 
 	// Add toolset to the group