snapctl 0.38.0__tar.gz → 0.38.2__tar.gz

{snapctl-0.38.0 → snapctl-0.38.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: snapctl
-Version: 0.38.0
+Version: 0.38.2
 Summary: Snapser CLI Tool
 Author: Ajinkya Apte
 Author-email: aj@snapser.com
@@ -17,7 +17,10 @@ Requires-Dist: requests (>=2.28.2,<3.0.0)
 Requires-Dist: typer[all] (>=0.12.3,<0.13.0)
 Description-Content-Type: text/markdown
 
-# Snapser CLI Tool
+# Snapser CLI
+
+Snapser has developed a CLI tool called **snapctl** that can be used on MaxOSX, Linux and Windows machines.
+Snapctl will be the best way for game studios to integrate Snapser into their build pipelines.
 
 ## Dependencies
 
@@ -53,12 +56,10 @@ If you also have Python 2.X on your machine, you may have to run the following c
 pip3 install --user snapctl
 ```
 
-<Note>
-  After you install snapctl you may have to add the python bin folder to your
-  path. For example, on MacOSX this is usually **~/Library/Python/3.9/bin**. On
-  Windows this is usually
-  **C:\Users\username\AppData\Roaming\Python\Python39\Scripts**.
-</Note>
+**IMPORTANT**: After you install snapctl you may have to add the python bin folder to your
+path. For example, on MacOSX this is usually **~/Library/Python/3.9/bin**. On
+Windows this is usually
+**C:\Users\username\AppData\Roaming\Python\Python39\Scripts**.
 
 ## Upgrade
 
@@ -77,10 +78,8 @@ In the left navigation click on **Developer** which will bring up your Personal
 If you have not generated an API Key yet click on the **Generate** button to generate a new key.
 You can generate up to 3 API Keys per user account.
 
-<Note>
-  Please make sure you save your API key in a safe place. You will not be able
-  to see it again.
-</Note>
+**IMPORTANT**: Please make sure you save your API key in a safe place. You will not be able
+to see it again.
 
 ### Setup a local config
 
@@ -288,6 +287,9 @@ snapctl byosnap publish-image $byosnap_sid --tag $image_tag --skip-build
 Publish a new version for your Snap. Only after your Snap version is published, you will be able
 to use your snap in your Snapend. This command should be run after `push` or `publish-image` commands.
 
+IMPORTANT: You need to have $byosnapProfile to run this command. BYOSnap profile is a JSON configuration
+of your BYOSnap for the development, staging and production environments.
+
 ```
 # Help for the byosnap command
 snapctl byosnap publish-version --help
@@ -619,3 +621,93 @@ snapctl snapend state $snapend_id
 | 81         | Generate profile error                                   |
 | 82         | Generate credentials error                               |
 
+
+
+## CLI Return Codes
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 0          | Operation completed successfully                         |
+| 1          | General error                                            |
+| 2          | Input error                                              |
+
+### Configuration Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 10         | Configuration incorrect                                  |
+| 11         | Configuration error                                      |
+| 12         | Dependency missing                                       |
+
+### BYOGS Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 20         | Generic BYOGS error                                      |
+| 21         | BYOGS dependency missing                                 |
+| 22         | BYOGS ECR login error                                    |
+| 23         | BYOGS build error                                        |
+| 24         | BYOGS tag error                                          |
+| 25         | BYOGS publish error                                      |
+| 26         | BYOGS publish permission error                           |
+| 27         | BYOGS publish duplicate tag error                        |
+
+### BYOSNAP Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 30         | Generic BYOSNAP error                                    |
+| 31         | BYOSNAP dependency missing                               |
+| 32         | BYOSNAP ECR login error                                  |
+| 33         | BYOSNAP build error                                      |
+| 34         | BYOSNAP tag error                                        |
+| 35         | BYOSNAP publish image error                              |
+| 36         | BYOSNAP publish image permission error                   |
+| 37         | BYOSNAP publish image duplicate tag error                |
+| 38         | BYOSNAP create error                                     |
+| 39         | BYOSNAP create permission error                          |
+| 40         | BYOSNAP create duplicate name error                      |
+| 41         | BYOSNAP publish version error                            |
+| 42         | BYOSNAP publish version permission error                 |
+| 43         | BYOSNAP publish version duplicate version error          |
+| 44         | BYOSNAP publish version duplicate tag error              |
+
+### Game Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 50         | Generic game error                                       |
+| 51         | Game create error                                        |
+| 52         | Game create permission error                             |
+| 53         | Game create duplicate name error                         |
+| 54         | Game enumerate error                                     |
+
+### Snapend Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 60         | Generic snapend error                                    |
+| 61         | Snapend enumerate error                                  |
+| 62         | Snapend clone error                                      |
+| 63         | Snapend clone server error                               |
+| 64         | Snapend clone timeout error                              |
+| 65         | Snapend apply error                                      |
+| 66         | Snapend apply server error                               |
+| 67         | Snapend apply timeout error                              |
+| 68         | Snapend promote error                                    |
+| 69         | Snapend promote server error                             |
+| 70         | Snapend promote timeout error                            |
+| 71         | Snapend download error                                   |
+| 72         | Snapend update error                                     |
+| 73         | Snapend update server error                              |
+| 74         | Snapend update timeout error                             |
+| 75         | Snapend state error                                      |
+
+### Generate Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 80         | Generic generate error                                   |
+| 81         | Generate profile error                                   |
+| 82         | Generate credentials error                               |
+

{snapctl-0.38.0 → snapctl-0.38.2}/README.md

@@ -1,4 +1,7 @@
-# Snapser CLI Tool
+# Snapser CLI
+
+Snapser has developed a CLI tool called **snapctl** that can be used on MaxOSX, Linux and Windows machines.
+Snapctl will be the best way for game studios to integrate Snapser into their build pipelines.
 
 ## Dependencies
 
@@ -34,12 +37,10 @@ If you also have Python 2.X on your machine, you may have to run the following c
 pip3 install --user snapctl
 ```
 
-<Note>
-  After you install snapctl you may have to add the python bin folder to your
-  path. For example, on MacOSX this is usually **~/Library/Python/3.9/bin**. On
-  Windows this is usually
-  **C:\Users\username\AppData\Roaming\Python\Python39\Scripts**.
-</Note>
+**IMPORTANT**: After you install snapctl you may have to add the python bin folder to your
+path. For example, on MacOSX this is usually **~/Library/Python/3.9/bin**. On
+Windows this is usually
+**C:\Users\username\AppData\Roaming\Python\Python39\Scripts**.
 
 ## Upgrade
 
@@ -58,10 +59,8 @@ In the left navigation click on **Developer** which will bring up your Personal
 If you have not generated an API Key yet click on the **Generate** button to generate a new key.
 You can generate up to 3 API Keys per user account.
 
-<Note>
-  Please make sure you save your API key in a safe place. You will not be able
-  to see it again.
-</Note>
+**IMPORTANT**: Please make sure you save your API key in a safe place. You will not be able
+to see it again.
 
 ### Setup a local config
 
@@ -269,6 +268,9 @@ snapctl byosnap publish-image $byosnap_sid --tag $image_tag --skip-build
 Publish a new version for your Snap. Only after your Snap version is published, you will be able
 to use your snap in your Snapend. This command should be run after `push` or `publish-image` commands.
 
+IMPORTANT: You need to have $byosnapProfile to run this command. BYOSnap profile is a JSON configuration
+of your BYOSnap for the development, staging and production environments.
+
 ```
 # Help for the byosnap command
 snapctl byosnap publish-version --help
@@ -599,3 +601,93 @@ snapctl snapend state $snapend_id
 | 80         | Generic generate error                                   |
 | 81         | Generate profile error                                   |
 | 82         | Generate credentials error                               |
+
+
+
+## CLI Return Codes
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 0          | Operation completed successfully                         |
+| 1          | General error                                            |
+| 2          | Input error                                              |
+
+### Configuration Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 10         | Configuration incorrect                                  |
+| 11         | Configuration error                                      |
+| 12         | Dependency missing                                       |
+
+### BYOGS Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 20         | Generic BYOGS error                                      |
+| 21         | BYOGS dependency missing                                 |
+| 22         | BYOGS ECR login error                                    |
+| 23         | BYOGS build error                                        |
+| 24         | BYOGS tag error                                          |
+| 25         | BYOGS publish error                                      |
+| 26         | BYOGS publish permission error                           |
+| 27         | BYOGS publish duplicate tag error                        |
+
+### BYOSNAP Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 30         | Generic BYOSNAP error                                    |
+| 31         | BYOSNAP dependency missing                               |
+| 32         | BYOSNAP ECR login error                                  |
+| 33         | BYOSNAP build error                                      |
+| 34         | BYOSNAP tag error                                        |
+| 35         | BYOSNAP publish image error                              |
+| 36         | BYOSNAP publish image permission error                   |
+| 37         | BYOSNAP publish image duplicate tag error                |
+| 38         | BYOSNAP create error                                     |
+| 39         | BYOSNAP create permission error                          |
+| 40         | BYOSNAP create duplicate name error                      |
+| 41         | BYOSNAP publish version error                            |
+| 42         | BYOSNAP publish version permission error                 |
+| 43         | BYOSNAP publish version duplicate version error          |
+| 44         | BYOSNAP publish version duplicate tag error              |
+
+### Game Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 50         | Generic game error                                       |
+| 51         | Game create error                                        |
+| 52         | Game create permission error                             |
+| 53         | Game create duplicate name error                         |
+| 54         | Game enumerate error                                     |
+
+### Snapend Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 60         | Generic snapend error                                    |
+| 61         | Snapend enumerate error                                  |
+| 62         | Snapend clone error                                      |
+| 63         | Snapend clone server error                               |
+| 64         | Snapend clone timeout error                              |
+| 65         | Snapend apply error                                      |
+| 66         | Snapend apply server error                               |
+| 67         | Snapend apply timeout error                              |
+| 68         | Snapend promote error                                    |
+| 69         | Snapend promote server error                             |
+| 70         | Snapend promote timeout error                            |
+| 71         | Snapend download error                                   |
+| 72         | Snapend update error                                     |
+| 73         | Snapend update server error                              |
+| 74         | Snapend update timeout error                             |
+| 75         | Snapend state error                                      |
+
+### Generate Errors
+
+| Error Code | Description                                              |
+|------------|----------------------------------------------------------|
+| 80         | Generic generate error                                   |
+| 81         | Generate profile error                                   |
+| 82         | Generate credentials error                               |

{snapctl-0.38.0 → snapctl-0.38.2}/pyproject.toml

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

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/commands/byogs.py

@@ -7,7 +7,7 @@ import os
 import subprocess
 import platform as sys_platform
 from sys import platform
-from typing import Union
+from typing import Union, List
 
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from snapctl.config.constants import SNAPCTL_BYOGS_DEPENDENCY_MISSING, \
@@ -32,7 +32,7 @@ class ByoGs:
     TAG_CHARACTER_LIMIT = 80
 
     def __init__(
-        self, subcommand: str, base_url: str, api_key: str | None,
+        self, subcommand: str, base_url: str, api_key: Union[str, None],
         input_tag: Union[str, None], path: Union[str, None], dockerfile: str,
         skip_build: bool = False
     ) -> None:
@@ -46,7 +46,7 @@ class ByoGs:
         self.token: Union[str, None] = get_composite_token(
             base_url, api_key, 'byogs', {'service_id': ByoGs.SID}
         )
-        self.token_parts: Union[list, None] = ByoGs._get_token_values(
+        self.token_parts: Union[List, None] = ByoGs._get_token_values(
             self.token) if self.token is not None else None
         self.input_tag: Union[str, None] = input_tag
         self.path: Union[str, None] = path
@@ -58,7 +58,7 @@ class ByoGs:
     # Protected methods
 
     @staticmethod
-    def _get_token_values(token: str) -> None | list:
+    def _get_token_values(token: str) -> Union[None, List]:
         """
             Get the token values
         """
@@ -124,7 +124,7 @@ class ByoGs:
                 ], shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT, check=False)
             else:
                 response = subprocess.run([
-                    f'echo "{ecr_repo_token}" | docker login '
+                    f'echo "{ecr_repo_token}" | docker login ' +
                     f'--username {ecr_repo_username} --password-stdin {ecr_repo_url}'
                 ], shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT, check=False)
             if not response.returncode:
@@ -169,8 +169,8 @@ class ByoGs:
             else:
                 response = subprocess.run([
                     # f"docker build --no-cache -t {tag} {path}"
-                    f"docker build --platform {
-                        build_platform} -t {self.input_tag} "
+                    "docker build --platform " +
+                    f"{build_platform} -t {self.input_tag} " +
                     f"-f {docker_file_path} {self.path}"
                 ], shell=True, check=False)
                 # stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
@@ -257,8 +257,8 @@ class ByoGs:
         # Check subcommand
         if not self.subcommand in ByoGs.SUBCOMMANDS:
             snapctl_error(
-                f"Invalid command. Valid commands are {
-                    ', '.join(ByoGs.SUBCOMMANDS)}.",
+                "Invalid command. Valid commands are " +
+                f"{', '.join(ByoGs.SUBCOMMANDS)}.",
                 SNAPCTL_INPUT_ERROR)
         # Validation for subcommands
         if self.token_parts is None:
@@ -270,7 +270,7 @@ class ByoGs:
                           SNAPCTL_INPUT_ERROR)
         if len(self.input_tag.split()) > 1 or len(self.input_tag) > ByoGs.TAG_CHARACTER_LIMIT:
             snapctl_error(
-                "Tag should be a single word with maximum of "
+                "Tag should be a single word with maximum of " +
                 f"{ByoGs.TAG_CHARACTER_LIMIT} characters",
                 SNAPCTL_INPUT_ERROR
             )

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/commands/byosnap.py

@@ -9,7 +9,7 @@ import re
 import subprocess
 import platform as sys_platform
 from sys import platform
-from typing import Union
+from typing import Union, List
 import requests
 from requests.exceptions import RequestException
 
@@ -47,7 +47,7 @@ class ByoSnap:
     MAX_MIN_REPLICAS = 4
 
     def __init__(
-        self, subcommand: str, base_url: str, api_key: str | None, sid: str, name: str,
+        self, subcommand: str, base_url: str, api_key: Union[str, None], sid: str, name: str,
         desc: str, platform_type: str, language: str, input_tag: Union[str, None],
         path: Union[str, None], dockerfile: str, prefix: str, version: Union[str, None],
         http_port: Union[int, None], byosnap_profile: Union[str, None],
@@ -86,7 +86,7 @@ class ByoSnap:
 
     # Protected methods
     @staticmethod
-    def _get_token_values(token: str) -> None | list:
+    def _get_token_values(token: str) -> Union[None, List]:
         """
           Method to break open the token
         """
@@ -157,7 +157,7 @@ class ByoSnap:
                 ], shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT, check=False)
             else:
                 response = subprocess.run([
-                    f'echo "{ecr_repo_token}" | docker login '
+                    f'echo "{ecr_repo_token}" | docker login ' +
                     f'--username {ecr_repo_username} --password-stdin {ecr_repo_url}'
                 ], shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT, check=False)
             if not response.returncode:
@@ -203,8 +203,8 @@ class ByoSnap:
             else:
                 response = subprocess.run([
                     # f"docker build --no-cache -t {tag} {path}"
-                    f"docker build --platform {
-                        build_platform} -t {self.input_tag} "
+                    "docker build --platform " +
+                    f"{build_platform} -t {self.input_tag} " +
                     f"-f {docker_file_path} {self.path}"
                 ], shell=True, check=False)
                 # stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
@@ -292,8 +292,8 @@ class ByoSnap:
             snapctl_error("Missing BYOSnap profile path", SNAPCTL_INPUT_ERROR)
         if not os.path.isfile(self.byosnap_profile):
             snapctl_error(
-                "Unable to find BYOSnap profile "
-                F"JSON at path {self.byosnap_profile}",
+                "Unable to find BYOSnap profile " +
+                f"JSON at path {self.byosnap_profile}",
                 SNAPCTL_INPUT_ERROR
             )
         profile_data = None
@@ -327,16 +327,14 @@ class ByoSnap:
                 )
             if profile_data[profile]['cpu'] not in ByoSnap.VALID_CPU_MARKS:
                 snapctl_error(
-                    'Invalid CPU value in BYOSnap profile. '
-                    f'Valid values are {
-                        ", ".join(map(str, ByoSnap.VALID_CPU_MARKS))}',
+                    'Invalid CPU value in BYOSnap profile. Valid values are' +
+                    f'{", ".join(map(str, ByoSnap.VALID_CPU_MARKS))}',
                     SNAPCTL_INPUT_ERROR
                 )
             if profile_data[profile]['memory'] not in ByoSnap.VALID_MEMORY_MARKS:
                 snapctl_error(
-                    'Invalid Memory value in BYOSnap profile. '
-                    f'Valid values are {
-                        ", ".join(map(str, ByoSnap.VALID_MEMORY_MARKS))}',
+                    'Invalid Memory value in BYOSnap profile. Valid values are ' +
+                    f'{", ".join(map(str, ByoSnap.VALID_MEMORY_MARKS))}',
                     SNAPCTL_INPUT_ERROR
                 )
             if 'min_replicas' in profile_data[profile] and \
@@ -344,9 +342,9 @@ class ByoSnap:
                     int(profile_data[profile]['min_replicas']) < 0 or
                  int(profile_data[profile]['min_replicas']) > ByoSnap.MAX_MIN_REPLICAS):
                 snapctl_error(
-                    'Invalid Min Replicas value in BYOSnap profile. '
-                    f'Minimum replicas should be between 0 and {
-                        ByoSnap.MAX_MIN_REPLICAS}',
+                    'Invalid Min Replicas value in BYOSnap profile. ' +
+                    'Minimum replicas should be between 0 and ' +
+                    f'{ByoSnap.MAX_MIN_REPLICAS}',
                     SNAPCTL_INPUT_ERROR
                 )
 
@@ -363,22 +361,21 @@ class ByoSnap:
         # Check subcommand
         if not self.subcommand in ByoSnap.SUBCOMMANDS:
             snapctl_error(
-                "Invalid command. Valid commands "
-                f"are {', '.join(ByoSnap.SUBCOMMANDS)}.",
+                "Invalid command. Valid commands are " +
+                f"{', '.join(ByoSnap.SUBCOMMANDS)}.",
                 SNAPCTL_INPUT_ERROR
             )
         # Validate the SID
         if not self.sid.startswith(ByoSnap.ID_PREFIX):
             snapctl_error(
-                f"Invalid Snap ID. Valid Snap IDs start with {
-                    ByoSnap.ID_PREFIX}.",
+                "Invalid Snap ID. Valid Snap IDs start with " +
+                f"{ByoSnap.ID_PREFIX}.",
                 SNAPCTL_INPUT_ERROR
             )
         if len(self.sid) > ByoSnap.SID_CHARACTER_LIMIT:
             snapctl_error(
-                "Invalid Snap ID. "
-                f"Snap ID should be less than {
-                    ByoSnap.SID_CHARACTER_LIMIT} characters",
+                "Invalid Snap ID. Snap ID should be less than " +
+                f"{ByoSnap.SID_CHARACTER_LIMIT} characters",
                 SNAPCTL_INPUT_ERROR
             )
         # Validation for subcommands
@@ -389,13 +386,13 @@ class ByoSnap:
                 snapctl_error("Missing language", SNAPCTL_INPUT_ERROR)
             if self.language not in ByoSnap.LANGUAGES:
                 snapctl_error(
-                    "Invalid language. Valid languages are "
+                    "Invalid language. Valid languages are " +
                     f"{', '.join(ByoSnap.LANGUAGES)}.",
                     SNAPCTL_INPUT_ERROR
                 )
             if self.platform_type not in ByoSnap.PLATFORMS:
                 snapctl_error(
-                    "Invalid platform. Valid platforms are "
+                    "Invalid platform. Valid platforms are " +
                     f"{', '.join(ByoSnap.PLATFORMS)}.",
                     SNAPCTL_INPUT_ERROR
                 )
@@ -411,7 +408,7 @@ class ByoSnap:
                 if len(self.input_tag.split()) > 1 or \
                         len(self.input_tag) > ByoSnap.TAG_CHARACTER_LIMIT:
                     snapctl_error(
-                        "Tag should be a single word with maximum of "
+                        "Tag should be a single word with maximum of " +
                         f"{ByoSnap.TAG_CHARACTER_LIMIT} characters",
                         SNAPCTL_INPUT_ERROR
                     )
@@ -421,8 +418,8 @@ class ByoSnap:
                 # Check path
                 if not self.skip_build and not os.path.isfile(f"{self.path}/{self.dockerfile}"):
                     snapctl_error(
-                        f"Unable to find {
-                            self.dockerfile} at path {self.path}",
+                        f"Unable to find " +
+                        f"{self.dockerfile} at path {self.path}",
                         SNAPCTL_INPUT_ERROR)
             # elif self.subcommand == 'push':
             #     if not self.input_tag:
@@ -439,7 +436,7 @@ class ByoSnap:
                 if len(self.input_tag.split()) > 1 or \
                         len(self.input_tag) > ByoSnap.TAG_CHARACTER_LIMIT:
                     snapctl_error(
-                        "Tag should be a single word with maximum of "
+                        "Tag should be a single word with maximum of " +
                         f"{ByoSnap.TAG_CHARACTER_LIMIT} characters",
                         SNAPCTL_INPUT_ERROR
                     )
@@ -473,8 +470,9 @@ class ByoSnap:
                 if self.readiness_delay is not None:
                     if self.readiness_delay < 0 or \
                             self.readiness_delay > ByoSnap.MAX_READINESS_TIMEOUT:
-                        snapctl_error("Readiness delay should be between 0 "
-                                      f"and {ByoSnap.MAX_READINESS_TIMEOUT}", SNAPCTL_INPUT_ERROR)
+                        snapctl_error(
+                            "Readiness delay should be between 0 " +
+                            f"and {ByoSnap.MAX_READINESS_TIMEOUT}", SNAPCTL_INPUT_ERROR)
                 # Check byosnap_profile path
                 self._validate_byosnap_profile()
 
@@ -539,12 +537,14 @@ class ByoSnap:
                         info('Unable to upload your swagger.json')
                 except RequestException as e:
                     info(
-                        f'Exception: Unable to find swagger.json at {
-                            self.path} {e}'
+                        'Exception: Unable to find swagger.json at ' +
+                        f'{self.path} {e}'
                     )
             else:
-                info(f'No swagger.json found at {self.path}'
-                     '. Skipping swagger.json upload')
+                info(
+                    f'No swagger.json found at {self.path}' +
+                    '. Skipping swagger.json upload'
+                )
 
             # Push the README.md
             if os.path.isfile(readme_file):
@@ -566,7 +566,9 @@ class ByoSnap:
                         info('Unable to upload your README.md')
                 except RequestException as e:
                     info(
-                        f'Exception: Unable to find README.md at {self.path} {str(e)}')
+                        'Exception: Unable to find README.md at ' +
+                        f'{self.path} {str(e)}'
+                    )
             else:
                 info(
                     f'No README.md found at {self.path}. Skipping README.md upload')
@@ -606,8 +608,8 @@ class ByoSnap:
             if "api_error_code" in response_json and "message" in response_json:
                 if response_json['api_error_code'] == HTTP_ERROR_SERVICE_VERSION_EXISTS:
                     snapctl_error(
-                        f'BYOSnap {
-                            self.name} already exists. Please use a different name',
+                        f'BYOSnap {self.name} already exists. ' +
+                        'Please use a different name',
                         SNAPCTL_BYOSNAP_CREATE_DUPLICATE_NAME_ERROR,
                         progress
                     )

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/commands/game.py

@@ -1,15 +1,13 @@
 """
   Snapend CLI commands
 """
+from typing import Union, Dict
 import requests
 from requests.exceptions import RequestException
-
-import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from snapctl.config.constants import SERVER_CALL_TIMEOUT, SNAPCTL_INPUT_ERROR, \
-    SNAPCTL_SUCCESS, SNAPCTL_GAME_CREATE_ERROR, SNAPCTL_GAME_ENUMERATE_ERROR, \
+    SNAPCTL_GAME_CREATE_ERROR, SNAPCTL_GAME_ENUMERATE_ERROR, \
     HTTP_ERROR_DUPLICATE_GAME_NAME, SNAPCTL_GAME_CREATE_DUPLICATE_NAME_ERROR
-from snapctl.utils.echo import error, success
 from snapctl.utils.helper import snapctl_error, snapctl_success
 
 
@@ -20,12 +18,12 @@ class Game:
     SUBCOMMANDS = ['create', 'enumerate']
 
     def __init__(
-            self, subcommand: str, base_url: str, api_key: str | None, name: str | None
+            self, subcommand: str, base_url: str, api_key: Union[str, None], name: Union[str, None]
     ) -> None:
         self.subcommand: str = subcommand
         self.base_url: str = base_url
         self.api_key: str = api_key
-        self.name: str | None = name
+        self.name: Union[str, None] = name
         # Validate input
         self.validate_input()
 
@@ -38,9 +36,9 @@ class Game:
             snapctl_error("Missing API Key.", SNAPCTL_INPUT_ERROR)
         # Check subcommand
         if not self.subcommand in Game.SUBCOMMANDS:
-            snapctl_error(
-                f"Invalid command. Valid commands are {', '.join(Game.SUBCOMMANDS)}.",
-                SNAPCTL_INPUT_ERROR)
+            snapctl_error("Invalid command. Valid commands are" +
+                          f"{', '.join(Game.SUBCOMMANDS)}.",
+                          SNAPCTL_INPUT_ERROR)
         # Check sdk-download commands
         if self.subcommand == 'create':
             if self.name is None or self.name == '':

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/commands/generate.py

@@ -5,7 +5,7 @@ import base64
 from binascii import Error as BinasciiError
 import json
 import os
-from typing import Union
+from typing import Union, List
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from snapctl.config.constants import SNAPCTL_INPUT_ERROR, \
     SNAPCTL_GENERATE_GENERIC_ERROR, SNAPCTL_GENERATE_PROFILE_ERROR, \
@@ -28,21 +28,21 @@ class Generate:
     }
 
     def __init__(
-        self, subcommand: str, base_url: str, api_key: str | None,
-        category: str | None,
+        self, subcommand: str, base_url: str, api_key: Union[str, None],
+        category: Union[str, None],
         out_path: Union[str, None]
     ) -> None:
         self.subcommand: str = subcommand
         self.base_url: str = base_url
         self.api_key: str = api_key
-        self.category: str | None = category
+        self.category: Union[str, None] = category
         self.out_path: Union[str, None] = out_path
         # Validate input
         self.validate_input()
 
     # Private methods
     @staticmethod
-    def _get_token_values(token: str) -> None | list:
+    def _get_token_values(token: str) -> Union[None, List]:
         """
             Get the token values
         """
@@ -63,7 +63,7 @@ class Generate:
         """
         if self.subcommand not in Generate.SUBCOMMANDS:
             snapctl_error(
-                f"Invalid command {self.subcommand}. Valid command are "
+                f"Invalid command {self.subcommand}. Valid command are " +
                 f"{Generate.SUBCOMMANDS}",
                 SNAPCTL_INPUT_ERROR
             )
@@ -71,7 +71,7 @@ class Generate:
         if self.subcommand == 'profile':
             if self.category not in Generate.CATEGORIES['profile']:
                 snapctl_error(
-                    f"Invalid category {self.category}. Valid category are "
+                    f"Invalid category {self.category}. Valid category are " +
                     f"{Generate.CATEGORIES['profile']}",
                     SNAPCTL_INPUT_ERROR
                 )
@@ -83,7 +83,7 @@ class Generate:
         elif self.subcommand == 'credentials':
             if self.category not in Generate.CATEGORIES['credentials']:
                 snapctl_error(
-                    f"Invalid category {self.category}. Valid category are "
+                    f"Invalid category {self.category}. Valid category are " +
                     f"{Generate.CATEGORIES['credentials']}",
                     SNAPCTL_INPUT_ERROR
                 )
@@ -95,7 +95,7 @@ class Generate:
         # Now confirm that out-path is valid
         if self.out_path and not os.path.isdir(self.out_path):
             snapctl_error(
-                f"Invalid path {self.out_path}. Wont be able to "
+                f"Invalid path {self.out_path}. Wont be able to " +
                 "store the output file",
                 SNAPCTL_INPUT_ERROR
             )
@@ -125,7 +125,7 @@ class Generate:
                 file_written = True
             if file_written:
                 snapctl_success(
-                    "BYOSNAP Profile generation successful. "
+                    "BYOSNAP Profile generation successful. " +
                     f"{Generate.BYOSNAP_PROFILE_FN} saved at {file_save_path}",
                     progress
                 )
@@ -191,7 +191,7 @@ class Generate:
                 file_written = True
             if file_written:
                 snapctl_success(
-                    "ECR Token generation successful. "
+                    "ECR Token generation successful. " +
                     f"{Generate.ECR_TOKEN_FN} saved at {file_save_path}",
                     progress
                 )

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/commands/snapend.py

@@ -7,6 +7,7 @@ import os
 import json
 import time
 import requests
+from typing import Dict
 from requests.exceptions import RequestException
 
 import typer
@@ -44,44 +45,44 @@ class Snapend:
     MAX_BLOCKING_RETRIES = 120
 
     def __init__(
-        self, subcommand: str, base_url: str, api_key: str | None, snapend_id: str | None,
+        self, subcommand: str, base_url: str, api_key: Union[str, None], snapend_id: Union[str, None],
         # Enumerate, Clone
-        game_id: str | None,
+        game_id: Union[str, None],
         # Clone
-        name: str | None,
-        env: str | None,
+        name: Union[str, None],
+        env: Union[str, None],
         # Clone, Apply, Promote
-        manifest_path: str | None,
+        manifest_path: Union[str, None],
         # Download
-        category: str, platform_type: str, protos_category: str, auth_type: str, snaps: str | None,
+        category: str, platform_type: str, protos_category: str, auth_type: str, snaps: Union[str, None],
         # Clone, Apply, Promote, Download
-        out_path: str | None,
+        out_path: Union[str, None],
         # Update
-        byosnaps: str | None, byogs: str | None, blocking: bool = False
+        byosnaps: Union[str, None], byogs: Union[str, None], blocking: bool = False
     ) -> None:
         self.subcommand: str = subcommand
         self.base_url: str = base_url
         self.api_key: str = api_key
         self.snapend_id: str = snapend_id
-        self.game_id: str | None = game_id
+        self.game_id: Union[str, None] = game_id
         self.name: str = name
         self.env: str = env
-        self.manifest_path: str | None = manifest_path
-        self.manifest_file_name: str | None = Snapend._get_manifest_file_name(
+        self.manifest_path: Union[str, None] = manifest_path
+        self.manifest_file_name: Union[str, None] = Snapend._get_manifest_file_name(
             manifest_path
         )
         self.category: str = category
         self.download_types: Union[
-            dict[str, dict[str, str]], None
+            Dict[str, Dict[str, str]], None
         ] = Snapend._make_download_type(category)
         self.protos_category: str = protos_category
         self.auth_type: str = auth_type
         self.platform_type: str = platform_type
-        self.out_path: str | None = out_path
-        self.snaps: str | None = snaps
+        self.out_path: Union[str, None] = out_path
+        self.snaps: Union[str, None] = snaps
         self.byosnap_list: Union[list, None] = Snapend._make_byosnap_list(
             byosnaps) if byosnaps else None
-        self.byogs_list: str | None = Snapend._make_byogs_list(
+        self.byogs_list: Union[str, None] = Snapend._make_byogs_list(
             byogs) if byogs else None
         self.blocking: bool = blocking
         # Validate input
@@ -90,7 +91,7 @@ class Snapend:
     # Helpers
 
     @staticmethod
-    def _get_manifest_file_name(manifest_path: str) -> str | None:
+    def _get_manifest_file_name(manifest_path: str) -> Union[str, None]:
         if manifest_path and manifest_path != '' and os.path.isfile(manifest_path):
             file_name = os.path.basename(manifest_path)
             if file_name.endswith('.json') or file_name.endswith('.yml') or \
@@ -181,7 +182,7 @@ class Snapend:
         self.category = download_category
         self.platform_type = platform_type
         self.download_types: Union[
-            dict[str, dict[str, str]], None
+            Dict[str, Dict[str, str]], None
         ] = Snapend._make_download_type(download_category)
 
     def _execute_download(self) -> bool:
@@ -191,13 +192,15 @@ class Snapend:
                 f"download?category={self.category}"
             )
             if self.category not in Snapend.DOWNLOAD_TYPE_NOT_REQUIRED:
-                url += f"&type={self.download_types[self.platform_type]['type']}"
+                url += "&type=" + \
+                    f"{self.download_types[self.platform_type]['type']}"
             # If Protos, add protos category
             if self.category == 'protos':
                 url += f"&subtype={self.protos_category}"
             # If client or server SDK, add sub type and auth type
             if self.category in ['client-sdk', 'server-sdk']:
-                url += f"&subtype={self.download_types[self.platform_type]['subtype']}"
+                url += "&subtype=" + \
+                    f"{self.download_types[self.platform_type]['subtype']}"
                 url_auth_type: str = 'user'
                 if self.category == 'server-sdk' and self.auth_type == 'app':
                     url_auth_type = 'app'
@@ -212,20 +215,14 @@ class Snapend:
             if self.category == 'admin-settings':
                 fn = f"snapser-{self.snapend_id}-admin-settings.json"
             elif self.category == 'snapend-manifest':
-                fn = (
-                    f"snapser-{self.snapend_id}-"
-                    f"manifest.{self.download_types[self.platform_type]['type']}"
-                )
+                fn = f"snapser-{self.snapend_id}-manifest." + \
+                    f"{self.download_types[self.platform_type]['type']}"
             elif self.category == 'protos':
-                fn = (
-                    f"snapser-{self.snapend_id}-{self.category}"
+                fn = f"snapser-{self.snapend_id}-{self.category}" + \
                     f"-{self.platform_type}-{self.protos_category}.zip"
-                )
             else:
-                fn = (
-                    f"snapser-{self.snapend_id}-{self.category}"
+                fn = f"snapser-{self.snapend_id}-{self.category}" + \
                     f"-{self.platform_type}-{self.auth_type}.zip"
-                )
             if self.out_path is not None:
                 file_save_path = os.path.join(self.out_path, fn)
             else:
@@ -256,7 +253,8 @@ class Snapend:
         # Check subcommand
         if not self.subcommand in Snapend.SUBCOMMANDS:
             snapctl_error(
-                f"Invalid command. Valid commands are {', '.join(Snapend.SUBCOMMANDS)}.",
+                "Invalid command. Valid commands are " +
+                f"{', '.join(Snapend.SUBCOMMANDS)}.",
                 SNAPCTL_INPUT_ERROR
             )
         if self.subcommand == 'enumerate':
@@ -279,11 +277,23 @@ class Snapend:
             if not self.manifest_path:
                 snapctl_error(
                     "Missing required parameter: manifest_path", SNAPCTL_INPUT_ERROR)
+            if not os.path.isfile(self.manifest_path):
+                snapctl_error(
+                    f"Invalid path {
+                        self.manifest_path}. Please enter a valid path to the manifest file",
+                    SNAPCTL_INPUT_ERROR
+                )
         elif self.subcommand == 'apply':
             if not self.manifest_path:
                 snapctl_error(
                     "Missing required parameter: manifest_path", SNAPCTL_INPUT_ERROR)
                 raise typer.Exit(code=SNAPCTL_INPUT_ERROR)
+            if not os.path.isfile(self.manifest_path):
+                snapctl_error(
+                    f"Invalid path {
+                        self.manifest_path}. Please enter a valid path to the manifest file",
+                    SNAPCTL_INPUT_ERROR
+                )
             if not self.manifest_file_name:
                 snapctl_error(
                     "Invalid manifest file. Supported formats are .json, .yml, .yaml",
@@ -426,15 +436,16 @@ class Snapend:
                                 'Snapend clone successful. Do not forget to download the latest manifest.',
                                 progress)
                         snapctl_error(
-                            'Snapend clone has been initiated but the Snapend is not up yet.'
+                            'Snapend clone has been initiated but the Snapend is not up yet.' +
                             'Please try checking the status of the Snapend in some time',
                             SNAPCTL_SNAPEND_CLONE_TIMEOUT_ERROR,
                             progress
                         )
                     snapctl_success(
-                        "Snapend clone has been initiated. "
-                        "You can check the status using "
-                        f"`snapctl snapend state --snapend-id {response['cluster']['id']}`",
+                        "Snapend clone has been initiated. " +
+                        "You can check the status using " +
+                        "`snapctl snapend state --snapend-id" +
+                        f"{response['cluster']['id']}`",
                         progress
                     )
         except RequestException as e:
@@ -488,18 +499,19 @@ class Snapend:
                             #     self.manifest_file_name.split('.')[-1])
                             # self._execute_download()
                             snapctl_success(
-                                'Snapend apply successful. Do not forget to download '
+                                'Snapend apply successful. Do not forget to download ' +
                                 'the latest manifest.',
                                 progress)
                         snapctl_error(
-                            'Snapend apply has been initiated but the Snapend is not up yet.'
+                            'Snapend apply has been initiated but the Snapend is not up yet.' +
                             'Please try checking the status of the Snapend in some time',
                             SNAPCTL_SNAPEND_APPLY_TIMEOUT_ERROR, progress
                         )
                     snapctl_success(
-                        "Snapend apply has been initiated. "
-                        "You can check the status using "
-                        f"`snapctl snapend state --snapend-id {response['cluster']['id']}`",
+                        "Snapend apply has been initiated. " +
+                        "You can check the status using " +
+                        "`snapctl snapend state --snapend-id" +
+                        f"{response['cluster']['id']}`",
                         progress
                     )
         except RequestException as e:
@@ -552,20 +564,21 @@ class Snapend:
                             # self._execute_download()
                             # Fetch the new manifest
                             snapctl_success(
-                                'Snapend promote successful. Do not forget to '
+                                'Snapend promote successful. Do not forget to ' +
                                 'download the latest manifest.',
                                 progress
                             )
                         snapctl_error(
-                            'Snapend apply has been initiated but the Snapend is not up yet.'
+                            'Snapend apply has been initiated but the Snapend is not up yet.' +
                             'Please try checking the status of the Snapend in some time',
                             SNAPCTL_SNAPEND_PROMOTE_TIMEOUT_ERROR,
                             progress
                         )
                     snapctl_success(
-                        "Snapend apply has been initiated. "
-                        "You can check the status using "
-                        f"`snapctl snapend state --snapend-id {response['cluster']['id']}`",
+                        "Snapend apply has been initiated. " +
+                        "You can check the status using " +
+                        "`snapctl snapend state --snapend-id" +
+                        f"{response['cluster']['id']}`",
                         progress
                     )
                 snapctl_error(f'Unable to promote the manifest. Reason: {res.text}',
@@ -593,7 +606,8 @@ class Snapend:
         try:
             if self._execute_download():
                 snapctl_success(
-                    f"Snapend download successful. {self.category} saved at {self.out_path}",
+                    "Snapend download successful. " +
+                    f"{self.category} saved at {self.out_path}",
                     progress
                 )
         except RequestException as e:
@@ -636,19 +650,19 @@ class Snapend:
                         #     self.manifest_file_name.split('.')[-1])
                         # self._execute_download()
                         snapctl_success(
-                            'Snapend update successful. Do not forget to '
+                            'Snapend update successful. Do not forget to ' +
                             'download the latest manifest.',
                             progress
                         )
                     snapctl_error(
-                        'Snapend update has been initiated. '
+                        'Snapend update has been initiated. ' +
                         'You can check the status using `snapctl snapend state`',
                         SNAPCTL_SNAPEND_UPDATE_TIMEOUT_ERROR,
                         progress
                     )
                 snapctl_success(
-                    "Snapend update has been initiated. "
-                    "You can check the status using "
+                    "Snapend update has been initiated. " +
+                    "You can check the status using " +
                     f"`snapctl snapend state --snapend-id {self.snapend_id}`",
                     progress
                 )
@@ -678,7 +692,8 @@ class Snapend:
             current_state = self._get_snapend_state()
             if current_state != 'INVALID':
                 snapctl_success(
-                    f'Snapend get state successful. Current snapend state is: {current_state}',
+                    'Snapend get state successful. Current snapend state is: ' +
+                    f'{current_state}',
                     progress)
             snapctl_error("Unable to get the snapend state.",
                           SNAPCTL_SNAPEND_STATE_ERROR, progress)

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/config/constants.py

@@ -2,7 +2,7 @@
 Constants used by snapctl
 """
 COMPANY_NAME = 'Snapser'
-VERSION = '0.38.0'
+VERSION = '0.38.2'
 CONFIG_FILE_MAC = '~/.snapser/config'
 CONFIG_FILE_WIN = '%homepath%\\.snapser\\config'
 

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/config/hashes.py

@@ -1,7 +1,9 @@
+from typing import Dict, List
+
 """
 This file contains the hashes / list constants
 """
-CLIENT_SDK_TYPES: dict[str, dict[str, str]] = {
+CLIENT_SDK_TYPES: Dict[str, Dict[str, str]] = {
     'unity': {
         'type': 'csharp',
         'subtype': 'unity',
@@ -52,7 +54,7 @@ CLIENT_SDK_TYPES: dict[str, dict[str, str]] = {
     },
 }
 
-SERVER_SDK_TYPES: dict[str, dict[str, str]] = {
+SERVER_SDK_TYPES: Dict[str, Dict[str, str]] = {
     'csharp': {
         'type': 'csharp',
         'subtype': '',
@@ -119,7 +121,7 @@ SERVER_SDK_TYPES: dict[str, dict[str, str]] = {
     },
 }
 
-PROTOS_TYPES: dict[str, dict[str, str]] = {
+PROTOS_TYPES: Dict[str, Dict[str, str]] = {
     'cpp': {
         'type': 'cpp',
         'subtype': '',
@@ -138,7 +140,7 @@ PROTOS_TYPES: dict[str, dict[str, str]] = {
     },
 }
 
-SNAPEND_MANIFEST_TYPES: dict[str, dict[str, str]] = {
+SNAPEND_MANIFEST_TYPES: Dict[str, Dict[str, str]] = {
     'json': {
         'type': 'json',
         'subtype': '',
@@ -149,14 +151,14 @@ SNAPEND_MANIFEST_TYPES: dict[str, dict[str, str]] = {
     },
 }
 
-SERVICE_IDS: list[str] = [
+SERVICE_IDS: List[str] = [
     'analytics', 'auth', 'client-logs', 'events', 'experiments', 'gdpr', 'guilds', 'hades', 'iap',
     'inventory', 'leaderboards', 'matchmaking', 'notifications', 'parties', 'profiles', 'quests',
     'relay', 'remote-config', 'scheduler', 'sequencer', 'social-graph', 'statistics', 'storage',
     'trackables', 'xp'
 ]
 
-DEFAULT_BYOSNAP_DEV_TEMPLATE = {
+DEFAULT_BYOSNAP_DEV_TEMPLATE: Dict[str, object] = {
     'cpu': 100,
     'memory': 0.125,
     'min_replicas': 1,
@@ -165,7 +167,7 @@ DEFAULT_BYOSNAP_DEV_TEMPLATE = {
     'env_params': [{'key': "SNAPSER_ENVIRONMENT", 'value': "DEVELOPMENT"}]
 }
 
-DEFAULT_BYOSNAP_STAGE_TEMPLATE = {
+DEFAULT_BYOSNAP_STAGE_TEMPLATE: Dict[str, object] = {
     'cpu': 100,
     'memory': 0.125,
     'min_replicas': 1,
@@ -174,7 +176,7 @@ DEFAULT_BYOSNAP_STAGE_TEMPLATE = {
     'env_params': [{'key': "SNAPSER_ENVIRONMENT", 'value': "STAGING"}]
 }
 
-DEFAULT_BYOSNAP_PROD_TEMPLATE = {
+DEFAULT_BYOSNAP_PROD_TEMPLATE: Dict[str, object] = {
     'cpu': 100,
     'memory': 0.125,
     'min_replicas': 2,
@@ -183,13 +185,13 @@ DEFAULT_BYOSNAP_PROD_TEMPLATE = {
     'env_params': [{'key': "SNAPSER_ENVIRONMENT", 'value': "PRODUCTION"}]
 }
 
-BYOSNAP_TEMPLATE = {
+BYOSNAP_TEMPLATE: Dict[str, Dict[str, object]] = {
     'dev_template': DEFAULT_BYOSNAP_DEV_TEMPLATE,
     'stage_template': DEFAULT_BYOSNAP_STAGE_TEMPLATE,
     'prod_template': DEFAULT_BYOSNAP_PROD_TEMPLATE
 }
 
-ARCHITECTURE_MAPPING: dict[str, str] = {
+ARCHITECTURE_MAPPING: Dict[str, str] = {
     'x86_64': 'amd64',
     'arm64': 'arm64',
     'aarch64': 'arm64',

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/main.py

@@ -44,7 +44,7 @@ app = typer.Typer(
 ######### HELPER METHODS #########
 
 
-def extract_config(extract_key: str, profile: str | None = None) -> object:
+def extract_config(extract_key: str, profile: Union[str, None] = None) -> object:
     """
       Extracts the API Key from the environment variable and if not present from the config file
     """
@@ -58,9 +58,9 @@ def extract_config(extract_key: str, profile: str | None = None) -> object:
         result['location'] = 'environment-variable'
         result['value'] = env_api_key
         return result
-    encoding: str | None = "utf-8-sig" if platform == 'win32' else None
+    encoding: Union[str, None] = "utf-8-sig" if platform == 'win32' else None
     # Option 2 - Get the API Key from CONFIG PATH environment variable
-    config_file_path: str | None = os.getenv(CONFIG_PATH_KEY)
+    config_file_path: Union[str, None] = os.getenv(CONFIG_PATH_KEY)
     # Option 3 - Get the API Key from the hardcoded config file we look for
     if config_file_path is None:
         if platform == 'win32':
@@ -76,8 +76,8 @@ def extract_config(extract_key: str, profile: str | None = None) -> object:
             result['location'] = f'"{config_file_path}:profile {profile}"'
             config_profile = f'profile {profile}'
             info(
-                f'Trying to extract API KEY from "{
-                    config_file_path}:profile {profile}"'
+                'Trying to extract API KEY from ' +
+                f'{config_file_path}:profile {profile}"'
             )
         result['value'] = config.get(
             config_profile, extract_key, fallback=None, raw=True
@@ -88,7 +88,7 @@ def extract_config(extract_key: str, profile: str | None = None) -> object:
     return result
 
 
-def get_base_url(api_key: str | None) -> str:
+def get_base_url(api_key: Union[str, None]) -> str:
     """
         Returns the base url based on the api_key
     """
@@ -141,7 +141,7 @@ def default_context_callback(ctx: typer.Context):
 
 def api_key_context_callback(
         ctx: typer.Context,
-        api_key: str | None = None
+        api_key: Union[str, None] = None
 ):
     """
       Callback to set the context for the api_key
@@ -160,7 +160,7 @@ def api_key_context_callback(
 
 def profile_context_callback(
         ctx: typer.Context,
-        profile: str | None = None
+        profile: Union[str, None] = None
 ):
     """
       Callback to set the context for the profile

{snapctl-0.38.0 → snapctl-0.38.2}/snapctl/utils/helper.py

@@ -1,6 +1,7 @@
 """
 Helper functions for snapctl
 """
+from typing import Union, Dict
 import re
 import requests
 import typer
@@ -12,7 +13,7 @@ from snapctl.config.hashes import ARCHITECTURE_MAPPING
 from snapctl.utils.echo import error, success
 
 
-def validate_api_key(base_url: str, api_key: str | None) -> bool:
+def validate_api_key(base_url: str, api_key: Union[str, None]) -> bool:
     """
     This function validates the API Key
     """
@@ -45,7 +46,7 @@ def validate_api_key(base_url: str, api_key: str | None) -> bool:
     raise typer.Exit(code=SNAPCTL_CONFIGURATION_ERROR)
 
 
-def get_composite_token(base_url: str, api_key: str | None, action: str, params: object) -> str:
+def get_composite_token(base_url: str, api_key: Union[str, None], action: str, params: object) -> str:
     """
     This function exchanges the api_key for a composite token.
     """
@@ -76,7 +77,7 @@ def get_composite_token(base_url: str, api_key: str | None, action: str, params:
     return res.json()['token']
 
 
-def check_dockerfile_architecture(dockerfile_path: str, system_arch: str) -> dict[str, object]:
+def check_dockerfile_architecture(dockerfile_path: str, system_arch: str) -> Dict[str, object]:
     """
     Check the Dockerfile for architecture specific commands
     """
@@ -113,14 +114,11 @@ def check_dockerfile_architecture(dockerfile_path: str, system_arch: str) -> dic
                 match = re.search(pattern, line)
                 if match and ARCHITECTURE_MAPPING.get(match.group(1)) != system_arch:
                     response['error'] = True
-                    response['message'] = (
-                        f'[Architecture Mismatch] Line {line_number}: "{
-                            line.strip()}" '
-                        f' of Dockerfile {dockerfile_path}'
-                        f' specifies architecture {
-                            match.group(1)}, which does not match the '
-                        f' systems ({system_arch}).'
-                    )
+                    response['message'] = '[Architecture Mismatch] Line ' + \
+                        f'{line_number}: "{line.strip()}" ' + \
+                        f'of Dockerfile {dockerfile_path} ' + \
+                        f'specifies architecture {match.group(1)}, which does not match the ' + \
+                        f'systems ({system_arch}).'
                     return response
     except FileNotFoundError:
         response['error'] = True
@@ -133,7 +131,7 @@ def check_dockerfile_architecture(dockerfile_path: str, system_arch: str) -> dic
     return response
 
 
-def snapctl_success(message: str, progress: Progress | None = None, no_exit: bool = False):
+def snapctl_success(message: str, progress: Union[Progress, None] = None, no_exit: bool = False):
     """
     This function exits the snapctl
     """
@@ -144,7 +142,7 @@ def snapctl_success(message: str, progress: Progress | None = None, no_exit: boo
         raise typer.Exit(code=SNAPCTL_SUCCESS)
 
 
-def snapctl_error(message: str, code: int, progress: Progress | None = None):
+def snapctl_error(message: str, code: int, progress: Union[Progress, None] = None):
     """
     This function exits the snapctl
     """