From ad75b5c705071d68ba6e0aaa70e791fb0570f80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 7 Jan 2022 14:15:08 +0100 Subject: [PATCH] Cleanup: Move some files around No functional changes --- cmd/flamenco-manager-poc/main.go | 5 +++-- internal/{ => manager}/job_compilers/author.go | 0 .../{ => manager}/job_compilers/job_compilers.go | 0 internal/{ => manager}/job_compilers/path.go | 0 internal/{ => manager}/job_compilers/path_test.go | 0 internal/{ => manager}/job_compilers/process.go | 0 internal/{ => manager}/job_compilers/scripts.go | 0 .../job_compilers/scripts/simple_blender_render.js | 0 .../manager/swagger_ui/static}/favicon-16x16.png | Bin .../manager/swagger_ui/static}/favicon-32x32.png | Bin .../manager/swagger_ui/static}/index.html | 0 .../manager/swagger_ui/static}/oauth2-redirect.html | 0 .../manager/swagger_ui/static}/swagger-ui-bundle.js | 0 .../swagger_ui/static}/swagger-ui-bundle.js.map | 0 .../swagger_ui/static}/swagger-ui-es-bundle-core.js | 0 .../static}/swagger-ui-es-bundle-core.js.map | 0 .../swagger_ui/static}/swagger-ui-es-bundle.js | 0 .../swagger_ui/static}/swagger-ui-es-bundle.js.map | 0 .../static}/swagger-ui-standalone-preset.js | 0 .../static}/swagger-ui-standalone-preset.js.map | 0 .../manager/swagger_ui/static}/swagger-ui.css | 0 .../manager/swagger_ui/static}/swagger-ui.css.map | 0 .../manager/swagger_ui/static}/swagger-ui.js | 0 .../manager/swagger_ui/static}/swagger-ui.js.map | 0 .../manager/swagger_ui}/swagger_ui.go | 6 +++--- pkg/api/flamenco.go | 2 +- 26 files changed, 7 insertions(+), 6 deletions(-) rename internal/{ => manager}/job_compilers/author.go (100%) rename internal/{ => manager}/job_compilers/job_compilers.go (100%) rename internal/{ => manager}/job_compilers/path.go (100%) rename internal/{ => manager}/job_compilers/path_test.go (100%) rename internal/{ => manager}/job_compilers/process.go (100%) rename internal/{ => manager}/job_compilers/scripts.go (100%) rename internal/{ => manager}/job_compilers/scripts/simple_blender_render.js (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/favicon-16x16.png (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/favicon-32x32.png (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/index.html (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/oauth2-redirect.html (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-bundle.js (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-bundle.js.map (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-es-bundle-core.js (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-es-bundle-core.js.map (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-es-bundle.js (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-es-bundle.js.map (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-standalone-preset.js (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui-standalone-preset.js.map (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui.css (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui.css.map (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui.js (100%) rename {pkg/api/swagger-ui => internal/manager/swagger_ui/static}/swagger-ui.js.map (100%) rename {pkg/api => internal/manager/swagger_ui}/swagger_ui.go (84%) diff --git a/cmd/flamenco-manager-poc/main.go b/cmd/flamenco-manager-poc/main.go index b6fb547e..e7ddfa40 100644 --- a/cmd/flamenco-manager-poc/main.go +++ b/cmd/flamenco-manager-poc/main.go @@ -17,7 +17,8 @@ import ( "github.com/ziflex/lecho/v3" "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" ) @@ -56,7 +57,7 @@ func echoOpenAPIPoC() { })) e.Use(middleware.Recover()) - api.RegisterSwaggerUIStaticFiles(e) + swagger_ui.RegisterSwaggerUIStaticFiles(e) swagger, err := api.GetSwagger() if err != nil { diff --git a/internal/job_compilers/author.go b/internal/manager/job_compilers/author.go similarity index 100% rename from internal/job_compilers/author.go rename to internal/manager/job_compilers/author.go diff --git a/internal/job_compilers/job_compilers.go b/internal/manager/job_compilers/job_compilers.go similarity index 100% rename from internal/job_compilers/job_compilers.go rename to internal/manager/job_compilers/job_compilers.go diff --git a/internal/job_compilers/path.go b/internal/manager/job_compilers/path.go similarity index 100% rename from internal/job_compilers/path.go rename to internal/manager/job_compilers/path.go diff --git a/internal/job_compilers/path_test.go b/internal/manager/job_compilers/path_test.go similarity index 100% rename from internal/job_compilers/path_test.go rename to internal/manager/job_compilers/path_test.go diff --git a/internal/job_compilers/process.go b/internal/manager/job_compilers/process.go similarity index 100% rename from internal/job_compilers/process.go rename to internal/manager/job_compilers/process.go diff --git a/internal/job_compilers/scripts.go b/internal/manager/job_compilers/scripts.go similarity index 100% rename from internal/job_compilers/scripts.go rename to internal/manager/job_compilers/scripts.go diff --git a/internal/job_compilers/scripts/simple_blender_render.js b/internal/manager/job_compilers/scripts/simple_blender_render.js similarity index 100% rename from internal/job_compilers/scripts/simple_blender_render.js rename to internal/manager/job_compilers/scripts/simple_blender_render.js diff --git a/pkg/api/swagger-ui/favicon-16x16.png b/internal/manager/swagger_ui/static/favicon-16x16.png similarity index 100% rename from pkg/api/swagger-ui/favicon-16x16.png rename to internal/manager/swagger_ui/static/favicon-16x16.png diff --git a/pkg/api/swagger-ui/favicon-32x32.png b/internal/manager/swagger_ui/static/favicon-32x32.png similarity index 100% rename from pkg/api/swagger-ui/favicon-32x32.png rename to internal/manager/swagger_ui/static/favicon-32x32.png diff --git a/pkg/api/swagger-ui/index.html b/internal/manager/swagger_ui/static/index.html similarity index 100% rename from pkg/api/swagger-ui/index.html rename to internal/manager/swagger_ui/static/index.html diff --git a/pkg/api/swagger-ui/oauth2-redirect.html b/internal/manager/swagger_ui/static/oauth2-redirect.html similarity index 100% rename from pkg/api/swagger-ui/oauth2-redirect.html rename to internal/manager/swagger_ui/static/oauth2-redirect.html diff --git a/pkg/api/swagger-ui/swagger-ui-bundle.js b/internal/manager/swagger_ui/static/swagger-ui-bundle.js similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-bundle.js rename to internal/manager/swagger_ui/static/swagger-ui-bundle.js diff --git a/pkg/api/swagger-ui/swagger-ui-bundle.js.map b/internal/manager/swagger_ui/static/swagger-ui-bundle.js.map similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-bundle.js.map rename to internal/manager/swagger_ui/static/swagger-ui-bundle.js.map diff --git a/pkg/api/swagger-ui/swagger-ui-es-bundle-core.js b/internal/manager/swagger_ui/static/swagger-ui-es-bundle-core.js similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-es-bundle-core.js rename to internal/manager/swagger_ui/static/swagger-ui-es-bundle-core.js diff --git a/pkg/api/swagger-ui/swagger-ui-es-bundle-core.js.map b/internal/manager/swagger_ui/static/swagger-ui-es-bundle-core.js.map similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-es-bundle-core.js.map rename to internal/manager/swagger_ui/static/swagger-ui-es-bundle-core.js.map diff --git a/pkg/api/swagger-ui/swagger-ui-es-bundle.js b/internal/manager/swagger_ui/static/swagger-ui-es-bundle.js similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-es-bundle.js rename to internal/manager/swagger_ui/static/swagger-ui-es-bundle.js diff --git a/pkg/api/swagger-ui/swagger-ui-es-bundle.js.map b/internal/manager/swagger_ui/static/swagger-ui-es-bundle.js.map similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-es-bundle.js.map rename to internal/manager/swagger_ui/static/swagger-ui-es-bundle.js.map diff --git a/pkg/api/swagger-ui/swagger-ui-standalone-preset.js b/internal/manager/swagger_ui/static/swagger-ui-standalone-preset.js similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-standalone-preset.js rename to internal/manager/swagger_ui/static/swagger-ui-standalone-preset.js diff --git a/pkg/api/swagger-ui/swagger-ui-standalone-preset.js.map b/internal/manager/swagger_ui/static/swagger-ui-standalone-preset.js.map similarity index 100% rename from pkg/api/swagger-ui/swagger-ui-standalone-preset.js.map rename to internal/manager/swagger_ui/static/swagger-ui-standalone-preset.js.map diff --git a/pkg/api/swagger-ui/swagger-ui.css b/internal/manager/swagger_ui/static/swagger-ui.css similarity index 100% rename from pkg/api/swagger-ui/swagger-ui.css rename to internal/manager/swagger_ui/static/swagger-ui.css diff --git a/pkg/api/swagger-ui/swagger-ui.css.map b/internal/manager/swagger_ui/static/swagger-ui.css.map similarity index 100% rename from pkg/api/swagger-ui/swagger-ui.css.map rename to internal/manager/swagger_ui/static/swagger-ui.css.map diff --git a/pkg/api/swagger-ui/swagger-ui.js b/internal/manager/swagger_ui/static/swagger-ui.js similarity index 100% rename from pkg/api/swagger-ui/swagger-ui.js rename to internal/manager/swagger_ui/static/swagger-ui.js diff --git a/pkg/api/swagger-ui/swagger-ui.js.map b/internal/manager/swagger_ui/static/swagger-ui.js.map similarity index 100% rename from pkg/api/swagger-ui/swagger-ui.js.map rename to internal/manager/swagger_ui/static/swagger-ui.js.map diff --git a/pkg/api/swagger_ui.go b/internal/manager/swagger_ui/swagger_ui.go similarity index 84% rename from pkg/api/swagger_ui.go rename to internal/manager/swagger_ui/swagger_ui.go index 3dde0107..8fe553f4 100644 --- a/pkg/api/swagger_ui.go +++ b/internal/manager/swagger_ui/swagger_ui.go @@ -1,4 +1,4 @@ -package api +package swagger_ui import ( "embed" @@ -9,11 +9,11 @@ import ( "github.com/rs/zerolog/log" ) -//go:embed swagger-ui +//go:embed static var swaggerUI embed.FS func RegisterSwaggerUIStaticFiles(router *echo.Echo) { - files, err := fs.Sub(swaggerUI, "swagger-ui") + files, err := fs.Sub(swaggerUI, "static") if err != nil { log.Fatal().Err(err).Msg("error preparing embedded files for serving over HTTP") } diff --git a/pkg/api/flamenco.go b/pkg/api/flamenco.go index 6bdd63cb..4b7d972a 100644 --- a/pkg/api/flamenco.go +++ b/pkg/api/flamenco.go @@ -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 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 client -o openapi_client.gen.go -package api flamenco-manager.yaml