tgwrap 0.8.12__py3-none-any.whl → 0.8.14__py3-none-any.whl

tgwrap/cli.py

@@ -50,7 +50,7 @@ CLICK_CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
 TG_COMMANDS=[
     'init', 'validate', 'validate-inputs', 'plan', 'apply',
-    'destroy', 'info', 'output', 'show',
+    'destroy', 'info', 'output', 'show', 'state',
     ]
 STAGES=['global', 'sbx', 'dev', 'qas', 'run', 'tst', 'acc', 'prd']
 class DefaultGroup(click.Group):
@@ -107,7 +107,7 @@ def main():
         ignore_unknown_options=True,
     ),
 )
-@click.argument('command', type=click.Choice(TG_COMMANDS + ['state', 'render-json']))
+@click.argument('command', type=click.Choice(TG_COMMANDS + ['render-json']))
 @click.option('--verbose', '-v', is_flag=True, default=False,
     help='Verbose printing',
     show_default=True
@@ -210,6 +210,10 @@ def run(command, verbose, debug, dry_run, no_lock, update, upgrade,
     help='Run the command step by step and stop when an error occurs (where applicable)',
     show_default=True
     )
+@click.option('--continue-on-error', '-C', is_flag=True, default=False,
+    help='When running in step by step, continue when an error occurs',
+    show_default=True
+    )
 @click.option('--planfile', '-p', is_flag=True, default=False,
     help='Use the generated planfile when applying the changes',
     show_default=True
@@ -244,7 +248,7 @@ def run(command, verbose, debug, dry_run, no_lock, update, upgrade,
 @click.argument('terragrunt-args', nargs=-1, type=click.UNPROCESSED)
 @click.version_option(version=__version__)
 def run_all(command, verbose, debug, dry_run, no_lock, update, upgrade, exclude_external_dependencies,
-    step_by_step, planfile, auto_approve, clean, working_dir, start_at_step,
+    step_by_step, continue_on_error, planfile, auto_approve, clean, working_dir, start_at_step,
     limit_parallelism, include_dir, exclude_dir, terragrunt_args):
     """ Executes a terragrunt command across multiple projects """
 
@@ -260,6 +264,7 @@ def run_all(command, verbose, debug, dry_run, no_lock, update, upgrade, exclude_
         upgrade=upgrade,
         exclude_external_dependencies=exclude_external_dependencies,
         step_by_step=step_by_step,
+        continue_on_error=continue_on_error,
         planfile=planfile,
         auto_approve=auto_approve,
         clean=clean,
@@ -287,9 +292,10 @@ def run_all(command, verbose, debug, dry_run, no_lock, update, upgrade, exclude_
 @click.option('--json', '-j', is_flag=True, default=False,
     help='Show output in json format',
     )
-@click.option('--planfile-dir', '-P', default=None,
+@click.option('--planfile-dir', '-P', default='.terragrunt-cache/current',
     help='Relative path to directory with plan file (or set TGWRAP_PLANFILE_DIR environment variable), see README for more details',
     envvar='TGWRAP_PLANFILE_DIR', type=click.Path(),
+    show_default=True,
     )
 @click.argument('terragrunt-args', nargs=-1, type=click.UNPROCESSED)
 @click.version_option(version=__version__)
@@ -392,9 +398,10 @@ def run_import(address, id, verbose, dry_run, working_dir, no_lock, terragrunt_a
     help='A glob of a directory that needs to be excluded, this option can be used multiple times. For example: -E "integrations/\*/\*"',
     show_default=True,
     )
-@click.option('--planfile-dir', '-P', default=None,
+@click.option('--planfile-dir', '-P', default='.terragrunt-cache/current',
     help='Relative path to directory with plan file (or set TGWRAP_PLANFILE_DIR environment variable), see README for more details',
     envvar='TGWRAP_PLANFILE_DIR', type=click.Path(),
+    show_default=True,
     )
 @click.argument('terragrunt-args', nargs=-1, type=click.UNPROCESSED)
 @click.version_option(version=__version__)

tgwrap/main.py

@@ -102,7 +102,7 @@ class TgWrap():
             'info': '{base_command} terragrunt-info --terragrunt-non-interactive {update} {upgrade} {common}',
             'plan': '{base_command} {command} --terragrunt-non-interactive  -out={planfile_name} {lock_level} {update} {parallelism} {common}',
             'apply': '{base_command} {command} {non_interactive} {no_auto_approve} {update} {parallelism} {common} {planfile}',
-            'show': '{base_command} {command} --terragrunt-non-interactive {planfile_name} {common}',
+            'show': '{base_command} {command} --terragrunt-non-interactive {common} {planfile_name}',
             'destroy': '{base_command} {command} {non_interactive} {no_auto_approve} {parallelism} {common} {planfile}',
         }
 
@@ -656,7 +656,7 @@ class TgWrap():
         self, command, exclude_external_dependencies, start_at_step, dry_run,
         parallel_execution=False, ask_for_confirmation=False, collect_output_file=None,
         backwards=False, working_dir=None, include_dirs=[], exclude_dirs=[],
-        use_native_terraform=False, add_to_workdir=None,
+        use_native_terraform=False, add_to_workdir=None, continue_on_error=False,
         ):
         "Runs the desired command in the directories as defined in the directed graph"
 
@@ -753,7 +753,7 @@ class TgWrap():
                         progress=progress,
                     )
 
-                    if stop_processing:
+                    if stop_processing and not continue_on_error:
                         self.printer.warning(f"Processing needs to be stopped at step {step_nbr}.")
                         self.printer.normal(
                             f"After you've fixed the problem, you can continue where you left off by adding '--start-at-step {step_nbr}'."
@@ -884,14 +884,14 @@ class TgWrap():
         # tgwrap state mv 'azuread_group.this["viewers"]' 'azuread_group.this["readers"]'
         rc = subprocess.run(
             shlex.split(cmd, posix=False),
-            cwd=cwd,
+            cwd=cwd if cwd else None,
             )
         self.printer.verbose(rc)
 
         sys.exit(rc.returncode)
 
     def run_all(self, command, debug, dry_run, no_lock, update, upgrade,
-        exclude_external_dependencies, step_by_step, planfile, auto_approve, clean,
+        exclude_external_dependencies, step_by_step, continue_on_error, planfile, auto_approve, clean,
         working_dir, start_at_step, limit_parallelism, include_dirs, exclude_dirs, terragrunt_args):
         """ Executes a terragrunt command across multiple modules """
 
@@ -903,10 +903,6 @@ class TgWrap():
         modifying_command = (command.lower() in ['apply', 'destroy'])
         auto_approve = auto_approve if modifying_command else True
 
-        # if the dir is not ending on '/*', add it
-        include_dirs = [dir.rstrip(f'.{os.path.sep}*') + f'{os.path.sep}*' for dir in include_dirs]
-        exclude_dirs = [dir.rstrip(f'.{os.path.sep}*') + f'{os.path.sep}*' for dir in exclude_dirs]
-
         cmd = self._construct_command(
             command=command,
             allow_no_run_all=False,
@@ -933,11 +929,16 @@ class TgWrap():
                 f'This command will be executed for each individual module:\n$ {cmd}'
                 )
 
+            # if the dir is not ending on '/*', add it
+            include_dirs = [dir.rstrip(f'.{os.path.sep}*') + f'{os.path.sep}*' for dir in include_dirs]
+            exclude_dirs = [dir.rstrip(f'.{os.path.sep}*') + f'{os.path.sep}*' for dir in exclude_dirs]
+
             self._run_di_graph(
                 command=cmd,
                 exclude_external_dependencies=exclude_external_dependencies,
                 working_dir=working_dir,
                 ask_for_confirmation=(not auto_approve),
+                continue_on_error=continue_on_error,
                 dry_run=dry_run,
                 start_at_step=start_at_step,
                 backwards=True if command.lower() in ['destroy'] else False,

{tgwrap-0.8.12.dist-info → tgwrap-0.8.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgwrap
-Version: 0.8.12
+Version: 0.8.14
 Summary: A (terragrunt) wrapper around a (terraform) wrapper around ....
 Home-page: https://gitlab.com/lunadata/tgwrap
 License: MIT

tgwrap-0.8.14.dist-info/RECORD

@@ -0,0 +1,11 @@
+tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tgwrap/analyze.py,sha256=CsSaGv-be6ATy36z9X7x00gpKY59soJys2VbIzD-tmg,8726
+tgwrap/cli.py,sha256=ZOt_aEGhfKGC81FhC5PNF8qhEuc5apyQC3ipQOonjco,29388
+tgwrap/deploy.py,sha256=bJiox_fz8JsoPreX4woW6-EqAebhpJWnKUVLVeGXkrI,10000
+tgwrap/main.py,sha256=Dqqzqe2x7UXHgAgQL764CfoZ6V0JFbk4TphBkBcYcC8,74872
+tgwrap/printer.py,sha256=dkcOCPIPB-IP6pn8QMpa06xlcqPFVaDvxnz-QEpDJV0,2663
+tgwrap-0.8.14.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
+tgwrap-0.8.14.dist-info/METADATA,sha256=Z-7SMM8jMi00xbW-PRAiF8ZGuoyER3S_h_YEoYLK4M4,11616
+tgwrap-0.8.14.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+tgwrap-0.8.14.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
+tgwrap-0.8.14.dist-info/RECORD,,

tgwrap-0.8.12.dist-info/RECORD

@@ -1,11 +0,0 @@
-tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tgwrap/analyze.py,sha256=CsSaGv-be6ATy36z9X7x00gpKY59soJys2VbIzD-tmg,8726
-tgwrap/cli.py,sha256=weYPXnpZ1200L28tNGzVaO_GlX7wAdLn1nQZsHKpe3k,29060
-tgwrap/deploy.py,sha256=bJiox_fz8JsoPreX4woW6-EqAebhpJWnKUVLVeGXkrI,10000
-tgwrap/main.py,sha256=82f4Wc-jPczDpP4vCMeJeaF1CBfiDGizNy0KDw_iDZw,74720
-tgwrap/printer.py,sha256=dkcOCPIPB-IP6pn8QMpa06xlcqPFVaDvxnz-QEpDJV0,2663
-tgwrap-0.8.12.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
-tgwrap-0.8.12.dist-info/METADATA,sha256=RGlxakJg0v5wKWoma5H3rip2BTJ7mcmbq41iazo-VVE,11616
-tgwrap-0.8.12.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-tgwrap-0.8.12.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
-tgwrap-0.8.12.dist-info/RECORD,,