tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-07 08:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge(cordis): abort helpers and gold upgrade fixture

Browse Source 
Bring Wavelet AbortNotFoundIfMissing/AbortBadRequestOnError, switch OpenFlare handlers to them, and pin the golden upgrade test to v3.5.4 via git archive.
This commit is contained in:
ryan
2026-08-30 18:03:04 +08:00
parent b216175ee2 7ce75d1dd0
commit f975c4f7cc
18 changed files with 177 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/openflare/plugins/server/domain/fleet/agent/routers.go
+9 -9
View File
@@ -44,7 +44,7 @@ func RegisterHandler(c *gin.Context) {
} else {
result, err = RegisterWithDiscovery(c.Request.Context(), payload)
}
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(result))
@@ -76,7 +76,7 @@ func HeartbeatHandler(c *gin.Context) {
}
heartbeat, err := HeartbeatNode(c.Request.Context(), authNode, payload)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(heartbeat))
@@ -98,7 +98,7 @@ func GetActiveConfigHandler(c *gin.Context) {
return
}
config, err := GetActiveConfig(c.Request.Context())
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(config))
@@ -122,7 +122,7 @@ func SyncWAFIPGroupsHandler(c *gin.Context) {
return
}
result, err := SyncWAFIPGroups(c.Request.Context(), input)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(result))
@@ -149,7 +149,7 @@ func ReportApplyLogHandler(c *gin.Context) {
payload.NodeID = authNode.NodeID
}
log, err := ReportApplyLog(c.Request.Context(), payload)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(log))
@@ -172,7 +172,7 @@ func GetPagesDeploymentHashHandler(c *gin.Context) {
return
}
hash, err := pages.GetDeploymentPackageHash(c.Request.Context(), deploymentID)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(protocol.PagesDeploymentHashResponse{
@@ -198,7 +198,7 @@ func DownloadPagesPackageHandler(c *gin.Context) {
return
}
packageObj, err := pages.OpenDeploymentPackage(c.Request.Context(), deploymentID)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
defer func() { _ = packageObj.Body.Close() }()
@@ -226,7 +226,7 @@ func GetPagesProjectLatestHashHandler(c *gin.Context) {
return
}
metadata, err := pages.GetProjectLatestPackageMetadata(c.Request.Context(), projectID)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(protocol.PagesProjectLatestHashResponse{
@@ -256,7 +256,7 @@ func DownloadPagesProjectLatestPackageHandler(c *gin.Context) {
return
}
packageObj, err := pages.OpenProjectLatestPackage(c.Request.Context(), projectID)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
defer func() { _ = packageObj.Body.Close() }()
backend/openflare/plugins/server/domain/fleet/flared/routers.go
+3 -3
View File
@@ -45,7 +45,7 @@ func PostHeartbeat(c *gin.Context) {
}
result, err := Heartbeat(c.Request.Context(), node, payload)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(result))
@@ -75,7 +75,7 @@ func GetActiveConfig(c *gin.Context) {
}
config, err := GetTunnelConfig(c.Request.Context(), node)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(config))
@@ -106,7 +106,7 @@ func PostApplyLog(c *gin.Context) {
}
log, err := ReportApplyLog(c.Request.Context(), payload)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(log))
backend/openflare/plugins/server/domain/fleet/node/routers.go
+1 -1
View File
@@ -19,7 +19,7 @@ func handleLogicError(c *gin.Context, err error) bool {
if err == nil {
return false
}
return apiutil.AbortNotFoundIfMissing(c, err, errNodeNotFound)
return response.AbortNotFoundIfMissing(c, err, errNodeNotFound)
}
// ListNodesHandler lists all nodes.
backend/openflare/plugins/server/domain/fleet/relay/routers.go
+1 -1
View File
@@ -46,7 +46,7 @@ func PostHeartbeat(c *gin.Context) {
}
result, err := Heartbeat(c.Request.Context(), node, payload)
if apiutil.AbortBadRequestOnError(c, err) {
if response.AbortBadRequestOnError(c, err) {
return
}
c.JSON(http.StatusOK, response.OK(result))