feat(dnscheck): implement richer input #1618
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This diff completes the set of preliminary richer input diffs. We build the TargetLoader using the ExperimentBuilder, which in turn uses a registry.Factory under the hood. This means that we can load targets for each experiment. Part of ooni/probe#2607
bassosimone
commented
Jun 6, 2024
| @@ -114,7 +114,7 @@ func (m *Measurer) ExperimentVersion() string { | |||
| // errors are in addition to any other errors returned by the low level packages | |||
| // that are used by this experiment to implement its functionality. | |||
| var ( | |||
| ErrInputRequired = errors.New("this experiment needs input") | |||
| ErrInputRequired = targetloading.ErrInputRequired | |||
There was a problem hiding this comment.
Note: this change breaks the ABI in terms of the exact error string that we emit in such a case. Because we do not have an API/ABI strict stability guarantee and because it makes sense to avoid having so many duplicate errors, I think it makes sense to apply this change in the interested of reducing unnecessary duplication a bit.
bassosimone
commented
Jun 6, 2024
| model.NewOOAPIURLInfoWithDefaultCategoryAndCountry("b"), | ||
| model.NewOOAPIURLInfoWithDefaultCategoryAndCountry("c"), | ||
| } | ||
| return results, nil |
There was a problem hiding this comment.
This fixes a test that I broke previously. Now that we have a loader, we need to return "a", "b", "c" here rather than using the Inputs fields above. With this change we're back at 100% coverage.
DecFox
requested changes
Jun 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This diff:
./internal/registryand itsdnscheck.gofile such thatdnscheckhas its own private target loader;./internal/targetloadingto allow reusing the code to read static input from CLI and from files;./internal/modelto pass optional richer input to experiments;./internal/engineto pass richer input to experiments;./internal/experiment/dnscheckto read and use the richer input it is passed;./internal/experiment/dnscheckreturning some static entries;./internal/oonirunto make sure richer-input experiments honor their options by moving option loading before the loading of targets.Once this diff is merged,
miniooniandooniprobewill rundnscheckwith richer input. Obviously, we are still lacking an API to fetch richer input, so for now this is static richer input, suitable as a starting point to land more diffs.Part of ooni/probe#2607.