REMOVE check base64 method.

illacloud · Sep 28, 2023 · f8217c4 · f8217c4
1 parent f28ad08
commit f8217c4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 43 deletions.
diff --git a/src/actionruntime/restapi/service.go b/src/actionruntime/restapi/service.go
@@ -246,11 +246,7 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 		if len(res.Rows) == 0 && len(resp.Body()) > 0 {
 			res.Rows = append(res.Rows, map[string]interface{}{"message": string(resp.Body())})
 		}
-		if !isBase64Encoded(string(resp.Body())) {
-			res.Extra["raw"] = base64Encode(resp.Body())
-		} else {
-			res.Extra["raw"] = string(resp.Body())
-		}
+		res.Extra["raw"] = base64Encode(resp.Body())
 		res.Extra["headers"] = resp.Header()
 		res.Extra["statusCode"] = resp.StatusCode()
 		res.Extra["statusText"] = resp.Status()
@@ -270,11 +266,7 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 		if len(res.Rows) == 0 && len(resp.Body()) > 0 {
 			res.Rows = append(res.Rows, map[string]interface{}{"message": string(resp.Body())})
 		}
-		if !isBase64Encoded(string(resp.Body())) {
-			res.Extra["raw"] = base64Encode(resp.Body())
-		} else {
-			res.Extra["raw"] = string(resp.Body())
-		}
+		res.Extra["raw"] = base64Encode(resp.Body())
 		res.Extra["headers"] = resp.Header()
 		res.Extra["statusCode"] = resp.StatusCode()
 		res.Extra["statusText"] = resp.Status()
@@ -294,11 +286,7 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 		if len(res.Rows) == 0 && len(resp.Body()) > 0 {
 			res.Rows = append(res.Rows, map[string]interface{}{"message": string(resp.Body())})
 		}
-		if !isBase64Encoded(string(resp.Body())) {
-			res.Extra["raw"] = base64Encode(resp.Body())
-		} else {
-			res.Extra["raw"] = string(resp.Body())
-		}
+		res.Extra["raw"] = base64Encode(resp.Body())
 		res.Extra["headers"] = resp.Header()
 		res.Extra["statusCode"] = resp.StatusCode()
 		res.Extra["statusText"] = resp.Status()
@@ -318,11 +306,7 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 		if len(res.Rows) == 0 && len(resp.Body()) > 0 {
 			res.Rows = append(res.Rows, map[string]interface{}{"message": string(resp.Body())})
 		}
-		if !isBase64Encoded(string(resp.Body())) {
-			res.Extra["raw"] = base64Encode(resp.Body())
-		} else {
-			res.Extra["raw"] = string(resp.Body())
-		}
+		res.Extra["raw"] = base64Encode(resp.Body())
 		res.Extra["headers"] = resp.Header()
 		res.Extra["statusCode"] = resp.StatusCode()
 		res.Extra["statusText"] = resp.Status()
@@ -342,11 +326,7 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 		if len(res.Rows) == 0 && len(resp.Body()) > 0 {
 			res.Rows = append(res.Rows, map[string]interface{}{"message": string(resp.Body())})
 		}
-		if !isBase64Encoded(string(resp.Body())) {
-			res.Extra["raw"] = base64Encode(resp.Body())
-		} else {
-			res.Extra["raw"] = string(resp.Body())
-		}
+		res.Extra["raw"] = base64Encode(resp.Body())
 		res.Extra["headers"] = resp.Header()
 		res.Extra["statusCode"] = resp.StatusCode()
 		res.Extra["statusText"] = resp.Status()
@@ -367,11 +347,7 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 		if len(res.Rows) == 0 && len(resp.Body()) > 0 {
 			res.Rows = append(res.Rows, map[string]interface{}{"message": string(resp.Body())})
 		}
-		if !isBase64Encoded(string(resp.Body())) {
-			res.Extra["raw"] = base64Encode(resp.Body())
-		} else {
-			res.Extra["raw"] = string(resp.Body())
-		}
+		res.Extra["raw"] = base64Encode(resp.Body())
 		res.Extra["headers"] = resp.Header()
 		res.Extra["statusCode"] = resp.StatusCode()
 		res.Extra["statusText"] = resp.Status()
@@ -391,11 +367,7 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 		if len(res.Rows) == 0 && len(resp.Body()) > 0 {
 			res.Rows = append(res.Rows, map[string]interface{}{"message": string(resp.Body())})
 		}
-		if !isBase64Encoded(string(resp.Body())) {
-			res.Extra["raw"] = base64Encode(resp.Body())
-		} else {
-			res.Extra["raw"] = string(resp.Body())
-		}
+		res.Extra["raw"] = base64Encode(resp.Body())
 		res.Extra["headers"] = resp.Header()
 		res.Extra["statusCode"] = resp.StatusCode()
 		res.Extra["statusText"] = resp.Status()
@@ -405,11 +377,6 @@ func (r *RESTAPIConnector) Run(resourceOptions map[string]interface{}, actionOpt
 	return res, nil
 }
 
-func isBase64Encoded(s string) bool {
-	_, err := base64.StdEncoding.DecodeString(s)
-	return err == nil
-}
-
 func base64Encode(s []byte) string {
 	encoded := base64.StdEncoding.EncodeToString(s)
 	return encoded

diff --git a/src/controller/app.go b/src/controller/app.go
@@ -1235,10 +1235,16 @@ func (controller *Controller) ForkMarketplaceApp(c *gin.Context) {
 	controller.DuplicateSetStateByVersion(c, app.ExportTeamID(), toTeamID, appID, duplicatedAppID, app.ExportMainlineVersion(), model.APP_EDIT_VERSION, userID)
 	controller.DuplicateActionByVersion(c, app.ExportTeamID(), toTeamID, appID, duplicatedAppID, app.ExportMainlineVersion(), model.APP_EDIT_VERSION, userID)
 
+	// init parallel counter
+	var wg sync.WaitGroup
+	wg.Add(1)
+
 	// add counter to marketpalce
-	marketplaceAPI := illamarketplacesdk.NewIllaMarketplaceRestAPI()
-	errInForkCounter := marketplaceAPI.ForkCounter(illamarketplacesdk.PRODUCT_TYPE_APPS, appID)
-	log.Printf("errInForkCounter: %+v\n", errInForkCounter)
+	go func() {
+		defer wg.Done()
+		marketplaceAPI := illamarketplacesdk.NewIllaMarketplaceRestAPI()
+		marketplaceAPI.ForkCounter(illamarketplacesdk.PRODUCT_TYPE_APPS, appID)
+	}()
 
 	// audit log
 	auditLogger := auditlogger.GetInstance()