utils_devops 0.1.174__tar.gz → 0.1.191__tar.gz

{utils_devops-0.1.174 → utils_devops-0.1.191}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils_devops
-Version: 0.1.174
+Version: 0.1.191
 Summary: Lightweight DevOps utilities for automation scripts: config editing (YAML/JSON/INI/.env), templating, diffing, and CLI tools
 License: MIT
 Keywords: devops,automation,nginx,cli,jinja2,yaml,config,diff,templating,logging,docker,compose,file-ops
@@ -40,6 +40,17 @@ Requires-Dist: slack-sdk (>=3.37.0,<4.0.0)
 Requires-Dist: sshtunnel (>=0.4.0,<0.5.0)
 Requires-Dist: tenacity (>=9.0,<10.0)
 Requires-Dist: typer (>=0.12.5,<0.13.0)
-Description-Content-Type: text/markdown
+Description-Content-Type: text/plain
 
+utils_devops
+============
 
+A utilities package for DevOps tasks.
+
+Installation:
+    pip install utils_devops
+
+Usage:
+    import utils_devops
+
+License: MIT

utils_devops-0.1.191/README.txt

@@ -0,0 +1,12 @@
+utils_devops
+============
+
+A utilities package for DevOps tasks.
+
+Installation:
+    pip install utils_devops
+
+Usage:
+    import utils_devops
+
+License: MIT

{utils_devops-0.1.174 → utils_devops-0.1.191}/pyproject.toml

@@ -1,10 +1,10 @@
 [tool.poetry]
 name = "utils_devops"
-version = "0.1.174"  # Bumped for new string features + diffing
+version = "0.1.191"  # Bumped for new string features + diffing
 description = "Lightweight DevOps utilities for automation scripts: config editing (YAML/JSON/INI/.env), templating, diffing, and CLI tools"
 authors = ["Hamed Sheikhan <sh.sheikhan.m@gmail.com>"]
 license = "MIT"
-readme = "README.md"
+readme = "README.txt"
 keywords = [
     "devops",
     "automation",

{utils_devops-0.1.174 → utils_devops-0.1.191}/src/utils_devops/extras/docker_ops.py

@@ -123,7 +123,7 @@ def _detect_compose_command() -> str:
     raise DockerOpsError("Neither 'docker compose' nor 'docker-compose' is available. Please install Docker Compose.")
 
 def run_docker_command(cmd: List[str], capture: bool = True, timeout: Optional[int] = None, 
-                      input_text: Optional[str] = None,logger: Optional[logger] = None) -> ExecResult:
+                      input_text: Optional[str] = None,stream: Optional[bool] = True,logger: Optional[logger] = None) -> ExecResult:
     """Run docker command and return result with detailed logging"""
     logger = logger or DEFAULT_LOGGER 
     try:
@@ -131,9 +131,9 @@ def run_docker_command(cmd: List[str], capture: bool = True, timeout: Optional[i
         
         # Remove timeout parameter since systems.run doesn't support it
         if input_text:
-            result = systems.run(cmd, capture=capture, input_text=input_text,logger=logger,stream=True)
+            result = systems.run(cmd, capture=capture, input_text=input_text,logger=logger,stream=stream)
         else:
-            result = systems.run(cmd, capture=capture,logger=logger,stream=True)
+            result = systems.run(cmd, capture=capture,logger=logger,stream=stream)
         
         # Log the full output for debugging
         if result.returncode != 0:
@@ -1086,7 +1086,8 @@ def _update_env_version(
     Update version in .env file based on git information.
     
     Sources:
-    - 'git': Use git tag, fallback to branch name + commit hash
+    - 'git': Use branch name + commit hash
+    - 'git_Tag': Use git tag, fallback to branch name + commit hash
     - 'branch': Use branch name only  
     - 'commit': Use commit hash only
     """
@@ -1114,6 +1115,8 @@ def _update_env_version(
         # Get new version based on source
         if source == 'git':
             new_version = _get_git_based_version()
+        elif source == 'git_tag':
+            new_version = _get_git_based_version(use_tag = True)
         elif source == 'branch':
             new_version = _get_current_branch()
         elif source == 'commit':
@@ -1144,12 +1147,13 @@ def _update_env_version(
         logger.error(f"Failed to update version: {e}")
         return None
 
-def _get_git_based_version() -> Optional[str]:
+def _get_git_based_version(use_tag : Optional[bool] = False) -> Optional[str]:
     """Get version from git tag, branch, or commit."""
     # Try to get git tag first (from CI/CD or local)
-    git_tag = _get_git_tag()
-    if git_tag:
-        return git_tag
+    if use_tag :
+        git_tag = _get_git_tag()
+        if git_tag:
+            return git_tag
     
     # If no tag, try branch name + commit hash
     branch = _get_current_branch()
@@ -1170,7 +1174,7 @@ def _get_git_tag() -> Optional[str]:
     """Get current git tag from environment or git command."""
     # First check CI/CD environment variables
     ci_vars = [
-        'CI_COMMIT_TAG','GIT_TAG', 'TRAVIS_TAG', 'CIRCLE_TAG', 
+        'GIT_TAG', 'CI_COMMIT_TAG', 'TRAVIS_TAG', 'CIRCLE_TAG', 
         'BUILD_SOURCEBRANCH', 'DRONE_TAG'
     ]
     
@@ -1180,6 +1184,8 @@ def _get_git_tag() -> Optional[str]:
             # Clean the tag (remove refs/tags/ prefix if present)
             if tag.startswith('refs/tags/'):
                 tag = tag[10:]
+
+            logger.info(f"Vesion Found in system env : {tag} ")
             return tag
     
     # Try git command as fallback
@@ -2946,7 +2952,8 @@ def build_compose(
     # Additional options
     project_name: Optional[str] = None,
     dry_run: bool = False,
-    logger: Optional[logger] = None
+    logger: Optional[logger] = None,
+    stream: Optional[bool] = True,
     
 ) -> Dict[str, Any]:
     """
@@ -4005,11 +4012,12 @@ def get_compose_status(compose_file: str, env_file: Optional[str] = None) -> Dic
 
 def cleanup_old_images_by_compose(keep_count: int = 3, dry_run: bool = False, compose_file: Optional[str] = None, env_file: Optional[str] = None) -> List[str]:
     """Clean up old Docker images, optionally limited to those in a compose file from compose"""
+    logger = DEFAULT_LOGGER 
     removed = []
     
     try:
         # Get all images
-        result = run_docker_command(["docker", "images", "--format", "{{.ID}}|{{.Repository}}|{{.Tag}}|{{.CreatedAt}}"])
+        result = run_docker_command(["docker", "images", "--format", "{{.ID}}|{{.Repository}}|{{.Tag}}|{{.CreatedAt}}"],stream=False)
         
         images = []
         for line in result.stdout.strip().splitlines():
@@ -4041,7 +4049,10 @@ def cleanup_old_images_by_compose(keep_count: int = 3, dry_run: bool = False, co
                 
                 compose_repos = set()
                 for service in services:
-                    image = get_service_image(compose_file, service, env_file)
+                    #image = get_service_image(compose_file, service, env_file)
+                    service_config = compose_data.get('services', {}).get(service, {})
+                    image = service_config.get('image')
+                    logger.info(f"IMAGES in COMPOSE : {image} " )
                     if image:
                         repo_tag = image.split(':')
                         repo = repo_tag[0]
@@ -4067,7 +4078,10 @@ def cleanup_old_images_by_compose(keep_count: int = 3, dry_run: bool = False, co
                 if dry_run:
                     logger.info(f"Would remove: {old_img['repository']}:{old_img['tag']}")
                 else:
-                    remove_result = run_docker_command(["docker", "rmi", old_img['id']])
+                    logger.info(f"CLEAN UP : Would remove: {old_img['repository']}:{old_img['tag']}")
+                    #remove_result = run_docker_command(["docker", "rmi", old_img['id'],"-f"])
+                    image_to_remove_with_tag =  (f"{old_img['repository']}:{old_img['tag']}")
+                    remove_result = run_docker_command(["docker", "rmi", image_to_remove_with_tag ,"-f"])
                     if remove_result.rc == 0:
                         removed.append(f"{old_img['repository']}:{old_img['tag']}")
     
@@ -5351,4 +5365,4 @@ Example:
            
         }  
     """
-    print(help.__doc__)
+    print(help.__doc__)

{utils_devops-0.1.174 → utils_devops-0.1.191}/src/utils_devops/extras/nginx_ops.py

@@ -496,6 +496,12 @@ class NginxManager:
                     placement="server_443_out",
                     context_adjuster=lambda ctx, mgr, site, val: ctx | {"SITE": site.name}
                 ),
+                "inner-ssl": Flag(
+                    "inner-ssl",
+                    template="inner-ssl.conf",
+                    placement="server_443_out",
+                    context_adjuster=lambda ctx, mgr, site, val: ctx | {"SITE": site.name}
+                ),
                 "dns": Flag(
                     "dns",
                     template="dns.conf",