domino-cli 2.2.0__tar.gz → 2.3.0__tar.gz

{domino_cli-2.2.0 → domino_cli-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: domino-cli
-Version: 2.2.0
+Version: 2.3.0
 Summary: Domino Platform CLI tool, providing utilities to install, configure and control your Domino Platform insfrastructure
 Project-URL: Maintainer's website, https://psprog.hu
 Classifier: Development Status :: 5 - Production/Stable
@@ -184,6 +184,14 @@ info <app>
 ```
 Instructs Domino to query the application's info endpoint and returns the results.
 
+### Deployment definition management commands
+
+```
+import <optional/path/to/deployment-definition.yml>
+```
+Imports a YAML formatted deployment definition. Without providing an absolute or relative path to your deployment 
+definition file, defaults to `.domino/deployment.yml`.
+
 ### Configuration wizards
 
 Domino CLI also provides configuration wizards which help to properly create Domino configuration files.

{domino_cli-2.2.0 → domino_cli-2.3.0}/README.md

@@ -166,6 +166,14 @@ info <app>
 ```
 Instructs Domino to query the application's info endpoint and returns the results.
 
+### Deployment definition management commands
+
+```
+import <optional/path/to/deployment-definition.yml>
+```
+Imports a YAML formatted deployment definition. Without providing an absolute or relative path to your deployment 
+definition file, defaults to `.domino/deployment.yml`.
+
 ### Configuration wizards
 
 Domino CLI also provides configuration wizards which help to properly create Domino configuration files.

{domino_cli-2.2.0 → domino_cli-2.3.0}/domino_cli/__init__.py

@@ -2,19 +2,10 @@
 domino_cli.py :: Main entry point for Domino CLI application.
 """
 
-__version__ = "2.2.0"
-
-import os
+__version__ = "2.3.0"
 
 from domino_cli.core.ApplicationContext import ApplicationContext
 
 
-def _set_work_dir() -> None:
-    script_path: str = os.path.realpath(__file__)
-    script_dir: str = os.path.dirname(script_path)
-    os.chdir(script_dir)
-
-
 def main() -> None:
-    _set_work_dir()
     ApplicationContext.init_cli(__version__).run_loop()

{domino_cli-2.2.0 → domino_cli-2.3.0}/domino_cli/core/ApplicationContext.py

@@ -8,6 +8,7 @@ from domino_cli.core.command.AuthCommand import AuthCommand
 from domino_cli.core.command.DeployApplicationCommand import DeployApplicationCommand
 from domino_cli.core.command.ExitCommand import ExitCommand
 from domino_cli.core.command.HelpCommand import HelpCommand
+from domino_cli.core.command.ImportCommand import ImportCommand
 from domino_cli.core.command.InfoCommand import InfoCommand
 from domino_cli.core.command.RestartApplicationCommand import RestartApplicationCommand
 from domino_cli.core.command.StartApplicationCommand import StartApplicationCommand
@@ -111,6 +112,7 @@ class ApplicationContext:
         _command_stop_app = StopApplicationCommand(_domino_service)
         _command_restart_app = RestartApplicationCommand(_domino_service)
         _command_deploy_app = DeployApplicationCommand(_domino_service)
+        _command_import = ImportCommand(_domino_service)
         _command_auth = AuthCommand(_auth_service)
         _command_wizard = WizardCommand(_config_wizard_service)
         _command_info = InfoCommand(_domino_service)
@@ -124,6 +126,7 @@ class ApplicationContext:
             _command_restart_app,
             _command_start_app,
             _command_stop_app,
+            _command_import,
             _command_wizard,
             _command_info
         ])

{domino_cli-2.2.0 → domino_cli-2.3.0}/domino_cli/core/client/DominoClient.py

@@ -26,7 +26,14 @@ class DominoClient:
         :return: Response object
         """
         resolved_path = urllib.parse.urljoin(self._domino_base_url, domino_request.path)
-        json_body = domino_request.body
+        headers = {"Content-Type": "text/plain"} \
+            if domino_request.as_text \
+            else {"Content-Type": "application/json"}
         auth = self._session_context_holder.get_bearer_auth() if domino_request.authenticated else None
 
-        return requests.request(domino_request.method.value, resolved_path, json=json_body, headers=auth)
+        if auth:
+            headers.update(auth)
+
+        return requests.request(domino_request.method.value, resolved_path, headers=headers,
+                                json=None if domino_request.as_text else domino_request.body,
+                                data=domino_request.body if domino_request.as_text else None)

{domino_cli-2.2.0 → domino_cli-2.3.0}/domino_cli/core/command/DeployApplicationCommand.py

@@ -1,4 +1,5 @@
-from domino_cli.core.cli.Logging import warning
+from domino_cli.core.cli.Logging import error
+from domino_cli.core.cli.RuntimeHelper import RuntimeHelper
 from domino_cli.core.command.AbstractCommand import AbstractCommand
 from domino_cli.core.domain.CommandDescriptor import CommandDescriptor
 from domino_cli.core.domain.DominoCommand import DominoCommand
@@ -26,7 +27,9 @@ class DeployApplicationCommand(AbstractCommand):
         :param command_descriptor: CommandDescriptor object containing the command arguments
         """
         if not len(command_descriptor.arguments) == 2:
-            warning("Application name and 'latest' keyword or explicit version is required")
+            error("Application name and 'latest' keyword or explicit version is required")
+            RuntimeHelper.exit_with_error_in_cicd_mode()
+
         else:
             application: str = command_descriptor.arguments[0]
             version: str = command_descriptor.arguments[1]

domino_cli-2.3.0/domino_cli/core/command/ImportCommand.py

@@ -0,0 +1,29 @@
+from domino_cli.core.cli.Logging import error
+from domino_cli.core.cli.RuntimeHelper import RuntimeHelper
+from domino_cli.core.command.AbstractCommand import AbstractCommand
+from domino_cli.core.domain.CommandDescriptor import CommandDescriptor
+from domino_cli.core.service.DominoService import DominoService
+
+_COMMAND_NAME = "import"
+
+
+class ImportCommand(AbstractCommand):
+    """
+    Command implementation to import a deployment definition from static YAML configuration file.
+    """
+    def __init__(self, domino_service: DominoService):
+        super().__init__(_COMMAND_NAME)
+        self._domino_service = domino_service
+
+    def execute_command(self, command_descriptor: CommandDescriptor) -> None:
+
+        if len(command_descriptor.arguments) > 1:
+            error("Too many arguments, expected command usage is 'import optional/path/to/deployment.yml' (defaults to '.domino/deployment.yml' without argument)")
+            RuntimeHelper.exit_with_error_in_cicd_mode()
+            return
+
+        definition_path = command_descriptor.arguments[0] \
+            if len(command_descriptor.arguments) == 1 \
+            else None
+
+        self._domino_service.import_definition(definition_path)

{domino_cli-2.2.0 → domino_cli-2.3.0}/domino_cli/core/domain/DominoCommand.py

@@ -24,3 +24,4 @@ class DominoCommand(Enum):
     DEPLOY_LATEST = DominoRequestDescriptor(HTTPMethod.PUT, "/lifecycle/{0}/deploy")
     DEPLOY_VERSION = DominoRequestDescriptor(HTTPMethod.PUT, "/lifecycle/{0}/deploy/{1}")
     INFO = DominoRequestDescriptor(HTTPMethod.GET, "/lifecycle/{0}/info")
+    IMPORT = DominoRequestDescriptor(HTTPMethod.POST, "/deployments/import")

{domino_cli-2.2.0 → domino_cli-2.3.0}/domino_cli/core/domain/DominoRequest.py

@@ -5,10 +5,11 @@ class DominoRequest:
     """
     REST request parameter wrapper.
     """
-    def __init__(self, method: HTTPMethod, path: str, body=None, authenticated: bool = False):
+    def __init__(self, method: HTTPMethod, path: str, body=None, as_text: bool = False, authenticated: bool = False):
         self.method = method
         self.path = path
         self.body = body
+        self.as_text = as_text
         self.authenticated = authenticated
 
     def __repr__(self):

{domino_cli-2.2.0 → domino_cli-2.3.0}/domino_cli/core/service/DominoService.py

@@ -42,7 +42,39 @@ class DominoService:
             DominoService._render_response(response)
 
         except Exception as exc:
-            error("Failed to execute HTTP request {0} - reason {1}".format(domino_request, str(exc)))
+            error("Failed to execute HTTP request {0} - reason: {1}".format(domino_request, str(exc)))
+            RuntimeHelper.exit_with_error_in_cicd_mode()
+
+    def import_definition(self, optional_definition_path: str | None = None) -> None:
+        """
+        Imports the given deployment definition. If path is not provided, defaults to ".domino/deployment.yml".
+
+        :param optional_definition_path: optional path to a deployment definition
+        """
+        definition_path = optional_definition_path \
+            if optional_definition_path \
+            else ".domino/deployment.yml"
+        info(f"Requesting Domino to import deployment definition from={definition_path}")
+
+        try:
+
+            with open(definition_path, "r") as definition_file:
+                definition = definition_file.read()
+                domino_request_descriptor: DominoRequestDescriptor = DominoCommand.IMPORT.value
+                domino_request = DominoRequest(domino_request_descriptor.method, domino_request_descriptor.path_template,
+                                               body=definition, authenticated=True, as_text=True)
+                response = self._domino_client.send_command(domino_request)
+
+                if DominoService._is_successful(response):
+                    info(f"Successfully imported definition {definition_path}")
+                else:
+                    error(f"Failed to import deployment definition {definition_path} - Domino responded with {response.status_code}")
+                    RuntimeHelper.exit_with_error_in_cicd_mode()
+
+            DominoService._render_response(response)
+
+        except Exception as exc:
+            error("Failed to import definition from {0} - reason: {1}".format(definition_path, str(exc)))
             RuntimeHelper.exit_with_error_in_cicd_mode()
 
     @staticmethod
@@ -51,6 +83,12 @@ class DominoService:
 
     @staticmethod
     def _render_response(response: Response):
+
+        if len(response.content) == 0:
+            info("No further response received from Domino")
+            print()
+            return
+
         response_dict = response.json()
         info(" --- Response details ---")
         [info("{:>20}: {}".format(field, response_dict[field])) for field in response_dict]