engine/ooapi: autogenerated API with login and caching (#234)
* internal/engine/ooapi: auto-generated API client * feat: introduce the callers abstraction * feat: implement API caching on disk * feat: implement cloneWithToken when we require login * feat: implement login * fix: do not cache all APIs * feat: start making space for more tests * feat: implement caching policy * feat: write tests for caching layer * feat: add integration tests and fix some minor issues * feat: write much more unit tests * feat: add some more easy unit tests * feat: add tests that use a local server While there, make sure many fields we care about are OK. * doc: write basic documentation * fix: tweak sentence * doc: improve ooapi documentation * doc(ooapi): other documentation improvements * fix(ooapi): remove caching for most APIs We discussed this topic yesterday with @FedericoCeratto. The only place where we want LRU caching is MeasurementMeta. * feat(ooapi): improve handling of errors during login This was also discussed yesterday with @FedericoCeratto * fix(swaggerdiff_test.go): temporarily disable Before I work on this, I need to tend onto other tasks. * fix(ootest): add one more test case We're going towards 100% coverage of this package, as it ought to be. * feat(ooapi): test cases for when the probe clock is off * fix(ooapi): change test to have 100% unittest coverage * feat: sync server and client APIs definition Companion PR: https://github.com/ooni/api/pull/218 * fix(ooapi): start testing again against API * fix(ooapi): only generate each file once * chore: set version to 3.7.0-alpha While there, make sure we don't always skip a currently failing riseupvpn test, and slightly clarify the readme. * fix(kvstore): less scoped error message
This commit is contained in:
parent
ae32ffa13b
commit
55bdebe8b2
58 changed files with 11273 additions and 0 deletions
158
internal/engine/ooapi/swaggerdiff_test.go
Normal file
158
internal/engine/ooapi/swaggerdiff_test.go
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
package ooapi
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"net/http"
|
||||
"sort"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/hexops/gotextdiff"
|
||||
"github.com/hexops/gotextdiff/myers"
|
||||
"github.com/hexops/gotextdiff/span"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/ooapi/internal/openapi"
|
||||
)
|
||||
|
||||
const (
|
||||
productionURL = "https://api.ooni.io/apispec_1.json"
|
||||
testingURL = "https://ams-pg-test.ooni.org/apispec_1.json"
|
||||
)
|
||||
|
||||
func makeModel(data []byte) *openapi.Swagger {
|
||||
var out openapi.Swagger
|
||||
if err := json.Unmarshal(data, &out); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
// We reduce irrelevant differences by producing a common header
|
||||
return &openapi.Swagger{Paths: out.Paths}
|
||||
}
|
||||
|
||||
func getServerModel(serverURL string) *openapi.Swagger {
|
||||
resp, err := http.Get(serverURL)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
data, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
return makeModel(data)
|
||||
}
|
||||
|
||||
func getClientModel() *openapi.Swagger {
|
||||
return makeModel([]byte(swagger))
|
||||
}
|
||||
|
||||
func simplifyRoundTrip(rt *openapi.RoundTrip) {
|
||||
// Normalize the used name when a parameter is in body. This
|
||||
// should only have a cosmetic impact on the spec.
|
||||
for _, param := range rt.Parameters {
|
||||
if param.In == "body" {
|
||||
param.Name = "body"
|
||||
}
|
||||
}
|
||||
|
||||
// Sort parameters so the comparison does not depend on order.
|
||||
sort.SliceStable(rt.Parameters, func(i, j int) bool {
|
||||
left, right := rt.Parameters[i].Name, rt.Parameters[j].Name
|
||||
return strings.Compare(left, right) < 0
|
||||
})
|
||||
|
||||
// Normalize description of 200 response
|
||||
rt.Responses.Successful.Description = "all good"
|
||||
}
|
||||
|
||||
func simplifyInPlace(path *openapi.Path) *openapi.Path {
|
||||
if path.Get != nil && path.Post != nil {
|
||||
log.Fatal("unsupported configuration")
|
||||
}
|
||||
if path.Get != nil {
|
||||
simplifyRoundTrip(path.Get)
|
||||
}
|
||||
if path.Post != nil {
|
||||
simplifyRoundTrip(path.Post)
|
||||
}
|
||||
return path
|
||||
}
|
||||
|
||||
func jsonify(model interface{}) string {
|
||||
data, err := json.MarshalIndent(model, "", " ")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
return string(data)
|
||||
}
|
||||
|
||||
type diffable struct {
|
||||
name string
|
||||
value string
|
||||
}
|
||||
|
||||
func computediff(server, client *diffable) string {
|
||||
d := gotextdiff.ToUnified(server.name, client.name, server.value, myers.ComputeEdits(
|
||||
span.URIFromPath(server.name), server.value, client.value,
|
||||
))
|
||||
return fmt.Sprint(d)
|
||||
}
|
||||
|
||||
// maybediff emits the diff between the server and the client and
|
||||
// returns the length of the diff itself in bytes.
|
||||
func maybediff(key string, server, client *openapi.Path) int {
|
||||
diff := computediff(&diffable{
|
||||
name: fmt.Sprintf("server%s.json", key),
|
||||
value: jsonify(simplifyInPlace(server)),
|
||||
}, &diffable{
|
||||
name: fmt.Sprintf("client%s.json", key),
|
||||
value: jsonify(simplifyInPlace(client)),
|
||||
})
|
||||
if diff != "" {
|
||||
fmt.Printf("%s", diff)
|
||||
}
|
||||
return len(diff)
|
||||
}
|
||||
|
||||
func compare(serverURL string) bool {
|
||||
good := true
|
||||
serverModel, clientModel := getServerModel(serverURL), getClientModel()
|
||||
// Implementation note: the server model is richer than the client
|
||||
// model, so we ignore everything not defined by the client.
|
||||
var count int
|
||||
for key := range serverModel.Paths {
|
||||
if _, found := clientModel.Paths[key]; !found {
|
||||
delete(serverModel.Paths, key)
|
||||
continue
|
||||
}
|
||||
count++
|
||||
if maybediff(key, serverModel.Paths[key], clientModel.Paths[key]) > 0 {
|
||||
good = false
|
||||
}
|
||||
}
|
||||
if count <= 0 {
|
||||
panic("no element found")
|
||||
}
|
||||
return good
|
||||
}
|
||||
|
||||
func TestWithProductionAPI(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skip test in short mode")
|
||||
}
|
||||
t.Log("using ", productionURL)
|
||||
if !compare(productionURL) {
|
||||
t.Fatal("model mismatch (see above)")
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithTestingAPI(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skip test in short mode")
|
||||
}
|
||||
t.Log("using ", testingURL)
|
||||
if !compare(testingURL) {
|
||||
t.Fatal("model mismatch (see above)")
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue