Merge pull request #61 from cisagov/lineage/skeleton

Lineage pull request for: skeleton

.ansible-lint

@@ -13,10 +13,10 @@ exclude_paths:
   - .cache
   # Seems wise to ignore this too
   - .github
-  # ansible-lint doesn't like the role name in this playbook, but it's
-  # what molecule requires
-  - molecule/default/converge.yml
-  # These two are Molecule configuration files, not Ansible playbooks
-  - molecule/default/molecule-no-systemd.yml
-  - molecule/default/molecule-with-systemd.yml
+kinds:
+  # This will force our systemd specific molecule configurations to be treated
+  # as plain yaml files by ansible-lint. This mirrors the default kind
+  # configuration in ansible-lint for molecule configurations:
+  # yaml: "**/molecule/*/{base,molecule}.{yaml,yml}"
+  - yaml: "**/molecule/*/molecule-{no,with}-systemd.yml"
 use_default_rules: true

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: check-case-conflict
       - id: check-executables-have-shebangs
@@ -31,13 +31,13 @@ repos:
 
   # Text file hooks
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.29.0
+    rev: v0.30.0
     hooks:
       - id: markdownlint
         args:
           - --config=.mdl_config.yaml
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.4.1
+    rev: v2.5.1
     hooks:
       - id: prettier
   - repo: https://github.com/adrienverge/yamllint
@@ -49,7 +49,7 @@ repos:
 
   # pre-commit hooks
   - repo: https://github.com/pre-commit/pre-commit
-    rev: v2.15.0
+    rev: v2.16.0
     hooks:
       - id: validate_manifest
 
@@ -76,7 +76,7 @@ repos:
   # Python hooks
   # Run bandit on "tests" tree with a configuration
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.0
+    rev: 1.7.1
     hooks:
       - id: bandit
         name: bandit (tests tree)
@@ -91,7 +91,7 @@ repos:
         name: bandit (everything else)
         exclude: tests
   - repo: https://github.com/psf/black
-    rev: 21.9b0
+    rev: 21.12b0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
@@ -101,32 +101,32 @@ repos:
         additional_dependencies:
           - flake8-docstrings
   - repo: https://github.com/PyCQA/isort
-    rev: 5.9.3
+    rev: 5.10.1
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910-1
+    rev: v0.931
     hooks:
       - id: mypy
         additional_dependencies:
           - types-mock
           - types-pytz
           - types-requests
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.0
+    rev: v2.31.0
     hooks:
       - id: pyupgrade
 
   # Ansible hooks
   - repo: https://github.com/ansible-community/ansible-lint
-    rev: v5.2.1
+    rev: v5.3.2
     hooks:
       - id: ansible-lint
       # files: molecule/default/playbook.yml
 
   # Terraform hooks
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.52.0
+    rev: v1.62.3
     hooks:
       - id: terraform_fmt
       - id: terraform_validate

src/tools/gophish_cleaner.py

@@ -32,7 +32,7 @@
 
 # Third-Party Libraries
 from docopt import docopt
-import requests
+import requests.packages.urllib3
 
 # cisagov Libraries
 from tools.connect import connect_api

src/tools/gophish_complete.py

@@ -30,7 +30,7 @@
 
 # Third-Party Libraries
 from docopt import docopt
-import requests
+import requests.packages.urllib3
 
 # cisagov Libraries
 from tools.connect import connect_api

src/tools/gophish_export.py

@@ -28,7 +28,7 @@
 # Third-Party Libraries
 from docopt import docopt
 import httpagentparser
-import requests
+import requests.packages.urllib3
 
 # cisagov Libraries
 from tools.connect import connect_api

src/tools/gophish_import.py

@@ -26,7 +26,7 @@
 # Third-Party Libraries
 from docopt import docopt
 from gophish.models import SMTP, Campaign, Error, Group, Page, Template, User
-import requests
+import requests.packages.urllib3
 
 # cisagov Libraries
 from tools.connect import connect_api

src/tools/gophish_test.py

@@ -28,7 +28,7 @@
 # Third-Party Libraries
 from docopt import docopt
 from gophish.models import SMTP, Campaign, Group, Page, Template, User
-import requests
+import requests.packages.urllib3
 
 # cisagov Libraries
 from tools.connect import connect_api