From 8da2ad66f378c2c72b74acc10e17cd732e3fb6ac Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Mon, 14 Oct 2024 13:29:55 +0200 Subject: [PATCH 1/2] asdf: update/cleanup tools and fix missing plugins --- .tool-versions | 8 +++----- requirements.txt | 11 +++++++---- setup.sh | 1 + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.tool-versions b/.tool-versions index f7a66ac..c5a4ab9 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,9 +1,7 @@ age 1.1.1 helm 3.12.1 -shellcheck 0.9.0 +shellcheck 0.10.0 sops 3.7.3 terraform 1.6.4 -python 3.11.4 -ansible-lint 6.17.2 -awscli 2.13.7 -yq 4.35.2 \ No newline at end of file +python 3.12.4 +yq 4.35.2 diff --git a/requirements.txt b/requirements.txt index 082c29c..35d43dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,9 @@ -ansible-lint==6.17.2 -ansible==8.2.0 -netaddr==0.8.0 -pip==23.3.1 PyYAML==6.0.1 passlib==1.7.4 +ansible-lint==24.6.0 +ansible==10.1.0 +molecule-containers==2.0.0 +molecule==24.6.0 +netaddr==1.3.0 +pip==24.0 +requests==2.31 # Fix for not being able to run 'molecule test' using docker on mac. Issue: https://github.com/docker/docker-py/issues/3256 diff --git a/setup.sh b/setup.sh index 6881378..251a9da 100755 --- a/setup.sh +++ b/setup.sh @@ -7,6 +7,7 @@ asdf plugin add sops https://github.com/feniix/asdf-sops.git asdf plugin add terraform https://github.com/asdf-community/asdf-hashicorp.git asdf plugin-add helm https://github.com/Antiarchitect/asdf-helm.git asdf plugin-add python +asdf plugin-add yq https://github.com/sudermanjr/asdf-yq.git asdf install From 75095ba93a9ef82f71e9e10823c3ffbfcec05c54 Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Mon, 14 Oct 2024 13:40:40 +0200 Subject: [PATCH 2/2] revert --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 35d43dc..207a18e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ -PyYAML==6.0.1 -passlib==1.7.4 ansible-lint==24.6.0 ansible==10.1.0 molecule-containers==2.0.0