Skip to content

Island: Remove HTTP_PORTS from top-level agent configuration #2029

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 1 commit into from
Jun 17, 2022
Merged

Island: Remove HTTP_PORTS from top-level agent configuration #2029

merged 1 commit into from
Jun 17, 2022

Conversation

mssalvatore
Copy link
Collaborator

What does this PR do?

Fixes #2028

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?
  • Have you checked that you haven't introduced any duplicate code?

Testing Checklist

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

    Tested by running ETE tests

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

@codecov
Copy link

codecov bot commented Jun 16, 2022 •
edited
Loading

Codecov Report

Merging #2029 (1f1c558) into develop (fd36aca) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff            @@
##           develop    #2029   +/-   ##
========================================
  Coverage    56.80%   56.81%           
========================================
  Files          463      463           
  Lines        12822    12823    +1     
========================================
+ Hits          7284     7285    +1     
  Misses        5538     5538
Impacted Files Coverage Δ
monkey/monkey_island/cc/services/config.py 86.62% <100.00%> (+0.04%) ⬆️

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 fd36aca...1f1c558. Read the comment docs.

@mssalvatore mssalvatore force-pushed the 2028-remove-http-ports branch from b636bdd to 1f1c558 Compare June 17, 2022 00:20
VakarisZ
VakarisZ reviewed Jun 17, 2022
View reviewed changes
monkey/monkey_island/cc/services/config.py
@@ -357,6 +357,10 @@ def format_flat_config_for_agent():
ConfigService._format_payloads_from_flat_config(config)
ConfigService._format_pbas_from_flat_config(config)
ConfigService._format_propagation_from_flat_config(config)

# Ok, I'll admit this is just sort of jammed in here. But this code is going away very soon.
Copy link
Contributor

Choose a reason for hiding this comment

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

Funny, but TODO is better, as it gets picked up by IDE's

@VakarisZ VakarisZ merged commit c413ae8 into develop Jun 17, 2022
@VakarisZ VakarisZ deleted the 2028-remove-http-ports branch June 17, 2022 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VakarisZ VakarisZ VakarisZ left review comments

@shreyamalviya shreyamalviya Awaiting requested review from shreyamalviya

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

Successfully merging this pull request may close these issues.

Remove HTTP_PORTS from top-level agent configuration
2 participants
@mssalvatore @VakarisZ