mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
* App ID * Clean-up * Use ID or name to reference apps * Can use app by name or ID * Get rid of AppName for routes API and model routes API is completely backwards-compatible routes API accepts both app ID and name * Get rid of AppName from calls API and model * Fixing tests * Get rid of AppName from logs API and model * Restrict API to work with app names only * Addressing review comments * Fix for hybrid mode * Fix rebase problems * Addressing review comments * Addressing review comments pt.2 * Fixing test issue * Addressing review comments pt.3 * Updated docstring * Adjust UpdateApp SQL implementation to work with app IDs instead of names * Fixing tests * fmt after rebase * Make tests green again! * Use GetAppByID wherever it is necessary - adding new v2 endpoints to keep hybrid api/runner mode working - extract CallBase from Call object to expose that to a user (it doesn't include any app reference, as we do for all other API objects) * Get rid of GetAppByName * Adjusting server router setup * Make hybrid work again * Fix datastore tests * Fixing tests * Do not ignore app_id * Resolve issues after rebase * Updating test to make it work as it was * Tabula rasa for migrations * Adding calls API test - we need to ensure we give "App not found" for the missing app and missing call in first place - making previous test work (request missing call for the existing app) * Make datastore tests work fine with correctly applied migrations * Make CallFunction middleware work again had to adjust its implementation to set app ID before proceeding * The biggest rebase ever made * Fix 8's migration * Fix tests * Fix hybrid client * Fix tests problem * Increment app ID migration version * Fixing TestAppUpdate * Fix rebase issues * Addressing review comments * Renew vendor * Updated swagger doc per recommendations
76 lines
1.6 KiB
Go
76 lines
1.6 KiB
Go
package server
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"net/http"
|
|
|
|
"errors"
|
|
"strings"
|
|
|
|
"github.com/fnproject/fn/api"
|
|
"github.com/fnproject/fn/api/models"
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// note: for backward compatibility, will go away later
|
|
type callLogResponse struct {
|
|
Message string `json:"message"`
|
|
Log *CallLog `json:"log"`
|
|
}
|
|
|
|
type CallLog struct {
|
|
CallID string `json:"call_id" db:"id"`
|
|
Log string `json:"log" db:"log"`
|
|
}
|
|
|
|
func writeJSON(c *gin.Context, callID string, logReader io.Reader) {
|
|
var b bytes.Buffer
|
|
b.ReadFrom(logReader)
|
|
c.JSON(http.StatusOK, callLogResponse{"Successfully loaded log",
|
|
&CallLog{
|
|
CallID: callID,
|
|
Log: b.String(),
|
|
}})
|
|
}
|
|
|
|
func (s *Server) handleCallLogGet(c *gin.Context) {
|
|
ctx := c.Request.Context()
|
|
|
|
appID := c.MustGet(api.AppID).(string)
|
|
callID := c.Param(api.Call)
|
|
|
|
logReader, err := s.logstore.GetLog(ctx, appID, callID)
|
|
if err != nil {
|
|
handleErrorResponse(c, err)
|
|
return
|
|
}
|
|
|
|
mimeTypes, _ := c.Request.Header["Accept"]
|
|
|
|
if len(mimeTypes) == 0 {
|
|
writeJSON(c, callID, logReader)
|
|
return
|
|
}
|
|
|
|
for _, mimeType := range mimeTypes {
|
|
if strings.Contains(mimeType, "application/json") {
|
|
writeJSON(c, callID, logReader)
|
|
return
|
|
}
|
|
if strings.Contains(mimeType, "text/plain") {
|
|
io.Copy(c.Writer, logReader)
|
|
return
|
|
|
|
}
|
|
if strings.Contains(mimeType, "*/*") {
|
|
writeJSON(c, callID, logReader)
|
|
return
|
|
}
|
|
}
|
|
|
|
// if we've reached this point it means that Fn didn't recognize Accepted content type
|
|
handleErrorResponse(c, models.NewAPIError(http.StatusNotAcceptable,
|
|
errors.New("unable to respond within acceptable response content types")))
|
|
}
|