feature(main): add readme (#24)

* feature(main): add readme Signed-off-by: cuisongliu <[email protected]> * feature(main): add readme Signed-off-by: cuisongliu <[email protected]> --------- Signed-off-by: cuisongliu <[email protected]>
labring · Jun 8, 2023 · c8cc4fb · c8cc4fb
1 parent d25d4bc
commit c8cc4fb
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 25 deletions.
diff --git a/.github/gh-bot.yml b/.github/gh-bot.yml
@@ -2,7 +2,12 @@ version: v1
 debug: true
 type: action
 action:
-  printConfig: true
+  printConfig: false
+  release:
+    retry: 15s
+    actionName: Release
+    allowOps:
+      - cuisongliu
 bot:
   prefix: /
   spe: _

diff --git a/README.md b/README.md
@@ -11,6 +11,13 @@ version: v1
 debug: true
 bot:
   prefix: /sealos
+  action:
+    printConfig: true
+    release:
+      retry: 15s
+      action: Release
+      allowOps:
+        - cuisongliu
   spe: _
   allowOps:
     - sealos-ci-robot
@@ -22,12 +29,6 @@ repo:
   name: labring/sealos
   fork: cuisongliu/sealos
 
-release:
-  retry: 15s
-  action: Release
-  allowOps:
-    - cuisongliu
-
 message:
   success: |
     🤖 says: The action {{.Body}} finished successfully 🎉
@@ -44,6 +45,12 @@ message:
 
 - `version` - 版本标识，当前为 v1。
 - `debug` - 是否开启调试模式，设置为 true 时开启。
+- `action` \- action配置。
+   - `printConfig` - 是否打印配置信息，设置为 true 时打印。
+   - `release` \- 发布配置。
+       - `retry` - 重试间隔，例如：15s。
+       - `action` - 执行动作，例如：Release。
+       - `allowOps` - 允许触发发布操作的用户名列表。
 - `bot` \- 机器人配置。
    - `prefix` - 机器人命令前缀，用于识别命令。默认值 `/`,如果设置为`/` 则 `spe` 失效。命令为`/release`
    - `spe` - 机器人命令分隔符，用于识别命令。默认值 `_`
@@ -54,10 +61,6 @@ message:
    - `org` - 是否为组织仓库，设置为 true 时表示是组织仓库。
    - `name` - 仓库名称。
    - `fork` - fork 的仓库名称。
-- `release` \- 发布配置。
-   - `retry` - 重试间隔，例如：15s。
-   - `action` - 执行动作，例如：Release。
-   - `allowOps` - 允许触发发布操作的用户名列表。
 - `message` \- 消息配置。
    - `success` - 成功消息模板。
    - `format_error` - 格式错误消息模板。

diff --git a/pkg/action/action.go b/pkg/action/action.go
@@ -31,7 +31,7 @@ func CommentEngine() error {
 	for _, t := range cmds {
 		logger.Debug("cmds: ", strings.TrimSpace(t))
 		wfs := make([]workflow.Interface, 0)
-		if types.GlobalsBotConfig.Release != nil {
+		if types.GlobalsBotConfig.Action.Release != nil {
 			wfs = append(wfs, workflow.NewRelease(strings.TrimSpace(t)))
 		}
 		used := 0

diff --git a/pkg/action/action_pr_comment.go b/pkg/action/action_pr_comment.go
@@ -28,7 +28,7 @@ import (
 )
 
 func GetEnvFromAction(key string) (string, error) {
-	allKey := strings.ToLower("sealos_" + key)
+	allKey := strings.ToUpper("sealos_" + key)
 	val, _ := os.LookupEnv(allKey)
 	if val == "" {
 		return "", fmt.Errorf("not found %s", allKey)

diff --git a/pkg/gh/check_release.go b/pkg/gh/check_release.go
@@ -35,7 +35,7 @@ type ActionOut struct {
 }
 
 func CheckRelease(tagName string) (*ActionOut, error) {
-	workflowOutput, _ := utils.RunCommandWithOutput(fmt.Sprintf(gitWorkflowCheck, types.GlobalsBotConfig.GetForkName(), types.GlobalsBotConfig.Release.Action, tagName), true)
+	workflowOutput, _ := utils.RunCommandWithOutput(fmt.Sprintf(gitWorkflowCheck, types.GlobalsBotConfig.GetForkName(), types.GlobalsBotConfig.Action.Release.ActionName, tagName), true)
 	if workflowOutput == "" || strings.Contains(workflowOutput, "could not find any workflows named") {
 		time.Sleep(5 * time.Second)
 		return CheckRelease(tagName)
@@ -52,7 +52,7 @@ func CheckRelease(tagName string) (*ActionOut, error) {
 		out.IsSuccess = false
 		return &out, nil
 	} else {
-		tt, err := time.ParseDuration(types.GlobalsBotConfig.Release.Retry)
+		tt, err := time.ParseDuration(types.GlobalsBotConfig.Action.Release.Retry)
 		if err != nil {
 			tt = time.Second * 20
 		}

diff --git a/pkg/types/config.go b/pkg/types/config.go
@@ -34,9 +34,9 @@ type Repo struct {
 }
 
 type Release struct {
-	Retry    string   `json:"retry"`
-	Action   string   `json:"action"`
-	AllowOps []string `json:"allowOps"`
+	Retry      string   `json:"retry"`
+	ActionName string   `json:"actionName"`
+	AllowOps   []string `json:"allowOps"`
 }
 
 type Type string
@@ -47,7 +47,8 @@ const (
 )
 
 type Action struct {
-	PrintConfig bool `json:"printConfig"`
+	PrintConfig bool     `json:"printConfig"`
+	Release     *Release `json:"release,omitempty"`
 }
 
 type Config struct {
@@ -59,8 +60,6 @@ type Config struct {
 	Repo    Repo              `json:"repo"`
 	Message map[string]string `json:"message"`
 	Token   string            `json:"-"`
-
-	Release *Release `json:"release,omitempty"`
 }
 
 // GetPrefix returns the prefix for the bot

diff --git a/pkg/types/validate.go b/pkg/types/validate.go
@@ -33,11 +33,11 @@ func (r *Config) validate() error {
 		if r.GetForkName() == "" {
 			return fmt.Errorf("repo fork is required")
 		}
-		if r.Release != nil {
-			if r.Release.Action == "" {
+		if r.Action.Release != nil {
+			if r.Action.Release.ActionName == "" {
 				return fmt.Errorf("release action is required")
 			}
-			if r.Release.Retry == "" {
+			if r.Action.Release.Retry == "" {
 				return fmt.Errorf("release retry is required")
 			}
 		}

diff --git a/pkg/workflow/release.go b/pkg/workflow/release.go
@@ -30,7 +30,7 @@ type release struct {
 }
 
 func (c *release) Run() error {
-	if checkPermission(types.GlobalsBotConfig.Release.AllowOps) != nil {
+	if checkPermission(types.GlobalsBotConfig.Action.Release.AllowOps) != nil {
 		return c.sender.sendMsgToIssue("permission_error")
 	}
 	data := strings.Split(c.Body, " ")