Skip to content

Commit

Permalink
Update template
Browse files Browse the repository at this point in the history
  • Loading branch information
hollow committed Jan 27, 2023
1 parent 18c0fe5 commit 980d223
Show file tree
Hide file tree
Showing 9 changed files with 298 additions and 163 deletions.
2 changes: 2 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ exclude_paths:
- requirements.yml

skip_list:
- meta-no-info
- template-instead-of-copy
- yaml[comments-indentation]
6 changes: 1 addition & 5 deletions .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: v0.39.1
_commit: v1.0.0
_src_path: gh:remerge/template
deploy_branch: production
google_cloud_gke_master_subnet: null
Expand All @@ -14,14 +14,10 @@ project_name: Ansible Role for ScaleFT
project_owner: sre
project_type: ansible-role
use_ansible: false
use_consul: false
use_docker: false
use_golang: false
use_google_cloud_compute: false
use_google_cloud_dns: false
use_google_cloud_gke: false
use_google_cloud_public_dns: false
use_nomad: false
use_python: true
use_terraform: false
use_terraform_google: false
4 changes: 2 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ dotenv_if_exists
PATH_add "${PWD}/bin"

# Load poetry virtual env
export POETRY_ACTIVE=1 && poetry run true
export VIRTUAL_ENV="$(poetry env info --path)"
VIRTUAL_ENV="$(poetry env info --path)"
export VIRTUAL_ENV POETRY_ACTIVE=1
PATH_add "${VIRTUAL_ENV}/bin"
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ repos:
- id: detect-private-key
- id: end-of-file-fixer
- id: fix-byte-order-marker
- id: forbid-new-submodules
- id: forbid-submodules
- id: trailing-whitespace

# https://github.com/pre-commit/mirrors-prettier/tags
Expand All @@ -39,14 +39,14 @@ repos:

# https://github.com/igorshubovych/markdownlint-cli/tags
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: "v0.32.2"
rev: "v0.33.0"
hooks:
- id: markdownlint-fix
name: markdownlint

# https://github.com/adrienverge/yamllint/tags
- repo: https://github.com/adrienverge/yamllint
rev: "v1.28.0"
rev: "v1.29.0"
hooks:
- id: yamllint
entry: yamllint --strict
Expand All @@ -65,13 +65,13 @@ repos:

# https://github.com/hollow/pre-commit-actionlint/tags
- repo: https://github.com/hollow/pre-commit-actionlint
rev: "v1.6.22"
rev: "v1.6.23"
hooks:
- id: actionlint

# https://github.com/ansible/ansible-lint/tags
- repo: https://github.com/ansible/ansible-lint
rev: "v6.10.2"
rev: "v6.11.0"
hooks:
- id: ansible-lint
name: ansible-lint
Expand All @@ -91,14 +91,14 @@ repos:

# https://github.com/bridgecrewio/checkov/tags
- repo: https://github.com/bridgecrewio/checkov
rev: "2.2.229"
rev: "2.2.304"
hooks:
- id: checkov
name: checkov
args: [--config-file=.checkov.yml]

# https://github.com/jorisroovers/gitlint/tags
- repo: https://github.com/jorisroovers/gitlint
rev: "v0.18.0"
rev: "v0.19.0dev"
hooks:
- id: gitlint
1 change: 1 addition & 0 deletions .yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ignore: |
rules:
comments:
min-spaces-from-content: 1
comments-indentation: disable
line-length: disable
truthy:
allowed-values: ["true", "false"]
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ recommended to install Ansible with [pipx](https://pypa.github.io/pipx/):
```shell
pipx install --include-deps ansible
pipx inject --include-apps ansible ansible-lint
pipx inject ansible netaddr
```

You can update all your pipx packages, including Ansible and all injected
Expand Down
13 changes: 2 additions & 11 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
---
galaxy_info:
author: remerge
role_name: scaleft
description: Install and configure ScaleFT agent with Ansible.
license: apache-2.0
author: remerge
company: remerge.io
min_ansible_version: "2.10"

platforms:
- name: EL
versions:
- "8"
- "9"

galaxy_tags:
- scaleft
min_ansible_version: "2.14"
410 changes: 278 additions & 132 deletions poetry.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "ansible-role-scaleft"
version = "0.2.0"
version = "0.3.1"
description = "Install and configure ScaleFT agent with Ansible."
authors = ["Remerge GmbH <[email protected]>"]

Expand All @@ -10,11 +10,11 @@ python = "^3.10"
[tool.poetry.group.dev.dependencies]
black = "^22.12.0"
flake8 = "^6.0.0"
flake8-bugbear = "^22.12.6"
pylint = "^2.15.8"
tox = "^4.0.11"
flake8-bugbear = "^23.1.20"
pylint = "^2.15.10"
tox = "^4.4.2"
molecule = {extras = ["docker"], version = "^4.0.4"}
ansible-lint = { version = "^6.10.0", markers = "platform_system != 'Windows'" }
ansible-lint = { version = "^6.11.0", markers = "platform_system != 'Windows'" }

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down

0 comments on commit 980d223

Please sign in to comment.