Fix | Remove reference to Terraform in error message

.github/release-drafter.yml

@@ -36,7 +36,8 @@ version-resolver:
       - 'patch'
   default: patch
 footer: |
-  *REMINDER:* please remember to add or update the Version Compatibility section before publishing a release draft.
+  ---  
+  ⚠️ *REMINDER:* please remember to add or update the Version Compatibility section before publishing a release draft.
 template: |
   ## Changes
 

.github/workflows/release-pypi-build-push-package.yml

@@ -8,13 +8,13 @@ jobs:
   build_push:
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: master
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.13'
 
       - name: Install Poetry
         run: |

.github/workflows/release-pypi-build-push-test-package.yml

@@ -14,11 +14,11 @@ jobs:
   build_push:
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.13'
 
       - name: Install Poetry
         run: |

.github/workflows/tests-integration.yaml

@@ -25,8 +25,8 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        python-version: ['3.9.15', '3.10.8', '3.11.8', '3.12.7']
-        toolbox-image-tag: ['1.3.5-0.2.0', '1.5.0-0.2.0', '1.6.0-0.2.0']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        toolbox-image-tag: ['1.3.5-0.2.3', '1.5.0-0.2.3', '1.6.0-0.2.3']
     steps:
       - name: Checkout base branch
         uses: actions/checkout@v3
@@ -141,7 +141,7 @@ jobs:
           printf "[INFO] Testing terraform\n"
 
           printf "[INFO]     Initializing layer\n"
-          leverage tf init --skip-validation
+          leverage terraform init --skip-validation
 
         working-directory: ../theadamproject/security/us-east-1/base-tf-backend
 
@@ -203,19 +203,19 @@ jobs:
         run: |
 
           printf "[INFO] Initializing layer\n"
-          leverage tf init --layers cli-test-layer,base-identities
+          leverage terraform init --layers cli-test-layer,base-identities
 
           printf "[INFO] Generating plan\n"
-          leverage tf plan --layers cli-test-layer
+          leverage terraform plan --layers cli-test-layer
 
           printf "[INFO] Applying changes\n"
-          leverage tf apply -auto-approve --layers cli-test-layer
+          leverage terraform apply -auto-approve --layers cli-test-layer
 
           printf "[INFO] Checking if all changes were applied\n"
-          leverage tf plan -detailed-exitcode --layers cli-test-layer
+          leverage terraform plan -detailed-exitcode --layers cli-test-layer
           [[ $? -eq 2 ]] && printf "[WARN] There are still remaining changes\n"
           [[ $? -eq 0 ]] && printf "[INFO] Apply checks out\n"
 
           printf "[INFO] Destroying all generated created resources\n"
-          leverage tf destroy -auto-approve --layers cli-test-layer
+          leverage terraform destroy -auto-approve --layers cli-test-layer
         working-directory: ../theblairwitchproject/apps-devstg/global

.github/workflows/tests-unit.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
       - uses: actions/checkout@v3
 
@@ -38,7 +38,7 @@ jobs:
         shell: bash
 
       - name: Report Coveralls
-        if: matrix.python-version == '3.9'  # Run this for the first python version only!
+        if: matrix.python-version == '3.13'  # Run this for the last python version only!
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -50,13 +50,13 @@ PROJECT=bb
 MFA_ENABLED=false
 
 # Terraform
-TERRAFORM_IMAGE_TAG=1.5.0-0.2.0
+TF_IMAGE_TAG=1.5.0-0.2.0
 ```
 
 So, if you have created a project with version <1.8.0 and want to use it with version >=1.8.0 you should:
 
 - remove TERRAFORM_IMAGE_NAME line
-- update TERRAFORM_IMAGE_TAG from this form '9.9.9' to this one '9.9.9-9.9.9'.
+- update TF_IMAGE_TAG from this form '9.9.9' to this one '9.9.9-9.9.9'.
 
 For the second item you can check the version [here](https://hub.docker.com/r/binbash/leverage-toolbox/tags).
 
@@ -70,6 +70,7 @@ Leverage CLI explicitly supports the following Python versions:
 - Python 3.10.x
 - Python 3.11.x
 - Python 3.12.x
+- Python 3.13.x
 
 These versions are not only supported but are also the only versions used in our CI/CD pipelines to ensure compatibility
 and performance. This rigorous testing helps prevent compatibility issues and ensures that the Leverage CLI performs as
@@ -111,14 +112,15 @@ pyenv install 3.9.7
 pyenv install 3.10.1
 pyenv install 3.11.8
 pyenv install 3.12.7
+pyenv install 3.13.6
 ```
 
 4. Create a virtual environment for the leverage project:
 
-Create a virtual environment for your project using Python 3.9.7:
+Create a virtual environment for your project using Python 3.13.x:
 
 ```bash
-pyenv virtualenv 3.9.7 leverage_py_39_venv
+pyenv virtualenv 3.13.6 leverage_py_313_venv
 ```
 
 5. Set your virtual environment to be used in the project:
@@ -127,10 +129,10 @@ To set this virtual environment as the local environment for your project, navig
 
 ```bash
 cd <path_to_leverage_project_root>
-pyenv local leverage_py_39_venv
+pyenv local leverage_py_313_venv
 ```
 
-This setup commands `pyenv` to use `leverage_py_39_venv` as the local Python version for your project directory,
+This setup commands `pyenv` to use `leverage_py_313_venv` as the local Python version for your project directory,
 ensuring that all Python operations within this directory use this isolated environment.
 
 ## Setting up development environment

leverage/container.py

@@ -490,10 +490,10 @@ def __init__(self, client, terraform=False, mounts=None, env_vars=None):
         if self.paths.tf_cache_dir:
             # then mount it too into the container
             self.environment["TF_PLUGIN_CACHE_DIR"] = self.paths.tf_cache_dir
-            # given that terraform use symlinks to point from the .terraform folder into the plugin folder
-            # we need to use the same directory inside the container
+            # given that opentofu/terraform uses symlinks to point from the .terraform folder
+            # into the plugin folder we need to use the same directory inside the container
             # otherwise symlinks will be broken once outside the container
-            # which will break terraform usage outside Leverage
+            # which will break opentofu/terraform usage outside Leverage
             self.mounts.append(Mount(source=self.paths.tf_cache_dir, target=self.paths.tf_cache_dir, type="bind"))
         if SSH_AUTH_SOCK is not None:
             self.mounts.append(Mount(source=SSH_AUTH_SOCK, target="/ssh-agent", type="bind"))
@@ -528,7 +528,7 @@ def auth_method(self) -> str:
 
     @property
     def tf_default_args(self):
-        """Array of strings containing all valid config files for layer as parameters for Terraform"""
+        """Array of strings containing all valid config files for layer as parameters for OpenTofu/Terraform"""
         common_config_files = [
             f"-var-file={self.paths.guest_config_file(common_file)}"
             for common_file in self.paths.common_config_dir.glob("*.tfvars")
@@ -669,7 +669,7 @@ def set_backend_key(self, skip_validation=False):
                     raise KeyError()
         except (KeyError, IndexError):
             logger.error(
-                "[red]✘[/red] Malformed [bold]config.tf[/bold] file. Missing Terraform backend block. In some cases you may want to skip this check by using the --skip-validation flag, e.g. the first time you initialize a terraform-backend layer."
+                "[red]✘[/red] Malformed [bold]config.tf[/bold] file. Missing backend block. In some cases you may want to skip this check by using the --skip-validation flag, e.g. the first time you initialize a tf-backend layer."
             )
             raise Exit(1)
         except Exception as e:

leverage/modules/credentials.py

@@ -157,7 +157,7 @@ def _ask_for_credentials_location():
             {
                 "type": "select",
                 "name": "input_type",
-                "message": "Select the means by which you'll provide the programatic keys:",
+                "message": "Select the means by which you'll provide the programmatic keys:",
                 "qmark": ">",
                 "choices": [
                     {"name": "Path to an access keys file obtained from AWS", "value": "path"},
@@ -312,7 +312,7 @@ def _load_configs_for_credentials():
     env_config = AWSCLI.env_conf
 
     terraform_config = {}
-    logger.info("Loading Terraform common configuration.")
+    logger.info("Loading tf common configuration.")
     terraform_config = AWSCLI.paths.common_conf
 
     config_values = {}

leverage/modules/project.py

@@ -203,8 +203,9 @@ def _render_templates(template_files, config, source=TEMPLATE_DIR, destination=P
         template_location = template_file.relative_to(TEMPLATES_REPO_DIR)
 
         template = JINJA_ENV.get_template(template_location.as_posix())
-        if not "terraform_image_tag" in config:
+        if "terraform_image_tag" not in config:
             config["terraform_image_tag"] = __toolbox_version__
+
         rendered_template = template.render(config)
 
         rendered_location = template_file.relative_to(source)
@@ -324,7 +325,7 @@ def create():
     _render_project_template(config=config)
 
     # Format the code correctly
-    logger.info("Reformatting terraform configuration to the standard style.")
+    logger.info("Reformatting configuration to the standard style.")
 
     terraform = TFContainer(get_docker_client())
     terraform.ensure_image()

leverage/path.py

@@ -275,13 +275,12 @@ def check_for_layer_location(self, path: Path = None):
         """Make sure the command is being run at layer level. If not, bail."""
         path = path or self.cwd
         if path in (self.common_config_dir, self.account_config_dir):
-            raise ExitError(1, "Currently in a configuration directory, no Terraform command can be run here.")
+            raise ExitError(1, "Currently in a configuration directory, no OpenTofu/Terraform command can be run here.")
 
         if path in (self.root_dir, self.account_dir):
             raise ExitError(
                 1,
-                "Terraform commands cannot run neither in the root of the project or in"
-                " the root directory of an account.",
+                "This command cannot run neither in the root of the project or in" " the root directory of an account.",
             )
 
         if not list(path.glob("*.tf")):