@@ -19,12 +19,10 @@ import (
19
19
"context"
20
20
"encoding/json"
21
21
"net/http"
22
- "path/filepath"
23
22
24
- indexessvr "github.com/arduino/arduino-create-agent/gen/http/indexes/server"
25
23
toolssvr "github.com/arduino/arduino-create-agent/gen/http/tools/server"
26
- indexessvc "github.com/arduino/arduino-create-agent/gen/indexes"
27
24
toolssvc "github.com/arduino/arduino-create-agent/gen/tools"
25
+ "github.com/arduino/arduino-create-agent/index"
28
26
"github.com/arduino/arduino-create-agent/v2/pkgs"
29
27
"github.com/sirupsen/logrus"
30
28
goahttp "goa.design/goa/v3/http"
@@ -33,28 +31,18 @@ import (
33
31
)
34
32
35
33
// Server is the actual server
36
- func Server (home string ) http.Handler {
34
+ func Server (directory string , index * index. IndexResource ) http.Handler {
37
35
mux := goahttp .NewMuxer ()
38
36
39
37
// Instantiate logger
40
38
logger := logrus .New ()
41
39
logger .SetLevel (logrus .DebugLevel )
42
40
logAdapter := LogAdapter {Logger : logger }
43
41
44
- // Mount indexes
45
- indexesSvc := pkgs.Indexes {
46
- Log : logger ,
47
- Folder : filepath .Join (home , "indexes" ),
48
- }
49
- indexesEndpoints := indexessvc .NewEndpoints (& indexesSvc )
50
- indexesServer := indexessvr .New (indexesEndpoints , mux , goahttp .RequestDecoder ,
51
- goahttp .ResponseEncoder , errorHandler (logger ), nil )
52
- indexessvr .Mount (mux , indexesServer )
53
-
54
42
// Mount tools
55
43
toolsSvc := pkgs.Tools {
56
- Folder : home ,
57
- Indexes : & indexesSvc ,
44
+ Folder : directory ,
45
+ Index : index ,
58
46
}
59
47
toolsEndpoints := toolssvc .NewEndpoints (& toolsSvc )
60
48
toolsServer := toolssvr .New (toolsEndpoints , mux , CustomRequestDecoder , goahttp .ResponseEncoder , errorHandler (logger ), nil )
0 commit comments