Merge pull request #34 from remerge/update-template

Update template
remerge · Jul 25, 2024 · 31c185f · 31c185f
2 parents 1e7f8f2 + e36de88
commit 31c185f
Show file tree

Hide file tree

Showing 10 changed files with 520 additions and 544 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,6 +1,6 @@
 ---
 # Changes here will be overwritten by Copier
-_commit: v2.16.0
+_commit: v2.25.1
 _src_path: gh:remerge/template
 project_id: ansible-role-nomad
 project_license: apache-2.0

diff --git a/.gitignore b/.gitignore
@@ -52,72 +52,6 @@
 secring.*
 
 
-## https://raw.githubusercontent.com/github/gitignore/main/Global/Images.gitignore
-
-# JPEG
-*.jpg
-*.jpeg
-*.jpe
-*.jif
-*.jfif
-*.jfi
-
-# JPEG 2000
-*.jp2
-*.j2k
-*.jpf
-*.jpx
-*.jpm
-*.mj2
-
-# JPEG XR
-*.jxr
-*.hdp
-*.wdp
-
-# Graphics Interchange Format
-*.gif
-
-# RAW
-*.raw
-
-# Web P
-*.webp
-
-# Portable Network Graphics
-*.png
-
-# Animated Portable Network Graphics
-*.apng
-
-# Multiple-image Network Graphics
-*.mng
-
-# Tagged Image File Format
-*.tiff
-*.tif
-
-# Scalable Vector Graphics
-*.svg
-*.svgz
-
-# Portable Document Format
-*.pdf
-
-# X BitMap
-*.xbm
-
-# BMP
-*.bmp
-*.dib
-
-# ICO
-*.ico
-
-# 3D Images
-*.3dm
-*.max
-
 ## https://raw.githubusercontent.com/github/gitignore/main/Global/Linux.gitignore
 
 *~
@@ -328,6 +262,164 @@ xcuserdata/
 ## S/MIME message
 *.smime
 
+## https://raw.githubusercontent.com/github/gitignore/main/Go.gitignore
+
+# If you prefer the allow list template instead of the deny list, see community template:
+# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
+#
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Go workspace file
+go.work
+go.work.sum
+
+## https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
 ## https://raw.githubusercontent.com/github/gitignore/main/Python.gitignore
 
 # Byte-compiled / optimized / DLL files
@@ -438,8 +530,10 @@ ipython_config.py
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
@@ -528,30 +622,6 @@ override.tf.json
 .terraformrc
 terraform.rc
 
-## https://raw.githubusercontent.com/github/gitignore/main/Go.gitignore
-
-# If you prefer the allow list template instead of the deny list, see community template:
-# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
-#
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-# Go workspace file
-go.work
-
 # Custom ignores for Go projects
 .build/
 .tools/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,6 +16,11 @@ repos:
       - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-json
+        exclude: |
+          (?x)^(
+              \.vscode/.*\.json|
+              \.eslintrc\.json
+          )$
       - id: check-merge-conflict
       - id: check-shebang-scripts-are-executable
       - id: check-symlinks
@@ -31,16 +36,21 @@ repos:
       - id: trailing-whitespace
         exclude: "^.gitignore$"
 
-  # https://github.com/pre-commit/mirrors-prettier/tags
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.1.0"
+  # https://github.com/prettier/prettier/tags
+  - repo: local
     hooks:
       - id: prettier
+        name: prettier
+        entry: prettier --write --list-different --ignore-unknown
+        language: node
+        types: [text]
         exclude: "^project/"
+        additional_dependencies:
+          - "prettier@3.3.2"
 
   # https://github.com/igorshubovych/markdownlint-cli/tags
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: "v0.39.0"
+    rev: "v0.41.0"
     hooks:
       - id: markdownlint-fix
         name: markdownlint
@@ -67,36 +77,14 @@ repos:
 
   # https://github.com/rhysd/actionlint/tags
   - repo: https://github.com/rhysd/actionlint
-    rev: "v1.6.27"
+    rev: "v1.7.1"
     hooks:
       - id: actionlint-docker
         name: actionlint
 
-  # https://github.com/ansible/ansible-lint/tags
-  - repo: https://github.com/ansible/ansible-lint
-    rev: "v24.2.2"
-    hooks:
-      - id: ansible-lint
-        name: ansible-lint
-        entry: python3 -m ansiblelint -v --force-color --strict
-        additional_dependencies:
-          - "passlib"
-
-  # https://github.com/robertdebock/pre-commit/tags
-  - repo: https://github.com/robertdebock/pre-commit
-    rev: "v1.5.2"
-    hooks:
-      - id: ansible_role_find_empty_directories
-      - id: ansible_role_find_empty_files
-      - id: ansible_role_find_horizontal_when
-      - id: ansible_role_find_undefined_handlers
-      - id: ansible_role_find_unquoted_values
-      - id: ansible_role_find_unused_variable
-      - id: ansible_role_fix_readability
-
   # https://github.com/bridgecrewio/checkov/tags
   - repo: https://github.com/bridgecrewio/checkov
-    rev: "3.2.74"
+    rev: "3.2.183"
     hooks:
       - id: checkov
         name: checkov
@@ -114,3 +102,26 @@ repos:
     hooks:
       - id: woke-from-source
         args: [--config=.woke.yaml]
+
+  # https://github.com/ansible/ansible-lint/tags
+  - repo: https://github.com/ansible/ansible-lint
+    rev: "v24.7.0"
+    hooks:
+      - id: ansible-lint
+        name: ansible-lint
+        entry: python3 -m ansiblelint -v --force-color --strict
+        additional_dependencies:
+          - "passlib"
+
+  # https://github.com/robertdebock/pre-commit/tags
+  - repo: https://github.com/robertdebock/pre-commit
+    rev: "v1.5.3"
+    hooks:
+      - id: ansible_role_find_empty_directories
+      - id: ansible_role_find_empty_files
+      - id: ansible_role_find_horizontal_when
+      - id: ansible_role_find_undefined_handlers
+      - id: ansible_role_find_unquoted_values
+      - id: ansible_role_find_unused_variable
+        args: [-f.]
+      - id: ansible_role_fix_readability
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,3 @@
 # auto generated
 .copier-answers.yml
+.pnp.loader.mjs