Merge pull request #1313 from Thenujan-Nagaratnam/mcp-server

Fix mcp-server export path

Author: npamudika

import-export-cli/cmd/exportMCPServer.go

@@ -89,7 +89,7 @@ func executeExportMCPServerCmd(credential credentials.Credential, exportDirector
 		utils.Logf(utils.LogPrefixInfo+"ResponseStatus: %v\n", resp.Status())
 		mcpServerZipLocationPath := filepath.Join(exportDirectory, CmdExportEnvironment)
 		if resp.StatusCode() == http.StatusOK {
-			impl.WriteToZip(exportMCPServerName, exportMCPServerVersion, "", mcpServerZipLocationPath, runningExportMCPServerCommand, resp)
+			impl.WriteMCPServerToZip(exportMCPServerName, exportMCPServerVersion, "", mcpServerZipLocationPath, runningExportMCPServerCommand, resp)
 		} else if resp.StatusCode() == http.StatusInternalServerError {
 			// 500 Internal Server Error
 			fmt.Println(string(resp.Body()))

import-export-cli/cmd/exportMCPServers.go

@@ -63,7 +63,7 @@ var ExportMCPServersCmd = &cobra.Command{
 // exportDirectory = <export_directory>/migration/
 func executeExportMCPServersCmd(credential credentials.Credential, exportDirectory string) {
 	//create dir structure
-	mcpServerExportDir := impl.CreateExportAPIsDirStructure(exportDirectory, CmdResourceTenantDomain, CmdExportEnvironment,
+	mcpServerExportDir := impl.CreateExportMCPServersDirStructure(exportDirectory, CmdResourceTenantDomain, CmdExportEnvironment,
 		CmdForceStartFromBegin)
 	exportRelatedFilesPath := filepath.Join(exportDirectory, CmdExportEnvironment,
 		utils.GetMigrationExportTenantDirName(CmdResourceTenantDomain))

import-export-cli/impl/exportMCPServer.go

@@ -19,7 +19,9 @@
 package impl
 
 import (
+	"fmt"
 	"net/url"
+	"path/filepath"
 	"strconv"
 
 	"github.com/go-resty/resty/v2"
@@ -71,3 +73,54 @@ func exportMCPServer(name, version, revisionNum, provider, format, publisherEndp
 
 	return resp, nil
 }
+
+// WriteMCPServerToZip
+// @param exportMCPServerName : Name of the MCP Server to be exported
+// @param exportMCPServerVersion: Version of the MCP Server to be exported
+// @param exportMCPServerRevisionNumber: Revision number of the MCP Server
+// @param zipLocationPath: Path to the export directory
+// @param runningExportMCPServerCommand: Whether the export MCP Server command is running
+// @param resp : Response returned from making the HTTP request (only pass a 200 OK)
+// Exported MCP Server will be written to a zip file
+func WriteMCPServerToZip(exportMCPServerName, exportMCPServerVersion, exportMCPServerRevisionNumber, zipLocationPath string,
+	runningExportMCPServerCommand bool, resp *resty.Response) {
+	zipFilename := exportMCPServerName + "_" + exportMCPServerVersion
+	if exportMCPServerRevisionNumber != "" {
+		zipFilename += "_" + utils.GetRevisionNamFromRevisionNum(exportMCPServerRevisionNumber)
+	}
+	zipFilename += ".zip" // MyMCPServer_1.0.0_Revision-1.zip
+	// Writes the REST MCP Server response to a temporary zip file
+	tempZipFile, err := utils.WriteResponseToTempZip(zipFilename, resp)
+	if err != nil {
+		utils.HandleErrorAndExit("Error creating the temporary zip file to store the exported MCP Server", err)
+	}
+
+	err = utils.CreateDirIfNotExist(zipLocationPath)
+	if err != nil {
+		utils.HandleErrorAndExit("Error creating dir to store zip archive: "+zipLocationPath, err)
+	}
+	exportedFinalZip := filepath.Join(zipLocationPath, zipFilename)
+
+	// Add mcp_server_meta.yaml file inside the zip and create a new zup file in exportedFinalZip location
+	metaData := utils.MetaData{
+		Name:    exportMCPServerName,
+		Version: exportMCPServerVersion,
+		DeployConfig: utils.DeployConfig{
+			Import: utils.ImportConfig{
+				Update:           true,
+				PreserveProvider: true,
+				RotateRevision:   false,
+			},
+		},
+	}
+	err = IncludeMetaFileToZip(tempZipFile, exportedFinalZip, utils.MetaFileMCPServer, metaData)
+	if err != nil {
+		utils.HandleErrorAndExit("Error creating the final zip archive with mcp_server_meta.yaml file", err)
+	}
+
+	// Output the final zip file location.
+	if runningExportMCPServerCommand {
+		fmt.Println("Successfully exported MCP Server!")
+		fmt.Println("Find the exported MCP Server at " + exportedFinalZip)
+	}
+}

import-export-cli/impl/exportMCPServers.go

@@ -29,15 +29,11 @@ import (
 	"github.com/wso2/product-apim-tooling/import-export-cli/utils"
 )
 
-var mcpServerExportDir string
 var mcpServerListOffset int //from which index of MCP Server, the MCP Servers will be fetched from APIM server
 var mcpServerCount int32    // size of MCP Server list to be exported or number of MCP Servers left to be exported from last iteration
 var mcpServers []utils.MCPServer
-var exportMCPServersRelatedFilesPath string
-var exportMCPServersFormat string
 
 var startingMCPServerIndexFromList int
-var mcpServerMainConfigFilePath string
 
 // Prepare resumption of previous-halted export-mcp-servers operation
 func PrepareMCPServerResumption(credential credentials.Credential, exportRelatedFilesPath, cmdResourceTenantDomain, cmdUsername, cmdExportEnvironment string) {
@@ -145,7 +141,7 @@ func getRevisionsListForMCPServer(accessToken, environment string, mcpServer uti
 
 // Do the MCP Server exportation
 func ExportMCPServers(credential credentials.Credential, exportRelatedFilesPath, environment, tenantDomain, format,
-	username, exportDir string, preserveStatus, runningExportMCPServerCommand, allRevisions,
+	username, mcpServerExportDir string, preserveStatus, runningExportMCPServerCommand, allRevisions,
 	preserveCredentials bool) {
 
 	if mcpServerCount == 0 {
@@ -196,7 +192,7 @@ func ExportMCPServers(credential credentials.Credential, exportRelatedFilesPath,
 			}
 		}
 		fmt.Println("\nTotal number of MCP Servers exported: " + cast.ToString(counterSucceededMCPServers))
-		fmt.Println("MCP Server export path: " + exportDir)
+		fmt.Println("MCP Server export path: " + mcpServerExportDir)
 		fmt.Println("\nCommand: export-mcp-servers execution completed !")
 	}
 }
@@ -222,11 +218,41 @@ func exportMCPServerAndWriteToZip(mcpServer utils.MCPServer, revisionNumber, acc
 
 	if resp.StatusCode() == http.StatusOK {
 		utils.Logf(utils.LogPrefixInfo+"ResponseStatus: %v\n", resp.Status())
-		WriteToZip(exportMCPServerName, exportMCPServerVersion, exportMCPServerRevision, mcpServerExportDir, runningExportMCPServerCommand, resp)
+		WriteMCPServerToZip(exportMCPServerName, exportMCPServerVersion, exportMCPServerRevision, mcpServerExportDir, runningExportMCPServerCommand, resp)
 		//write on last-succeeded-mcp-server.log
 		utils.WriteLastSucceededMCPServerFileData(exportRelatedFilesPath, mcpServer)
 	} else {
 		fmt.Printf("Error exporting MCP Server: %s - %s of Provider: %s\n", exportMCPServerName, exportMCPServerVersion, exportMCPServerProvider)
 		utils.PrintErrorResponseAndExit(resp)
 	}
 }
+
+// Create the required directory structure to save the exported MCP Servers
+func CreateExportMCPServersDirStructure(artifactExportDirectory, cmdResourceTenantDomain, cmdExportEnvironment string, cmdForceStartFromBegin bool) string {
+	var resourceTenantDirName = utils.GetMigrationExportTenantDirName(cmdResourceTenantDomain)
+
+	var createDirError error
+	createDirError = utils.CreateDirIfNotExist(artifactExportDirectory)
+
+	migrationsArtifactsEnvPath := filepath.Join(artifactExportDirectory, cmdExportEnvironment)
+	migrationsArtifactsEnvTenantPath := filepath.Join(migrationsArtifactsEnvPath, resourceTenantDirName)
+	migrationsArtifactsEnvTenantMCPServersPath := filepath.Join(migrationsArtifactsEnvTenantPath, utils.ExportedMCPServersDirName)
+
+	createDirError = utils.CreateDirIfNotExist(migrationsArtifactsEnvPath)
+	createDirError = utils.CreateDirIfNotExist(migrationsArtifactsEnvTenantPath)
+
+	if dirExists, _ := utils.IsDirExists(migrationsArtifactsEnvTenantMCPServersPath); dirExists {
+		if cmdForceStartFromBegin {
+			utils.RemoveDirectory(migrationsArtifactsEnvTenantMCPServersPath)
+			createDirError = utils.CreateDir(migrationsArtifactsEnvTenantMCPServersPath)
+		}
+	} else {
+		createDirError = utils.CreateDir(migrationsArtifactsEnvTenantMCPServersPath)
+	}
+
+	if createDirError != nil {
+		utils.HandleErrorAndExit("Error in creating directory structure for the MCP Server export for migration .",
+			createDirError)
+	}
+	return migrationsArtifactsEnvTenantMCPServersPath
+}

import-export-cli/utils/constants.go

@@ -272,6 +272,7 @@ const (
 // project meta files
 const (
 	MetaFileAPI         = "api_meta.yaml"
+	MetaFileMCPServer   = "mcp_server_meta.yaml"
 	MetaFileAPIProduct  = "api_product_meta.yaml"
 	MetaFileApplication = "application_meta.yaml"
 )