Skip to content

Commit

Permalink
Merge pull request #21 from remerge/CORE-15-update-template
Browse files Browse the repository at this point in the history
Update template
  • Loading branch information
hollow committed Jul 27, 2023
2 parents 2b0b207 + 64c711f commit 2e118fb
Show file tree
Hide file tree
Showing 7 changed files with 389 additions and 303 deletions.
2 changes: 2 additions & 0 deletions .checkov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ quiet: true
compact: false

skip-check:
# https://github.com/bridgecrewio/checkov/issues/5286
- CKV_TF_1
# do not enforce Customer Supplied Encryption Keys (CSEK)
- CKV_GCP_37
- CKV_GCP_38
Expand Down
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Changes here will be overwritten by Copier
_commit: v2.0.0-rc2-37-g12fce82
_commit: v2.0.1
_src_path: gh:remerge/template
project_id: ansible-role-nomad
project_license: apache-2.0
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ secring.*
.LSOverride

# Icon must end with two \r
Icon
Icon

# Thumbnails
._*
Expand Down Expand Up @@ -505,8 +505,8 @@ crash.log
crash.*.log

# Exclude all .tfvars files, which are likely to contain sensitive data, such as
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# password, private keys, and other secrets. These should not be part of version
# control as they are data points which are potentially sensitive and subject
# to change depending on the environment.
*.tfvars
*.tfvars.json
Expand Down
5 changes: 3 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ repos:
- id: fix-byte-order-marker
- id: forbid-submodules
- id: trailing-whitespace
exclude: "^.gitignore$"

# https://github.com/pre-commit/mirrors-prettier/tags
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v2.7.1"
rev: "v3.0.0"
hooks:
- id: prettier
exclude: "^project/"
Expand Down Expand Up @@ -95,7 +96,7 @@ repos:

# https://github.com/bridgecrewio/checkov/tags
- repo: https://github.com/bridgecrewio/checkov
rev: "2.3.296"
rev: "2.3.340"
hooks:
- id: checkov
name: checkov
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"ms-toolsai.jupyter",
"aaron-bond.better-comments",
"bierner.markdown-emoji",
"bungcip.better-toml",
"DavidAnson.vscode-markdownlint",
"DotJoshJohnson.xml",
"eamodio.gitlens",
Expand All @@ -27,6 +26,7 @@
"redhat.vscode-yaml",
"samuelcolvin.jinjahtml",
"sharat.vscode-brewfile",
"tamasfe.even-better-toml",
"timonwong.shellcheck",
"wholroyd.jinja",
"yzhang.markdown-all-in-one"
Expand Down
666 changes: 375 additions & 291 deletions poetry.lock

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ authors = ["Remerge GmbH <core@remerge.io>"]
python = "^3.9"

[tool.poetry.group.dev.dependencies]
black = "^23.3.0"
black = "^23.7.0"
flake8 = "^6.0.0"
flake8-bugbear = "^23.6.5"
flake8-bugbear = "^23.7.10"
pylint = "^2.17.4"
tox = "^4.6.3"
# for compatibility with ansible-lint 6.17.1 until molecule 5.0.2 is released
molecule = {extras = ["docker"], git = "https://github.com/ansible-community/molecule", rev = "3fbaa68" }
tox = "^4.6.4"
molecule = { extras = ["docker"], version = "^5.1.0" }
ansible-lint = { version = "^6.17.2", markers = "platform_system != 'Windows'" }

[build-system]
Expand Down

0 comments on commit 2e118fb

Please sign in to comment.