⚠️ CONFLICT! Lineage pull request for: skeleton

.github/workflows/codeql-analysis.yml

@@ -8,8 +8,8 @@ name: "CodeQL"
 
 on:
   push:
-    # Push on all branches
-    # branches: [develop]
+  # Push on all branches
+  # branches: [develop]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [develop]
@@ -68,7 +68,7 @@ jobs:
       # three lines and modify them (or add more) to build your code if your
       # project uses a compiled language
 
-      #- run: |
+      # - run: |
       #   make bootstrap
       #   make release
 

.pre-commit-config.yaml

@@ -5,11 +5,13 @@ default_language_version:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.4.0
     hooks:
+      - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-json
       - id: check-merge-conflict
+      - id: check-toml
       - id: check-xml
       - id: debug-statements
       - id: detect-aws-credentials
@@ -29,19 +31,21 @@ repos:
 
   # Text file hooks
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.24.0
+    rev: v0.26.0
     hooks:
       - id: markdownlint
         args:
           - --config=.mdl_config.json
-  - repo: https://github.com/prettier/pre-commit
-    rev: v2.1.2
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.2.1
     hooks:
       - id: prettier
   - repo: https://github.com/adrienverge/yamllint
     rev: v1.25.0
     hooks:
       - id: yamllint
+        args:
+          - --strict
 
   # Shell script hooks
   - repo: https://github.com/detailyang/pre-commit-shell
@@ -52,7 +56,7 @@ repos:
   # Python hooks
   # Run bandit on "tests" tree with a configuration
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.6.2
+    rev: 1.7.0
     hooks:
       - id: bandit
         name: bandit (tests tree)
@@ -61,12 +65,12 @@ repos:
           - --config=.bandit.yml
   # Run bandit everything but tests directory
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.6.2
+    rev: 1.7.0
     hooks:
       - id: bandit
         name: bandit (everything else)
         exclude: tests
-  - repo: https://github.com/python/black
+  - repo: https://github.com/psf/black
     rev: 20.8b1
     hooks:
       - id: black
@@ -76,29 +80,29 @@ repos:
       - id: flake8
         additional_dependencies:
           - flake8-docstrings
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.6.4
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.7.0
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.790
     hooks:
       - id: mypy
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.2
+    rev: v2.7.4
     hooks:
       - id: pyupgrade
 
   # Ansible hooks
-  - repo: https://github.com/ansible/ansible-lint.git
-    rev: v4.3.5
+  - repo: https://github.com/ansible-community/ansible-lint
+    rev: v4.3.7
     hooks:
       - id: ansible-lint
       # files: molecule/default/playbook.yml
 
   # Terraform hooks
-  - repo: https://github.com/antonbabenko/pre-commit-terraform.git
-    rev: v1.43.0
+  - repo: https://github.com/antonbabenko/pre-commit-terraform
+    rev: v1.45.0
     hooks:
       - id: terraform_fmt
       # There are ongoing issues with how this command works. This issue
@@ -123,3 +127,10 @@ repos:
     rev: v2.0.0
     hooks:
       - id: docker-compose-check
+
+  # Packer hooks
+  - repo: https://github.com/cisagov/pre-commit-packer
+    rev: v0.0.2
+    hooks:
+      - id: packer_validate
+      - id: packer_fmt