Get rid of GPG constants.

After the previous commit, they're not used *inside* securesystemslib. Outside, we can check [sourcegraph]. This will break a few folks, notably [in-toto] (just tests) and [DataDog/integrations-core]. But it's an easy enough fix. [sourcegraph]: https://sourcegraph.com/search?q=context:global+lang:python+securesystemslib+AND+%28HAVE_GPG+OR+GPG_COMMAND+OR+GPG_VERSION_COMMAND+OR+GPG_SIGN_COMMAND+OR+GPG_EXPORT_PUBKEY_COMMAND%29&patternType=standard [in-toto]: https://github.com/in-toto/in-toto/blob/c1a5e6b7468ccc74d7e79bc8bec2caf96ddb31f1/tests/test_verifylib.py#L58 [DataDog/integrations-core]: https://github.com/DataDog/integrations-core/blob/0e20752603f0d43db44090c8777d4ea69ca7111a/datadog_checks_dev/datadog_checks/dev/tooling/signing.py#L13 Signed-off-by: Zachary Newman <[email protected]>
znewman01 · Oct 13, 2022 · c879125 · c879125
1 parent 19ba269
commit c879125
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 71 deletions.
diff --git a/securesystemslib/gpg/_lazy.py b/securesystemslib/gpg/_lazy.py
diff --git a/securesystemslib/gpg/constants.py b/securesystemslib/gpg/constants.py
@@ -19,8 +19,6 @@
 import logging
 import os
 
-import securesystemslib.gpg._lazy as lazy
-
 from securesystemslib import process
 
 log = logging.getLogger(__name__)
@@ -55,23 +53,14 @@ def gpg_command() -> str:
     return GPG1_COMMAND
   return ""
 
-GPG_COMMAND = lazy.wrap_thunk(gpg_command)
-
-
 def have_gpg() -> bool:
   """Returns True if a gpg_command is available."""
   return bool(gpg_command())
 
-HAVE_GPG = lazy.wrap_thunk(have_gpg)
-
-
 def gpg_version_command() -> str:
   """Returns the command to get the current GPG version."""
   return f"{gpg_command()} --version"
 
-GPG_VERSION_COMMAND = lazy.wrap_thunk(gpg_version_command)
-
-
 FULLY_SUPPORTED_MIN_VERSION = "2.1.0"
 NO_GPG_MSG = (
   f"GPG support requires a GPG client. 'gpg2' or 'gpg' with version "
@@ -82,17 +71,10 @@ def gpg_sign_command(keyarg: str, homearg: str) -> str:
   """Returns the command to use GPG to sign STDIN."""
   return f"{gpg_command()} --detach-sign --digest-algo SHA256 {keyarg} {homearg}"
 
-GPG_SIGN_COMMAND = lazy.wrap_thunk(lambda: gpg_sign_command("{keyarg}", "{homearg}"))
-
-
 def gpg_export_pubkey_command(homearg: str, keyid: str):
   """Returns the GPG command to export a public key."""
   return f"{gpg_command()} {homearg} --export {keyid}"
 
-GPG_EXPORT_PUBKEY_COMMAND = lazy.wrap_thunk(
-  lambda: gpg_export_pubkey_command("{homearg}", "{keyid}")
-)
-
 # See RFC4880 section 4.3. Packet Tags for a list of all packet types The
 # relevant packets defined below are described in sections 5.2 (signature),
 # 5.5.1.1 (primary pubkey) and 5.5.1.2 (pub subkey), 5.12 (user id) and 5.13