qubership-pipelines-common-library 0.1.6__tar.gz → 0.1.8__tar.gz

{qubership_pipelines_common_library-0.1.6 → qubership_pipelines_common_library-0.1.8}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.3
 Name: qubership-pipelines-common-library
-Version: 0.1.6
+Version: 0.1.8
 Summary: Qubership Pipelines common library
+License: Apache-2.0
 Author: Igor Lebedev
 Author-email: lebedev.light@gmail.com
 Requires-Python: >=3.11,<4.0
+Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{qubership_pipelines_common_library-0.1.6 → qubership_pipelines_common_library-0.1.8}/pyproject.toml

@@ -1,9 +1,10 @@
 [tool.poetry]
 name = "qubership-pipelines-common-library"
-version = "0.1.6"
+version = "0.1.8"
 description = "Qubership Pipelines common library"
 authors = ["Igor Lebedev <lebedev.light@gmail.com>"]
 readme = "README.md"
+license = "Apache-2.0"
 packages = [{include = "qubership_pipelines_common_library"}]
 
 [tool.poetry.dependencies]

{qubership_pipelines_common_library-0.1.6 → qubership_pipelines_common_library-0.1.8}/qubership_pipelines_common_library/v1/execution/exec_command.py

@@ -25,11 +25,11 @@ class ExecutionCommand:
     SUCCESS_MSG = "Status: SUCCESS"
     FAILURE_MSG = "Status: FAILURE"
 
-    def __init__(self, context_path: str = None, input_params: dict = None, folder_path: str = None,
-                 parent_context_to_reuse: ExecutionContext = None):
+    def __init__(self, context_path: str = None, input_params: dict = None, input_params_secure: dict = None,
+                 folder_path: str = None, parent_context_to_reuse: ExecutionContext = None):
         if not context_path:
-            context_path = create_execution_context(input_params=input_params, folder_path=folder_path,
-                                                    parent_context_to_reuse=parent_context_to_reuse)
+            context_path = create_execution_context(input_params=input_params, input_params_secure=input_params_secure,
+                                                    folder_path=folder_path, parent_context_to_reuse=parent_context_to_reuse)
         self.context = ExecutionContext(context_path)
 
     def run(self):

{qubership_pipelines_common_library-0.1.6 → qubership_pipelines_common_library-0.1.8}/qubership_pipelines_common_library/v1/git_client.py

@@ -60,6 +60,10 @@ class GitClient:
         )
 
     def commit_and_push(self, commit_message: str):
+        self.commit(commit_message)
+        self.push()
+
+    def commit(self, commit_message: str):
         """"""
         if not self._is_cloned():
             raise Exception("Cannot commit without preliminary cloning")
@@ -73,7 +77,20 @@ class GitClient:
             self.repo.config_writer().set_value("user", "name", self.username).release()
             self.repo.config_writer().set_value("user", "email", self.email).release()
             self.repo.git.commit('-a', '-m', commit_message)
-            self.repo.git.push(self.repo.remote().name, self.repo.active_branch.name)
+
+    def push(self):
+        """"""
+        if not self._is_cloned():
+            raise Exception("Cannot push without preliminary cloning")
+        logging.debug(f"Push into remote = {self.repo.remote().name} and branch = {self.repo.active_branch.name}")
+        self.repo.git.push(self.repo.remote().name, self.repo.active_branch.name)
+
+    def pull(self, **kwargs):
+        """"""
+        if not self._is_cloned():
+            raise Exception("Cannot pull without preliminary cloning")
+        logging.debug(f"Pull with options: {kwargs}")
+        self.repo.git.pull(**kwargs)
 
     def get_file_content_utf8(self, relative_path: str):
         """"""

{qubership_pipelines_common_library-0.1.6 → qubership_pipelines_common_library-0.1.8}/qubership_pipelines_common_library/v1/utils/utils_context.py

@@ -38,9 +38,11 @@ def init_context(context_path):
     UtilsFile.write_yaml(context_path, context)
 
 
-def create_execution_context(input_params: dict = None, folder_path: str = None, parent_context_to_reuse: ExecutionContext = None):
+def create_execution_context(input_params: dict = None, input_params_secure: dict = None, folder_path: str = None,
+                             parent_context_to_reuse: ExecutionContext = None):
     """params:
         input_params: dict (will be merged into created input params)
+        input_params_secure: dict (will be merged into created secure input params)
         folder_path: str (optional, will generate new temp)
         parent_context_to_reuse: ExecutionContext (optional, to propagate existing input params)
     """
@@ -71,6 +73,7 @@ def create_execution_context(input_params: dict = None, folder_path: str = None,
 
     input_params_file.content = recursive_merge(input_params_file.content, input_params)
     input_params_file.save(context_file.get("paths.input.params"))
+    input_params_secure_file.content = recursive_merge(input_params_secure_file.content, input_params_secure)
     input_params_secure_file.save(context_file.get("paths.input.params_secure"))
 
     ExecutionContextFile().init_params().save(context_file.get("paths.output.params"))