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

tgwrap/deploy.py

@@ -171,66 +171,69 @@ def prepare_deploy_config(step, config, source_dir, source_config_dir, target_di
             printer.warning(f'Source path of config file does not exist: {source_path}')
 
     for ss, substack in substack_configs:
-        printer.verbose(f'Found substack : {ss}')
-
-        source_path = os.path.join(
-            source_dir, source_stage, substack['source'], ''
-            )
-        target_path = os.path.join(
-            target_dir, substack['target'], ''
-            )
-
-        include_modules = substack['include_modules'] if len(substack.get('include_modules', {})) > 0 else []
-        printer.verbose(f'Include modules: {include_modules}')
-
-        if include_modules:
-            # get all directories in the substack and create an exlude_modules list from that
-            source_directories = get_directories(source_path)
-            exclude_modules = list(set(source_directories) - set(include_modules))
-        else:
-            exclude_modules = substack.get('exclude_modules', [])
-        
-        if os.path.exists(source_path):
-            deploy_actions[f'substack -> {substack["target"]}'] = {
-                "source": source_path,
-                "target": target_path,
-                "excludes": exclude_modules,
-            }
+        if 'applies_to_stages' in substack and target_stage not in substack['applies_to_stages']:
+            printer.verbose(f'Target stage {target_stage} not applicable for substack {ss}.')
         else:
-            printer.warning(f'Source path of substack does not exist: {source_path}')
-
-        if len(substack.get('configs', [])) > 0:
-            # run some checks and sets some variables
-            if not source_config_dir:
-                raise Exception("Config files must be deployed but 'config_path' variable is not set!")
-            elif not config_dir:
-                raise Exception("Config files must be deployed but 'config_dir' variable is not set!")
+            printer.verbose(f'Found substack : {ss}')
 
+            source_path = os.path.join(
+                source_dir, source_stage, substack['source'], ''
+                )
             target_path = os.path.join(
-                target_dir, config_dir, module_name, target_stage, substack['target'], '',
+                target_dir, substack['target'], ''
                 )
-            # the target path might not exist
-            try:
-                os.makedirs(target_path)
-            except FileExistsError:
-                pass
 
-        for cfg in substack.get('configs', []):
-            printer.verbose(f'Found substack config file : {cfg}')
+            include_modules = substack['include_modules'] if len(substack.get('include_modules', {})) > 0 else []
+            printer.verbose(f'Include modules: {include_modules}')
 
-            full_source_path = os.path.join(
-                source_config_dir, source_stage, substack['source'], cfg
-                )
+            if include_modules:
+                # get all directories in the substack and create an exlude_modules list from that
+                source_directories = get_directories(source_path)
+                exclude_modules = list(set(source_directories) - set(include_modules))
+            else:
+                exclude_modules = substack.get('exclude_modules', [])
             
-            full_target_path = os.path.dirname(os.path.join(target_path, cfg))
-            # print("source: ", full_source_path)
-            # print("target: ", full_target_path)
             if os.path.exists(source_path):
-                deploy_actions[f"substack {substack['target']} configs -> {os.path.join(substack['source'], cfg)}"] = {
-                    "source": full_source_path,
-                    "target": full_target_path,
+                deploy_actions[f'substack -> {substack["target"]}'] = {
+                    "source": source_path,
+                    "target": target_path,
+                    "excludes": exclude_modules,
                 }
             else:
-                printer.warning(f'Source path of config file does not exist: {source_path}')
+                printer.warning(f'Source path of substack does not exist: {source_path}')
+
+            if len(substack.get('configs', [])) > 0:
+                # run some checks and sets some variables
+                if not source_config_dir:
+                    raise Exception("Config files must be deployed but 'config_path' variable is not set!")
+                elif not config_dir:
+                    raise Exception("Config files must be deployed but 'config_dir' variable is not set!")
+
+                target_path = os.path.join(
+                    target_dir, config_dir, module_name, target_stage, substack['target'], '',
+                    )
+                # the target path might not exist
+                try:
+                    os.makedirs(target_path)
+                except FileExistsError:
+                    pass
+
+            for cfg in substack.get('configs', []):
+                printer.verbose(f'Found substack config file : {cfg}')
+
+                full_source_path = os.path.join(
+                    source_config_dir, source_stage, substack['source'], cfg
+                    )
+                
+                full_target_path = os.path.dirname(os.path.join(target_path, cfg))
+                # print("source: ", full_source_path)
+                # print("target: ", full_target_path)
+                if os.path.exists(source_path):
+                    deploy_actions[f"substack {substack['target']} configs -> {os.path.join(substack['source'], cfg)}"] = {
+                        "source": full_source_path,
+                        "target": full_target_path,
+                    }
+                else:
+                    printer.warning(f'Source path of config file does not exist: {source_path}')
 
     return deploy_actions

tgwrap/main.py

@@ -159,6 +159,7 @@ class TgWrap():
             parallelism_stmt  = f'--terragrunt-parallelism {limit_parallelism}' if limit_parallelism else ''
             include_dir_stmt  = f'--terragrunt-strict-include  --terragrunt-include-dir {" --terragrunt-include-dir ".join(include_dirs)}' if len(include_dirs) > 0 else ""
             exclude_dir_stmt  = f'--terragrunt-exclude-dir {" --terragrunt-exclude-dir ".join(exclude_dirs)}' if len(exclude_dirs) > 0 else ""
+
         else:
             base_command      = 'terragrunt'
             ignore_deps_stmt  = ''
@@ -214,6 +215,10 @@ 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]
 
+        # 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]
+
         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}')
 
@@ -898,6 +903,10 @@ 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,
@@ -1305,6 +1314,10 @@ class TgWrap():
             # and make it unique
             substacks = set(substacks)
 
+            # the manifest file supports both `sub_stacks` and `substack` config name. Annoying to be a bit autistic when it comes to naming :-/
+            substack_configs = manifest.get('sub_stacks', {})
+            substack_configs.update(manifest.get('substacks', {}))
+
             for target_stage in target_stages:
                 target_dir = os.path.join(working_dir, '', target_stage)
                 self.printer.header(f'Deploy stage {target_stage} to {target_dir}...')
@@ -1328,7 +1341,7 @@ class TgWrap():
                                 target_dir=target_dir,
                                 target_stage=target_stage,
                                 substacks=substacks,
-                                substack_configs=manifest.get('sub_stacks', {}).items(),
+                                substack_configs=substack_configs.items(),
                                 tg_file_name=self.TERRAGRUNT_FILE,
                                 verbose=self.printer.print_verbose,
                             )
@@ -1568,9 +1581,6 @@ Note:
         if terragrunt_args:
             self.printer.verbose(f"- with additional parameters: {' '.join(terragrunt_args)}")
 
-        # self.printer.verbose(f"Include dirs: {'; '.join(include_dirs)}")
-        # self.printer.verbose(f"Exclude dirs: {'; '.join(exclude_dirs)}")
-
         "Runs the desired command in the directories as defined in the directed graph"
         graph = self._get_di_graph(backwards=backwards, working_dir=working_dir)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tgwrap
-Version: 0.8.10
+Version: 0.8.12
 Summary: A (terragrunt) wrapper around a (terraform) wrapper around ....
 Home-page: https://gitlab.com/lunadata/tgwrap
 License: MIT
@@ -230,7 +230,7 @@ deploy: # which modules do you want to deploy
       #  - source: networking
       #  - target: networking-connected
 
-sub_stacks:
+substacks:
   is01:
     source: shared-integration/intsvc01
     target: integration/is01
@@ -240,6 +240,8 @@ sub_stacks:
       - my-ss-config.hcl
       - ../my-ss-config-dir
   is02:
+    applies_to_stages: # optional list of stages to include the substack in
+      - dev
     source: shared-integration/intsvc01
     target: integration/is02
 

tgwrap-0.8.12.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=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,,

tgwrap-0.8.10.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=oD-H1ojdcSQTbiQHs7BZP9NnbV_MDtlpJFaDRl2-KvU,9578
-tgwrap/main.py,sha256=ltOAJaACSneLECgcCYzqwQuoJZZe88juoQOfwsFZzJA,74105
-tgwrap/printer.py,sha256=dkcOCPIPB-IP6pn8QMpa06xlcqPFVaDvxnz-QEpDJV0,2663
-tgwrap-0.8.10.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
-tgwrap-0.8.10.dist-info/METADATA,sha256=8atooQVSQ-GQUIhZgTg_RxMDBci6F36fKGoPSgOJ5PQ,11529
-tgwrap-0.8.10.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-tgwrap-0.8.10.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
-tgwrap-0.8.10.dist-info/RECORD,,