FIX/ENH: HttpMixin refactored and various fixes #2151
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
waldbauer-certat
force-pushed
the
fix-2150
branch
3 times, most recently
from
60181b1 to
2d39d0b
Compare
waldbauer-certat
force-pushed
the
fix-2150
branch
4 times, most recently
from
d0ad85c to
f3ae806
Compare
Codecov Report
@@ Coverage Diff @@
## develop #2151 +/- ##
===========================================
+ Coverage 76.34% 76.40% +0.06%
===========================================
Files 441 441
Lines 23652 23560 -92
Branches 3739 3729 -10
===========================================
- Hits 18058 18002 -56
+ Misses 4857 4836 -21
+ Partials 737 722 -15
|
waldbauer-certat
force-pushed
the
fix-2150
branch
from
f3ae806 to
ede84f7
Compare
**General** Removed 'requests' MissingDependencyError, because requests is a core lib from intelmq Removed HTTP variables from Bot class in favor of HttpMixin Removed trying to import requests in pipeline, its a core lib from intelmq Added additional configuration variables to HttpMixin ( from Bot class ) **Bots** GitHub API is now using HttpMixin MS Azure Collector is now using HttpMixin DO-Portal Expert is now using HttpMixin GeoHash using MissingDependencyError instead of ValueError (consistency) HttpContentExpert is now using HttpMixin HttpStatusExpert is now using HttpMixin NationalCERTContactCertATExpert is now using HttpMixin RDAPExpert is now using HttpMixin RIPEExpert is now using HttpMixin SplunkSavedSearchExpert is now using HttpMixin TuencyExpert is now using HttpMixin RestAPIOutput is now using HttpMixin **Bot tests** GitHub API Collector is now using requests_mock instead of MagicMock (consistency) RestAPI Output is now using correct headers Fixes #2150 Fixes #2137 Signed-off-by: Sebastian Waldbauer <[email protected]>
waldbauer-certat
force-pushed
the
fix-2150
branch
from
ede84f7 to
4527da7
Compare
wagner-intevation
suggested changes
Jul 25, 2022
| @@ -23,7 +23,7 @@ | |||
| create_configuration = None # noqa | |||
|
|
|||
|
|
|||
| class MicrosoftAzureCollectorBot(CollectorBot, CacheMixin): | |||
| class MicrosoftAzureCollectorBot(CollectorBot, CacheMixin, HttpMixin): | |||
There was a problem hiding this comment.
Is it used here? The bot uses the azure library and the parameters http_proxy and https_proxy are used by direct access.
Comment on lines
+44
to
+45
| http_username: str = None | ||
| http_password: str = None |
There was a problem hiding this comment.
Suggested change
| http_username: str = None | |
| http_password: str = None | |
| http_username: Optional[str] = None | |
| http_password: Optional[str] = None |
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.
General
Removed 'requests' MissingDependencyError, because requests is a core lib from intelmq
Removed HTTP variables from Bot class in favor of HttpMixin
Removed trying to import requests in pipeline, its a core lib from intelmq
Added additional configuration variables to HttpMixin ( from Bot class )
Bots
GitHub API is now using HttpMixin
MS Azure Collector is now using HttpMixin
DO-Portal Expert is now using HttpMixin
GeoHash using MissingDependencyError instead of ValueError (consistency)
HttpContentExpert is now using HttpMixin
HttpStatusExpert is now using HttpMixin
NationalCERTContactCertATExpert is now using HttpMixin
RDAPExpert is now using HttpMixin
RIPEExpert is now using HttpMixin
SplunkSavedSearchExpert is now using HttpMixin
TuencyExpert is now using HttpMixin
RestAPIOutput is now using HttpMixin
Bot tests
GitHub API Collector is now using requests_mock instead of MagicMock (consistency)
RestAPI Output is now using correct headers
Fixes #2150
Fixes #2137