From 9da6c55b294ff56646763a0f97ee96972f13ee4e Mon Sep 17 00:00:00 2001
From: wubijie <wubijie@kylinos.cn>
Date: Thu, 31 Oct 2024 16:45:12 +0800
Subject: [PATCH] Fix some errors and add a configuration type API

---
 configmanage/server/controller/configinstance.go |  6 +++---
 configmanage/server/controller/lists.go          | 12 ++++++++++++
 configmanage/server/router/router.go             | 13 +++++++++----
 configmanage/server/service/extentions.go        |  4 ++--
 configmanage/server/service/repo.go              |  1 +
 5 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 configmanage/server/controller/lists.go

diff --git a/configmanage/server/controller/configinstance.go b/configmanage/server/controller/configinstance.go
index e00a07d3..c5a2fe88 100644
--- a/configmanage/server/controller/configinstance.go
+++ b/configmanage/server/controller/configinstance.go
@@ -31,7 +31,7 @@ func AddConfigHandler(c *gin.Context) {
 	//存储配置管理类型
 	ci := service.ConfigInstance{
 		UUID:        uuid.New().String(),
-		Type:        global.Repo,
+		Type:        query.Type,
 		Description: query.Description,
 		BatchIds:    query.BatchIds,
 		DepartIds:   query.DepartIds,
@@ -70,7 +70,7 @@ func AddConfigHandler(c *gin.Context) {
 		repoconfig.IsActive = false
 		repoconfig.Content, err = json.Marshal(files)
 		if err != nil {
-			logger.Error("fError encoding JSON:: %s", err.Error())
+			logger.Error("Error encoding JSON:: %s", err.Error())
 			response.Fail(c, "Error encoding JSON:", err.Error())
 			return
 		}
@@ -131,7 +131,7 @@ func LoadConfigHandler(c *gin.Context) {
 		repoconfig := &service.RepoConfig{
 			ConfigInfoUUID: ci.UUID,
 		}
-		//加载配置
+		// 加载正在使用的配置
 		err = repoconfig.Load()
 		if err != nil {
 			logger.Error("failed to get repofile file: %s", err.Error())
diff --git a/configmanage/server/controller/lists.go b/configmanage/server/controller/lists.go
new file mode 100644
index 00000000..4bb6456a
--- /dev/null
+++ b/configmanage/server/controller/lists.go
@@ -0,0 +1,12 @@
+package controller
+
+import (
+	"gitee.com/openeuler/PilotGo/sdk/response"
+	"github.com/gin-gonic/gin"
+	"openeuler.org/PilotGo/configmanage-plugin/global"
+)
+
+func ConfigTypeListHandler(c *gin.Context) {
+	result := []string{global.Repo, global.Host, global.SSH, global.SSHD, global.Sysctl}
+	response.Success(c, result, "get config type success")
+}
diff --git a/configmanage/server/router/router.go b/configmanage/server/router/router.go
index 0d06a58d..ce3ab2de 100644
--- a/configmanage/server/router/router.go
+++ b/configmanage/server/router/router.go
@@ -17,10 +17,15 @@ func InitRouter() *gin.Engine {
 func RegisterAPIs(router *gin.Engine) {
 	//输出插件初始化的信息
 	global.GlobalClient.RegisterHandlers(router)
-	pg := router.Group("/plugin/" + global.GlobalClient.PluginInfo.Name)
+	api := router.Group("/plugin/" + global.GlobalClient.PluginInfo.Name)
 	{
-		pg.POST("/add", controller.AddConfigHandler)
-		pg.GET("/load", controller.LoadConfigHandler)
-		pg.POST("/apply", controller.ApplyConfigHandler)
+		list := api.Group("/list")
+		{
+			// 提供配置文件类型的列表
+			list.GET("/config_type", controller.ConfigTypeListHandler)
+		}
+		api.POST("/add", controller.AddConfigHandler)
+		api.GET("/load", controller.LoadConfigHandler)
+		api.POST("/apply", controller.ApplyConfigHandler)
 	}
 }
diff --git a/configmanage/server/service/extentions.go b/configmanage/server/service/extentions.go
index 4e83dc70..4fab2c8b 100644
--- a/configmanage/server/service/extentions.go
+++ b/configmanage/server/service/extentions.go
@@ -8,11 +8,11 @@ import (
 func AddPermission() {
 	var ps []common.Permission
 	p1 := common.Permission{
-		Resource: "plugin.atune",
+		Resource: "plugin.configmanage",
 		Operate:  "agent_install",
 	}
 	p2 := common.Permission{
-		Resource: "plugin.atune",
+		Resource: "plugin.configmanage",
 		Operate:  "agent_uninstall",
 	}
 	ps = append(ps, p1, p2)
diff --git a/configmanage/server/service/repo.go b/configmanage/server/service/repo.go
index 4592129c..6fd7f405 100644
--- a/configmanage/server/service/repo.go
+++ b/configmanage/server/service/repo.go
@@ -49,6 +49,7 @@ func (rc *RepoConfig) Record() error {
 }
 
 func (rc *RepoConfig) Load() error {
+	// 加载正在使用的某配置文件
 	rf, err := internal.GetRepoFileByInfoUUID(rc.ConfigInfoUUID, true)
 	if err != nil {
 		return err
-- 
Gitee