diff --git a/src/sign_workflow/signer_pgp.py b/src/sign_workflow/signer_pgp.py index 8080015ccf..18675ddeac 100644 --- a/src/sign_workflow/signer_pgp.py +++ b/src/sign_workflow/signer_pgp.py @@ -9,7 +9,6 @@ import os from pathlib import Path -from git.git_repository import GitRepository from sign_workflow.signer import Signer """ @@ -19,7 +18,6 @@ class SignerPGP(Signer): - git_repo: GitRepository ACCEPTED_FILE_TYPES = [".zip", ".jar", ".war", ".pom", ".module", ".tar.gz", ".whl", ".crate", ".rpm"] diff --git a/src/sign_workflow/signer_windows.py b/src/sign_workflow/signer_windows.py index 0681367d46..30ece8eb9b 100644 --- a/src/sign_workflow/signer_windows.py +++ b/src/sign_workflow/signer_windows.py @@ -9,7 +9,6 @@ import os from pathlib import Path -from git.git_repository import GitRepository from sign_workflow.signer import Signer """ @@ -19,7 +18,6 @@ class SignerWindows(Signer): - git_repo: GitRepository ACCEPTED_FILE_TYPES = [".msi", ".exe", ".dll", ".sys", ".ps1", ".psm1", ".psd1", ".cat", ".zip"] diff --git a/tests/tests_sign_workflow/test_signer_pgp.py b/tests/tests_sign_workflow/test_signer_pgp.py index f950e4c32b..08153fa114 100644 --- a/tests/tests_sign_workflow/test_signer_pgp.py +++ b/tests/tests_sign_workflow/test_signer_pgp.py @@ -1,3 +1,4 @@ +import os import unittest from pathlib import Path from unittest.mock import MagicMock, Mock, call, patch @@ -90,12 +91,14 @@ def test_signer_verify_sig(self, mock_repo: Mock) -> None: def test_signer_sign_asc(self, mock_repo: Mock) -> None: signer = SignerPGP() signer.sign("the-jar.jar", Path("/path/"), ".asc") + command = "./opensearch-signer-client -i " + os.path.join(Path("/path/"), 'the-jar.jar') + " -o " + os.path.join(Path("/path/"), 'the-jar.jar.asc') + " -p pgp" mock_repo.assert_has_calls( - [call().execute("./opensearch-signer-client -i /path/the-jar.jar -o /path/the-jar.jar.asc -p pgp")]) + [call().execute(command)]) @patch("sign_workflow.signer.GitRepository") def test_signer_sign_sig(self, mock_repo: Mock) -> None: signer = SignerPGP() signer.sign("the-jar.jar", Path("/path/"), ".sig") + command = "./opensearch-signer-client -i " + os.path.join(Path("/path/"), 'the-jar.jar') + " -o " + os.path.join(Path("/path/"), 'the-jar.jar.sig') + " -p pgp" mock_repo.assert_has_calls( - [call().execute("./opensearch-signer-client -i /path/the-jar.jar -o /path/the-jar.jar.sig -p pgp")]) + [call().execute(command)]) diff --git a/tests/tests_sign_workflow/test_signer_windows.py b/tests/tests_sign_workflow/test_signer_windows.py index 4fc39b230f..2a1ea77013 100644 --- a/tests/tests_sign_workflow/test_signer_windows.py +++ b/tests/tests_sign_workflow/test_signer_windows.py @@ -1,3 +1,4 @@ +import os import unittest from pathlib import Path from unittest.mock import MagicMock, Mock, call, patch @@ -43,5 +44,6 @@ def test_accepted_file_types(self, git_repo: Mock) -> None: def test_signer_sign(self, mock_os_mkdir: Mock, mock_os_rename: Mock, mock_repo: Mock) -> None: signer = SignerWindows() signer.sign("the-msi.msi", Path("/path/"), ".asc") + command = "./opensearch-signer-client -i " + os.path.join(Path("/path/"), 'the-msi.msi') + " -o " + os.path.join(Path("/path/"), 'signed_the-msi.msi') + " -p windows" mock_repo.assert_has_calls( - [call().execute("./opensearch-signer-client -i /path/the-msi.msi -o /path/signed_the-msi.msi -p windows")]) + [call().execute(command)])