snapctl 0.35.0__tar.gz → 0.38.1__tar.gz

{snapctl-0.35.0 → snapctl-0.38.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: snapctl
-Version: 0.35.0
+Version: 0.38.1
 Summary: Snapser CLI Tool
 Author: Ajinkya Apte
 Author-email: aj@snapser.com
@@ -264,6 +264,10 @@ snapctl byosnap upload-docs $byosnap_sid --tag $image_tag --path $code_root_path
 Publish a custom snap code image. This command executes, `build`, `push` and `upload-docs` one
 after the other.
 
+**IMPORTANT**: Take note of the hardware architecture of machine and your Dockerfile commands.
+Commands in docker file may be hardware architecture specific. Snapser throws a warning if it detects
+a mismatch.
+
 ```
 # Help for the byosnap command
 snapctl byosnap publish-image --help
@@ -348,6 +352,10 @@ snapctl byogs push --tag $image_tag
 Publish your custom game server image. This commend replaces the old way of creating, publishing image and
 then publishing the byogs. Now all you have to do is publish your image and create a fleet using the web portal.
 
+**IMPORTANT**: Take note of the hardware architecture of machine and your Dockerfile commands.
+Commands in docker file may be hardware architecture specific. Snapser throws a warning if it detects
+a mismatch.
+
 ```
 # Help for the byogs command
 snapctl byogs publish --help

{snapctl-0.35.0 → snapctl-0.38.1}/README.md

@@ -245,6 +245,10 @@ snapctl byosnap upload-docs $byosnap_sid --tag $image_tag --path $code_root_path
 Publish a custom snap code image. This command executes, `build`, `push` and `upload-docs` one
 after the other.
 
+**IMPORTANT**: Take note of the hardware architecture of machine and your Dockerfile commands.
+Commands in docker file may be hardware architecture specific. Snapser throws a warning if it detects
+a mismatch.
+
 ```
 # Help for the byosnap command
 snapctl byosnap publish-image --help
@@ -329,6 +333,10 @@ snapctl byogs push --tag $image_tag
 Publish your custom game server image. This commend replaces the old way of creating, publishing image and
 then publishing the byogs. Now all you have to do is publish your image and create a fleet using the web portal.
 
+**IMPORTANT**: Take note of the hardware architecture of machine and your Dockerfile commands.
+Commands in docker file may be hardware architecture specific. Snapser throws a warning if it detects
+a mismatch.
+
 ```
 # Help for the byogs command
 snapctl byogs publish --help

{snapctl-0.35.0 → snapctl-0.38.1}/pyproject.toml

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

{snapctl-0.35.0 → snapctl-0.38.1}/snapctl/commands/byogs.py

@@ -5,16 +5,18 @@ import base64
 from binascii import Error as BinasciiError
 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, \
     SNAPCTL_BYOGS_ECR_LOGIN_ERROR, SNAPCTL_BYOGS_BUILD_ERROR, \
     SNAPCTL_BYOGS_TAG_ERROR, SNAPCTL_BYOGS_PUBLISH_ERROR, \
     SNAPCTL_BYOGS_PUBLISH_DUPLICATE_TAG_ERROR, SNAPCTL_INPUT_ERROR
-from snapctl.utils.helper import get_composite_token, snapctl_error, snapctl_success
-from snapctl.utils.echo import info
+from snapctl.utils.helper import get_composite_token, snapctl_error, snapctl_success, \
+    check_dockerfile_architecture
+from snapctl.utils.echo import info, warning
 
 
 class ByoGs:
@@ -30,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:
@@ -44,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
@@ -56,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
         """
@@ -122,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:
@@ -150,6 +152,13 @@ class ByoGs:
                 build_platform = self.token_parts[3]
             # Build your snap
             docker_file_path = os.path.join(self.path, self.dockerfile)
+            # Warning check for architecture specific commands
+            info(f'Building on system architecture {sys_platform.machine()}')
+            check_response = check_dockerfile_architecture(
+                docker_file_path, sys_platform.machine())
+            if check_response['error']:
+                warning(check_response['message'])
+            # Build the image
             if platform == "win32":
                 response = subprocess.run([
                     # f"docker build --no-cache -t {tag} {path}"
@@ -160,7 +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)
@@ -247,7 +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:
@@ -259,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.35.0 → snapctl-0.38.1}/snapctl/commands/byosnap.py

@@ -7,8 +7,9 @@ import json
 import os
 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
 
@@ -22,8 +23,9 @@ from snapctl.config.constants import HTTP_ERROR_SERVICE_VERSION_EXISTS, \
     SNAPCTL_BYOSNAP_CREATE_DUPLICATE_NAME_ERROR, SNAPCTL_BYOSNAP_CREATE_PERMISSION_ERROR, \
     SNAPCTL_BYOSNAP_CREATE_ERROR, SNAPCTL_BYOSNAP_PUBLISH_VERSION_DUPLICATE_TAG_ERROR, \
     SNAPCTL_BYOSNAP_PUBLISH_VERSION_ERROR
-from snapctl.utils.echo import success, info
-from snapctl.utils.helper import get_composite_token, snapctl_error, snapctl_success
+from snapctl.utils.echo import success, info, warning
+from snapctl.utils.helper import get_composite_token, snapctl_error, snapctl_success, \
+    check_dockerfile_architecture
 
 
 class ByoSnap:
@@ -41,13 +43,16 @@ class ByoSnap:
     TAG_CHARACTER_LIMIT = 80
     VALID_CPU_MARKS = [100, 250, 500, 750, 1000, 1500, 2000, 3000]
     VALID_MEMORY_MARKS = [0.125, 0.25, 0.5, 1, 2, 3, 4]
+    MAX_READINESS_TIMEOUT = 30
+    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],
-        skip_build: bool = False
+        skip_build: bool = False, readiness_path: Union[str, None] = None,
+        readiness_delay: Union[int, None] = None
     ) -> None:
         self.subcommand: str = subcommand
         self.base_url: str = base_url
@@ -74,12 +79,14 @@ class ByoSnap:
         self.http_port: Union[int, None] = http_port
         self.byosnap_profile: Union[str, None] = byosnap_profile
         self.skip_build: bool = skip_build
+        self.readiness_path: Union[str, None] = readiness_path
+        self.readiness_delay: Union[int, None] = readiness_delay
         # Validate the input
         self.validate_input()
 
     # 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
         """
@@ -150,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:
@@ -179,6 +186,13 @@ class ByoSnap:
         try:
             # Build your snap
             docker_file_path = os.path.join(self.path, self.dockerfile)
+            # Warning check for architecture specific commands
+            info(f'Building on system architecture {sys_platform.machine()}')
+            check_response = check_dockerfile_architecture(
+                docker_file_path, sys_platform.machine())
+            if check_response['error']:
+                warning(check_response['message'])
+            # Build the image
             if platform == "win32":
                 response = subprocess.run([
                     # f"docker build --no-cache -t {tag} {path}"
@@ -189,7 +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)
@@ -277,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
@@ -300,6 +315,7 @@ class ByoSnap:
                 SNAPCTL_INPUT_ERROR
             )
         for profile in ['dev_template', 'stage_template', 'prod_template']:
+            # Currently, not checking for 'min_replicas' not in profile_data[profile]
             if 'cpu' not in profile_data[profile] or \
                 'memory' not in profile_data[profile] or \
                     'cmd' not in profile_data[profile] or \
@@ -311,14 +327,24 @@ 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 \
+                (not isinstance(profile_data[profile]['min_replicas'], int) or
+                    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. ' +
+                    'Minimum replicas should be between 0 and ' +
+                    f'{ByoSnap.MAX_MIN_REPLICAS}',
                     SNAPCTL_INPUT_ERROR
                 )
 
@@ -335,20 +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
@@ -359,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
                 )
@@ -381,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
                     )
@@ -391,7 +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:
@@ -405,9 +433,10 @@ class ByoSnap:
                 if not self.input_tag:
                     snapctl_error(
                         "Missing required parameter: tag", SNAPCTL_INPUT_ERROR)
-                if len(self.input_tag.split()) > 1 or len(self.input_tag) > ByoSnap.TAG_CHARACTER_LIMIT:
+                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
                     )
@@ -431,6 +460,19 @@ class ByoSnap:
                 if not self.http_port.isdigit():
                     snapctl_error("Ingress HTTP Port should be a number",
                                   SNAPCTL_INPUT_ERROR)
+                if self.readiness_path is not None:
+                    if self.readiness_path.strip() == '':
+                        snapctl_error("Readiness path cannot be empty",
+                                      SNAPCTL_INPUT_ERROR)
+                    if not self.readiness_path.strip().startswith('/'):
+                        snapctl_error("Readiness path has to start with /",
+                                      SNAPCTL_INPUT_ERROR)
+                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)
                 # Check byosnap_profile path
                 self._validate_byosnap_profile()
 
@@ -495,11 +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):
@@ -521,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')
@@ -561,7 +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
                     )
@@ -628,6 +676,10 @@ class ByoSnap:
                 "image_tag": self.input_tag,
                 "base_url": f"{self.prefix}/{self.sid}",
                 "http_port": self.http_port,
+                "readiness_probe_config": {
+                    "path": self.readiness_path,
+                    "initial_delay_seconds": self.readiness_delay
+                },
                 "dev_template": profile_data['dev_template'],
                 "stage_template": profile_data['stage_template'],
                 "prod_template": profile_data['prod_template']

{snapctl-0.35.0 → snapctl-0.38.1}/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.35.0 → snapctl-0.38.1}/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.35.0 → snapctl-0.38.1}/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.35.0 → snapctl-0.38.1}/snapctl/config/constants.py

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

{snapctl-0.35.0 → snapctl-0.38.1}/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,39 +151,49 @@ SNAPEND_MANIFEST_TYPES: dict[str, dict[str, str]] = {
     },
 }
 
-SERVICE_IDS = [
+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,
     'cmd': '',
     'args': [],
     '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,
     'cmd': '',
     'args': [],
     '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,
     'cmd': '',
     'args': [],
     '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] = {
+    'x86_64': 'amd64',
+    'arm64': 'arm64',
+    'aarch64': 'arm64',
+    'amd64': 'amd64'
+}

{snapctl-0.35.0 → snapctl-0.38.1}/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,7 +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
@@ -87,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
     """
@@ -140,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
@@ -159,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
@@ -338,7 +339,12 @@ def byosnap(
     skip_build: bool = typer.Option(
         False, "--skip-build", help="(optional: publish-image) Skip the build step. You have to pass the image tag you used during the build step."
     ),
-
+    readiness_path: str = typer.Option(
+        None, "--readiness-path", help="(req: publish-version) Readiness path for your snap"
+    ),
+    readiness_delay: int = typer.Option(
+        None, "--readiness-delay", help="(req: publish-version) Delay before readiness check"
+    ),
     # overrides
     api_key: Union[str, None] = typer.Option(
         None, "--api-key", help="API Key override.", callback=api_key_context_callback
@@ -354,7 +360,8 @@ def byosnap(
     byosnap_obj: ByoSnap = ByoSnap(
         subcommand, ctx.obj['base_url'], ctx.obj['api_key'], sid,
         name, desc, platform_type, language, tag, path, docker_file,
-        prefix, version, http_port, byosnap_profile, skip_build
+        prefix, version, http_port, byosnap_profile, skip_build,
+        readiness_path, readiness_delay
     )
     getattr(byosnap_obj, subcommand.replace('-', '_'))()
     success(f"BYOSnap {subcommand} complete")

{snapctl-0.35.0 → snapctl-0.38.1}/snapctl/utils/echo.py

@@ -20,6 +20,13 @@ def error(msg: str, code: int = SNAPCTL_ERROR, data: object = None) -> None:
     typer.echo(json.dumps(error_response.to_dict()), err=True)
 
 
+def warning(msg: str) -> None:
+    """
+    Prints a warning message to the console.
+    """
+    print(f"[bold yellow]Warning[/bold yellow] {msg}")
+
+
 def info(msg: str) -> None:
     """
     Prints an info message to the console.

{snapctl-0.35.0 → snapctl-0.38.1}/snapctl/utils/helper.py

@@ -1,16 +1,19 @@
 """
 Helper functions for snapctl
 """
+from typing import Union, Dict
+import re
 import requests
 import typer
 from requests.exceptions import RequestException
 from rich.progress import Progress
 from snapctl.config.constants import HTTP_NOT_FOUND, HTTP_FORBIDDEN, HTTP_UNAUTHORIZED, \
     SERVER_CALL_TIMEOUT, SNAPCTL_CONFIGURATION_ERROR, SNAPCTL_SUCCESS
+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):
+def validate_api_key(base_url: str, api_key: Union[str, None]) -> bool:
     """
     This function validates the API Key
     """
@@ -43,7 +46,7 @@ def validate_api_key(base_url: str, api_key: str | None):
     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.
     """
@@ -74,7 +77,61 @@ def get_composite_token(base_url: str, api_key: str | None, action: str, params:
     return res.json()['token']
 
 
-def snapctl_success(message: str, progress: Progress | None = None, no_exit: bool = False):
+def check_dockerfile_architecture(dockerfile_path: str, system_arch: str) -> Dict[str, object]:
+    """
+    Check the Dockerfile for architecture specific commands
+    """
+    response = {
+        'error': False,
+        'message': ''
+    }
+    # Normalize system architecture
+    system_arch = ARCHITECTURE_MAPPING.get(system_arch, system_arch)
+    try:
+        lines = []
+        with open(dockerfile_path, 'r') as file:
+            lines = file.readlines()
+        for line_number, line in enumerate(lines, 1):
+            if line.startswith('#'):
+                continue
+            # Checking various build and run commands for architecture specifics
+            patterns = [
+                # FROM with platform
+                r'FROM --platform=linux/(\w+)',
+                # dotnet runtime
+                r'-r linux-(\w+)',
+                # Build args specifying arch
+                r'--build-arg ARCH=(\w+)',
+                # Environment variables setting arch
+                r'ENV ARCH=(\w+)',
+                # cmake specifying arch
+                r'cmake.*?-DARCH=(\w+)',
+                # make specifying arch
+                r'make.*?ARCH=(\w+)'
+            ]
+
+            for pattern in patterns:
+                match = re.search(pattern, line)
+                if match and ARCHITECTURE_MAPPING.get(match.group(1)) != system_arch:
+                    response['error'] = True
+                    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
+        response['message'] = f'Dockerfile not found at {dockerfile_path}'
+        return response
+    except Exception as e:
+        response['error'] = True
+        response['message'] = f'Exception {e}'
+        return response
+    return response
+
+
+def snapctl_success(message: str, progress: Union[Progress, None] = None, no_exit: bool = False):
     """
     This function exits the snapctl
     """
@@ -85,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
     """