Cleanup: Move some files around

No functional changes
This commit is contained in:
Sybren A. Stüvel 2022-01-07 14:15:08 +01:00 committed by Sybren A. Stüvel
parent b512b399d6
commit ad75b5c705
26 changed files with 7 additions and 6 deletions

View File

@ -17,7 +17,8 @@ import (
"github.com/ziflex/lecho/v3" "github.com/ziflex/lecho/v3"
"gitlab.com/blender/flamenco-goja-test/internal/appinfo" "gitlab.com/blender/flamenco-goja-test/internal/appinfo"
"gitlab.com/blender/flamenco-goja-test/internal/job_compilers" "gitlab.com/blender/flamenco-goja-test/internal/manager/job_compilers"
"gitlab.com/blender/flamenco-goja-test/internal/manager/swagger_ui"
"gitlab.com/blender/flamenco-goja-test/pkg/api" "gitlab.com/blender/flamenco-goja-test/pkg/api"
) )
@ -56,7 +57,7 @@ func echoOpenAPIPoC() {
})) }))
e.Use(middleware.Recover()) e.Use(middleware.Recover())
api.RegisterSwaggerUIStaticFiles(e) swagger_ui.RegisterSwaggerUIStaticFiles(e)
swagger, err := api.GetSwagger() swagger, err := api.GetSwagger()
if err != nil { if err != nil {

View File

Before

Width:  |  Height:  |  Size: 665 B

After

Width:  |  Height:  |  Size: 665 B

View File

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 628 B

View File

@ -1,4 +1,4 @@
package api package swagger_ui
import ( import (
"embed" "embed"
@ -9,11 +9,11 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
//go:embed swagger-ui //go:embed static
var swaggerUI embed.FS var swaggerUI embed.FS
func RegisterSwaggerUIStaticFiles(router *echo.Echo) { func RegisterSwaggerUIStaticFiles(router *echo.Echo) {
files, err := fs.Sub(swaggerUI, "swagger-ui") files, err := fs.Sub(swaggerUI, "static")
if err != nil { if err != nil {
log.Fatal().Err(err).Msg("error preparing embedded files for serving over HTTP") log.Fatal().Err(err).Msg("error preparing embedded files for serving over HTTP")
} }

View File

@ -1,5 +1,5 @@
//go:generate oapi-codegen -generate types -o openapi_types.gen.go -package api flamenco-manager.yaml //go:generate oapi-codegen -generate types -o openapi_types.gen.go -package api flamenco-manager.yaml
//go:generate oapi-codegen -generate server -o openapi_echo.gen.go -package api flamenco-manager.yaml //go:generate oapi-codegen -generate server -o openapi_server.gen.go -package api flamenco-manager.yaml
//go:generate oapi-codegen -generate spec -o openapi_spec.gen.go -package api flamenco-manager.yaml //go:generate oapi-codegen -generate spec -o openapi_spec.gen.go -package api flamenco-manager.yaml
//go:generate oapi-codegen -generate client -o openapi_client.gen.go -package api flamenco-manager.yaml //go:generate oapi-codegen -generate client -o openapi_client.gen.go -package api flamenco-manager.yaml