devsecops-engine-tools 1.8.0__tar.gz → 1.8.1__tar.gz

{devsecops_engine_tools-1.8.0 → devsecops_engine_tools-1.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.8.0
+Version: 1.8.1
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

{devsecops_engine_tools-1.8.0 → devsecops_engine_tools-1.8.1}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/azure/azure_devops.py

@@ -90,7 +90,6 @@ class AzureDevops(DevopsPlatformGateway):
                 "stage": SystemVariables.System_HostType,
                 "path_directory": SystemVariables.System_DefaultWorkingDirectory,
                 "os": AgentVariables.Agent_OS,
-                "work_folder": AgentVariables.Agent_WorkFolder,
                 "temp_directory": AgentVariables.Agent_TempDirectory,
                 "agent_directory": AgentVariables.Agent_BuildDirectory,
                 "target_branch": SystemVariables.System_TargetBranchName,

{devsecops_engine_tools-1.8.0 → devsecops_engine_tools-1.8.1}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/github/github_actions.py

@@ -84,7 +84,6 @@ class GithubActions(DevopsPlatformGateway):
             "stage": SystemVariables.github_job,
             "path_directory": SystemVariables.github_workspace,
             "os": AgentVariables.runner_os,
-            "work_folder": AgentVariables.github_workspace,
             "temp_directory": AgentVariables.runner_tool_cache,
             "agent_directory": AgentVariables.runner_workspace,
             "target_branch": SystemVariables.github_event_base_ref,

{devsecops_engine_tools-1.8.0 → devsecops_engine_tools-1.8.1}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/runtime_local/runtime_local.py

@@ -61,7 +61,6 @@ class RuntimeLocal(DevopsPlatformGateway):
             "stage" : "DET_STAGE",
             "path_directory" : "DET_PATH_DIRECTORY",
             "os" : "DET_OS",
-            "work_folder" : "DET_WORK_FOLDER",
             "temp_directory" : "DET_TEMP_DIRECTORY",
             "agent_directory" : "DET_AGENT_DIRECTORY",
             "target_branch" : "DET_TARGET_BRANCH",

{devsecops_engine_tools-1.8.0 → devsecops_engine_tools-1.8.1}/devsecops_engine_tools/engine_sast/engine_secret/src/domain/usecases/secret_scan.py

@@ -34,7 +34,7 @@ class SecretScan:
         if skip_tool == False:
             self.tool_gateway.install_tool(self.devops_platform_gateway.get_variable("os"), self.devops_platform_gateway.get_variable("temp_directory"))
             files_pullrequest = self.git_gateway.get_files_pull_request(
-                self.devops_platform_gateway.get_variable("work_folder"),
+                self.devops_platform_gateway.get_variable("path_directory"),
                 self.devops_platform_gateway.get_variable("target_branch"),
                 config_tool.target_branches,
                 self.devops_platform_gateway.get_variable("source_branch"),
@@ -47,14 +47,14 @@ class SecretScan:
                     files_pullrequest,
                     config_tool.exclude_path,
                     self.devops_platform_gateway.get_variable("os"),
-                    self.devops_platform_gateway.get_variable("work_folder"),
+                    self.devops_platform_gateway.get_variable("path_directory"),
                     config_tool.number_threads,
                     self.devops_platform_gateway.get_variable("repository")
                     )
             finding_list = self.tool_deserialize.get_list_vulnerability(
                 findings,
                 self.devops_platform_gateway.get_variable("os"),
-                self.devops_platform_gateway.get_variable("work_folder")
+                self.devops_platform_gateway.get_variable("path_directory")
                 )
         return finding_list, file_path_findings
     

{devsecops_engine_tools-1.8.0 → devsecops_engine_tools-1.8.1}/devsecops_engine_tools/engine_sast/engine_secret/src/infrastructure/driven_adapters/git_cli/git_run.py

@@ -24,6 +24,21 @@ class GitRun(GitGateway):
                                repository_provider):
         try:
             if repository_provider == 'GitHub' or target_branch not in config_target_branch:
+                os.chdir(sys_working_dir)
+                subprocess.run(['git', 'checkout', '-b', source_branch, f'origin/{source_branch}'], capture_output=True, text=True)
+                env = os.environ.copy()
+                env["GIT_COMMITTER_NAME"] = "Your Name"
+                env["GIT_COMMITTER_EMAIL"] = "your.email@example.com"
+                env["GIT_AUTHOR_NAME"] = "Your Name"
+                env["GIT_AUTHOR_EMAIL"] = "your.email@example.com"
+                command = ["git", "rebase", f"origin/{target_branch}", "-X", "theirs"]
+                subprocess.run(command, env=env, capture_output=True, text=True)
+
+                diff = subprocess.run(['git', 'diff', f'origin/{target_branch}..{source_branch}', '--name-only'], capture_output=True, text=True)
+                if diff.returncode == 0:
+                    diff_files = diff.stdout.strip().split("\n")
+                    print("Pull Requests Associated Files:",diff_files)
+                    return diff_files
                 return []
             base_compact_url = (
             f"https://{collection_uri.rstrip('/').split('/')[-1].replace('.visualstudio.com','')}"

devsecops_engine_tools-1.8.1/devsecops_engine_tools/version.py

@@ -0,0 +1 @@
+version = '1.8.1'

{devsecops_engine_tools-1.8.0 → devsecops_engine_tools-1.8.1}/devsecops_engine_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devsecops-engine-tools
-Version: 1.8.0
+Version: 1.8.1
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

devsecops_engine_tools-1.8.0/devsecops_engine_tools/version.py

@@ -1 +0,0 @@
-version = '1.8.0'