Integrate further with ooni/probe-engine: episode two (#46)
* utils/geoip.go: use github.com/ooni/probe-engine
Let's start using the engine by rewriting utils/geoip.go to
be just a thin wrapper around the engine functionality.
* Ready for review
* Checkpoint: the im tests are converted
Still have some doubts with respect to the variables that
are passed to MK via probe-engine. Will double check.
* fix(i/c/r/run.go): write the correct logic
* nettests: one more comment and also fix a format string
* Tweak previous
* progress
* Fix doofus
* better comment
* XXX => actionable comment
* Add glue to simplify test keys management
Making the concept of measurement more abstract in the engine is
not feasible because, when submitting a measurement, we need to
modify it to update the report ID and the measurement ID. Therefore,
returning a serialized measurement is not a good idea. We will
keep using a model.Measurement in the engine.
Changing model.Measurement.TestKeys's type from a `interface{}`
pointing to a well defined data structure to `map[string]interface{}`
is a regression because means that we are moving from code that
has a clear and defined structure to code that is more complicated
to parse and validate. Since we're already suffering havily from
the lack of a good schema, I'm not going to make the situation
worst by worsening the engine. At least for ndt7 and psiphon, we
now have a good schema and I don't want to lose that.
However, the current code in this repository is expecting the
test keys to be a `map[string]interface{}`. This choice was
dictated by the fact that we receive a JSON from Measurement Kit
and by the fact that there's not a clear schema.
To solve this tension, in this commit I am going to write glue
adapter code that makes sure that the TestKeys of a Measurement
are converted to `map[string]interface{}`. This will be done
using a type cast where possible and JSON serialization and parsing
otherwise. In a perfect world, glue is not a good idea, but in a
real world it may actually be useful.
When all tests in the engine will have a clear Go data structure,
we'll then remove the glue and just cast to the proper data
structure from `interface{}` where required.
* nettests/performance: use probe-engine
* go.{mod,sum}: upgrade to latest probe-engine
* nettests/middlebox: use ooni/probe-engine
* Update to the latest probe-engine
* web_connectivity: rewrite to use probe-engine
* Cosmetic change suggested by @hellais
* nettests/nettests.go: remove unused code
* nettests/nettests.go: fix progress
* nettests/nettests.go: remove go-measurement-kit code
* We don't depend on go-measurement-kit anymore
* Improve non-verbose output where possible
See also: https://github.com/measurement-kit/measurement-kit/issues/1856
* Make web_connectivity output pleasant
* Update to the latest probe-engine
* nettests/nettests.go: honour sharing settings
* Update to the latest probe-engine
* Use log.WithFields for probe-engine
* Update go.mod go.sum
* Revert "Update go.mod go.sum"
This reverts commit 5ecd38d8236f4a4e9b77ddb8e8a0d1e3cdd4b818.
* Revert "Revert "Update go.mod go.sum""
This reverts commit 6114b31eca98826112032776bd0feff02d763ecd.
* Upgrade ooni/probe-engine
* Unset GOPATH before running go build commands
* Dockefile: fix linux build by using latest
* Update to the latest ooni/probe-engine
```
go get -u github.com/ooni/probe-engine
go mod tidy
```
* Repair build
2019-08-15 18:08:43 +02:00
|
|
|
GO ?= GOPATH="" go
|
2018-02-07 19:02:18 +01:00
|
|
|
|
2018-09-07 15:16:20 +02:00
|
|
|
install-dev-deps:
|
|
|
|
|
@$(GO) get golang.org/x/tools/cmd/cover
|
|
|
|
|
@$(GO) get github.com/mattn/goveralls
|
|
|
|
|
|
2018-02-07 19:02:18 +01:00
|
|
|
build:
|
2018-05-11 11:21:34 +02:00
|
|
|
@echo "Building dist/ooni"
|
2019-05-15 14:48:06 +02:00
|
|
|
@$(GO) build -o dist/ooni cmd/ooni/main.go
|
2018-02-07 19:02:18 +01:00
|
|
|
.PHONY: build
|
2018-02-12 17:29:03 +01:00
|
|
|
|
2018-05-11 11:21:34 +02:00
|
|
|
build-windows:
|
2019-05-15 14:48:06 +02:00
|
|
|
@echo "Building dist/windows/amd64/ooni.exe"
|
|
|
|
|
@./build.sh windows
|
|
|
|
|
|
|
|
|
|
build-linux:
|
|
|
|
|
@echo "Building dist/linux/amd64/ooni"
|
|
|
|
|
@./build.sh linux
|
|
|
|
|
|
|
|
|
|
build-macos:
|
|
|
|
|
@echo "Building dist/macos/amd64/ooni"
|
|
|
|
|
@./build.sh macos
|
|
|
|
|
|
|
|
|
|
build-all: build-windows build-linux build-macos
|
|
|
|
|
.PHONY: build-all build-windows build-linux build-macos
|
2018-03-23 12:41:06 +01:00
|
|
|
|
2018-02-12 17:29:03 +01:00
|
|
|
bindata:
|
2018-03-08 20:34:30 +01:00
|
|
|
@$(GO) run vendor/github.com/shuLhan/go-bindata/go-bindata/*.go \
|
2018-02-12 17:29:03 +01:00
|
|
|
-nometadata \
|
|
|
|
|
-o internal/bindata/bindata.go -pkg bindata \
|
2018-02-12 17:30:27 +01:00
|
|
|
data/...;
|
2018-09-06 16:13:04 +02:00
|
|
|
|
2019-05-15 17:55:11 +02:00
|
|
|
release:
|
2019-05-16 15:41:57 +02:00
|
|
|
GITHUB_TOKEN=`cat ~/.GORELEASE_GITHUB_TOKEN` goreleaser --rm-dist
|
|
|
|
|
./build.sh linux
|
|
|
|
|
mv dist/linux/amd64 dist/ooniprobe_$(git describe --tags | sed s/^v//)_linux_amd64
|
|
|
|
|
tar cvzf dist/ooniprobe_$(git describe --tags | sed s/^v//)_linux_amd64.tar.gz \
|
|
|
|
|
-C dist/ooniprobe_$(git describe --tags | sed s/^v//)_linux_amd64 \
|
|
|
|
|
ooni
|
|
|
|
|
cd dist && shasum -a 256 ooniprobe_$(git describe --tags | sed s/^v//)_linux_amd64.tar.gz >> ooniprobe_checksums.txt
|
|
|
|
|
gpg -a --detach-sign dist/ooniprobe_checksums.txt
|
2019-05-15 17:55:11 +02:00
|
|
|
|
2018-09-06 16:13:04 +02:00
|
|
|
test-internal:
|
|
|
|
|
@$(GO) test -v ./internal/...
|
|
|
|
|
|
2018-02-12 17:29:03 +01:00
|
|
|
.PHONY: bindata
|
