mas-devops 10.0.0__tar.gz → 10.1.2__tar.gz

{mas_devops-10.0.0/src/mas_devops.egg-info → mas_devops-10.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-devops
-Version: 10.0.0
+Version: 10.1.2
 Summary: Python for Maximo Application Suite Dev/Ops
 Home-page: https://github.com/ibm-mas/python-devops
 Author: David Parker

{mas_devops-10.0.0 → mas_devops-10.1.2}/src/mas/devops/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.0.0"
+__version__ = "10.1.2"

{mas_devops-10.0.0 → mas_devops-10.1.2}/src/mas/devops/backup.py

@@ -11,7 +11,7 @@ import logging
 import os
 import yaml
 from openshift.dynamic import DynamicClient
-from openshift.dynamic.exceptions import NotFoundError
+from openshift.dynamic.exceptions import NotFoundError, ResourceNotFoundError
 import boto3
 from botocore.exceptions import ClientError, NoCredentialsError
 
@@ -244,7 +244,7 @@ def backupResources(
 
         return (backed_up_count, not_found_count, failed_count, discovered_secrets)
 
-    except NotFoundError:
+    except (NotFoundError, ResourceNotFoundError):
         if name:
             logger.info(f"{kind} '{name}' not found in {scope_desc}")
             not_found_count = 1

{mas_devops-10.0.0 → mas_devops-10.1.2}/src/mas/devops/restore.py

@@ -10,7 +10,7 @@
 import logging
 import yaml
 from openshift.dynamic import DynamicClient
-from openshift.dynamic.exceptions import NotFoundError
+from openshift.dynamic.exceptions import NotFoundError, ResourceNotFoundError
 
 logger = logging.getLogger(name=__name__)
 
@@ -125,6 +125,9 @@ def restoreResource(dynClient: DynamicClient, resource_data: dict, namespace=Non
             logger.error(error_msg)
             return (False, resource_name, error_msg)
 
+    except ResourceNotFoundError:
+        return (True, resource_data.get("kind"), "skipped")
+
     except Exception as e:
         error_msg = f"Error restoring resource: {e}"
         logger.error(error_msg)

{mas_devops-10.0.0 → mas_devops-10.1.2}/src/mas/devops/templates/pipelinerun-backup.yml.j2

@@ -130,6 +130,10 @@ spec:
     - name: manage_workspace_id
       value: "{{ manage_workspace_id }}"
     {% endif %}
+    {% if backup_manage_include_pvc is defined and backup_manage_include_pvc != "" %}
+    - name: backup_manage_include_pvc
+      value: "{{ backup_manage_include_pvc }}"
+    {% endif %}
 
     # Manage Db2 Backup Configuration
     {% if manage_db2_namespace is defined and manage_db2_namespace != "" %}
@@ -178,6 +182,10 @@ spec:
     - name: facilities_workspace_id
       value: "{{ facilities_workspace_id }}"
     {% endif %}
+    {% if backup_facilities_include_pvc is defined and backup_facilities_include_pvc != "" %}
+    - name: backup_facilities_include_pvc
+      value: "{{ backup_facilities_include_pvc }}"
+    {% endif %}
 
     # Facilities Db2 Backup Configuration
     {% if facilities_db2_namespace is defined and facilities_db2_namespace != "" %}

{mas_devops-10.0.0 → mas_devops-10.1.2}/src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -840,6 +840,58 @@ spec:
     - name: mas_ws_facilities_properties_secret_name
       value: "{{ mas_ws_facilities_properties_secret_name }}"
 {%- endif %}
+{%- if mas_ws_facilities_dataconnectagent_deploymentmode is defined and mas_ws_facilities_dataconnectagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_dataconnectagent_deploymentmode
+      value: "{{ mas_ws_facilities_dataconnectagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_extendedformulaagent_deploymentmode is defined and mas_ws_facilities_extendedformulaagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_extendedformulaagent_deploymentmode
+      value: "{{ mas_ws_facilities_extendedformulaagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_formularecalcagent_deploymentmode is defined and mas_ws_facilities_formularecalcagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_formularecalcagent_deploymentmode
+      value: "{{ mas_ws_facilities_formularecalcagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_incomingmailagent_deploymentmode is defined and mas_ws_facilities_incomingmailagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_incomingmailagent_deploymentmode
+      value: "{{ mas_ws_facilities_incomingmailagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_objectmigrationagent_deploymentmode is defined and mas_ws_facilities_objectmigrationagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_objectmigrationagent_deploymentmode
+      value: "{{ mas_ws_facilities_objectmigrationagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_objectpublishagent_deploymentmode is defined and mas_ws_facilities_objectpublishagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_objectpublishagent_deploymentmode
+      value: "{{ mas_ws_facilities_objectpublishagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_maintenanceagent_deploymentmode is defined and mas_ws_facilities_maintenanceagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_maintenanceagent_deploymentmode
+      value: "{{ mas_ws_facilities_maintenanceagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_reportqueueagent_deploymentmode is defined and mas_ws_facilities_reportqueueagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_reportqueueagent_deploymentmode
+      value: "{{ mas_ws_facilities_reportqueueagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_wfagent_deploymentmode is defined and mas_ws_facilities_wfagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_wfagent_deploymentmode
+      value: "{{ mas_ws_facilities_wfagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_wffutureagent_deploymentmode is defined and mas_ws_facilities_wffutureagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_wffutureagent_deploymentmode
+      value: "{{ mas_ws_facilities_wffutureagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_wfnotificationagent_deploymentmode is defined and mas_ws_facilities_wfnotificationagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_wfnotificationagent_deploymentmode
+      value: "{{ mas_ws_facilities_wfnotificationagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_reservesmtpagent_deploymentmode is defined and mas_ws_facilities_reservesmtpagent_deploymentmode != "" %}
+    - name: mas_ws_facilities_reservesmtpagent_deploymentmode
+      value: "{{ mas_ws_facilities_reservesmtpagent_deploymentmode }}"
+{%- endif %}
+{%- if mas_ws_facilities_scheduleragent_deploymentmode is defined and mas_ws_facilities_scheduleragent_deploymentmode != "" %}
+    - name: mas_ws_facilities_scheduleragent_deploymentmode
+      value: "{{ mas_ws_facilities_scheduleragent_deploymentmode }}"
+{%- endif %}
 
 {%- endif %}
 

{mas_devops-10.0.0 → mas_devops-10.1.2}/src/mas/devops/templates/pipelinerun-restore.yml.j2

@@ -204,6 +204,10 @@ spec:
     - name: restore_manage_db
       value: "{{ restore_manage_db }}"
     {% endif %}
+    {% if restore_manage_include_pvc is defined and restore_manage_include_pvc != "" %}
+    - name: restore_manage_include_pvc
+      value: "{{ restore_manage_include_pvc }}"
+    {% endif %}
     # Manage App Storage class
     {% if manage_app_override_storageclass is defined and manage_app_override_storageclass != "" %}
     - name: manage_app_override_storageclass
@@ -246,6 +250,10 @@ spec:
     - name: restore_facilities_db
       value: "{{ restore_facilities_db }}"
     {% endif %}
+    {% if restore_facilities_include_pvc is defined and restore_facilities_include_pvc != "" %}
+    - name: restore_facilities_include_pvc
+      value: "{{ restore_facilities_include_pvc }}"
+    {% endif %}
     # Facilities App Storage class
     {% if facilities_app_override_storageclass is defined and facilities_app_override_storageclass != "" %}
     - name: facilities_app_override_storageclass

mas_devops-10.1.2/src/mas/devops/utils.py

@@ -0,0 +1,171 @@
+"""
+Utility functions for version comparison and other common operations.
+
+This module provides semantic version comparison utilities with custom handling
+for pre-release versions and wildcard version strings.
+"""
+
+import logging
+import re
+import semver
+import requests
+from requests.auth import HTTPBasicAuth
+
+logger = logging.getLogger(__name__)
+
+
+def isVersionBefore(_compare_to_version, _current_version):
+    """
+    Check if the current version is before (older than) the comparison version.
+
+    This function performs a modified semantic version comparison where pre-release
+    versions are treated as equal to their base release version. For example,
+    '8.6.0-pre.m1dev86' is normalized to '8.6.0' before comparison. Wildcard versions
+    like '8.6.x' are converted to '8.6.0'.
+
+    Args:
+        _compare_to_version (str): The version to compare against (e.g., "8.6.0").
+        _current_version (str): The current version to check (e.g., "8.5.0" or "8.6.0-pre.m1dev86").
+                               Can be None, in which case False is returned.
+
+    Returns:
+        bool: True if current_version < compare_to_version, False otherwise.
+              Returns False if _current_version is None.
+
+    Note:
+        This differs from strict semantic versioning where pre-release versions
+        are considered less than their base version.
+    """
+    if _current_version is None:
+        print("Version is not informed. Returning False")
+        return False
+
+    strippedVersion = _current_version.split("-")[0]
+    if ".x" in strippedVersion:
+        strippedVersion = strippedVersion.replace(".x", ".0")
+    current_version = semver.VersionInfo.parse(strippedVersion)
+    compareToVersion = semver.VersionInfo.parse(_compare_to_version)
+    return current_version.compare(compareToVersion) < 0
+
+
+def isVersionEqualOrAfter(_compare_to_version, _current_version):
+    """
+    Check if the current version is equal to or after (newer than) the comparison version.
+
+    This function performs a modified semantic version comparison where pre-release
+    versions are treated as equal to their base release version. For example,
+    '8.6.0-pre.m1dev86' is normalized to '8.6.0' before comparison. Wildcard versions
+    like '8.6.x' are converted to '8.6.0'.
+
+    Args:
+        _compare_to_version (str): The version to compare against (e.g., "8.6.0").
+        _current_version (str): The current version to check (e.g., "8.7.0" or "8.6.0-pre.m1dev86").
+                               Can be None, in which case False is returned.
+
+    Returns:
+        bool: True if current_version >= compare_to_version, False otherwise.
+              Returns False if _current_version is None.
+
+    Note:
+        This differs from strict semantic versioning where pre-release versions
+        are considered less than their base version.
+    """
+    if _current_version is None:
+        print("Version is not informed. Returning False")
+        return False
+
+    strippedVersion = _current_version.split("-")[0]
+    if ".x" in strippedVersion:
+        strippedVersion = strippedVersion.replace(".x", ".0")
+    current_version = semver.VersionInfo.parse(strippedVersion)
+    compareToVersion = semver.VersionInfo.parse(_compare_to_version)
+    return current_version.compare(compareToVersion) >= 0
+
+
+def validateIBMEntitlementKey(entitlementKey: str, repository: str = "cp/mas/coreapi", timeout: int = 30) -> bool:
+    """Validate IBM entitlement key against cp.icr.io registry.
+
+    This function validates an IBM entitlement key by attempting to obtain
+    an authentication token from the IBM Container Registry and verifying
+    access to the specified repository.
+
+    Args:
+        entitlementKey (str): IBM entitlement key to validate.
+        repository (str, optional): Repository to test access against. Defaults to "cp/mas/coreapi".
+        timeout (int, optional): Request timeout in seconds. Defaults to 30.
+
+    Returns:
+        bool: True if key is valid and grants access to the repository, False otherwise.
+
+    Raises:
+        requests.exceptions.RequestException: If network request fails.
+    """
+    try:
+        registry_url = f"https://cp.icr.io/v2/{repository}/tags/list"
+        logger.debug(f"Validating entitlement key against {repository}")
+
+        # First request without auth to get the auth challenge
+        response = requests.get(registry_url, timeout=timeout)
+
+        if response.status_code == 401:
+            # Parse WWW-Authenticate header to get token endpoint
+            auth_header = response.headers.get("WWW-Authenticate", "")
+            logger.debug(f"Auth challenge received: {auth_header[:100]}...")
+
+            # Extract realm and service from auth header
+            realm_match = re.search(r'realm="([^"]+)"', auth_header)
+            service_match = re.search(r'service="([^"]+)"', auth_header)
+            scope_match = re.search(r'scope="([^"]+)"', auth_header)
+
+            if not realm_match:
+                logger.error("Could not parse authentication realm")
+                return False
+
+            token_url = realm_match.group(1)
+            params = {}
+
+            if service_match:
+                params["service"] = service_match.group(1)
+            if scope_match:
+                params["scope"] = scope_match.group(1)
+            else:
+                params["scope"] = f"repository:{repository}:pull"
+
+            logger.debug(f"Token endpoint: {token_url}")
+
+            # Get authentication token
+            token_response = requests.get(token_url, params=params, auth=HTTPBasicAuth("cp", entitlementKey), timeout=timeout)
+
+            if token_response.status_code != 200:
+                logger.error(f"Failed to get token (HTTP {token_response.status_code})")
+                return False
+
+            token_data = token_response.json()
+            token = token_data.get("token") or token_data.get("access_token")
+
+            if not token:
+                logger.error("No token received - invalid entitlement key")
+                return False
+
+            # Validate token by accessing registry
+            logger.debug("Validating token against registry")
+            headers = {"Authorization": f"Bearer {token}"}
+            validate_response = requests.get(registry_url, headers=headers, timeout=timeout)
+
+            if validate_response.status_code == 200:
+                logger.info(f"Valid entitlement key with access to {repository}")
+                return True
+            else:
+                logger.error(f"Token validation failed (HTTP {validate_response.status_code})")
+                return False
+
+        elif response.status_code == 200:
+            logger.info("Registry accessible without authentication (public repository)")
+            return True
+        else:
+            logger.error(f"Unexpected response (HTTP {response.status_code})")
+            return False
+
+    except requests.exceptions.RequestException as e:
+        logger.error(f"Request failed: {e}")
+        raise

{mas_devops-10.0.0 → mas_devops-10.1.2/src/mas_devops.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-devops
-Version: 10.0.0
+Version: 10.1.2
 Summary: Python for Maximo Application Suite Dev/Ops
 Home-page: https://github.com/ibm-mas/python-devops
 Author: David Parker

mas_devops-10.0.0/src/mas/devops/utils.py

@@ -1,76 +0,0 @@
-"""
-Utility functions for version comparison and other common operations.
-
-This module provides semantic version comparison utilities with custom handling
-for pre-release versions and wildcard version strings.
-"""
-
-import semver
-
-
-def isVersionBefore(_compare_to_version, _current_version):
-    """
-    Check if the current version is before (older than) the comparison version.
-
-    This function performs a modified semantic version comparison where pre-release
-    versions are treated as equal to their base release version. For example,
-    '8.6.0-pre.m1dev86' is normalized to '8.6.0' before comparison. Wildcard versions
-    like '8.6.x' are converted to '8.6.0'.
-
-    Args:
-        _compare_to_version (str): The version to compare against (e.g., "8.6.0").
-        _current_version (str): The current version to check (e.g., "8.5.0" or "8.6.0-pre.m1dev86").
-                               Can be None, in which case False is returned.
-
-    Returns:
-        bool: True if current_version < compare_to_version, False otherwise.
-              Returns False if _current_version is None.
-
-    Note:
-        This differs from strict semantic versioning where pre-release versions
-        are considered less than their base version.
-    """
-    if _current_version is None:
-        print("Version is not informed. Returning False")
-        return False
-
-    strippedVersion = _current_version.split("-")[0]
-    if ".x" in strippedVersion:
-        strippedVersion = strippedVersion.replace(".x", ".0")
-    current_version = semver.VersionInfo.parse(strippedVersion)
-    compareToVersion = semver.VersionInfo.parse(_compare_to_version)
-    return current_version.compare(compareToVersion) < 0
-
-
-def isVersionEqualOrAfter(_compare_to_version, _current_version):
-    """
-    Check if the current version is equal to or after (newer than) the comparison version.
-
-    This function performs a modified semantic version comparison where pre-release
-    versions are treated as equal to their base release version. For example,
-    '8.6.0-pre.m1dev86' is normalized to '8.6.0' before comparison. Wildcard versions
-    like '8.6.x' are converted to '8.6.0'.
-
-    Args:
-        _compare_to_version (str): The version to compare against (e.g., "8.6.0").
-        _current_version (str): The current version to check (e.g., "8.7.0" or "8.6.0-pre.m1dev86").
-                               Can be None, in which case False is returned.
-
-    Returns:
-        bool: True if current_version >= compare_to_version, False otherwise.
-              Returns False if _current_version is None.
-
-    Note:
-        This differs from strict semantic versioning where pre-release versions
-        are considered less than their base version.
-    """
-    if _current_version is None:
-        print("Version is not informed. Returning False")
-        return False
-
-    strippedVersion = _current_version.split("-")[0]
-    if ".x" in strippedVersion:
-        strippedVersion = strippedVersion.replace(".x", ".0")
-    current_version = semver.VersionInfo.parse(strippedVersion)
-    compareToVersion = semver.VersionInfo.parse(_compare_to_version)
-    return current_version.compare(compareToVersion) >= 0