tgwrap 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

tgwrap/deploy.py

@@ -188,10 +188,7 @@ def prepare_deploy_config(step, config, source_dir, source_config_dir, target_di
 
             printer.verbose(f'Include substack modules: {include_modules}')
 
-    # printer.verbose(f'Found modules: {source_modules}')
-        # include_modules = config['include_modules'] if len(config.get('include_modules')) > 0 else source_modules
-            include_modules = substack['include_modules'] if len(substack.get('include_modules', {})) > 0 else source_modules
-            printer.verbose(f'Include modules: {include_modules}')
+            include_modules = substack.get('include_modules', [])
 
             if include_modules:
                 # get all directories in the substack and create an exlude_modules list from that
@@ -199,7 +196,10 @@ def prepare_deploy_config(step, config, source_dir, source_config_dir, target_di
                 exclude_modules = list(set(source_directories) - set(include_modules))
             else:
                 exclude_modules = substack.get('exclude_modules', [])
-            
+
+            printer.verbose(f'Include modules: {include_modules}')
+            printer.verbose(f'Exclude modules: {include_modules}')
+
             if os.path.exists(source_path):
                 deploy_actions[f'substack -> {substack["target"]}'] = {
                     "source": source_path,

tgwrap/main.py

@@ -781,6 +781,12 @@ class TgWrap():
         Posts the payload to the given (Azure) data collection endpoint
         """
 
+        def mask_basic_auth(url):
+            # Regular expression to match basic authentication credentials in URL
+            auth_pattern = re.compile(r"(https?://)([^:@]+):([^:@]+)@(.+)")
+            # Return the url without the basic auth part
+            return auth_pattern.sub(r"\1\4", url)
+
         #
         # Everything we do here, can be done using native python. And probably this is preferable as well.
         # But I have decided to follow (at least for now) the overall approach of the app and that is
@@ -854,6 +860,9 @@ class TgWrap():
         if not repo:
             raise Exception(f'Could not get git repo info: {repo}')
 
+        # Remove the basic auth info if it is part of the url
+        repo = mask_basic_auth(repo)
+
         # Get the current path in the repo
         rc = subprocess.run(
             shlex.split('git rev-parse --show-prefix'),
@@ -908,6 +917,7 @@ class TgWrap():
             )
 
             resp.raise_for_status()
+            self.printer.success('Analyze results logged to DCE')
 
         except requests.exceptions.RequestException as e:
             # we warn but continue

{tgwrap-0.9.0.dist-info → tgwrap-0.9.2.dist-info}/METADATA

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

tgwrap-0.9.2.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=jP7KuZzqwW2693fVsqEChzIto2T3YyPcSc9kW8ElDWI,29727
+tgwrap/deploy.py,sha256=-fSk-Ix_HqrXY7KQX_L27TnFzIuhBHYv4xYJW6zRDN4,10243
+tgwrap/main.py,sha256=9v8c7o32xmmkgEOgrUCiDCcivol4lRzauS6L0pvXdLw,81157
+tgwrap/printer.py,sha256=dkcOCPIPB-IP6pn8QMpa06xlcqPFVaDvxnz-QEpDJV0,2663
+tgwrap-0.9.2.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
+tgwrap-0.9.2.dist-info/METADATA,sha256=n9o0ybKKHmlNA6XVq1HLnqPffzq5idUvIu5V45RoAAY,13334
+tgwrap-0.9.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+tgwrap-0.9.2.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
+tgwrap-0.9.2.dist-info/RECORD,,

tgwrap-0.9.0.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=jP7KuZzqwW2693fVsqEChzIto2T3YyPcSc9kW8ElDWI,29727
-tgwrap/deploy.py,sha256=giLjpN9b4TWov2w8fWyB6jinAUbupMTCUoZHVT442DM,10421
-tgwrap/main.py,sha256=FqpCZ3xGD33YD3IesFMq2QI2AvSv0_4txRpnoPX19Z4,80691
-tgwrap/printer.py,sha256=dkcOCPIPB-IP6pn8QMpa06xlcqPFVaDvxnz-QEpDJV0,2663
-tgwrap-0.9.0.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
-tgwrap-0.9.0.dist-info/METADATA,sha256=IYdY5B0k1OswfcfVCbdwFOHs_itQXKq9fgbtjZPusIw,13334
-tgwrap-0.9.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-tgwrap-0.9.0.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
-tgwrap-0.9.0.dist-info/RECORD,,