33de701263
* refactor(atomicx): move outside the engine package After merging probe-engine into probe-cli, my impression is that we have too much unnecessary nesting of packages in this repository. The idea of this commit and of a bunch of following commits will instead be to reduce the nesting and simplify the structure. While there, improve the documentation. * fix: always use the atomicx package For consistency, never use sync/atomic and always use ./internal/atomicx so we can just grep and make sure we're not risking to crash if we make a subtle mistake on a 32 bit platform. While there, mention in the contributing guidelines that we want to always prefer the ./internal/atomicx package over sync/atomic. * fix(atomicx): remove unnecessary constructor We don't need a constructor here. The default constructed `&Int64{}` instance is already usable and the constructor does not add anything to what we are doing, rather it just creates extra confusion. * cleanup(atomicx): we are not using Float64 Because atomicx.Float64 is unused, we can safely zap it. * cleanup(atomicx): simplify impl and improve tests We can simplify the implementation by using defer and by letting the Load() method call Add(0). We can improve tests by making many goroutines updated the atomic int64 value concurrently. * refactor(fsx): can live in the ./internal pkg Let us reduce the amount of nesting. While there, ensure that the package only exports the bare minimum, and improve the documentation of the tests, to ease reading the code. * refactor: move runtimex to ./internal * refactor: move shellx into the ./internal package While there, remove unnecessary dependency between packages. While there, specify in the contributing guidelines that one should use x/sys/execabs instead of os/exec. * refactor: move ooapi into the ./internal pkg * refactor(humanize): move to ./internal and better docs * refactor: move platform to ./internal * refactor(randx): move to ./internal * refactor(multierror): move into the ./internal pkg * refactor(kvstore): all kvstores in ./internal Rather than having part of the kvstore inside ./internal/engine/kvstore and part in ./internal/engine/kvstore.go, let us put every piece of code that is kvstore related into the ./internal/kvstore package. * fix(kvstore): always return ErrNoSuchKey on Get() error It should help to use the kvstore everywhere removing all the copies that are lingering around the tree. * sessionresolver: make KVStore mandatory Simplifies implementation. While there, use the ./internal/kvstore package rather than having our private implementation. * fix(ooapi): use the ./internal/kvstore package * fix(platform): better documentation
159 lines
3.7 KiB
Go
159 lines
3.7 KiB
Go
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/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)")
|
|
}
|
|
}
|