Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
Release Infection Monkey v2.0.0
  • Loading branch information
mssalvatore committed Feb 10, 2023
2 parents be2a683 + ce2ed78 commit 9eb8f82
Show file tree
Hide file tree
Showing 1,850 changed files with 80,718 additions and 56,722 deletions.
4 changes: 3 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ exclude = monkey/monkey_island/cc/ui,vulture_allowlist.py
show-source = True
max-complexity = 10
max-line-length = 100
per-file-ignores = __init__.py:F401
per-file-ignores =
__init__.py:F401
monkey/tests/unit_tests/infection_monkey/island_api_client/configuration_validation_constants.py:E501

### ignore "whitespace before ':'", "line break before binary operator" for
### compatibility with black, and cyclomatic complexity (for now).
Expand Down
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
monkey/tests/data_for_tests/ransomware_targets/** -text
monkey/tests/data_for_tests/test_readme.txt -text
monkey/tests/data_for_tests/stable_file.txt -text
monkey/infection_monkey/ransomware/ransomware_readme.txt -text
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/04_refactor.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: "🏗Refactor"
about: Refactor existing code
title: ''
labels: Refactor
assignees: ''

---

# Refactor

## Component(s) to be refactored

-

## Explanation
File renamed without changes.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/06_blank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
name: "📒Blank"
about: A blank issue for anything not covered by another template
title: ''
labels:
assignees: ''

---
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ contact_links:
url: https://join.slack.com/t/infectionmonkey/shared_invite/enQtNDU5MjAxMjg1MjU1LWM0NjVmNWE2ZTMzYzAxOWJiYmMxMzU0NWU3NmUxYjcyNjk0YWY2MDkwODk4NGMyNDU4NzA4MDljOWNmZWViNDU
about: Our community Slack channel - you can ask questions or suggest things here.
- name: FAQs
url: https://www.guardicore.com/infectionmonkey/faq/
url: https://www.guardicore.com/infectionmonkey/docs/faq/
about: Frequently Asked Questions - if you have a question, see if we've already answered it!
15 changes: 6 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
# What does this PR do?
# What does this PR do?

Fixes #`put issue number here`.
Fixes #`put issue number here`.

Add any further explanations here.
Add any further explanations here.

## 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?
* [ ] 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 the Monkey locally with relevant config/running Island/...}
> 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.
15 changes: 14 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ coverage.xml
*.log

# Sphinx documentation
docs/_build/
/monkey/monkey_island/docs/source/_autosummary

# PyBuilder
target/
Expand Down Expand Up @@ -98,3 +98,16 @@ profiler_logs/

# Virtualenv
venv/

# Hugo
.hugo_build.lock

# mypy
.mypy_cache

# MacOS
.DS_Store

# Terraform usage files
envs/monkey_zoo/terraform/.terraform*
envs/monkey_zoo/terraform/terraform.*
21 changes: 16 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
default_stages: [commit]
repos:
- repo: https://github.com/pycqa/isort
rev: 5.8.0
rev: 5.10.1
hooks:
- id: isort
name: isort (python)
Expand All @@ -12,16 +12,16 @@ repos:
name: isort (pyi)
types: [pyi]
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.1
rev: 4.0.1
hooks:
- id: flake8
additional_dependencies: [dlint]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.1.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -31,10 +31,21 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/eslint/eslint
rev: v7.24.0
rev: v8.12.0
hooks:
- id: eslint
args: ["monkey/monkey_island/cc/ui/src/", "--fix", "--max-warnings=0"]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.971
hooks:
- id: mypy
additional_dependencies: [types-ipaddress, types-paramiko, types-python-dateutil, types-pytz, types-PyYAML, types-requests]
exclude: "vulture_allowlist.py"
args: [--ignore-missing-imports]
- repo: https://github.com/koalaman/shellcheck-precommit
rev: v0.7.2
hooks:
- id: shellcheck
- repo: local
hooks:
- id: pytest
Expand Down
86 changes: 0 additions & 86 deletions .swm/AzD8XysWg1BBXCjCDkfq.swm

This file was deleted.

52 changes: 0 additions & 52 deletions .swm/JFXftJml8DpmuCPBA9rL.swm

This file was deleted.

Loading

0 comments on commit 9eb8f82

Please sign in to comment.