feat: show specific deploy error message (#35)

* feat:add deploy failcase to metaData * feat: dice2.0 add deploy failcase to metaData * style: remove useless comments * perf: remove develop log * perf: error format * perf: error format
erda-project · Mar 6, 2024 · 384b187 · 384b187
1 parent 1329655
commit 384b187
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/actions/dice/1.0/internal/dice/deploy.go b/actions/dice/1.0/internal/dice/deploy.go
@@ -13,12 +13,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/erda-project/erda-actions/pkg/log"
 	"github.com/erda-project/erda/apistructs"
 	"github.com/erda-project/erda/pkg/filehelper"
 	"github.com/erda-project/erda/pkg/http/httpclient"
 	"github.com/erda-project/erda/pkg/http/httputil"
 	"github.com/erda-project/erda/pkg/retry"
+
+	"github.com/erda-project/erda-actions/pkg/log"
 )
 
 func Run() error {
@@ -119,7 +120,7 @@ func storeMetaFileWithErr(conf *conf, runtimeID int64, deploymentID int64, deplo
 	if deployResult == nil {
 		return storeMetaFile(conf, runtimeID, deploymentID)
 	}
-	if len(deployResult.Data.MoudleErrMsg) == 0 {
+	if len(deployResult.Data.MoudleErrMsg) == 0 && deployResult.Data.FailCause == "" {
 		return storeMetaFile(conf, runtimeID, deploymentID)
 	}
 	metaData := generateMetadata(conf, runtimeID, deploymentID)
@@ -129,6 +130,13 @@ func storeMetaFileWithErr(conf *conf, runtimeID int64, deploymentID int64, deplo
 			Value: v,
 		})
 	}
+	if deployResult.Data.FailCause != "" {
+		*metaData = append(*metaData, metadata.MetadataField{
+			Name:  "FailCause",
+			Value: deployResult.Data.FailCause,
+			Level: metadata.MetadataLevelError,
+		})
+	}
 	// remove that the value is empty
 	newMetadata := make([]metadata.MetadataField, 0)
 	for _, v := range *metaData {

diff --git a/actions/dice/2.0/internal/pkg/dice/deploy/status_check.go b/actions/dice/2.0/internal/pkg/dice/deploy/status_check.go
@@ -1,18 +1,19 @@
 package deploy
 
 import (
+	"context"
 	"fmt"
-	"time"
 	"sync"
-	"context"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
 	"github.com/erda-project/erda/pkg/http/httpclient"
+
 	"github.com/erda-project/erda-actions/actions/dice/2.0/internal/common"
-	"github.com/erda-project/erda-actions/actions/dice/2.0/internal/pkg/utils"
 	"github.com/erda-project/erda-actions/actions/dice/2.0/internal/pkg/dice/callback"
+	"github.com/erda-project/erda-actions/actions/dice/2.0/internal/pkg/utils"
 )
 
 var (
@@ -75,7 +76,7 @@ func (d *deploy) statusCheckLoop(ctx context.Context, drMap map[string]*common.D
 		case <-ticker.C:
 			isDeploying, err := d.check(drMap)
 			if err != nil {
-				logrus.Error("failed to check deploy", err)
+				logrus.Errorf("failed to check deploy, err: %v", err)
 				return err
 			}
 			// deploy done
@@ -96,7 +97,7 @@ func (d *deploy) checkBatchStatusLoop(ctx context.Context, orderId string) error
 		case <-ticker.C:
 			isDeploying, err := d.checkBatch(orderId)
 			if err != nil {
-				logrus.Error("failed to check deploy", err)
+				logrus.Errorf("failed to check deploy, err: %v", err)
 				return err
 			}
 			// deploy done
@@ -162,6 +163,16 @@ func (d *deploy) check(drMap map[string]*common.DeployResult) (bool, error) {
 		needPrint, isErr, isDeploying bool
 	)
 
+	defer func() {
+		// error message will store meta and report
+		if isErr {
+			err := d.store.BatchStoreMetaFile(statusResult)
+			if err != nil {
+				logrus.Errorf("failed to batch store meta file, err: %v", err)
+			}
+		}
+	}()
+
 	// analyse status check results
 	for appName, data := range statusResult {
 		if data == nil {
@@ -188,6 +199,7 @@ func (d *deploy) check(drMap map[string]*common.DeployResult) (bool, error) {
 		tmpIsDeploying, err := parseStatus(data)
 		if err != nil {
 			logrus.Debug(err)
+			isErr = true
 			return isDeploying, err
 		}
 
@@ -202,14 +214,6 @@ func (d *deploy) check(drMap map[string]*common.DeployResult) (bool, error) {
 		utils.BatchPrintStatusCheckResult(statusResult)
 	}
 
-	// error message will store meta and report
-	if isErr {
-		err := d.store.BatchStoreMetaFile(statusResult)
-		if err != nil {
-			logrus.Errorf("failed to batch store meta file, err: %v", err)
-		}
-	}
-
 	return isDeploying, nil
 }
 

diff --git a/actions/dice/2.0/internal/pkg/dice/store/store.go b/actions/dice/2.0/internal/pkg/dice/store/store.go
@@ -7,13 +7,13 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/erda-project/erda/apistructs"
+	"github.com/erda-project/erda/pkg/metadata"
 	"github.com/pkg/errors"
 
 	"github.com/erda-project/erda-actions/actions/dice/2.0/internal/common"
 	"github.com/erda-project/erda-actions/actions/dice/2.0/internal/conf"
 	"github.com/erda-project/erda-actions/actions/dice/2.0/internal/pkg/utils"
-	"github.com/erda-project/erda/apistructs"
-	"github.com/erda-project/erda/pkg/metadata"
 )
 
 type Store interface {
@@ -98,6 +98,13 @@ func (s *store) BatchStoreMetaFile(statusResp map[string]*common.DeploymentStatu
 			}...)
 			break
 		}
+		if resp.Data.FailCause != "" {
+			metaData = append(metaData, metadata.MetadataField{
+				Name:  "FailCause",
+				Value: resp.Data.FailCause,
+				Level: metadata.MetadataLevelError,
+			})
+		}
 	}
 
 	return s.storeMetaFile(metaData)