From 98ea9857d5a0a7b8494424f6c2c060bf9b2104a7 Mon Sep 17 00:00:00 2001 From: Luis Mayta Date: Mon, 30 Dec 2024 15:18:07 -0500 Subject: [PATCH] feat(lint): upgrade versions (#57) --- .ci/linters/.gitleaks.toml | 1 + .ci/linters/.tflint.hcl | 2 +- .pre-commit-config.yaml | 14 +++++--- Taskfile.yml | 65 ++++++++++++++++++++++++++++++-------- pyproject.toml | 2 +- 5 files changed, 64 insertions(+), 20 deletions(-) diff --git a/.ci/linters/.gitleaks.toml b/.ci/linters/.gitleaks.toml index 8ae1ca3..7daa163 100644 --- a/.ci/linters/.gitleaks.toml +++ b/.ci/linters/.gitleaks.toml @@ -162,6 +162,7 @@ title = "gitleaks config" '''host=HOST''', '''--private-key={{.PRIVATE_KEY_FILE}}''', '''PASSWORD=XXXXXX''', + '''password={password}''', ] diff --git a/.ci/linters/.tflint.hcl b/.ci/linters/.tflint.hcl index 9374409..08d5e95 100644 --- a/.ci/linters/.tflint.hcl +++ b/.ci/linters/.tflint.hcl @@ -1,6 +1,6 @@ plugin "aws" { enabled = true - version = "0.27.0" + version = "0.32.0" source = "github.com/terraform-linters/tflint-ruleset-aws" } rule "terraform_deprecated_index" { diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 934c984..7d407d7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ ci: autoupdate_schedule: monthly default_stages: - - commit + - pre-commit exclude: > (?x)^( ^(\/|)vendor\/(.*?)$| @@ -11,6 +11,7 @@ exclude: > .+\.terraform.*$| .+\.venv.*$| .+\.lock$| + .+\.mdx$| )$ repos: @@ -22,15 +23,18 @@ repos: - --ignore-words=.ci/linters/.codespell-ignores exclude: > (?x)^( + go.mod| + go.sum| + app/ia/datasets\/.*$| + openapi.yaml| .+\.vendor\/.*$| .+\.node_modules\/.*$| .+\.sops.*$| .+\.lock$| - go.mod| - go.sum| + .+\.mdx$| )$ - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook - rev: v9.16.0 + rev: v9.20.0 hooks: - id: commitlint stages: [commit-msg] @@ -38,7 +42,7 @@ repos: args: - --config=.ci/linters/.commitlintrc.json - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: detect-private-key files: ^(?!\.?git-crypt) diff --git a/Taskfile.yml b/Taskfile.yml index c85169b..cafc91d 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -2,17 +2,52 @@ version: "3" includes: - changelog: ./provision/task/changelog.yml - confluence: ./provision/task/confluence.yml - python: ./provision/task/python.yml - git: ./provision/task/git.yml docs: ./provision/task/docs.yml - docker: ./provision/task/docker.yml - version: ./provision/task/version.yml - plantuml: ./provision/task/plantuml.yml - prettier: ./provision/task/prettier.yml - sonar: ./provision/task/sonar.yml - diagrams: ./provision/diagrams/Taskfile.yml + + ansible: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/ansible/Taskfile.yml" + pre-commit: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/pre-commit/Taskfile.yml" + github: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/github/Taskfile.yml" + changelog: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/changelog/Taskfile.yml" + confluence: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/confluence/Taskfile.yml" + python: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/python/Taskfile.yml" + git: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/git/Taskfile.yml" + # docs: + # taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/docs/Taskfile.yml" + docker: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/docker/Taskfile.yml" + version: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/version/Taskfile.yml" + yarn: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/yarn/Taskfile.yml" + plantuml: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/plantuml/Taskfile.yml" + packer: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/packer/Taskfile.yml" + prettier: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/prettier/Taskfile.yml" + sonar: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/sonar/Taskfile.yml" + sops: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/sops/Taskfile.yml" + keybase: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/keybase/Taskfile.yml" + multipass: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/multipass/Taskfile.yml" + terraform: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/terraform/Taskfile.yml" + terragrunt: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/terragrunt/Taskfile.yml" + openssl: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/openssl/Taskfile.yml" + ssh: + taskfile: "https://raw.githubusercontent.com/hadenlabs/tasks/main/ssh/Taskfile.yml" env: DOCKER: @@ -36,12 +71,14 @@ vars: PROJECT_NAME: base-template ORGANIZATION: hadenlabs DOCKER_PLATFORM: linux/amd64 + USER: ubuntu REVIEWERS: luismayta PYTHON_VERSION: 3.11.5 - NODE_VERSION: 18.18.2 - TERRAFORM_VERSION: 1.8.4 - GIT_IGNORES: python,node,go,zsh,sonar,java,maven,intellij+all,terraform,linux + TERRAFORM_DIR: provision/terraform + NODE_VERSION: v18.20.4 + GIT_IGNORES: python,go,zsh,sonar,java,maven,intellij+all,node,helm,terraform GOLANGCI_VERSION: 1.42.0 + TERRAFORM_VERSION: 1.10.2 README_FILE: README.md GIT_IGNORES_CUSTOM: | bin @@ -56,6 +93,8 @@ vars: *.zip .external_modules vendor + charts + .DS_Store tasks: default: diff --git a/pyproject.toml b/pyproject.toml index 17ed0a4..dd2c89b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ readme = "README.md" repository = "https://github.com/hadenlabs/base-template" [tool.poetry.dependencies] -python = "^3.8,<3.12" +python = "^3.9,<3.12" boto3 = "^1.26.130" [tool.poetry.group.dev.dependencies]