snapctl 0.49.3__py3-none-any.whl → 0.49.5__py3-none-any.whl

snapctl/commands/byows.py

@@ -99,11 +99,12 @@ class Byows:
     def _get_export_commands(snap_ids, port):
         '''
         Generate export commands for the given snap IDs and port.
+        Replace hyphens with underscores in environment variable names.
         '''
         env_vars = []
 
         for snap_id in snap_ids:
-            upper_id = snap_id.upper()
+            upper_id = snap_id.upper().replace("-", "_")
             env_vars.append(f"SNAPEND_{upper_id}_GRPC_URL=localhost:{port}")
             env_vars.append(
                 f"SNAPEND_{upper_id}_HTTP_URL=http://localhost:{port}")
@@ -121,11 +122,12 @@ class Byows:
     def _generate_env_file(snap_ids, port):
         '''
         Generate an environment file with the given snap IDs and port.
+        Replace hyphens with underscores in environment variable names.
         '''
         env_lines = []
 
         for snap_id in snap_ids:
-            upper_id = snap_id.upper()
+            upper_id = snap_id.upper().replace("-", "_")
             env_lines.append(
                 f"export SNAPEND_{upper_id}_GRPC_URL=localhost:{port}")
             env_lines.append(

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/config/constants.py

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

snapctl/data/releases/beta-0.49.4.mdx

@@ -0,0 +1,8 @@
+## beta-0.49.4
+##### May 20, 2025
+
+### Bug Fixes
+
+#### Bring your own workstation (BYOW)
+- Environment exports no longer include hyphens in the variable names.
+

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.
+

{snapctl-0.49.3.dist-info → snapctl-0.49.5.dist-info}/METADATA

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

{snapctl-0.49.3.dist-info → snapctl-0.49.5.dist-info}/RECORD

@@ -3,13 +3,13 @@ snapctl/__main__.py,sha256=43jKoTk8b85hk_MT6499N3ruHdEfM8WBImd_-3VzjI8,116
 snapctl/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 snapctl/commands/byogs.py,sha256=WumLZRriCVF0SSnMn8TUL--iWhh3Yub3yQ-jz30faI0,19486
 snapctl/commands/byosnap.py,sha256=9Xe75VAi-KPFALSleUyMJsrvDJEG6cxBiGiF267PSJA,76897
-snapctl/commands/byows.py,sha256=XNornG5rOocALBtCeJ_9O91AHAFnR5v6CVr5Aen9l1o,18339
+snapctl/commands/byows.py,sha256=xmvTsWGjp3CkIvMj3LdVJO02P5W0-HfWqsP2pf9tsXE,18519
 snapctl/commands/game.py,sha256=lAABIWIibrwcqvpKvTy_7UzzLtbiP6gdk4_qPBHFKOI,5248
 snapctl/commands/generate.py,sha256=9-NlZVQllBT2LZT_t9S3ztwtHzTbM-C8_x0f6z70U3g,5606
 snapctl/commands/release_notes.py,sha256=QlhBlywLiRTKBs3SlaxHf-0E0OEU_47Xjld9gGtj4Zw,1943
-snapctl/commands/snapend.py,sha256=4hY4ffLtZ2mxbKRgwDPi8erc78nGl-6kxmCf56HODpk,39382
+snapctl/commands/snapend.py,sha256=lcg9HlgQ9YedP-GmNEZQz8UeIPmfa49KtLRgeeHyaCo,40310
 snapctl/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-snapctl/config/constants.py,sha256=nH037LGq73dpZ0UW-OTXpJP0veNvcW7sVlBxjV6SKeg,3716
+snapctl/config/constants.py,sha256=9A7Ktr2fZ4O8ugnLMKUnMV01znnrKlfXGlJU4SOpy3Q,3716
 snapctl/config/endpoints.py,sha256=jD0n5ocJBbIkrb97F2_r9hqAHzUuddAqzqqBAPUKDTI,477
 snapctl/config/hashes.py,sha256=3OKAyOxQPnn--_hvPIzFJnhC8NVfQK4WT-RH4PHEV1w,5242
 snapctl/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,14 +28,16 @@ snapctl/data/releases/beta-0.49.0.mdx,sha256=pqJP7NfM3ZMxs4SoeANCdDqTxjR9IBGbBI3
 snapctl/data/releases/beta-0.49.1.mdx,sha256=4EXupEegYffnL5bu_XWxGbzIPp9xOzl7t4xbmhq52fU,200
 snapctl/data/releases/beta-0.49.2.mdx,sha256=Vv_OIQyPieEGI9FgTUT0v5Gm0PC2JWa2FqcCUhnvx6s,176
 snapctl/data/releases/beta-0.49.3.mdx,sha256=XmSfpiH-LqvKS2REJ5FGDcLgyEN-OcSzwrXNI_EhiGc,234
+snapctl/data/releases/beta-0.49.4.mdx,sha256=olSEvzwrBgp6TfVYehYslhGrjLXz1EcybTmbXUmtA18,161
+snapctl/data/releases/beta-0.49.5.mdx,sha256=I_NdMkfxtFUOhUQgCUfcnY1YraFim4eAtRYq5g0dJqs,138
 snapctl/main.py,sha256=6EDEQlcF3GPSqH3-Ezl7bkI33ZKaFR_c55B0Dkt0pDM,25212
 snapctl/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 snapctl/types/definitions.py,sha256=EQzLeiXkJ8ISRlCqHMviNVsWWpmhWjpKaOBLdlvOTmY,644
 snapctl/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 snapctl/utils/echo.py,sha256=V0qgjqqGXRiueMkq31enmNmdqciC8S90qGRcK8UupXA,1090
 snapctl/utils/helper.py,sha256=7ugGs1GE7Rywf1-tQxrgqXUU97EQYFjS3JUDpk9SX_Q,6850
-snapctl-0.49.3.dist-info/LICENSE,sha256=6AcXm54KFSpmUI1ji9NIBd4Xl-DtjTqiyjBzfVb_CEk,2804
-snapctl-0.49.3.dist-info/METADATA,sha256=IPsVNEln6oo3iMdAdWrsRdqAgTc72Yc3C74DbeH81ls,36275
-snapctl-0.49.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-snapctl-0.49.3.dist-info/entry_points.txt,sha256=tkKW9MzmFdRs6Bgkv29G78i9WEBK4WIOWunPfe3t2Wg,44
-snapctl-0.49.3.dist-info/RECORD,,
+snapctl-0.49.5.dist-info/LICENSE,sha256=6AcXm54KFSpmUI1ji9NIBd4Xl-DtjTqiyjBzfVb_CEk,2804
+snapctl-0.49.5.dist-info/METADATA,sha256=LTqz4qckGzXeP20E2jP_ZtiVxIrNyjoQGA4NKDGMN5Y,36275
+snapctl-0.49.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+snapctl-0.49.5.dist-info/entry_points.txt,sha256=tkKW9MzmFdRs6Bgkv29G78i9WEBK4WIOWunPfe3t2Wg,44
+snapctl-0.49.5.dist-info/RECORD,,