From f05ba4ac6c0d0d5c1c3ac937a866215f89507aaa Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Thu, 6 Jun 2024 12:13:12 +0200 Subject: [PATCH] x --- cmd/ooniprobe/internal/nettests/dnscheck.go | 4 ++-- cmd/ooniprobe/internal/nettests/stunreachability.go | 4 ++-- cmd/ooniprobe/internal/nettests/web_connectivity.go | 4 ++-- internal/engine/inputloader_integration_test.go | 6 +++--- internal/oonirun/experiment.go | 4 ++-- internal/oonirun/session.go | 4 ++-- internal/{inputloading => targetloading}/inputloading.go | 4 ++-- .../{inputloading => targetloading}/inputloading_test.go | 2 +- .../testdata/inputloader1.txt | 0 .../testdata/inputloader2.txt | 0 .../testdata/inputloader3.txt | 0 pkg/oonimkall/taskrunner.go | 4 ++-- pkg/oonimkall/taskrunner_test.go | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) rename internal/{inputloading => targetloading}/inputloading.go (99%) rename internal/{inputloading => targetloading}/inputloading_test.go (99%) rename internal/{inputloading => targetloading}/testdata/inputloader1.txt (100%) rename internal/{inputloading => targetloading}/testdata/inputloader2.txt (100%) rename internal/{inputloading => targetloading}/testdata/inputloader3.txt (100%) diff --git a/cmd/ooniprobe/internal/nettests/dnscheck.go b/cmd/ooniprobe/internal/nettests/dnscheck.go index 44c7f86e2a..6824aa8af0 100644 --- a/cmd/ooniprobe/internal/nettests/dnscheck.go +++ b/cmd/ooniprobe/internal/nettests/dnscheck.go @@ -3,7 +3,7 @@ package nettests import ( "context" - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/model" ) @@ -11,7 +11,7 @@ import ( type DNSCheck struct{} func (n DNSCheck) lookupURLs(ctl *Controller) ([]model.ExperimentTarget, error) { - inputloader := &inputloading.Loader{ + inputloader := &targetloading.Loader{ CheckInConfig: &model.OOAPICheckInConfig{ // not needed because we have default static input in the engine }, diff --git a/cmd/ooniprobe/internal/nettests/stunreachability.go b/cmd/ooniprobe/internal/nettests/stunreachability.go index f77fe3ea84..6e2dcc267f 100644 --- a/cmd/ooniprobe/internal/nettests/stunreachability.go +++ b/cmd/ooniprobe/internal/nettests/stunreachability.go @@ -3,7 +3,7 @@ package nettests import ( "context" - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/model" ) @@ -11,7 +11,7 @@ import ( type STUNReachability struct{} func (n STUNReachability) lookupURLs(ctl *Controller) ([]model.ExperimentTarget, error) { - inputloader := &inputloading.Loader{ + inputloader := &targetloading.Loader{ CheckInConfig: &model.OOAPICheckInConfig{ // not needed because we have default static input in the engine }, diff --git a/cmd/ooniprobe/internal/nettests/web_connectivity.go b/cmd/ooniprobe/internal/nettests/web_connectivity.go index 9131e811a9..10fb759a2b 100644 --- a/cmd/ooniprobe/internal/nettests/web_connectivity.go +++ b/cmd/ooniprobe/internal/nettests/web_connectivity.go @@ -4,12 +4,12 @@ import ( "context" "github.com/apex/log" - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/model" ) func (n WebConnectivity) lookupURLs(ctl *Controller, categories []string) ([]model.ExperimentTarget, error) { - inputloader := &inputloading.Loader{ + inputloader := &targetloading.Loader{ CheckInConfig: &model.OOAPICheckInConfig{ // Setting Charging and OnWiFi to true causes the CheckIn // API to return to us as much URL as possible with the diff --git a/internal/engine/inputloader_integration_test.go b/internal/engine/inputloader_integration_test.go index a5a0bad598..712596b151 100644 --- a/internal/engine/inputloader_integration_test.go +++ b/internal/engine/inputloader_integration_test.go @@ -6,13 +6,13 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/engine" - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/kvstore" "github.com/ooni/probe-cli/v3/internal/model" ) // This historical integration test ensures that we're able to fetch URLs from -// the dev infrastructure. We say this test's historical because the inputloading.Loader +// the dev infrastructure. We say this test's historical because the targetloading.Loader // belonged to the engine package before we introduced richer input. It kind of feels // good to keep this integration test here since we want to use a real session and a real // Loader and double check whether we can get inputs. In a more distant future it would @@ -36,7 +36,7 @@ func TestInputLoaderInputOrQueryBackendWithNoInput(t *testing.T) { t.Fatal(err) } defer sess.Close() - il := &inputloading.Loader{ + il := &targetloading.Loader{ InputPolicy: model.InputOrQueryBackend, Session: sess, } diff --git a/internal/oonirun/experiment.go b/internal/oonirun/experiment.go index 01eada8abb..29972ee73f 100644 --- a/internal/oonirun/experiment.go +++ b/internal/oonirun/experiment.go @@ -13,7 +13,7 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/humanize" - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/model" ) @@ -200,7 +200,7 @@ func (ed *Experiment) newInputLoader(inputPolicy model.InputPolicy) inputLoader if ed.newInputLoaderFn != nil { return ed.newInputLoaderFn(inputPolicy) } - return &inputloading.Loader{ + return &targetloading.Loader{ CheckInConfig: &model.OOAPICheckInConfig{ RunType: model.RunTypeManual, OnWiFi: true, // meaning: not on 4G diff --git a/internal/oonirun/session.go b/internal/oonirun/session.go index 4b55da17de..e740c74ac9 100644 --- a/internal/oonirun/session.go +++ b/internal/oonirun/session.go @@ -10,14 +10,14 @@ package oonirun // import ( - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/model" ) // Session is the definition of Session used by this package. type Session interface { // A Session is also an InputLoaderSession. - inputloading.Session + targetloading.Session // A Session is also a SubmitterSession. SubmitterSession diff --git a/internal/inputloading/inputloading.go b/internal/targetloading/inputloading.go similarity index 99% rename from internal/inputloading/inputloading.go rename to internal/targetloading/inputloading.go index 3b339cceaf..8329e91e0a 100644 --- a/internal/inputloading/inputloading.go +++ b/internal/targetloading/inputloading.go @@ -1,5 +1,5 @@ -// Package inputloading contains common code to load input. -package inputloading +// Package targetloading contains common code to load input. +package targetloading import ( "bufio" diff --git a/internal/inputloading/inputloading_test.go b/internal/targetloading/inputloading_test.go similarity index 99% rename from internal/inputloading/inputloading_test.go rename to internal/targetloading/inputloading_test.go index bcb77f4a56..5424828692 100644 --- a/internal/inputloading/inputloading_test.go +++ b/internal/targetloading/inputloading_test.go @@ -1,4 +1,4 @@ -package inputloading +package targetloading import ( "context" diff --git a/internal/inputloading/testdata/inputloader1.txt b/internal/targetloading/testdata/inputloader1.txt similarity index 100% rename from internal/inputloading/testdata/inputloader1.txt rename to internal/targetloading/testdata/inputloader1.txt diff --git a/internal/inputloading/testdata/inputloader2.txt b/internal/targetloading/testdata/inputloader2.txt similarity index 100% rename from internal/inputloading/testdata/inputloader2.txt rename to internal/targetloading/testdata/inputloader2.txt diff --git a/internal/inputloading/testdata/inputloader3.txt b/internal/targetloading/testdata/inputloader3.txt similarity index 100% rename from internal/inputloading/testdata/inputloader3.txt rename to internal/targetloading/testdata/inputloader3.txt diff --git a/pkg/oonimkall/taskrunner.go b/pkg/oonimkall/taskrunner.go index 78f2cec6a1..7ff6203894 100644 --- a/pkg/oonimkall/taskrunner.go +++ b/pkg/oonimkall/taskrunner.go @@ -8,7 +8,7 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/engine" - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" ) @@ -192,7 +192,7 @@ func (r *runnerForTask) Run(rootCtx context.Context) { } case model.InputOrStaticDefault: if len(r.settings.Inputs) <= 0 { - inputs, err := inputloading.StaticBareInputForExperiment(r.settings.Name) + inputs, err := targetloading.StaticBareInputForExperiment(r.settings.Name) if err != nil { r.emitter.EmitFailureStartup("no default static input for this experiment") return diff --git a/pkg/oonimkall/taskrunner_test.go b/pkg/oonimkall/taskrunner_test.go index 1c349dfdd0..d7840e8f12 100644 --- a/pkg/oonimkall/taskrunner_test.go +++ b/pkg/oonimkall/taskrunner_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/ooni/probe-cli/v3/internal/inputloading" + "github.com/ooni/probe-cli/v3/internal/targetloading" "github.com/ooni/probe-cli/v3/internal/model" ) @@ -645,7 +645,7 @@ func TestTaskRunnerRun(t *testing.T) { {Key: eventTypeStatusProgress, Count: 1}, {Key: eventTypeStatusReportCreate, Count: 1}, } - allEntries, err := inputloading.StaticBareInputForExperiment(experimentName) + allEntries, err := targetloading.StaticBareInputForExperiment(experimentName) if err != nil { t.Fatal(err) }