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
215 lines
5.5 KiB
Go
215 lines
5.5 KiB
Go
// Code generated by go generate; DO NOT EDIT.
|
|
// 2022-04-12 11:16:01.028122 +0200 CEST m=+0.000154543
|
|
|
|
package ooapi
|
|
|
|
//go:generate go run ./internal/generator -file clientcall.go
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
|
|
)
|
|
|
|
func (c *Client) newCheckReportIDCaller() callerForCheckReportIDAPI {
|
|
return &simpleCheckReportIDAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
}
|
|
}
|
|
|
|
// CheckReportID calls the CheckReportID API.
|
|
func (c *Client) CheckReportID(
|
|
ctx context.Context, req *apimodel.CheckReportIDRequest,
|
|
) (*apimodel.CheckReportIDResponse, error) {
|
|
api := c.newCheckReportIDCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newCheckInCaller() callerForCheckInAPI {
|
|
return &simpleCheckInAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
}
|
|
}
|
|
|
|
// CheckIn calls the CheckIn API.
|
|
func (c *Client) CheckIn(
|
|
ctx context.Context, req *apimodel.CheckInRequest,
|
|
) (*apimodel.CheckInResponse, error) {
|
|
api := c.newCheckInCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newMeasurementMetaCaller() callerForMeasurementMetaAPI {
|
|
return &withCacheMeasurementMetaAPI{
|
|
API: &simpleMeasurementMetaAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
},
|
|
GobCodec: c.GobCodec,
|
|
KVStore: c.KVStore,
|
|
}
|
|
}
|
|
|
|
// MeasurementMeta calls the MeasurementMeta API.
|
|
func (c *Client) MeasurementMeta(
|
|
ctx context.Context, req *apimodel.MeasurementMetaRequest,
|
|
) (*apimodel.MeasurementMetaResponse, error) {
|
|
api := c.newMeasurementMetaCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newTestHelpersCaller() callerForTestHelpersAPI {
|
|
return &simpleTestHelpersAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
}
|
|
}
|
|
|
|
// TestHelpers calls the TestHelpers API.
|
|
func (c *Client) TestHelpers(
|
|
ctx context.Context, req *apimodel.TestHelpersRequest,
|
|
) (apimodel.TestHelpersResponse, error) {
|
|
api := c.newTestHelpersCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newPsiphonConfigCaller() callerForPsiphonConfigAPI {
|
|
return &withLoginPsiphonConfigAPI{
|
|
API: &simplePsiphonConfigAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
},
|
|
JSONCodec: c.JSONCodec,
|
|
KVStore: c.KVStore,
|
|
RegisterAPI: &simpleRegisterAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
},
|
|
LoginAPI: &simpleLoginAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
},
|
|
}
|
|
}
|
|
|
|
// PsiphonConfig calls the PsiphonConfig API.
|
|
func (c *Client) PsiphonConfig(
|
|
ctx context.Context, req *apimodel.PsiphonConfigRequest,
|
|
) (apimodel.PsiphonConfigResponse, error) {
|
|
api := c.newPsiphonConfigCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newTorTargetsCaller() callerForTorTargetsAPI {
|
|
return &withLoginTorTargetsAPI{
|
|
API: &simpleTorTargetsAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
},
|
|
JSONCodec: c.JSONCodec,
|
|
KVStore: c.KVStore,
|
|
RegisterAPI: &simpleRegisterAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
},
|
|
LoginAPI: &simpleLoginAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
},
|
|
}
|
|
}
|
|
|
|
// TorTargets calls the TorTargets API.
|
|
func (c *Client) TorTargets(
|
|
ctx context.Context, req *apimodel.TorTargetsRequest,
|
|
) (apimodel.TorTargetsResponse, error) {
|
|
api := c.newTorTargetsCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newURLsCaller() callerForURLsAPI {
|
|
return &simpleURLsAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
}
|
|
}
|
|
|
|
// URLs calls the URLs API.
|
|
func (c *Client) URLs(
|
|
ctx context.Context, req *apimodel.URLsRequest,
|
|
) (*apimodel.URLsResponse, error) {
|
|
api := c.newURLsCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newOpenReportCaller() callerForOpenReportAPI {
|
|
return &simpleOpenReportAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
}
|
|
}
|
|
|
|
// OpenReport calls the OpenReport API.
|
|
func (c *Client) OpenReport(
|
|
ctx context.Context, req *apimodel.OpenReportRequest,
|
|
) (*apimodel.OpenReportResponse, error) {
|
|
api := c.newOpenReportCaller()
|
|
return api.Call(ctx, req)
|
|
}
|
|
|
|
func (c *Client) newSubmitMeasurementCaller() callerForSubmitMeasurementAPI {
|
|
return &simpleSubmitMeasurementAPI{
|
|
BaseURL: c.BaseURL,
|
|
HTTPClient: c.HTTPClient,
|
|
JSONCodec: c.JSONCodec,
|
|
RequestMaker: c.RequestMaker,
|
|
UserAgent: c.UserAgent,
|
|
}
|
|
}
|
|
|
|
// SubmitMeasurement calls the SubmitMeasurement API.
|
|
func (c *Client) SubmitMeasurement(
|
|
ctx context.Context, req *apimodel.SubmitMeasurementRequest,
|
|
) (*apimodel.SubmitMeasurementResponse, error) {
|
|
api := c.newSubmitMeasurementCaller()
|
|
return api.Call(ctx, req)
|
|
}
|