make serving published repos in api mode configurable

api/router.go

@@ -51,18 +51,19 @@ func Router(c *ctx.AptlyContext) http.Handler {
 		MetricsCollectorRegistrar.Register(router)
 	}
 
-	router.GET("/repos/:storage/*pkgPath", func(c *gin.Context) {
+	if c.Config().ServeInAPIMode {
-		pkgpath := c.Param("pkgPath")
+		router.GET("/repos/:storage/*pkgPath", func(c *gin.Context) {
+			pkgpath := c.Param("pkgPath")
 
-		storage := c.Param("storage")
+			storage := c.Param("storage")
-		if storage == "-" {
+			if storage == "-" {
-			storage = ""
+				storage = ""
-		}
+			}
 
-		publicPath := context.GetPublishedStorage("filesystem:" + storage).(aptly.FileSystemPublishedStorage).PublicPath()
+			publicPath := context.GetPublishedStorage("filesystem:" + storage).(aptly.FileSystemPublishedStorage).PublicPath()
-
+			c.FileFromFS(pkgpath, http.Dir(publicPath))
-		c.FileFromFS(pkgpath, http.Dir(publicPath))
+		})
-	})
+	}
 
 	api := router.Group("/api")
 	if context.Flags().Lookup("no-lock").Value.Get().(bool) {

system/lib.py

@@ -148,7 +148,8 @@ class BaseTest(object):
         "ppaCodename": "",
         "enableMetricsEndpoint": True,
         "logLevel": "debug",
-        "logFormat": "default"
+        "logFormat": "default",
+        "serveInAPIMode": True
     }
     configOverride = {}
     environmentOverride = {}

system/t02_config/ConfigShowTest_gold

@@ -27,5 +27,6 @@
     "AsyncAPI": false,
     "enableMetricsEndpoint": true,
     "logLevel": "debug",
-    "logFormat": "default"
+    "logFormat": "default",
+    "serveInAPIMode": true
 }

system/t02_config/CreateConfigTest_gold

@@ -27,5 +27,6 @@
   "AsyncAPI": false,
   "enableMetricsEndpoint": false,
   "logLevel": "debug",
-  "logFormat": "default"
+  "logFormat": "default",
+  "serveInAPIMode": false
 }

utils/config.go

@@ -37,6 +37,7 @@ type ConfigStructure struct { // nolint: maligned
 	EnableMetricsEndpoint  bool                             `json:"enableMetricsEndpoint"`
 	LogLevel               string                           `json:"logLevel"`
 	LogFormat              string                           `json:"logFormat"`
+	ServeInAPIMode         bool                             `json:"serveInAPIMode"`
 }
 
 // FileSystemPublishRoot describes single filesystem publishing entry point
@@ -116,6 +117,7 @@ var Config = ConfigStructure{
 	EnableMetricsEndpoint:  false,
 	LogLevel:               "debug",
 	LogFormat:              "default",
+	ServeInAPIMode:         false,
 }
 
 // LoadConfig loads configuration from json file

utils/config_test.go

@@ -136,7 +136,8 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
 		"  \"AsyncAPI\": false,\n"+
 		"  \"enableMetricsEndpoint\": false,\n"+
 		"  \"logLevel\": \"info\",\n"+
-		"  \"logFormat\": \"json\"\n"+
+		"  \"logFormat\": \"json\",\n"+
+		"  \"serveInAPIMode\": false\n"+
 		"}")
 }