d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
18 lines
435 B
Go
18 lines
435 B
Go
package probeservices
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
)
|
|
|
|
// FetchPsiphonConfig fetches psiphon config from authenticated OONI orchestra.
|
|
func (c Client) FetchPsiphonConfig(ctx context.Context) ([]byte, error) {
|
|
_, auth, err := c.GetCredsAndAuth()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
client := c.Client
|
|
client.Authorization = fmt.Sprintf("Bearer %s", auth.Token)
|
|
return client.FetchResource(ctx, "/api/v1/test-list/psiphon-config")
|
|
}
|