tgwrap 0.11.2__py3-none-any.whl → 0.11.4__py3-none-any.whl

tgwrap/analyze.py

@@ -34,6 +34,7 @@ def run_analyze(config, data, ignore_attributes, verbose=False):
 
     detected_changes = get_resource_actions(data)
 
+    ignorable_updates = []
     if config:
         ts_default_levels =  {
             'low': 'ignore_deletion',
@@ -44,7 +45,6 @@ def run_analyze(config, data, ignore_attributes, verbose=False):
         for criticallity, ts_level in ts_default_levels.items():
             ts_config[ts_level] = [f"*{key}*" for key, value in config[criticallity].items() if value.get('terrasafe_level', ts_level) == ts_level]
 
-        ignorable_updates = []
         for resource in detected_changes['updates']:
             before = resource['change']['before']
             after = resource['change']['after']

tgwrap/cli.py

@@ -17,7 +17,7 @@ import click
 
 from outdated import check_outdated
 
-from .main import TgWrap
+from .main import TgWrap, TG_COMMANDS, STAGES
 
 PACKAGE_NAME = 'tgwrap'
 try:
@@ -48,11 +48,6 @@ def check_latest_version(verbose=False):
 
 CLICK_CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
-TG_COMMANDS=[
-    'init', 'validate', 'validate-inputs', 'plan', 'apply',
-    'destroy', 'info', 'output', 'show', 'state', 'force-unlock'
-    ]
-STAGES=['global', 'sbx', 'dev', 'qas', 'run', 'tst', 'acc', 'prd']
 class DefaultGroup(click.Group):
     '''
     Allow a default command for a group
@@ -546,8 +541,8 @@ def unlock(module, auto_approve, verbose, dry_run, working_dir):
     help='Clean up files on target side that do not exist as source',
     show_default=True
     )
-@click.option('--include-lock-file', '-i', is_flag=True, default=False,
-    help='Include the terraform lock file',
+@click.option('--include-dotenv-file', '-i', is_flag=True, default=False,
+    help='Include the .env (or .envrc) files',
     show_default=True
     )
 @click.option('--auto-approve', '-a', is_flag=True, default=False,
@@ -568,7 +563,7 @@ def unlock(module, auto_approve, verbose, dry_run, working_dir):
 @click.version_option(version=__version__)
 def sync(
     source_domain, source_stage, target_domain, target_stage, module, auto_approve,
-    verbose, dry_run, clean, include_lock_file, working_dir
+    verbose, dry_run, clean, include_dotenv_file, working_dir
     ):
     """ Syncs the terragrunt config files from one stage to another (and possibly to a different domain) """
 
@@ -584,7 +579,7 @@ def sync(
         auto_approve=auto_approve,
         dry_run=dry_run,
         clean=clean,
-        include_lock_file=include_lock_file,
+        include_dotenv_file=include_dotenv_file,
         working_dir=working_dir,
     )
 
@@ -604,8 +599,8 @@ def sync(
     help='Clean up files on target side that do not exist as source',
     show_default=True
     )
-@click.option('--include-lock-file', '-i', is_flag=True, default=False,
-    help='Include the terraform lock file',
+@click.option('--include-dotenv-file', '-i', is_flag=True, default=False,
+    help='Include the .env (or .envrc) files',
     show_default=True
     )
 @click.option('--auto-approve', '-a', is_flag=True, default=False,
@@ -626,7 +621,7 @@ def sync(
 @click.version_option(version=__version__)
 def sync_dir(
     source_directory, target_directory, auto_approve,
-    verbose, dry_run, clean, include_lock_file, working_dir
+    verbose, dry_run, clean, include_dotenv_file, working_dir
     ):
     """ Syncs the terragrunt config files from one directory to anothery """
 
@@ -639,7 +634,7 @@ def sync_dir(
         auto_approve=auto_approve,
         dry_run=dry_run,
         clean=clean,
-        include_lock_file=include_lock_file,
+        include_dotenv_file=include_dotenv_file,
         working_dir=working_dir,
     )
 

tgwrap/deploy.py

@@ -10,7 +10,7 @@ import shlex
 from .printer import Printer
 
 def run_sync(
-    source_path, target_path, auto_approve, include_lock_file, dry_run, clean, terragrunt_file,
+    source_path, target_path, auto_approve, include_dotenv_file, dry_run, clean, terragrunt_file,
     excludes=[], source_stage=None, target_stage=None, source_domain=None, verbose=False,
     ):
     """ Run a sync copying files from a source to a target path """
@@ -46,8 +46,8 @@ def run_sync(
         dry_run_stmt = '--dry-run' if dry_run else ''
         clean_stmt   = '--delete' if clean else ''
         env_file_stmt   = "--exclude='env.hcl'" if source_stage != target_stage else "--include='env.hcl'"
-        lock_file_stmt  = "--include='.terraform.lock.hcl'" if include_lock_file \
-            else "--exclude='.terraform.lock.hcl'"
+        dotenv_file_stmt  = "--include='.env' --include='.envrc'" if include_dotenv_file \
+            else "--exclude='.env' --exclude='.envrc'"
         excludes_stmt = ' '.join([f"--exclude={x}" for x in excludes])
 
         include_statements = ""
@@ -57,7 +57,7 @@ def run_sync(
         #
         if os.path.isdir(target_path):
             include_statements = \
-                f"--include='{terragrunt_file}' {lock_file_stmt} {env_file_stmt} {excludes_stmt} " + \
+                f"--include='{terragrunt_file}' {dotenv_file_stmt} {env_file_stmt} {excludes_stmt} " + \
                 "--exclude='.terragrunt-cache/' --exclude='.terraform/' " + \
                 "--exclude='terragrunt-debug.tfvars.json' --exclude=planfile " + \
                 "--exclude='.DS_Store' --exclude='*.log' "

tgwrap/main.py

@@ -38,6 +38,35 @@ from .analyze import run_analyze
 from .deploy import prepare_deploy_config, run_sync
 from .inspector import AzureInspector
 
+TG_COMMANDS=[
+    'apply',
+    'destroy',
+    'exec',
+    'force-unlock',
+    'graph',
+    'info',
+    'init',
+    'output',
+    'plan',
+    'run',
+    'show',
+    'state',
+    'taint',
+    'untaint',
+    'validate-inputs',
+    'validate',
+    ]
+STAGES=[
+    'global',
+    'sbx',
+    'dev',
+    'qas',
+    'run',
+    'tst',
+    'acc',
+    'prd',
+    ]
+
 class DateTimeEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, datetime):
@@ -1241,7 +1270,9 @@ class TgWrap():
         else:
             self.printer.verbose('Use native terraform for module selection')
             use_native_terraform = True
-            cmd = f"terraform show -json {self.PLANFILE_NAME}"
+            # the 'tf' command is part of tenv and determines, based on the existence of .opentofu-version or .terraform-version
+            # whether to use terraform or opentofu
+            cmd = f"tf show -json {self.PLANFILE_NAME}"
 
         config = None
         if analyze_config:
@@ -1448,7 +1479,7 @@ class TgWrap():
 
     def sync(
         self, source_stage, target_stage, source_domain, target_domain, module,
-        auto_approve, dry_run, clean, include_lock_file, working_dir, 
+        auto_approve, dry_run, clean, include_dotenv_file, working_dir, 
         ):
         """ Syncs the terragrunt config files from one stage to another (and possibly to a different domain) """
     
@@ -1476,7 +1507,7 @@ class TgWrap():
             source_domain=source_domain,
             source_stage=source_stage,
             target_stage=target_stage,
-            include_lock_file=include_lock_file,
+            include_dotenv_file=include_dotenv_file,
             auto_approve=auto_approve,
             dry_run=dry_run,
             clean=clean,
@@ -1486,7 +1517,7 @@ class TgWrap():
 
     def sync_dir(
         self, source_directory, target_directory,
-        auto_approve, dry_run, clean, include_lock_file, working_dir, 
+        auto_approve, dry_run, clean, include_dotenv_file, working_dir, 
         ):
         """ Syncs the terragrunt config files from one directory to anothery """
     
@@ -1499,10 +1530,10 @@ class TgWrap():
         run_sync(
             source_path=source_path,
             target_path=target_path,
-            include_lock_file=include_lock_file,
             auto_approve=auto_approve,
             dry_run=dry_run,
             clean=clean,
+            include_dotenv_file=include_dotenv_file,
             terragrunt_file=self.TERRAGRUNT_FILE,
             verbose=self.printer.print_verbose,
         )
@@ -1590,6 +1621,7 @@ class TgWrap():
                         source_path = os.path.join(
                             source_dir, global_config['source']
                             )
+
                         target = global_config.get('target', global_config['source'])
                         target_path = os.path.dirname(
                             os.path.join(
@@ -1625,7 +1657,7 @@ class TgWrap():
                                 source_path=value['source'],
                                 target_path=value['target'],
                                 excludes=value.get('excludes', []),
-                                include_lock_file=True,
+                                include_dotenv_file=True,
                                 auto_approve=True,
                                 dry_run=dry_run,
                                 clean=False,

{tgwrap-0.11.2.dist-info → tgwrap-0.11.4.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: tgwrap
-Version: 0.11.2
+Version: 0.11.4
 Summary: A (terragrunt) wrapper around a (terraform) wrapper around ....
-Home-page: https://gitlab.com/lunadata/tgwrap
 License: MIT
 Keywords: terraform,terragrunt,terrasafe,python
 Author: Gerco Grandia
@@ -26,6 +25,7 @@ Requires-Dist: python-hcl2 (>=4.3.2,<5.0.0)
 Requires-Dist: pyyaml (>=6.0)
 Requires-Dist: terrasafe (>=0.5.1,<0.6.0)
 Project-URL: Documentation, https://gitlab.com/lunadata/tgwrap/
+Project-URL: Homepage, https://gitlab.com/lunadata/tgwrap
 Project-URL: Repository, https://gitlab.com/lunadata/tgwrap
 Description-Content-Type: text/markdown
 

tgwrap-0.11.4.dist-info/RECORD

@@ -0,0 +1,13 @@
+tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tgwrap/analyze.py,sha256=fuET7_L8b6rlv2qnKOYXSlIv5LArvZ39CPktCeQHo7A,10285
+tgwrap/cli.py,sha256=IZuVHCR_9a40WRKpUCWOMVksUKzE_s2fzM26zbJ_N8o,32017
+tgwrap/deploy.py,sha256=gwFdRDzJWjkmEzZ8b0GUSrgvJeOKnpnJm1c6mM80OcY,10259
+tgwrap/inspector-resources-template.yml,sha256=Mos8NDzzZ3VxdXgeiVL9cmQfRcIXIHMLf79_KLwdXu8,3297
+tgwrap/inspector.py,sha256=5pW7Ex1lkKRoXY6hZGbCNmSD2iRzgMSfqi9w7gb-AcY,16990
+tgwrap/main.py,sha256=A8Xa1tWsaQgVjQG4VYZWouj0uoIwkMgXIm-prfmF0c8,94907
+tgwrap/printer.py,sha256=frn1PARd8A28mkRCYR6ybN2x0NBULhNOutn4l2U7REY,2754
+tgwrap-0.11.4.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
+tgwrap-0.11.4.dist-info/METADATA,sha256=e6h-8JnVXLJDh3fILUO5_vDl90TIR0ii_P3PJPtNWNc,17698
+tgwrap-0.11.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+tgwrap-0.11.4.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
+tgwrap-0.11.4.dist-info/RECORD,,

{tgwrap-0.11.2.dist-info → tgwrap-0.11.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any

tgwrap-0.11.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-tgwrap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tgwrap/analyze.py,sha256=5C0OcDpOfn6U39QNIoc7V9ePjjcXKbJH6cOVNr9jJ9A,10289
-tgwrap/cli.py,sha256=9zvBop3Gm5B2b8K-zXVHEvRUCC7t5ffZUJZEpj1Fxtw,32186
-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=Vzmy9GEuBT-T6TB_ZzN_lET5ihY0P-9WcPZ_MPCus_k,94366
-tgwrap/printer.py,sha256=frn1PARd8A28mkRCYR6ybN2x0NBULhNOutn4l2U7REY,2754
-tgwrap-0.11.2.dist-info/LICENSE,sha256=VT-AVxIXt3EQTC-7Hy1uPGnrDNJLqfcgLgJD78fiyx4,1065
-tgwrap-0.11.2.dist-info/METADATA,sha256=fYWSDZfgDmERSCJ7ZOJqMmf7M6cdemNBjFg_jsUG5KQ,17686
-tgwrap-0.11.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-tgwrap-0.11.2.dist-info/entry_points.txt,sha256=H8X0PMPmd4aW7Y9iyChZ0Ug6RWGXqhRUvHH-6f6Mxz0,42
-tgwrap-0.11.2.dist-info/RECORD,,