Add Fission version API to router for CLI consumption (#2612)

* add version API to router

* return empty struct in case of error in getserverinfo
This commit is contained in:
neha_gupta
2022-11-11 12:58:40 +05:30
committed by GitHub
parent 32bd874ab6
commit fa037166e1
2 changed files with 59 additions and 11 deletions
+20
View File
@@ -24,14 +24,17 @@ import (
"github.com/gorilla/mux"
"go.uber.org/zap"
kerrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
k8sCache "k8s.io/client-go/tools/cache"
fv1 "github.com/fission/fission/pkg/apis/core/v1"
ferror "github.com/fission/fission/pkg/error"
executorClient "github.com/fission/fission/pkg/executor/client"
config "github.com/fission/fission/pkg/featureconfig"
"github.com/fission/fission/pkg/generated/clientset/versioned"
"github.com/fission/fission/pkg/info"
"github.com/fission/fission/pkg/throttler"
"github.com/fission/fission/pkg/utils"
"github.com/fission/fission/pkg/utils/metrics"
@@ -107,6 +110,21 @@ func routerHealthHandler(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
}
func versionHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json; charset=utf-8")
_, err := w.Write([]byte(info.ApiInfo().String()))
if err != nil {
se, ok := err.(*kerrors.StatusError)
if ok {
http.Error(w, se.Error(), int(se.ErrStatus.Code))
return
}
code, msg := ferror.GetHTTPError(err)
http.Error(w, msg, code)
}
}
func (ts *HTTPTriggerSet) getRouter(fnTimeoutMap map[types.UID]int) *mux.Router {
featureConfig, _ := config.GetFeatureConfig()
@@ -267,6 +285,8 @@ func (ts *HTTPTriggerSet) getRouter(fnTimeoutMap map[types.UID]int) *mux.Router
// Healthz endpoint for the router.
muxRouter.HandleFunc("/router-healthz", routerHealthHandler).Methods("GET")
// version of application.
muxRouter.HandleFunc("/_version", versionHandler).Methods("GET")
return muxRouter
}