From 7fdeaa3abf1ee5185f389c41f080c9acfe6897a7 Mon Sep 17 00:00:00 2001
From: tungbq <85242618+tungbq@users.noreply.github.com>
Date: Sat, 25 May 2024 01:19:45 +0000
Subject: [PATCH] core: update tool versions

---
 Dockerfile        | 10 +++++-----
 README.md         | 10 +++++-----
 toolkit_info.json | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c4828e1..a5ff506 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,11 +34,11 @@ RUN curl -k https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
 
 # Install Ansible
 # Docs: https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#installing-and-upgrading-ansible-with-pip
-ARG ANSIBLE_VERSION=2.16.6
+ARG ANSIBLE_VERSION=2.17.0
 RUN python3 -m pip install ansible-core==${ANSIBLE_VERSION}
 
 # Install Terraform
-ARG TERRAFORM_VERSION=1.8.3
+ARG TERRAFORM_VERSION=1.8.4
 RUN mkdir /tmp/terraform_env/ && \
     cd /tmp/terraform_env/ && \
     wget https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
@@ -56,7 +56,7 @@ RUN mkdir /tmp/kubectl_env/ && \
     rm -rf /tmp/kubectl_env/
 
 # Install Helm
-ARG HELM_VERSION=3.15.0
+ARG HELM_VERSION=3.15.1
 RUN mkdir /tmp/helm_env/ && \
     cd /tmp/helm_env/ && \
     wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
@@ -65,7 +65,7 @@ RUN mkdir /tmp/helm_env/ && \
     rm -rf /tmp/helm_env/
 
 # Install AwsCLI
-ARG AWSCLI_VERSION=2.15.53
+ARG AWSCLI_VERSION=2.15.58
 RUN mkdir /tmp/awscli_env/ && \
     cd /tmp/awscli_env/ && \
     wget "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWSCLI_VERSION}.zip" && \
@@ -74,7 +74,7 @@ RUN mkdir /tmp/awscli_env/ && \
     rm -rf /tmp/awscli_env/
 
 # Install AzureCLI
-ARG AZURECLI_VERSION=2.60.0
+ARG AZURECLI_VERSION=2.61.0
 RUN mkdir -p /etc/apt/keyrings && \
     curl -sLS https://packages.microsoft.com/keys/microsoft.asc | \
     gpg --dearmor | \
diff --git a/README.md b/README.md
index 78773b3..260b417 100644
--- a/README.md
+++ b/README.md
@@ -97,12 +97,12 @@ Built on `ubuntu:22.04` base image
 | Name      | Version                 | Release                                                                      | Usage                                              |
 | :-------- | :---------------------- | :--------------------------------------------------------------------------- | :------------------------------------------------- |
 | Python    | PYTHON_VERSION=3.11     | [Check](https://www.python.org/downloads/source/)                            | [python_usage](./docs/usage/python_usage.md)       |
-| Ansible   | ANSIBLE_VERSION=2.16.6  | [Check](https://api.github.com/repos/ansible/ansible/releases/latest)        | [ansible_usage](./docs/usage/ansible_usage.md)     |
-| Terraform | TERRAFORM_VERSION=1.8.3 | [Check](https://releases.hashicorp.com/terraform/)                           | [terraform_usage](./docs/usage/terraform_usage.md) |
+| Ansible   | ANSIBLE_VERSION=2.17.0  | [Check](https://api.github.com/repos/ansible/ansible/releases/latest)        | [ansible_usage](./docs/usage/ansible_usage.md)     |
+| Terraform | TERRAFORM_VERSION=1.8.4 | [Check](https://releases.hashicorp.com/terraform/)                           | [terraform_usage](./docs/usage/terraform_usage.md) |
 | Kubectl   | KUBECTL_VERSION=1.30.1  | [Check](https://dl.k8s.io/release/stable.txt)                                | [kubectl_usage](./docs/usage/kubectl_usage.md)     |
-| Helm      | HELM_VERSION=3.15.0     | [Check](https://github.com/helm/helm/releases)                               | [helm_usage](./docs/usage/helm_usage.md)           |
-| AwsCLI    | AWSCLI_VERSION=2.15.53  | [Check](https://raw.githubusercontent.com/aws/aws-cli/v2/CHANGELOG.rst)      | [awscli_usage](./docs/usage/awscli_usage.md)       |
-| AzureCLI  | AZURECLI_VERSION=2.60.0 | [Check](https://learn.microsoft.com/en-us/cli/azure/release-notes-azure-cli) | [azurecli_usage](./docs/usage/azurecli_usage.md)   |
+| Helm      | HELM_VERSION=3.15.1     | [Check](https://github.com/helm/helm/releases)                               | [helm_usage](./docs/usage/helm_usage.md)           |
+| AwsCLI    | AWSCLI_VERSION=2.15.58  | [Check](https://raw.githubusercontent.com/aws/aws-cli/v2/CHANGELOG.rst)      | [awscli_usage](./docs/usage/awscli_usage.md)       |
+| AzureCLI  | AZURECLI_VERSION=2.61.0 | [Check](https://learn.microsoft.com/en-us/cli/azure/release-notes-azure-cli) | [azurecli_usage](./docs/usage/azurecli_usage.md)   |
 
 And more tools to be implemented...
 
diff --git a/toolkit_info.json b/toolkit_info.json
index 3e1658a..0c78465 100644
--- a/toolkit_info.json
+++ b/toolkit_info.json
@@ -1,9 +1,9 @@
 {
   "python3": "3.11",
-  "ansible": "2.16.6",
-  "terraform": "1.8.3",
+  "ansible": "2.17.0",
+  "terraform": "1.8.4",
   "kubectl": "1.30.1",
-  "helm": "3.15.0",
-  "awscli": "2.15.53",
-  "azurecli": "2.60.0"
+  "helm": "3.15.1",
+  "awscli": "2.15.58",
+  "azurecli": "2.61.0"
 }
\ No newline at end of file