PATCH-44819 Move addMimeType to main package

3 files changed, 21 insertions, 17 deletions

diff --git a/extra_mime_types.go b/extra_mime_types.go
new file mode 100644
index 00000000..510eac17
--- /dev/null
+++ b/extra_mime_types.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	"mime"
+
+	"gitlab.com/gitlab-org/labkit/log"
+)
+
+var extraMIMETypes = map[string]string{
+	".avif": "image/avif",
+}
+
+func addExtraMIMETypes() {
+	for ext, mimeType := range extraMIMETypes {
+		if err := mime.AddExtensionType(ext, mimeType); err != nil {
+			log.WithError(err).Errorf("failed to add extension: %q with MIME type: %q", ext, mimeType)
+		}
+	}
+}
diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go
index c0f5417d..11b1689e 100644
--- a/internal/serving/disk/serving.go
+++ b/internal/serving/disk/serving.go
@@ -1,11 +1,8 @@
 package disk
 
 import (
-	"mime"
 	"os"
 
-	"gitlab.com/gitlab-org/labkit/log"
-
 	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/vfs"
@@ -46,8 +43,6 @@ func (s *Disk) ServeNotFoundHTTP(h serving.Handler) {
 // New returns a serving instance that is capable of reading files
 // from the VFS
 func New(vfs vfs.VFS) serving.Serving {
-	addExtraMIMETypes(extraMIMETypes)
-
 	return &Disk{
 		reader: Reader{
 			fileSizeMetric: metrics.DiskServingFileSize,
@@ -55,15 +50,3 @@ func New(vfs vfs.VFS) serving.Serving {
 		},
 	}
 }
-
-var extraMIMETypes = map[string]string{
-	".avif": "image/avif",
-}
-
-func addExtraMIMETypes(mimeTypes map[string]string) {
-	for ext, mimeType := range mimeTypes {
-		if err := mime.AddExtensionType(ext, mimeType); err != nil {
-			log.WithError(err).Errorf("failed to add extension: %q with MIME type: %q", ext, mimeType)
-		}
-	}
-}
diff --git a/main.go b/main.go
index 1d397922..bf7921e9 100644
--- a/main.go
+++ b/main.go
@@ -319,6 +319,8 @@ func appMain() {
 	}).Print("GitLab Pages Daemon")
 	log.Printf("URL: https://gitlab.com/gitlab-org/gitlab-pages")
 
+	addExtraMIMETypes()
+
 	if err := os.Chdir(*pagesRoot); err != nil {
 		fatal(err, "could not change directory into pagesRoot")
 	}