Fix path

cmd/handlers.go

@@ -2,8 +2,11 @@ package cmd
 
 import "github.com/gin-gonic/gin"
 
-func RegisterHandlers(r *gin.Engine) {
+func RegisterPublicHandlers(r *gin.RouterGroup) {
+	registerPublicHandlers(r)
+}
+
+func RegisterPrivateHandlers(r *gin.RouterGroup) {
 	registerUserHandlers(r)
 	registerMyLabHandlers(r)
-	registerPublicHandlers(r)
 }

cmd/mylab-handler.go

@@ -61,7 +61,7 @@ func quotas(c *gin.Context) {
 	}*/
 }
 
-func registerMyLabHandlers(r *gin.Engine) {
+func registerMyLabHandlers(r *gin.RouterGroup) {
 	r.GET("/my-lab/services", myServices)
 	r.GET("/my-lab/events", events)
 	r.GET("/my-lab/quota", quotas)

cmd/public-handler.go

@@ -20,6 +20,11 @@ func ip(c *gin.Context) {
 	})
 }
 
-func registerPublicHandlers(r *gin.Engine) {
-	r.GET("/public/ip", ip)
+func healthcheck(c *gin.Context) {
+	c.Status(http.StatusOK)
+}
+
+func registerPublicHandlers(r *gin.RouterGroup) {
+	r.GET("/ip", ip)
+	r.GET("/healthcheck", healthcheck)
 }

cmd/user-handler.go

@@ -56,6 +56,6 @@ func userInfo(c *gin.Context) {
 	c.JSON(http.StatusOK, userInfo)
 }
 
-func registerUserHandlers(r *gin.Engine) {
+func registerUserHandlers(r *gin.RouterGroup) {
 	r.GET("/user/info", userInfo)
 }

config.yaml

@@ -1,3 +1,4 @@
 authentication:
   issuerURI:
-  audience: 
+  audience: 
+rootPath: /api

configuration.go

@@ -2,6 +2,7 @@ package main
 
 type configuration struct {
 	Authentication authentication
+	RootPath       string
 }
 
 type authentication struct {

main.go

@@ -22,7 +22,10 @@ import (
 func main() {
 	loadConfiguration()
 	r := gin.Default()
-	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
+	baseRoutes := r.Group(config.RootPath)
+	baseRoutes.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
+	privateRoutes := baseRoutes.Group("/")
+	publicRoutes := baseRoutes.Group("/public")
 
 	zap.ReplaceGlobals(zap.Must(zap.NewProduction()))
 
@@ -42,11 +45,12 @@ func main() {
 			oidcConfig.SkipClientIDCheck = true
 		}
 		verifier := provider.Verifier(oidcConfig)
-		r.Use(cmd.AuthMiddleware(ctx, verifier))
+		privateRoutes.Use(cmd.AuthMiddleware(ctx, verifier))
 	}
 
 	kubernetes.InitClient()
 
-	cmd.RegisterHandlers(r)
+	cmd.RegisterPrivateHandlers(privateRoutes)
+	cmd.RegisterPublicHandlers(publicRoutes)
 	r.Run()
 }