feat: [ML-1327]: Fix internal mode for committments (#136)

* feat: [ML-1327]: Fix internal mode for committments

Author: David-Kreiner

client/ccmcommitments.go

@@ -12,9 +12,9 @@ import (
 )
 
 const (
-	ccmCommitmentEstimatedSavingsPath = ccmCommitmentBasePath + "/accounts/%s/v2/setup/%s/estimated_savings?accountIdentifier=%s"
-	ccmCommitmentSpendDetailsPath     = ccmCommitmentBasePath + "/accounts/%s/v2/spend/detail?accountIdentifier=%s"
-	ccmCommitmentMasterAccountsPath   = ccmCommitmentBasePath + "/accounts/%s/v1/setup/listMasterAccounts?accountIdentifier=%s"
+	ccmCommitmentEstimatedSavingsPath = "/accounts/%s/v2/setup/%s/estimated_savings?accountIdentifier=%s"
+	ccmCommitmentSpendDetailsPath     = "/accounts/%s/v2/spend/detail?accountIdentifier=%s"
+	ccmCommitmentMasterAccountsPath   = "/accounts/%s/v1/setup/listMasterAccounts?accountIdentifier=%s"
 
 	defaultTargetCoveragePercentage = 90.0
 )

client/ccmcosts.go

@@ -12,14 +12,13 @@ import (
 
 const (
 	ccmBasePath                                = "ccm/api"
-	ccmCommitmentBasePath                      = "/lw/co/api"
 	ccmGetOverviewPath                         = ccmBasePath + "/overview?accountIdentifier=%s&startTime=%d&endTime=%d&groupBy=%s"
 	ccmCostCategoryListPath                    = ccmBasePath + "/business-mapping/filter-panel?accountIdentifier=%s"
 	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"
-	ccmCommitmentUtilisationDetailsPath        = ccmCommitmentBasePath + "/accounts/%s/v1/detail/commitment_utilisation?accountIdentifier=%s"
+	ccmCommitmentCoverageDetailsPath           = "/accounts/%s/v1/detail/compute_coverage?accountIdentifier=%s"
+	ccmCommitmentSavingsDetailsPath            = "/accounts/%s/v1/detail/savings?accountIdentifier=%s"
+	ccmCommitmentUtilisationDetailsPath        = "/accounts/%s/v1/detail/commitment_utilisation?accountIdentifier=%s"
 	ccmCommitmentComputeService         string = "Amazon Elastic Compute Cloud - Compute"
 )
 

pkg/modules/ccm.go

@@ -77,7 +77,7 @@ func RegisterCloudCostManagement(config *config.Config, tsg *toolsets.ToolsetGro
 		Client: c,
 	}
 
-	commOrchBaseURL := utils.BuildServiceURL(config, config.CCMCommOrchBaseURL, config.BaseURL, "")
+	commOrchBaseURL := utils.BuildServiceURL(config, config.CCMCommOrchBaseURL, config.BaseURL, "lw/co/api")
 	commOrchSecret := config.CCMCommOrchSecret
 
 	// Create base client for CCM