tgwrap 0.10.2__py3-none-any.whl → 0.10.3__py3-none-any.whl

tgwrap/cli.py

@@ -120,7 +120,7 @@ def main():
     help='dry-run mode, no real actions are executed (only in combination with step-by-step mode)',
     show_default=True
     )
-@click.option('--no-lock', '-n', is_flag=True, default=False,
+@click.option('--no-lock', '-n', is_flag=True, default=True,
     help='Do not apply a lock while executing the command (or set the TGWRAP_NO_LOCK environment variable, only applicable with plan)',
     envvar='TGWRAP_NO_LOCK', show_default=True,
     )
@@ -189,7 +189,7 @@ def run(command, verbose, debug, dry_run, no_lock, update, upgrade,
     help='dry-run mode, no real actions are executed (only in combination with step-by-step mode)',
     show_default=True
     )
-@click.option('--no-lock', '-n', is_flag=True, default=False,
+@click.option('--no-lock', '-n', is_flag=True, default=True,
     help='Do not apply a lock while executing the command (or set the TGWRAP_NO_LOCK environment variable, only applicable with plan)',
     envvar='TGWRAP_NO_LOCK', show_default=True,
     )
@@ -335,7 +335,7 @@ def show(verbose, json, working_dir, planfile_dir, terragrunt_args):
 @click.option('--working-dir', '-w', default=None,
     help='Working directory, when omitted the current directory is used',
     )
-@click.option('--no-lock', '-n', is_flag=True, default=False,
+@click.option('--no-lock', '-n', is_flag=True, default=True,
     help='Do not apply a lock while executing the command (or set the TGWRAP_NO_LOCK environment variable, only applicable with plan)',
     envvar='TGWRAP_NO_LOCK', show_default=True,
     )

tgwrap/main.py

@@ -222,9 +222,12 @@ class TgWrap():
         include_dirs = [dir.lstrip(f'.{os.path.sep}') for dir in include_dirs]
         exclude_dirs = [dir.lstrip(f'.{os.path.sep}') for dir in exclude_dirs]
 
+        # Below doesn't seem to work, at least when using `analyze`
+        # Not sure it has been added here in the first place
+
         # 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]
+        # 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]
 
         common_path = os.path.commonpath([os.path.abspath(working_dir), os.path.abspath(directory)])
         self.printer.verbose(f'Common path for dir {directory}: {common_path}')
@@ -961,6 +964,25 @@ class TgWrap():
         planfile, auto_approve, clean, working_dir, terragrunt_args):
         """ Executes a terragrunt command on a single module """
 
+        def extract_source_value(terragrunt_file_content):
+            # Regular expression to capture the terraform block
+            terraform_block_pattern = re.compile(r'terraform\s*\{(.*?)\n\}', re.DOTALL)
+            
+            # Regular expression to capture the 'source' key and its value
+            source_pattern = re.compile(r'source\s*=\s*"(.*?)(?<!\\)"', re.DOTALL)
+            
+            # Find the terraform block
+            terraform_block_match = terraform_block_pattern.search(terragrunt_file_content)
+            if terraform_block_match:
+                terraform_block = terraform_block_match.group(1)
+                
+                # Search for the 'source' key within the block
+                source_match = source_pattern.search(terraform_block)
+                if source_match:
+                    return source_match.group(1)  # Return the value of 'source'
+            else:
+                raise ValueError('Could not locate the terragrunt source value')
+
         self.printer.verbose(f"Attempting to execute 'run {command}'")
         if terragrunt_args:
             self.printer.verbose(f"- with additional parameters: {' '.join(terragrunt_args)}")
@@ -968,6 +990,7 @@ class TgWrap():
         check_for_file=self.TERRAGRUNT_FILE
         if working_dir:
             check_for_file = os.path.join(working_dir, check_for_file)
+
         if not os.path.isfile(check_for_file):
             self.printer.error(
                 f"{check_for_file} not found, this seems not to be a terragrunt module directory!"
@@ -978,13 +1001,15 @@ class TgWrap():
             source_module = None
             with open(check_for_file, 'r') as file:
                 try:
-                    content = hcl2.load(file)
-                    source = content['terraform'][0]['source']
+                    content = file.read()
+                    source = extract_source_value(content)
+
                     # get the source part, typically the last part after the double /.
                     # also remove a potential version element from it.
                     source_module = re.sub(r'\${[^}]*}', '', source.split('//')[::-1][0])
                 except Exception as e:
-                    self.printer.verbose(f'Could not parse terragrunt.hcl, error (of type {type(e)}) raised, but we fall back to default behaviour.')
+                    self.printer.warning(f'Could not parse terragrunt.hcl, but we fall back to default behaviour.')
+                    self.printer.verbose(f'error (of type {type(e)}) raised')
                     pass
 
         cmd = self._construct_command(
@@ -1673,6 +1698,7 @@ class TgWrap():
             for location in result:
                 # Determine the deployed version as defined in the version file
                 with open(os.path.join(working_dir, location, self.VERSION_FILE), 'r') as file:
+                    # todo: replace this with regex as it is (now) the only reason we use this lib
                     content = hcl2.load(file)
                     try:
                         version_tag = content['locals'][0]['version_tag']

{tgwrap-0.10.2.dist-info → tgwrap-0.10.3.dist-info}/METADATA

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

{tgwrap-0.10.2.dist-info → tgwrap-0.10.3.dist-info}/RECORD

@@ -1,13 +1,13 @@
 tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tgwrap/analyze.py,sha256=TJvAKVIbWl8-8oxpTwXVBWU72q_XQKzUTlyMZ25cV2M,8728
-tgwrap/cli.py,sha256=0SFzLJA-deut81Mpt6Giq77WK26vTDcajyFnPIHXR5c,31649
+tgwrap/cli.py,sha256=3tf-wi-zN6T_0T2fHt8UtWzoZeUwlraGWsu5BduYxs4,31646
 tgwrap/deploy.py,sha256=-fSk-Ix_HqrXY7KQX_L27TnFzIuhBHYv4xYJW6zRDN4,10243
 tgwrap/inspector-resources-template.yml,sha256=Mos8NDzzZ3VxdXgeiVL9cmQfRcIXIHMLf79_KLwdXu8,3297
 tgwrap/inspector.py,sha256=5pW7Ex1lkKRoXY6hZGbCNmSD2iRzgMSfqi9w7gb-AcY,16990
-tgwrap/main.py,sha256=WKxlREE4QmdZKTHivhWa3K5yI40amGlmjBs4y7oCTqw,88748
+tgwrap/main.py,sha256=Ggnb9S1GbsZUzg4TW_9xUhK2ZaZUCoAWX6oBteRu4O4,90012
 tgwrap/printer.py,sha256=frn1PARd8A28mkRCYR6ybN2x0NBULhNOutn4l2U7REY,2754
-tgwrap-0.10.2.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
-tgwrap-0.10.2.dist-info/METADATA,sha256=TMYitOkytrAQdGcEIeCOeiyKLg5yAFtgnmiupyLiJjo,17476
-tgwrap-0.10.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-tgwrap-0.10.2.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
-tgwrap-0.10.2.dist-info/RECORD,,
+tgwrap-0.10.3.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
+tgwrap-0.10.3.dist-info/METADATA,sha256=K47ImnV2gqCBkW6ARwFyuNiAJWJkyGEyxiUZXeIXJmc,17476
+tgwrap-0.10.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+tgwrap-0.10.3.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
+tgwrap-0.10.3.dist-info/RECORD,,