snapctl 0.44.1__py3-none-any.whl → 0.46.1__py3-none-any.whl

snapctl/commands/byogs.py

@@ -37,30 +37,27 @@ class ByoGs:
     def __init__(
         self, *, subcommand: str, base_url: str, api_key: Union[str, None],
         tag: Union[str, None] = None, path: Union[str, None] = None,
-        resources_path: Union[str, None] = None, dockerfile: Union[str, None] = None,
+        resources_path: Union[str, None] = None, docker_filename: Union[str, None] = None,
         skip_build: bool = False, snapend_id: Union[str, None] = None,
         fleet_names: Union[str, None] = None, blocking: bool = False
     ) -> None:
         self.subcommand: str = subcommand
         self.base_url: str = base_url
         self.api_key: Union[str, None] = api_key
-        # self.sid: str = sid
-        # if subcommand == 'publish':
-        #     self.sid = ByoGs.SID
-
-        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) if self.token is not None else None
         self.tag: Union[str, None] = tag
         self.path: Union[str, None] = path
         self.resources_path: Union[str, None] = resources_path
-        self.dockerfile: str = dockerfile
+        self.docker_filename: str = docker_filename
         self.skip_build: bool = skip_build
         self.snapend_id: Union[str, None] = snapend_id
         self.fleet_names: Union[str, None] = fleet_names
         self.blocking: bool = blocking
+        # Values below are derived values
+        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) if self.token is not None else None
         # Validate input
         self.validate_input()
 
@@ -131,7 +128,7 @@ class ByoGs:
         try:
             # Login to Snapser Registry
             if platform == 'win32':
-                # Start: Hack for Windows               
+                # Start: Hack for Windows
                 data = {
                     "auths": {
                         "https://index.docker.io/v1/": {}
@@ -139,7 +136,8 @@ class ByoGs:
                 }
 
                 # Path to the Docker config file, adjust the path as necessary
-                docker_config_path = os.path.expanduser('~\\.docker\\config.json')
+                docker_config_path = os.path.expanduser(
+                    '~\\.docker\\config.json')
 
                 # Ensure the directory exists
                 os.makedirs(os.path.dirname(docker_config_path), exist_ok=True)
@@ -191,7 +189,7 @@ class ByoGs:
                 base_path = self.resources_path
             else:
                 base_path = self.path
-            docker_file_path = os.path.join(base_path, self.dockerfile)
+            docker_file_path = os.path.join(base_path, self.docker_filename)
 
             # Warning check for architecture specific commands
             info(f'Building on system architecture {sys_platform.machine()}')
@@ -373,14 +371,15 @@ class ByoGs:
                     code=SNAPCTL_INPUT_ERROR)
             # Check path
             if self.resources_path:
-                docker_file_path = f"{self.resources_path}/{self.dockerfile}"
+                docker_file_path = f"{
+                    self.resources_path}/{self.docker_filename}"
             else:
-                docker_file_path = f"{self.path}/{self.dockerfile}"
+                docker_file_path = f"{self.path}/{self.docker_filename}"
 
             if not self.skip_build and not os.path.isfile(docker_file_path):
                 snapctl_error(
                     message="Unable to find " +
-                    f"{self.dockerfile} at path {docker_file_path}",
+                    f"{self.docker_filename} at path {docker_file_path}",
                     code=SNAPCTL_INPUT_ERROR)
         elif self.subcommand == 'sync':
             if not self.skip_build and not self.path:
@@ -389,14 +388,15 @@ class ByoGs:
                     code=SNAPCTL_INPUT_ERROR)
             # Check path
             if self.resources_path:
-                docker_file_path = f"{self.resources_path}/{self.dockerfile}"
+                docker_file_path = f"{
+                    self.resources_path}/{self.docker_filename}"
             else:
-                docker_file_path = f"{self.path}/{self.dockerfile}"
+                docker_file_path = f"{self.path}/{self.docker_filename}"
 
             if not self.skip_build and not os.path.isfile(docker_file_path):
                 snapctl_error(
                     message="Unable to find " +
-                    f"{self.dockerfile} at path {docker_file_path}",
+                    f"{self.docker_filename} at path {docker_file_path}",
                     code=SNAPCTL_INPUT_ERROR)
             if not self.snapend_id:
                 snapctl_error(