tgwrap 0.11.6__py3-none-any.whl → 0.11.8__py3-none-any.whl

tgwrap/cli.py

@@ -111,7 +111,7 @@ def main():
     help='Run the terragrunt command with debug logging enabled (where applicable)',
     show_default=True
     )
-@click.option('--dry-run', '-D', is_flag=True, default=False,
+@click.option('--dry-run', is_flag=True, default=False,
     help='dry-run mode, no real actions are executed (only in combination with step-by-step mode)',
     show_default=True
     )
@@ -180,7 +180,7 @@ def run(command, verbose, debug, dry_run, no_lock, update, upgrade,
     help='Run the terragrunt command with debug logging enabled (where applicable)',
     show_default=True
     )
-@click.option('--dry-run', '-D', is_flag=True, default=False,
+@click.option('--dry-run', is_flag=True, default=False,
     help='dry-run mode, no real actions are executed (only in combination with step-by-step mode)',
     show_default=True
     )
@@ -354,7 +354,7 @@ def show(verbose, json, working_dir, planfile_dir, terragrunt_args):
     help='Verbose printing',
     show_default=True
     )
-@click.option('--dry-run', '-D', is_flag=True, default=False,
+@click.option('--dry-run', is_flag=True, default=False,
     help='dry-run mode, no real actions are executed',
     show_default=True
     )
@@ -483,7 +483,7 @@ def run_analyze(verbose, exclude_external_dependencies, working_dir, start_at_st
     help='Verbose printing',
     show_default=True
     )
-@click.option('--dry-run', '-D', is_flag=True, default=False,
+@click.option('--dry-run', is_flag=True, default=False,
     help='dry-run mode, no real actions are executed',
     show_default=True
     )
@@ -523,7 +523,7 @@ def lock(module, auto_approve, verbose, dry_run, working_dir):
     help='Verbose printing',
     show_default=True
     )
-@click.option('--dry-run', '-D', is_flag=True, default=False,
+@click.option('--dry-run', is_flag=True, default=False,
     help='dry-run mode, no real actions are executed',
     show_default=True
     )
@@ -584,7 +584,7 @@ def unlock(module, auto_approve, verbose, dry_run, working_dir):
     help='Verbose printing',
     show_default=True
     )
-@click.option('--dry-run', '-D', is_flag=True, default=False,
+@click.option('--dry-run', is_flag=True, default=False,
     help='dry-run mode, no real actions are executed',
     show_default=True
     )
@@ -642,7 +642,7 @@ def sync(
     help='Verbose printing',
     show_default=True
     )
-@click.option('--dry-run', '-D', is_flag=True, default=False,
+@click.option('--dry-run', is_flag=True, default=False,
     help='dry-run mode, no real actions are executed',
     show_default=True
     )
@@ -701,7 +701,7 @@ def sync_dir(
     help='Verbose printing',
     is_flag=True, default=False, show_default=True,
     )
-@click.option('--dry-run', '-D',
+@click.option('--dry-run',
     help='dry-run mode, no real actions are executed',
     is_flag=True, default=False, show_default=True,
     )

tgwrap/main.py

@@ -1013,6 +1013,9 @@ class TgWrap():
         if terragrunt_args:
             self.printer.verbose(f"- with additional parameters: {' '.join(terragrunt_args)}")
 
+        if self.printer.print_verbose:
+            self.show_tf_version(working_dir=working_dir)
+
         check_for_file=self.TERRAGRUNT_FILE
         if working_dir:
             check_for_file = os.path.join(working_dir, check_for_file)
@@ -1134,6 +1137,9 @@ class TgWrap():
         if terragrunt_args:
             self.printer.verbose(f"- with additional parameters: {' '.join(terragrunt_args)}")
 
+        if self.printer.print_verbose:
+            self.show_tf_version(working_dir=working_dir)
+
         # auto approve is only relevant with a modifying command
         modifying_command = (command.lower() in ['apply', 'destroy'])
         auto_approve = auto_approve if modifying_command else True
@@ -1190,7 +1196,12 @@ class TgWrap():
                 self.printer.verbose(rc)
 
         # if we are planning, and analyze is requested, we need to run the analysis
-        if analyze_after_plan and command.lower() == 'plan':
+        if not rc: # this happens in step by step mode
+            pass
+        elif rc.returncode != 0:
+            self.printer.error(f"An error occurred (return code {rc.returncode}) while executing command: {command.lower()}")
+            self.printer.verbose(f"Executed command: {json.dumps(rc.args, indent=2)}")
+        elif analyze_after_plan and command.lower() == 'plan':
             self.printer.verbose('Analyze after plan requested')
             self.analyze(
                 exclude_external_dependencies=exclude_external_dependencies,
@@ -2074,6 +2085,28 @@ Note:
         self.printer.verbose(rc)
         self.printer.normal("Cleaned the temporary files")
 
+    def show_tf_version(self, working_dir):
+        """ Show the terraform version """
+
+        cmd = 'tf --version'
+        print("Show the version of terraform or tofu:")
+
+        rc = subprocess.run(
+            cmd,
+            shell=True,
+            check=True,
+            stdout=sys.stdout if self.printer.print_verbose else subprocess.DEVNULL,
+            stderr=sys.stderr if self.printer.print_verbose else subprocess.DEVNULL,
+            cwd=working_dir if working_dir else None,
+            )
+        self.printer.verbose(rc)
+
+        # check if TERRAGRUNT_TFPATH is set
+        if os.environ.get('TERRAGRUNT_TFPATH'):
+            self.printer.verbose(f"TERRAGRUNT_TFPATH: {os.environ.get('TERRAGRUNT_TFPATH')}")
+        else:
+            self.printer.verbose("TERRAGRUNT_TFPATH is not set, note that then the default will be to use terraform (instead of tofu)")
+
     def change_log(self, changelog_file, working_dir, include_nbr_of_releases):
         """ Generate a change log """
 

{tgwrap-0.11.6.dist-info → tgwrap-0.11.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tgwrap
-Version: 0.11.6
+Version: 0.11.8
 Summary: A (terragrunt) wrapper around a (terraform) wrapper around ....
 License: MIT
 Keywords: terraform,terragrunt,terrasafe,python

{tgwrap-0.11.6.dist-info → tgwrap-0.11.8.dist-info}/RECORD

@@ -1,13 +1,13 @@
 tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tgwrap/analyze.py,sha256=fuET7_L8b6rlv2qnKOYXSlIv5LArvZ39CPktCeQHo7A,10285
-tgwrap/cli.py,sha256=7VPowJ9DtbtbOsl5s01Vj0rsMTQuin5KhvOTbNTSQZA,33551
+tgwrap/cli.py,sha256=J57Kc5fScMj8__wYp8jprV8x8edOluUGsBx-arAi6kg,33503
 tgwrap/deploy.py,sha256=gwFdRDzJWjkmEzZ8b0GUSrgvJeOKnpnJm1c6mM80OcY,10259
 tgwrap/inspector-resources-template.yml,sha256=Mos8NDzzZ3VxdXgeiVL9cmQfRcIXIHMLf79_KLwdXu8,3297
 tgwrap/inspector.py,sha256=5pW7Ex1lkKRoXY6hZGbCNmSD2iRzgMSfqi9w7gb-AcY,16990
-tgwrap/main.py,sha256=0SjSHx78FujmmmQ8vYK2CJn4UEDhlNRVLFCXcToce8g,95885
+tgwrap/main.py,sha256=lEu68njHWLCiGN3l9oAO4qCrI4-2dZy6CfjEpP8dw5g,97278
 tgwrap/printer.py,sha256=frn1PARd8A28mkRCYR6ybN2x0NBULhNOutn4l2U7REY,2754
-tgwrap-0.11.6.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
-tgwrap-0.11.6.dist-info/METADATA,sha256=Y9vs2jMnGp-SB7XAVIKwr3FPLx_w9Sbnt0iPDkag5ZA,18355
-tgwrap-0.11.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-tgwrap-0.11.6.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
-tgwrap-0.11.6.dist-info/RECORD,,
+tgwrap-0.11.8.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
+tgwrap-0.11.8.dist-info/METADATA,sha256=EjNlQYi7yVwXTsLZ9jRFPCS7pi8dXb97hT-kXSCqNfY,18355
+tgwrap-0.11.8.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+tgwrap-0.11.8.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
+tgwrap-0.11.8.dist-info/RECORD,,