snapctl 0.49.4__tar.gz → 0.49.5__tar.gz

{snapctl-0.49.4 → snapctl-0.49.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: snapctl
-Version: 0.49.4
+Version: 0.49.5
 Summary: Snapser CLI Tool
 Author: Ajinkya Apte
 Author-email: aj@snapser.com

{snapctl-0.49.4 → snapctl-0.49.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "snapctl"
-version = "0.49.4"
+version = "0.49.5"
 description = "Snapser CLI Tool"
 authors = ["Ajinkya Apte <aj@snapser.com>"]
 readme = "README.md"

{snapctl-0.49.4 → snapctl-0.49.5}/snapctl/commands/snapend.py

@@ -22,7 +22,7 @@ from snapctl.config.constants import SERVER_CALL_TIMEOUT, SNAPCTL_INPUT_ERROR, \
     SNAPCTL_SNAPEND_APPLY_MANIFEST_MISMATCH_ERROR
 from snapctl.config.hashes import PROTOS_TYPES, CLIENT_SDK_TYPES, SERVER_SDK_TYPES, \
     SNAPEND_MANIFEST_TYPES, SDK_TYPES, SDK_ACCESS_AUTH_TYPE_LOOKUP
-from snapctl.utils.echo import error, success, info
+from snapctl.utils.echo import error, success, info, warning
 from snapctl.utils.helper import snapctl_error, snapctl_success
 
 
@@ -84,17 +84,21 @@ class Snapend:
         self.manifest_path_filename: Union[str, None] = manifest_path_filename
         self.force: bool = force
         self.category: str = category
-        self.portal_category: Union[str, None] = Snapend._make_portal_category(
-            category_format)
         self.category_format: str = category_format
         self.category_type: Union[str, None] = category_type
         self.category_http_lib: Union[str, None] = category_http_lib
-        self.download_types: Union[
-            Dict[str, Dict[str, str]], None
-        ] = Snapend._make_download_type(category)
         self.out_path: Union[str, None] = out_path
         self.snaps: Union[str, None] = snaps
+        self.blocking: bool = blocking
         # Values below are derived values
+        # portal_category: This is purely because we have simplified the input for the user
+        # Only used for a reverse lookup to pass the category to the portal server
+        self.portal_category: Union[str, None] = Snapend._make_portal_category(
+            category_format)
+        # download_types: This stores our own internal mapping of the category to the type
+        self.download_types: Union[
+            Dict[str, Dict[str, str]], None
+        ] = Snapend._make_download_type(category)
         self.manifest_file_name: Union[str, None] = Snapend._get_manifest_file_name(
             manifest_path_filename
         )
@@ -102,7 +106,6 @@ class Snapend:
             byosnaps) if byosnaps else None
         self.byogs_list: Union[str, None] = Snapend._make_byogs_list(
             byogs) if byogs else None
-        self.blocking: bool = blocking
         # Validate input
         self.validate_input()
 
@@ -127,6 +130,10 @@ class Snapend:
             return 'client-sdk'
         if category_format in SERVER_SDK_TYPES:
             return 'server-sdk'
+        if category_format in PROTOS_TYPES:
+            return 'protos'
+        if category_format in SNAPEND_MANIFEST_TYPES:
+            return 'snapend-manifest'
         return None
 
     @staticmethod
@@ -240,6 +247,8 @@ class Snapend:
             # Customize snaps
             if self.snaps:
                 url += f"&snaps={self.snaps}"
+            if "None" in url:
+                warning('Detecting a potential issue in the download URL.')
             res = requests.get(
                 url, headers={'api-key': self.api_key}, timeout=SERVER_CALL_TIMEOUT
             )
@@ -391,8 +400,14 @@ class Snapend:
                     code=SNAPCTL_INPUT_ERROR)
             if self.category not in Snapend.DOWNLOAD_TYPE_NOT_REQUIRED and \
                (self.download_types is None or self.category_format not in self.download_types):
+                message = "Invalid format. Valid formats are " + \
+                    "(req: --category sdk|protos|snapend-manifest --format  " + \
+                    "sdk(" + ", ".join(SDK_TYPES.keys()) + \
+                    ") | protos(" + ", ".join(PROTOS_TYPES.keys()) + ")" + \
+                    ") | snapend-manifest(" + \
+                    ", ".join(SNAPEND_MANIFEST_TYPES.keys()) + ")"
                 snapctl_error(
-                    message="Invalid Download format.", code=SNAPCTL_INPUT_ERROR)
+                    message=message, code=SNAPCTL_INPUT_ERROR)
             # Check the Protos category
             if self.category == 'protos' and self.category_type not in Snapend.CATEGORY_TYPE_PROTOS:
                 snapctl_error(

{snapctl-0.49.4 → snapctl-0.49.5}/snapctl/config/constants.py

@@ -3,7 +3,7 @@ Constants used by snapctl
 """
 COMPANY_NAME = 'Snapser'
 VERSION_PREFIX = 'beta-'
-VERSION = '0.49.4'
+VERSION = '0.49.5'
 CONFIG_FILE_MAC = '~/.snapser/config'
 CONFIG_FILE_WIN = '%homepath%\\.snapser\\config'
 

snapctl-0.49.5/snapctl/data/releases/beta-0.49.5.mdx

@@ -0,0 +1,8 @@
+## beta-0.49.5
+##### May 22, 2025
+
+### Bug Fixes
+
+#### Snapend Download
+- Fixed a bug with snapend download manifest and apply manifest.
+