refactor(server): embed templates - avoid relying on the container

Dockerfile

@@ -11,6 +11,5 @@ RUN go build
 FROM alpine:3.19
 WORKDIR /tmp
 COPY --from=builder /workspace/inca /usr/sbin/
-COPY --from=builder /workspace/server/views /tmp/server/views
 ENTRYPOINT ["/usr/sbin/inca"]
 LABEL org.opencontainers.image.source=https://github.com/immobiliare/inca

server/config/parser.go

@@ -10,27 +10,18 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-const (
-	defaultEnvironment   = "development"
-	defaultTemplatesPath = "./server/views"
-)
-
 type Config struct {
-	Sentry        string
-	Environment   string
-	TemplatesPath string
-	Storage       *storage.Storage
-	Providers     []*provider.Provider
-	ACL           map[string][]string
+	Sentry    string
+	Storage   *storage.Storage
+	Providers []*provider.Provider
+	ACL       map[string][]string
 }
 
 type Wrapper struct {
-	Sentry        string                   `yaml:"sentry"`
-	TemplatesPath string                   `yaml:"templates_path"`
-	Environment   string                   `yaml:"environment"`
-	Storage       map[string]interface{}   `yaml:"storage"`
-	Providers     []map[string]interface{} `yaml:"providers"`
-	ACL           map[string][]string      `yaml:"acl"`
+	Sentry    string                   `yaml:"sentry"`
+	Storage   map[string]interface{}   `yaml:"storage"`
+	Providers []map[string]interface{} `yaml:"providers"`
+	ACL       map[string][]string      `yaml:"acl"`
 }
 
 func Parse(path string) (*Config, error) {
@@ -79,16 +70,6 @@ func Parse(path string) (*Config, error) {
 		cfg.Sentry = wrapper.Sentry
 	}
 
-	cfg.Environment = defaultEnvironment
-	if len(wrapper.Environment) > 0 {
-		cfg.Environment = wrapper.Environment
-	}
-
-	cfg.TemplatesPath = defaultTemplatesPath
-	if len(wrapper.TemplatesPath) > 0 {
-		cfg.TemplatesPath = wrapper.TemplatesPath
-	}
-
 	if len(wrapper.ACL) > 0 {
 		cfg.ACL = wrapper.ACL
 	}

server/inca.go

@@ -36,6 +36,9 @@ type Inca struct {
 //go:embed static/**
 var embedStatic embed.FS
 
+//go:embed views/**
+var embedViews embed.FS
+
 func Spinup(path string) (*Inca, error) {
 	cfg, err := config.Parse(path)
 	if err != nil {
@@ -53,16 +56,15 @@ func Spinup(path string) (*Inca, error) {
 		log.Info().Msg("sentry correctly initialized")
 	}
 
-	templateEngine := django.New(cfg.TemplatesPath, ".html.j2")
-	templateEngine.Reload(strings.EqualFold(cfg.Environment, "development"))
-	templateEngine.Debug(strings.EqualFold(cfg.Environment, "development"))
-
 	inca := &Inca{
 		fiber.New(
 			fiber.Config{
 				DisableStartupMessage: true,
-				Views:                 templateEngine,
-				// Views:                 html.NewFileSystem(http.Dir("./server/views"), ".html.j2"),
+				Views: django.NewPathForwardingFileSystem(
+					http.FS(embedViews),
+					"/views",
+					".html.j2",
+				),
 			},
 		),
 		cfg.Storage,

server/inca_test.go

@@ -16,8 +16,6 @@ const (
 	testingCACrtPath   = ".testServerInca.crt.pem"
 	testingCAKeyPath   = ".testServerInca.key.pem"
 	testingConfig      = `bind: :65535
-templates_path: ./views
-environment: production
 storage:
     type: fs
     path: ./