diff options
| author | Kegsay <kegan@matrix.org> | 2020-06-04 15:43:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 15:43:07 +0100 |
| commit | 9834ac97db042b0c78fbd72652aa534129ca3afe (patch) | |
| tree | 4fd862ffba61e47f94b2fcc5685a0502e21b3c70 /cmd | |
| parent | d785ad82b996989381657292fbd2c28b9fbb7df6 (diff) | |
Convert everything but serverkeyapi to inthttp (#1096)
* Convert roomserver to new inthttp format
* Convert eduserver to new inthttp format
* Convert appservice to new inthttp format
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dendrite-appservice-server/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-client-api-server/main.go | 4 | ||||
| -rw-r--r-- | cmd/dendrite-federation-api-server/main.go | 4 | ||||
| -rw-r--r-- | cmd/dendrite-federation-sender-server/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-monolith-server/main.go | 6 | ||||
| -rw-r--r-- | cmd/dendrite-public-rooms-api-server/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-sync-api-server/main.go | 2 | ||||
| -rw-r--r-- | cmd/roomserver-integration-tests/main.go | 5 |
8 files changed, 14 insertions, 13 deletions
diff --git a/cmd/dendrite-appservice-server/main.go b/cmd/dendrite-appservice-server/main.go index a508be3b..c16505fd 100644 --- a/cmd/dendrite-appservice-server/main.go +++ b/cmd/dendrite-appservice-server/main.go @@ -28,7 +28,7 @@ func main() { accountDB := base.CreateAccountsDB() deviceDB := base.CreateDeviceDB() federation := base.CreateFederationClient() - rsAPI := base.CreateHTTPRoomserverAPIs() + rsAPI := base.RoomserverHTTPClient() cache := transactions.New() appservice.SetupAppServiceAPIComponent( diff --git a/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go index 280e9cde..ba8e6af7 100644 --- a/cmd/dendrite-client-api-server/main.go +++ b/cmd/dendrite-client-api-server/main.go @@ -35,8 +35,8 @@ func main() { serverKeyAPI := base.CreateHTTPServerKeyAPIs() keyRing := serverKeyAPI.KeyRing() - asQuery := base.CreateHTTPAppServiceAPIs() - rsAPI := base.CreateHTTPRoomserverAPIs() + asQuery := base.AppserviceHTTPClient() + rsAPI := base.RoomserverHTTPClient() fsAPI := base.FederationSenderHTTPClient() rsAPI.SetFederationSenderAPI(fsAPI) eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New(), deviceDB) diff --git a/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go index 3c42532c..aca6ba57 100644 --- a/cmd/dendrite-federation-api-server/main.go +++ b/cmd/dendrite-federation-api-server/main.go @@ -36,8 +36,8 @@ func main() { fsAPI := base.FederationSenderHTTPClient() - rsAPI := base.CreateHTTPRoomserverAPIs() - asAPI := base.CreateHTTPAppServiceAPIs() + rsAPI := base.RoomserverHTTPClient() + asAPI := base.AppserviceHTTPClient() rsAPI.SetFederationSenderAPI(fsAPI) eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New(), deviceDB) eduProducer := producers.NewEDUServerProducer(eduInputAPI) diff --git a/cmd/dendrite-federation-sender-server/main.go b/cmd/dendrite-federation-sender-server/main.go index 2b1e0ae8..14524dca 100644 --- a/cmd/dendrite-federation-sender-server/main.go +++ b/cmd/dendrite-federation-sender-server/main.go @@ -29,7 +29,7 @@ func main() { serverKeyAPI := base.CreateHTTPServerKeyAPIs() keyRing := serverKeyAPI.KeyRing() - rsAPI := base.CreateHTTPRoomserverAPIs() + rsAPI := base.RoomserverHTTPClient() fsAPI := federationsender.SetupFederationSenderComponent( base, federation, rsAPI, keyRing, ) diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go index eedd4412..ba918925 100644 --- a/cmd/dendrite-monolith-server/main.go +++ b/cmd/dendrite-monolith-server/main.go @@ -83,21 +83,21 @@ func main() { ) rsAPI := rsComponent if base.UseHTTPAPIs { - rsAPI = base.CreateHTTPRoomserverAPIs() + rsAPI = base.RoomserverHTTPClient() } eduInputAPI := eduserver.SetupEDUServerComponent( base, cache.New(), deviceDB, ) if base.UseHTTPAPIs { - eduInputAPI = base.CreateHTTPEDUServerAPIs() + eduInputAPI = base.EDUServerClient() } asAPI := appservice.SetupAppServiceAPIComponent( base, accountDB, deviceDB, federation, rsAPI, transactions.New(), ) if base.UseHTTPAPIs { - asAPI = base.CreateHTTPAppServiceAPIs() + asAPI = base.AppserviceHTTPClient() } fsAPI := federationsender.SetupFederationSenderComponent( diff --git a/cmd/dendrite-public-rooms-api-server/main.go b/cmd/dendrite-public-rooms-api-server/main.go index c2df1b3f..18a813ba 100644 --- a/cmd/dendrite-public-rooms-api-server/main.go +++ b/cmd/dendrite-public-rooms-api-server/main.go @@ -29,7 +29,7 @@ func main() { deviceDB := base.CreateDeviceDB() fsAPI := base.FederationSenderHTTPClient() - rsAPI := base.CreateHTTPRoomserverAPIs() + rsAPI := base.RoomserverHTTPClient() rsAPI.SetFederationSenderAPI(fsAPI) publicRoomsDB, err := storage.NewPublicRoomsServerDatabase(string(base.Cfg.Database.PublicRoomsAPI), base.Cfg.DbProperties(), cfg.Matrix.ServerName) diff --git a/cmd/dendrite-sync-api-server/main.go b/cmd/dendrite-sync-api-server/main.go index 5a1a80df..eeab115a 100644 --- a/cmd/dendrite-sync-api-server/main.go +++ b/cmd/dendrite-sync-api-server/main.go @@ -28,7 +28,7 @@ func main() { accountDB := base.CreateAccountsDB() federation := base.CreateFederationClient() - rsAPI := base.CreateHTTPRoomserverAPIs() + rsAPI := base.RoomserverHTTPClient() syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, rsAPI, federation, cfg) diff --git a/cmd/roomserver-integration-tests/main.go b/cmd/roomserver-integration-tests/main.go index 126053ba..2433f9ff 100644 --- a/cmd/roomserver-integration-tests/main.go +++ b/cmd/roomserver-integration-tests/main.go @@ -31,6 +31,7 @@ import ( "github.com/matrix-org/dendrite/internal/caching" "github.com/matrix-org/dendrite/internal/test" "github.com/matrix-org/dendrite/roomserver/api" + "github.com/matrix-org/dendrite/roomserver/inthttp" "github.com/matrix-org/gomatrixserverlib" ) @@ -209,7 +210,7 @@ func writeToRoomServer(input []string, roomserverURL string) error { return err } } - x, err := api.NewRoomserverInternalAPIHTTP(roomserverURL, &http.Client{Timeout: timeoutHTTP}, nil) + x, err := inthttp.NewRoomserverClient(roomserverURL, &http.Client{Timeout: timeoutHTTP}, nil) if err != nil { return err } @@ -276,7 +277,7 @@ func testRoomserver(input []string, wantOutput []string, checkQueries func(api.R cmd.Args = []string{"dendrite-room-server", "--config", filepath.Join(dir, test.ConfigFile)} gotOutput, err := runAndReadFromTopic(cmd, cfg.RoomServerURL()+"/metrics", doInput, outputTopic, len(wantOutput), func() { - queryAPI, _ := api.NewRoomserverInternalAPIHTTP("http://"+string(cfg.Listen.RoomServer), &http.Client{Timeout: timeoutHTTP}, cache) + queryAPI, _ := inthttp.NewRoomserverClient("http://"+string(cfg.Listen.RoomServer), &http.Client{Timeout: timeoutHTTP}, cache) checkQueries(queryAPI) }) if err != nil { |