From dd3ea57e28659db6c177621be54d11838391c6c5 Mon Sep 17 00:00:00 2001
From: wubijie <wubijie@kylinos.cn>
Date: Mon, 4 Nov 2024 15:44:33 +0800
Subject: [PATCH] Improve the ApplyConfigHandler to handle host configuration
 logic

---
 configmanage/server/controller/configinstance.go | 12 +++++++++++-
 configmanage/server/controller/lists.go          |  2 +-
 configmanage/server/internal/repofile.go         |  2 +-
 configmanage/server/service/repo.go              |  4 ++--
 configmanage/server/service/repo_test.go         |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/configmanage/server/controller/configinstance.go b/configmanage/server/controller/configinstance.go
index 3d546fbc..510c749f 100644
--- a/configmanage/server/controller/configinstance.go
+++ b/configmanage/server/controller/configinstance.go
@@ -244,7 +244,17 @@ func ApplyConfigHandler(c *gin.Context) {
 		response.Success(c, nil, "apply repo config success")
 
 	case global.Host:
-
+		hostconfig := &service.HostConfig{
+			UUID:           query.UUID,
+			ConfigInfoUUID: ci.UUID,
+		}
+		_, err := hostconfig.Apply()
+		if err != nil {
+			logger.Error("failed to apply hostconfig file: %s", err.Error())
+			response.Fail(c, "failed to apply hostconfig:", err.Error())
+			return
+		}
+		response.Success(c, nil, "apply hostconfig success")
 	case global.SSH:
 
 	case global.SSHD:
diff --git a/configmanage/server/controller/lists.go b/configmanage/server/controller/lists.go
index def88655..424602a6 100644
--- a/configmanage/server/controller/lists.go
+++ b/configmanage/server/controller/lists.go
@@ -66,7 +66,7 @@ func ConfigInfoHandler(c *gin.Context) {
 	switch ci.Type {
 	case global.Repo:
 		// 获取有关配置的所有文件信息
-		repofiles, err := service.GetRopeFilesByCinfigUUID(ci.UUID)
+		repofiles, err := service.GetRopeFilesByConfigUUID(ci.UUID)
 		if err != nil {
 			logger.Error("failed to get repoconfig file:s %s", err.Error())
 			response.Fail(c, "failed to get repoconfig files", err.Error())
diff --git a/configmanage/server/internal/repofile.go b/configmanage/server/internal/repofile.go
index d1b05c62..355e2530 100644
--- a/configmanage/server/internal/repofile.go
+++ b/configmanage/server/internal/repofile.go
@@ -53,7 +53,7 @@ func (rf *RepoFile) UpdateByuuid() error {
 }
 
 // 根据配置uuid获取所有配置文件
-func GetRopeFilesByCinfigUUID(uuid string) ([]RepoFile, error) {
+func GetRopeFilesByConfigUUID(uuid string) ([]RepoFile, error) {
 	var files []RepoFile
 	err := db.MySQL().Model(&RepoFile{}).Where("config_info_uuid=?", uuid).Find(&files).Error
 	return files, err
diff --git a/configmanage/server/service/repo.go b/configmanage/server/service/repo.go
index d5d091ca..5506bd24 100644
--- a/configmanage/server/service/repo.go
+++ b/configmanage/server/service/repo.go
@@ -242,8 +242,8 @@ func (rc *RepoConfig) Collect() error {
 }
 
 // 根据配置uuid获取所有配置文件
-func GetRopeFilesByCinfigUUID(uuid string) ([]RepoFile, error) {
-	return internal.GetRopeFilesByCinfigUUID(uuid)
+func GetRopeFilesByConfigUUID(uuid string) ([]RepoFile, error) {
+	return internal.GetRopeFilesByConfigUUID(uuid)
 }
 
 // 查看某台机器某种类型的的历史配置信息
diff --git a/configmanage/server/service/repo_test.go b/configmanage/server/service/repo_test.go
index 18bd7ce3..2bbadba7 100644
--- a/configmanage/server/service/repo_test.go
+++ b/configmanage/server/service/repo_test.go
@@ -33,7 +33,7 @@ func TestGetRopeFilesByCinfigUUID(t *testing.T) {
 	testUUID := "9c3f8e3d-5f8e-42df-b2d0-49bf55cfeb56"
 
 	// 调用被测试的函数
-	files, err := GetRopeFilesByCinfigUUID(testUUID)
+	files, err := GetRopeFilesByConfigUUID(testUUID)
 	if err != nil {
 		fmt.Printf("load repofiles error: %s\n", err)
 		os.Exit(-1)
-- 
Gitee