Merge pull request #977 from lakshithagunasekara/throttle-policy-fix

Group exported rate limiting policies by env name and import with relative path

import-export-cli/cmd/exportThrottlePolicy.go

@@ -20,9 +20,10 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/wso2/product-apim-tooling/import-export-cli/impl"
 	"net/http"
 
+	"github.com/wso2/product-apim-tooling/import-export-cli/impl"
+
 	"github.com/wso2/product-apim-tooling/import-export-cli/credentials"
 
 	"github.com/spf13/cobra"
@@ -77,8 +78,9 @@ func executeExportThrottlePolicyCmd(credential credentials.Credential, exportDir
 		}
 		// Print info on response
 		utils.Logf(utils.LogPrefixInfo+"ResponseStatus: %v\n", resp.Status())
+		throttlePolicyZipLocationPath := filepath.Join(exportDirectory, CmdExportEnvironment)
 		if resp.StatusCode() == http.StatusOK {
-			impl.WriteThrottlePolicyToFile(exportDirectory, resp, exportThrottlePolicyFormat, runningExportThrottlePolicyCommand)
+			impl.WriteThrottlePolicyToFile(throttlePolicyZipLocationPath, resp, exportThrottlePolicyFormat, runningExportThrottlePolicyCommand)
 		} else if resp.StatusCode() == http.StatusInternalServerError {
 			// 500 Internal Server Error
 			fmt.Println(string(resp.Body()))

import-export-cli/impl/importThrottlePolicy.go

@@ -21,11 +21,13 @@ package impl
 import (
 	"errors"
 	"fmt"
-	"github.com/go-resty/resty/v2"
-	"github.com/wso2/product-apim-tooling/import-export-cli/utils"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strconv"
+
+	"github.com/go-resty/resty/v2"
+	"github.com/wso2/product-apim-tooling/import-export-cli/utils"
 )
 
 func ImportThrottlingPolicyToEnv(accessOAuthToken, importEnvironment, importPath string, importThrottlePolicyUpdate bool) error {
@@ -41,7 +43,15 @@ func ImportThrottlingPolicyToEnv(accessOAuthToken, importEnvironment, importPath
 }
 
 func importThrottlingPolicy(endpoint string, importPath string, accessToken string, isOauth bool, ThrottlePolicyUpdate bool) error {
-	resp, err := executeThrottlingPolicyUploadRequest(endpoint, importPath, ThrottlePolicyUpdate, accessToken, isOauth)
+	exportDirectory := filepath.Join(utils.ExportDirectory, utils.ExportedPoliciesDirName, utils.ExportedThrottlePoliciesDirName)
+	resolvedPolicyFilePath, err := resolvePolicyImportFilePath(importPath, exportDirectory)
+	if err != nil {
+		return err
+	}
+
+	utils.Logln(utils.LogPrefixInfo + "Policy Location: ", resolvedPolicyFilePath)
+
+	resp, err := executeThrottlingPolicyUploadRequest(endpoint, resolvedPolicyFilePath, ThrottlePolicyUpdate, accessToken, isOauth)
 	utils.Logf("Response : %v", resp)
 	if err != nil {
 		utils.Logln(utils.LogPrefixError, err)