tgwrap 0.7.16__py3-none-any.whl → 0.7.18__py3-none-any.whl

tgwrap/cli.py

@@ -774,8 +774,12 @@ def clean(verbose, working_dir):
 @click.option('--working-dir', '-w', default=None,
     help='Working directory, when omitted the current directory is used',
     )
+@click.option('--include-nbr-of-releases', '-i',
+    type=int, default=20, show_default=True,
+    help='Max number of releases to include',
+    )
 @click.version_option(version=__version__)
-def change_log(changelog_file, verbose, working_dir):
+def change_log(changelog_file, verbose, working_dir, include_nbr_of_releases):
     """ Experimental! Generate a change log """
 
     check_latest_version(verbose)
@@ -784,6 +788,7 @@ def change_log(changelog_file, verbose, working_dir):
     tgwrap.change_log(
         changelog_file=changelog_file,
         working_dir=working_dir,
+        include_nbr_of_releases=include_nbr_of_releases,
     )
 
 # this is needed for the vscode debugger to work

tgwrap/main.py

@@ -110,7 +110,7 @@ class TgWrap():
         }
 
         lock_stmt = ''
-        if no_lock and command in ['init', 'validate', 'validate-inputs', 'plan', 'info', 'output', 'show']:
+        if no_lock and command in ['init', 'validate', 'validate-inputs', 'plan', 'info', 'output', 'show', 'state']:
             lock_stmt = '-lock=false'
             self.printer.warning('Terraform state will NOT be locked')
         elif no_lock:
@@ -958,6 +958,9 @@ class TgWrap():
         include_dirs, exclude_dirs, planfile_dir, terragrunt_args):
         """ Analyzes the plan files """
 
+        def calculate_score(major: int, medium: int, minor: int) -> float :
+            return major * 10 + medium + minor / 10
+
         self.printer.verbose("Attempting to 'analyze'")
         if terragrunt_args:
             self.printer.verbose(f"- with additional parameters: {' '.join(terragrunt_args)}")
@@ -1080,14 +1083,25 @@ class TgWrap():
             "major": 0,
             "unknown": 0,
             "total": 0,
+            "score": 0,
         }
 
         for key, value in changes.items():
             for type in ["minor", "medium", "major", "unknown", "total"]:
                 total_drifts[type] += value["drifts"][type]
+            
+            # the formula below is just a way to achieve a numeric results that is coming from the various drift categories
+            value['drifts']['score'] = calculate_score(
+                major = value['drifts']['major'],
+                medium = value['drifts']['medium'],
+                minor = value['drifts']['minor'],
+            )
+            value['drifts']['score'] = value['drifts']['major'] * 10 + value['drifts']['medium'] + value['drifts']['minor'] / 10
 
         # the formula below is just a way to achieve a numeric results that is coming from the various drift categories
         total_drift_score = total_drifts['major'] * 10 + total_drifts['medium'] + total_drifts['minor'] / 10
+        total_drifts['score'] = total_drift_score
+
         self.printer.header(f"Drift score: {total_drift_score} ({total_drifts['major']}.{total_drifts['medium']}.{total_drifts['minor']})")
         if total_drifts["unknown"] > 0:
             self.printer.warning(f"For {total_drifts['unknown']} resources, drift score is not configured, please update configuration!")
@@ -1096,15 +1110,22 @@ class TgWrap():
                 for m in value["unknowns"]:
                     self.printer.warning(f' -> {m}')
 
+
+
         if out:
             # in the output we convert the dict of dicts to a list of dicts as it makes processing
             # (e.g. by telegraph) easier.
-            changes_for_output = []
+            output = {
+                "changes": [],
+                "summary": {},
+            }
             for key, value in changes.items():
                 value['module'] = key
-                changes_for_output.append(value)
+                output["changes"].append(value)
 
-            print(json.dumps(changes_for_output, indent=4))
+            output["summary"] = total_drifts
+
+            print(json.dumps(output, indent=4))
 
         if not ts_validation_successful:
             self.printer.error("Analysis detected unauthorised deletions, please check your configuration!!!")
@@ -1626,7 +1647,7 @@ Note:
         self.printer.verbose(rc)
         self.printer.normal("Cleaned the temporary files")
 
-    def change_log(self, changelog_file, working_dir):
+    def change_log(self, changelog_file, working_dir, include_nbr_of_releases):
         """ Generate a change log """
 
         # Run 'git log' to capture the Git log as a string
@@ -1637,8 +1658,13 @@ Note:
             cwd=working_dir if working_dir else None,
             )
 
-        # Define a regular expression pattern to extract release tags (e.g., vYYYY.MM.DD(.n))
-        release_pattern = r'\b(v\d{4}\.\d{1,2}\.\d{1,2}(\.\d+)?)\b'
+        # Define a regular expression pattern to extract release tags
+        # The following formats are supported:
+        #  vYYYY.MM.DD
+        #  vYYYYMMDD
+        #  vYYYY.MM.DD.01
+        #  vYYYYMMDD.01
+        release_pattern = r'\b(v\d{4}\.?\d{1,2}\.?\d{1,2}(\.\d+)?)\b'
 
         # Split the Git log into individual commit entries
         release_commits = {}
@@ -1654,18 +1680,18 @@ Note:
                     release_commits[current_release] = []
             elif current_release:
                 release_commits[current_release].append(entry)
-
         # Print the grouped commits to the console (you can write them to a file as needed)
         changelog = ""
+        counter = 0
         for release, commits in release_commits.items():
-            changelog = changelog + f"\nRelease: {release}\n  - "
-            # print(f"Release: {release}")
-            # for commit in commits:
-            #     changelog = changelog + f"\n - {commit}"
-                # print(f"  - {commit}")
-            changelog = changelog + '\n  - '.join(commits) + '\n'
-            # print()
-            # changelog = 
+            if len(commits) > 0:
+                counter += 1
+
+                changelog = changelog + f"\nRelease: {release}\n  - "
+                changelog = changelog + '\n  - '.join(commits) + '\n'
+
+            if include_nbr_of_releases and counter > include_nbr_of_releases:
+                break
 
         # do we need to update an existingchange log file?
         if changelog_file:

{tgwrap-0.7.16.dist-info → tgwrap-0.7.18.dist-info}/METADATA

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

tgwrap-0.7.18.dist-info/RECORD

@@ -0,0 +1,10 @@
+tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tgwrap/analyze.py,sha256=DTNQ10yI1pmKr6TuMJOQFjIWetu589GZ2bBlL8hz37Q,8576
+tgwrap/cli.py,sha256=cvGWGCyY78TasT4RajJyHUKUihmRxd_TBb_VyepgOLE,27858
+tgwrap/main.py,sha256=GBtz-Lii_sPVDedzjXRaVe6TBB6-k8mB0iOH_uXNJcY,77443
+tgwrap/printer.py,sha256=dkcOCPIPB-IP6pn8QMpa06xlcqPFVaDvxnz-QEpDJV0,2663
+tgwrap-0.7.18.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
+tgwrap-0.7.18.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+tgwrap-0.7.18.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
+tgwrap-0.7.18.dist-info/METADATA,sha256=MO8Z3V8tTJi1PHJYnpT4TxQ_DGIqZbQJPfOXJ2lqSVI,10610
+tgwrap-0.7.18.dist-info/RECORD,,

tgwrap-0.7.16.dist-info/RECORD

@@ -1,10 +0,0 @@
-tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tgwrap/analyze.py,sha256=DTNQ10yI1pmKr6TuMJOQFjIWetu589GZ2bBlL8hz37Q,8576
-tgwrap/cli.py,sha256=6zJRQ7PKE-Vkzz173sNCaPKmqzYOHfUBSgLOPs4zK74,27630
-tgwrap/main.py,sha256=WXfxMv1XzOi_aVBdFbW9zYX1WGIIh2bKmgrEdel4Q44,76538
-tgwrap/printer.py,sha256=dkcOCPIPB-IP6pn8QMpa06xlcqPFVaDvxnz-QEpDJV0,2663
-tgwrap-0.7.16.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
-tgwrap-0.7.16.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-tgwrap-0.7.16.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
-tgwrap-0.7.16.dist-info/METADATA,sha256=RCLLigdmLL0avYMDXPpmUt3tVnhzgvJp7F9EYEo5iiQ,10610
-tgwrap-0.7.16.dist-info/RECORD,,