Set shortcodes in trigger response entities based on config or request URL (#1099)

* adding trigger short code injection

* more annotation provider stuff

* fixed up tests

* Fix validator
This commit is contained in:
Owen Cliffe
2018-07-03 21:59:00 +01:00
committed by Reed Allman
parent 83c51fa316
commit 5d970d9295
11 changed files with 300 additions and 22 deletions

View File

@@ -3,6 +3,7 @@ package server
import (
"net/http"
"fmt"
"github.com/fnproject/fn/api/models"
"github.com/gin-gonic/gin"
)
@@ -28,5 +29,32 @@ func (s *Server) handleTriggerList(c *gin.Context) {
return
}
// Annotate the outbound triggers
// this is fairly cludgy bit hard to do in datastore middleware confidently
appCache := make(map[string]*models.App)
newTriggers := make([]*models.Trigger, len(triggers.Items))
for idx, t := range triggers.Items {
app, ok := appCache[t.AppID]
if !ok {
gotApp, err := s.Datastore().GetAppByID(ctx, t.AppID)
if err != nil {
handleErrorResponse(c, fmt.Errorf("failed to get app for trigger %s", err))
return
}
app = gotApp
appCache[app.ID] = gotApp
}
newT, err := s.triggerAnnotator.AnnotateTrigger(c, app, t)
if err != nil {
handleErrorResponse(c, err)
return
}
newTriggers[idx] = newT
}
triggers.Items = newTriggers
c.JSON(http.StatusOK, triggers)
}