leverage 2.2.0rc4__tar.gz → 2.2.0rc5__tar.gz

{leverage-2.2.0rc4 → leverage-2.2.0rc5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leverage
-Version: 2.2.0rc4
+Version: 2.2.0rc5
 Summary: Binbash Leverage Command-Line tool.
 Home-page: https://github.com/binbashar/leverage
 License: MIT

{leverage-2.2.0rc4 → leverage-2.2.0rc5}/leverage/__init__.py

@@ -4,7 +4,7 @@
 
 # pylint: disable=wrong-import-position
 
-__version__ = "2.2.0rc4"
+__version__ = "2.2.0rc5"
 
 import sys
 from shutil import which

{leverage-2.2.0rc4 → leverage-2.2.0rc5}/leverage/modules/auth.py

@@ -270,7 +270,7 @@ def refresh_layer_credentials_mfa(paths: PathsHandler):
             continue
 
         # if it is exactly that variable, we already know the layer profile is tf_profile
-        layer_profile = tf_profile if raw_profile in ("${var.profile}", "each.value.profile") else None
+        layer_profile = tf_profile if raw_profile in ("var.profile", "each.value.profile") else None
 
         # replace variables with their corresponding values
         profile_name = (
@@ -284,7 +284,7 @@ def refresh_layer_credentials_mfa(paths: PathsHandler):
             layer_profile = profile_name
 
         logger.info(f"Attempting to get temporary credentials for {profile_name} profile.")
-        if profile := config_updater.get_section(f"profile {profile_name}"):
+        if profile := config_updater.get_section(f"profile {profile_name}-mfa"):
             role_arn = profile.get("role_arn").value
             mfa_serial = profile.get("mfa_serial").value
             source_profile = profile.get("source_profile").value
@@ -295,6 +295,9 @@ def refresh_layer_credentials_mfa(paths: PathsHandler):
                 f"Check the following link for possible solutions: https://leverage.binbash.co/user-guide/troubleshooting/credentials/",
             )
 
+        if not paths.aws_cache_dir.exists():
+            paths.aws_cache_dir.mkdir(parents=True)
+
         cache_file = paths.aws_cache_dir / profile_name
         if cache_file.exists():
             logger.debug(f"Found cached credentials in {cache_file}.")
@@ -321,12 +324,8 @@ def refresh_layer_credentials_mfa(paths: PathsHandler):
                 raise ExitError(1, "Aborted by user.")
 
             try:
-                logger.debug(
-                    f"Assuming role {role_arn} for {profile_name} profile with serial {mfa_serial} and token code {mfa_token_code}"
-                )
                 credentials = client.assume_role(
                     RoleArn=role_arn,
-                    SourceIdentity=source_profile,
                     RoleSessionName=f"leverage-{profile_name}",
                     SerialNumber=mfa_serial,
                     TokenCode=mfa_token_code,

{leverage-2.2.0rc4 → leverage-2.2.0rc5}/leverage/modules/credentials.py

@@ -611,7 +611,7 @@ def configure_accounts_profiles(
         if mfa_serial:
             account_profile["mfa_serial"] = mfa_serial
         # A profile identifier looks like `le-security-oaar`
-        account_profiles[f"{short_name}-{account_name}-{PROFILES[_type]['profile_role']}"] = account_profile
+        account_profiles[f"{short_name}-{account_name}-{PROFILES[_type]['profile_role']}-mfa"] = account_profile
 
     logger.info("Backing up account profiles file.")
     shutil.copy(paths.aws_config_file, paths.aws_config_file.with_suffix(".bkp"))

{leverage-2.2.0rc4 → leverage-2.2.0rc5}/leverage/modules/tf.py

@@ -322,7 +322,7 @@ def _init(tf: TFRunner, paths: PathsHandler, args: Sequence[str], working_dir: P
     )
     init_args = (*filtered_args, f"-backend-config={paths.backend_tfvars}")
 
-    tf.run("init", *init_args, working_dir=working_dir)
+    tf.run("init", *tf_default_args(), *init_args, working_dir=working_dir)
 
 
 @authenticate

{leverage-2.2.0rc4 → leverage-2.2.0rc5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leverage"
-version = "2.2.0rc4"
+version = "2.2.0rc5"
 description = "Binbash Leverage Command-Line tool."
 authors = ["BinBash Inc <leverage@binbash.com.ar>"]
 license = "MIT"