306d18e466
Here's the squash of the following patches that enable support
for go1.18 and update our dependencies.
This diff WILL need to be backported to the release/3.14 branch.
* chore: use go1.17.8
See https://github.com/ooni/probe/issues/2067
* chore: upgrade to probe-assets@v0.8.0
See https://github.com/ooni/probe/issues/2067.
* chore: update dependencies and enable go1.18
As mentioned in 7a0d17ea91
,
the tree won't build with `go1.18` unless we say it does.
So, not only here we need to update dependencies but also we
need to explicitly say `go1.18` in the `go.mod`.
This work is part of https://github.com/ooni/probe/issues/2067.
* chore(coverage.yml): run with go1.18
This change will give us a bare minimum confidence that we're
going to build our tree using version 1.18 of golang.
See https://github.com/ooni/probe/issues/2067.
* chore: update user agent used for measuring
See https://github.com/ooni/probe/issues/2067
* chore: run `go generate ./...`
See https://github.com/ooni/probe/issues/2067
* fix(dialer_test.go): make test work with go1.17 and go1.18
1. the original test wanted the dial to fail, so ensure we're not
passing any domain name to exercise dialing not resolving;
2. match the end of the error rather than the whole error string.
Tested locally with both go1.17 and go1.18.
See https://github.com/ooni/probe-cli/pull/708#issuecomment-1096447186
213 lines
5.0 KiB
Go
213 lines
5.0 KiB
Go
// Code generated by go generate; DO NOT EDIT.
|
|
// 2022-04-12 11:16:01.660847 +0200 CEST m=+0.000161543
|
|
|
|
package ooapi
|
|
|
|
//go:generate go run ./internal/generator -file fakeapi_test.go
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/atomicx"
|
|
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
|
|
)
|
|
|
|
type FakeCheckReportIDAPI struct {
|
|
Err error
|
|
Response *apimodel.CheckReportIDResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeCheckReportIDAPI) Call(ctx context.Context, req *apimodel.CheckReportIDRequest) (*apimodel.CheckReportIDResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForCheckReportIDAPI = &FakeCheckReportIDAPI{}
|
|
)
|
|
|
|
type FakeCheckInAPI struct {
|
|
Err error
|
|
Response *apimodel.CheckInResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeCheckInAPI) Call(ctx context.Context, req *apimodel.CheckInRequest) (*apimodel.CheckInResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForCheckInAPI = &FakeCheckInAPI{}
|
|
)
|
|
|
|
type FakeLoginAPI struct {
|
|
Err error
|
|
Response *apimodel.LoginResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeLoginAPI) Call(ctx context.Context, req *apimodel.LoginRequest) (*apimodel.LoginResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForLoginAPI = &FakeLoginAPI{}
|
|
)
|
|
|
|
type FakeMeasurementMetaAPI struct {
|
|
Err error
|
|
Response *apimodel.MeasurementMetaResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeMeasurementMetaAPI) Call(ctx context.Context, req *apimodel.MeasurementMetaRequest) (*apimodel.MeasurementMetaResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForMeasurementMetaAPI = &FakeMeasurementMetaAPI{}
|
|
)
|
|
|
|
type FakeRegisterAPI struct {
|
|
Err error
|
|
Response *apimodel.RegisterResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeRegisterAPI) Call(ctx context.Context, req *apimodel.RegisterRequest) (*apimodel.RegisterResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForRegisterAPI = &FakeRegisterAPI{}
|
|
)
|
|
|
|
type FakeTestHelpersAPI struct {
|
|
Err error
|
|
Response apimodel.TestHelpersResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeTestHelpersAPI) Call(ctx context.Context, req *apimodel.TestHelpersRequest) (apimodel.TestHelpersResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForTestHelpersAPI = &FakeTestHelpersAPI{}
|
|
)
|
|
|
|
type FakePsiphonConfigAPI struct {
|
|
WithResult callerForPsiphonConfigAPI
|
|
Err error
|
|
Response apimodel.PsiphonConfigResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakePsiphonConfigAPI) Call(ctx context.Context, req *apimodel.PsiphonConfigRequest) (apimodel.PsiphonConfigResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
func (fapi *FakePsiphonConfigAPI) WithToken(token string) callerForPsiphonConfigAPI {
|
|
return fapi.WithResult
|
|
}
|
|
|
|
var (
|
|
_ callerForPsiphonConfigAPI = &FakePsiphonConfigAPI{}
|
|
_ clonerForPsiphonConfigAPI = &FakePsiphonConfigAPI{}
|
|
)
|
|
|
|
type FakeTorTargetsAPI struct {
|
|
WithResult callerForTorTargetsAPI
|
|
Err error
|
|
Response apimodel.TorTargetsResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeTorTargetsAPI) Call(ctx context.Context, req *apimodel.TorTargetsRequest) (apimodel.TorTargetsResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
func (fapi *FakeTorTargetsAPI) WithToken(token string) callerForTorTargetsAPI {
|
|
return fapi.WithResult
|
|
}
|
|
|
|
var (
|
|
_ callerForTorTargetsAPI = &FakeTorTargetsAPI{}
|
|
_ clonerForTorTargetsAPI = &FakeTorTargetsAPI{}
|
|
)
|
|
|
|
type FakeURLsAPI struct {
|
|
Err error
|
|
Response *apimodel.URLsResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeURLsAPI) Call(ctx context.Context, req *apimodel.URLsRequest) (*apimodel.URLsResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForURLsAPI = &FakeURLsAPI{}
|
|
)
|
|
|
|
type FakeOpenReportAPI struct {
|
|
Err error
|
|
Response *apimodel.OpenReportResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeOpenReportAPI) Call(ctx context.Context, req *apimodel.OpenReportRequest) (*apimodel.OpenReportResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForOpenReportAPI = &FakeOpenReportAPI{}
|
|
)
|
|
|
|
type FakeSubmitMeasurementAPI struct {
|
|
Err error
|
|
Response *apimodel.SubmitMeasurementResponse
|
|
CountCall *atomicx.Int64
|
|
}
|
|
|
|
func (fapi *FakeSubmitMeasurementAPI) Call(ctx context.Context, req *apimodel.SubmitMeasurementRequest) (*apimodel.SubmitMeasurementResponse, error) {
|
|
if fapi.CountCall != nil {
|
|
fapi.CountCall.Add(1)
|
|
}
|
|
return fapi.Response, fapi.Err
|
|
}
|
|
|
|
var (
|
|
_ callerForSubmitMeasurementAPI = &FakeSubmitMeasurementAPI{}
|
|
)
|