leverage 2.0.0__tar.gz → 2.1.2rc0__tar.gz

{leverage-2.0.0 → leverage-2.1.2rc0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: leverage
-Version: 2.0.0
+Version: 2.1.2rc0
 Summary: Binbash Leverage Command-Line tool.
 Home-page: https://github.com/binbashar/leverage
 License: MIT
 Keywords: leverage,binbash
 Author: BinBash Inc
 Author-email: leverage@binbash.com.ar
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.9,<3.14
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Build Tools
 Requires-Dist: boto3 (==1.33.2)
 Requires-Dist: click (==8.0.1)
@@ -24,10 +25,10 @@ Requires-Dist: docker (==6.1.0)
 Requires-Dist: dockerpty (==0.4.1)
 Requires-Dist: docutils (==0.17.1)
 Requires-Dist: jinja2 (==3.0.1)
-Requires-Dist: python-hcl2 (==7.0.1)
+Requires-Dist: python-hcl2 (==7.3.1)
 Requires-Dist: questionary (==1.10.0)
 Requires-Dist: requests (==2.31)
-Requires-Dist: rich (==10.4.0)
+Requires-Dist: rich (==14.1.0)
 Requires-Dist: ruamel.yaml (==0.17.10)
 Requires-Dist: simple-term-menu (==1.6.4)
 Requires-Dist: yaenv (==1.5.3post1)
@@ -87,13 +88,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).
 
@@ -107,6 +108,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
@@ -148,14 +150,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:
@@ -164,10 +167,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-2.0.0 → leverage-2.1.2rc0}/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-2.0.0 → leverage-2.1.2rc0}/leverage/__init__.py

@@ -4,7 +4,7 @@
 
 # pylint: disable=wrong-import-position
 
-__version__ = "2.0.0"
+__version__ = "2.1.2rc0"
 __toolbox_version__ = "1.3.5-0.2.0"
 
 MINIMUM_VERSIONS = {

{leverage-2.0.0 → leverage-2.1.2rc0}/leverage/container.py

@@ -490,10 +490,10 @@ class TFContainer(SSOContainer):
         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 @@ class TFContainer(SSOContainer):
 
     @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 @@ class TFContainer(SSOContainer):
                     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-2.0.0 → leverage-2.1.2rc0}/leverage/modules/auth.py

@@ -21,10 +21,10 @@ def get_layer_profile(raw_profile: str, config_updater: ConfigUpdater, tf_profil
         raise SkipProfile
 
     # if it is exactly that variable, we already know the layer profile is tf_profile
-    layer_profile = tf_profile if raw_profile == "${var.profile}" else None
+    layer_profile = tf_profile if raw_profile in ("${var.profile}", "each.value.profile") else None
 
     # replace variables with their corresponding values
-    raw = raw_profile.replace("${var.profile}", tf_profile).replace("${var.project}", project)
+    raw = raw_profile.replace("${var.profile}", tf_profile).replace("${var.project}", project).replace("each.value.profile", tf_profile).replace("each.value.project", project)
 
     # the project and the role are at the beginning and end of the string
     _, *account_name, _ = raw.split("-")

{leverage-2.0.0 → leverage-2.1.2rc0}/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-2.0.0 → leverage-2.1.2rc0}/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-2.0.0 → leverage-2.1.2rc0}/leverage/path.py

@@ -275,13 +275,12 @@ class PathsHandler:
         """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")):

{leverage-2.0.0 → leverage-2.1.2rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leverage"
-version = "2.0.0"
+version = "2.1.2rc0"
 description = "Binbash Leverage Command-Line tool."
 authors = ["BinBash Inc <leverage@binbash.com.ar>"]
 license = "MIT"
@@ -17,7 +17,8 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12"
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13"
 ]
 packages = [
     { include = "leverage" },
@@ -26,7 +27,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "~3.9 || ~3.10 || ~3.11 || ~3.12"
+python = "~3.9 || ~3.10 || ~3.11 || ~3.12 || ~3.13"
 click = "8.0.1"
 yaenv = "1.5.3post1"
 "ruamel.yaml" = "0.17.10"
@@ -34,11 +35,11 @@ jinja2 = "3.0.1"
 docker = "6.1.0"
 dockerpty = "0.4.1"
 questionary = "1.10.0"
-python-hcl2 = "7.0.1"
+python-hcl2 = "7.3.1"
 boto3 = "1.33.2"
 configupdater = "3.2"
 docutils = "0.17.1"
-rich = "10.4.0"
+rich = "14.1.0"
 requests = "2.31"
 simple-term-menu = "1.6.4"
 
@@ -46,7 +47,7 @@ simple-term-menu = "1.6.4"
 pylint = "2.8.3"
 pytest = "8.3.3"
 pytest-cov = "6.0.0"
-twine = "3.4.1"
+twine = "6.1.0"
 black = "23.3.0"
 pre-commit = "3.5.0"