Skip to content

Remove max iterations and timeout between iterations options #1600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 8 commits into from
Nov 19, 2021
Merged

Remove max iterations and timeout between iterations options #1600

merged 8 commits into from
Nov 19, 2021

Conversation

shreyamalviya
Copy link
Contributor

What does this PR do?

Fixes #1537

PR Checklist

  • Have you added an explanation of what your changes do and why you'd like to include them?
  • Is the TravisCI build passing?
  • Was the CHANGELOG.md updated to reflect the changes?
  • Was the documentation framework updated to reflect the changes?

Testing Checklist

  • Added relevant unit tests?
  • Have you successfully tested your changes locally? Elaborate:

    Tested by {Running the Monkey locally with relevant config/running Island/...}

  • If applicable, add screenshots or log transcripts of the feature working

Explain Changes

Are the commit messages enough? If not, elaborate.

@mssalvatore
Copy link
Collaborator

I think we can also get rid of "retry failed exploitation." If I understand it correctly, that option allows you to enable or disable whether or not the monkey will retry exploitation in subsequent runs. Since there's now only 1 run, the option is meaningless. Please inspect the code to confirm.

ilija-lazoroski
ilija-lazoroski approved these changes Nov 16, 2021
View reviewed changes
Copy link
Contributor

@ilija-lazoroski ilija-lazoroski left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Just fix conflicts.

@shreyamalviya
Copy link
Contributor Author

image

ilija-lazoroski
ilija-lazoroski requested changes Nov 18, 2021
View reviewed changes
Copy link
Contributor

@ilija-lazoroski ilija-lazoroski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Travis is failing due to swimm unit Add a new configuration to the Agent . I am guessing the problems are first line numbers.
image
image

@codecov
Copy link

codecov bot commented Nov 19, 2021

Codecov Report

Merging #1600 (65781f9) into develop (2fb2bc0) will increase coverage by 0.03%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1600      +/-   ##
===========================================
+ Coverage    44.65%   44.69%   +0.03%     
===========================================
  Files          468      468              
  Lines        13628    13611      -17     
===========================================
- Hits          6086     6083       -3     
+ Misses        7542     7528      -14
Impacted Files Coverage Δ
monkey/infection_monkey/config.py 60.48% <ø> (-0.94%) ⬇️
monkey/infection_monkey/monkey.py 0.00% <0.00%> (ø)
.../monkey_island/cc/services/config_schema/monkey.py 100.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2fb2bc0...65781f9. Read the comment docs.

@mssalvatore mssalvatore force-pushed the 1537-remove-max-iters branch from 65781f9 to 52019f2 Compare November 19, 2021 13:08
@mssalvatore mssalvatore merged commit f3b7803 into develop Nov 19, 2021
@mssalvatore mssalvatore deleted the 1537-remove-max-iters branch November 19, 2021 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ilija-lazoroski ilija-lazoroski ilija-lazoroski requested changes

@mssalvatore mssalvatore mssalvatore approved these changes

@VakarisZ VakarisZ Awaiting requested review from VakarisZ

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove unused/untested options
3 participants
@shreyamalviya @mssalvatore @ilija-lazoroski