Merge ~pappacena/launchpad:renaming-archive-signing-key into launchpad:master

[Thiago F. Pappacena]

Renaming (I)ArchiveSigningKey to (I)ArchiveGPGSigningKey

Currently, the class named ArchiveSigningKey only deals with GPG signing, wereas package signing mechanisms are done by another class.

As a path to migrate the signing to a new service, we are planning to have a database entity named ArchiveSigningKey. So, to make the code more readable, we are changing the current ArchiveSigningKey to a more specific name.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/archivepublisher/archivesigningkey.py b/lib/lp/archivepublisher/archivegpgsigningkey.py
similarity index 94%
rename from lib/lp/archivepublisher/archivesigningkey.py
rename to lib/lp/archivepublisher/archivegpgsigningkey.py
index cb8737b..2b14365 100644
--- a/lib/lp/archivepublisher/archivesigningkey.py
+++ b/lib/lp/archivepublisher/archivegpgsigningkey.py
@@ -1,12 +1,12 @@
 # Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""ArchiveSigningKey implementation."""
+"""ArchiveGPGSigningKey implementation."""
 
 __metaclass__ = type
 
 __all__ = [
-    'ArchiveSigningKey',
+    'ArchiveGPGSigningKey',
     'SignableArchive',
     'SigningMode',
     ]
@@ -29,9 +29,9 @@ from zope.security.proxy import (
 
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.archivepublisher.config import getPubConfig
-from lp.archivepublisher.interfaces.archivesigningkey import (
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
     CannotSignArchive,
-    IArchiveSigningKey,
+    IArchiveGPGSigningKey,
     ISignableArchive,
     )
 from lp.archivepublisher.run_parts import (
@@ -176,18 +176,18 @@ class SignableArchive:
             [(path, "%s.gpg" % path, SigningMode.DETACHED, suite)], log=log)
 
 
-@implementer(IArchiveSigningKey)
-class ArchiveSigningKey(SignableArchive):
+@implementer(IArchiveGPGSigningKey)
+class ArchiveGPGSigningKey(SignableArchive):
     """`IArchive` adapter for manipulating its GPG key."""
 
     def getPathForSecretKey(self, key):
-        """See `IArchiveSigningKey`."""
+        """See `IArchiveGPGSigningKey`."""
         return os.path.join(
             config.personalpackagearchive.signing_keys_root,
             "%s.gpg" % key.fingerprint)
 
     def exportSecretKey(self, key):
-        """See `IArchiveSigningKey`."""
+        """See `IArchiveGPGSigningKey`."""
         assert key.secret, "Only secret keys should be exported."
         export_path = self.getPathForSecretKey(key)
 
@@ -198,7 +198,7 @@ class ArchiveSigningKey(SignableArchive):
             export_file.write(key.export())
 
     def generateSigningKey(self):
-        """See `IArchiveSigningKey`."""
+        """See `IArchiveGPGSigningKey`."""
         assert self.archive.signing_key is None, (
             "Cannot override signing_keys.")
 
@@ -208,7 +208,7 @@ class ArchiveSigningKey(SignableArchive):
         default_ppa = self.archive.owner.archive
         if self.archive != default_ppa:
             if default_ppa.signing_key is None:
-                IArchiveSigningKey(default_ppa).generateSigningKey()
+                IArchiveGPGSigningKey(default_ppa).generateSigningKey()
             key = default_ppa.signing_key
             self.archive.signing_key_owner = key.owner
             self.archive.signing_key_fingerprint = key.fingerprint
@@ -221,7 +221,7 @@ class ArchiveSigningKey(SignableArchive):
         self._setupSigningKey(secret_key)
 
     def setSigningKey(self, key_path, async_keyserver=False):
-        """See `IArchiveSigningKey`."""
+        """See `IArchiveGPGSigningKey`."""
         assert self.archive.signing_key is None, (
             "Cannot override signing_keys.")
         assert os.path.exists(key_path), (
diff --git a/lib/lp/archivepublisher/configure.zcml b/lib/lp/archivepublisher/configure.zcml
index 99bdcb4..f52d4ff 100644
--- a/lib/lp/archivepublisher/configure.zcml
+++ b/lib/lp/archivepublisher/configure.zcml
@@ -10,15 +10,15 @@
     xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
     i18n_domain="launchpad">
 
-    <!-- ArchiveSigningKey -->
-    <class class="lp.archivepublisher.archivesigningkey.ArchiveSigningKey">
-        <allow interface="lp.archivepublisher.interfaces.archivesigningkey.IArchiveSigningKey"/>
+    <!-- ArchiveGPGSigningKey -->
+    <class class="lp.archivepublisher.archivegpgsigningkey.ArchiveGPGSigningKey">
+        <allow interface="lp.archivepublisher.interfaces.archivegpgsigningkey.IArchiveGPGSigningKey"/>
     </class>
 
     <adapter
         for="lp.soyuz.interfaces.archive.IArchive"
-        provides="lp.archivepublisher.interfaces.archivesigningkey.IArchiveSigningKey"
-        factory="lp.archivepublisher.archivesigningkey.ArchiveSigningKey"
+        provides="lp.archivepublisher.interfaces.archivegpgsigningkey.IArchiveGPGSigningKey"
+        factory="lp.archivepublisher.archivegpgsigningkey.ArchiveGPGSigningKey"
         />
 
     <!-- PublisherConfig -->
diff --git a/lib/lp/archivepublisher/customupload.py b/lib/lp/archivepublisher/customupload.py
index 7db20cb..0c6a2c9 100644
--- a/lib/lp/archivepublisher/customupload.py
+++ b/lib/lp/archivepublisher/customupload.py
@@ -27,7 +27,7 @@ from lp.archivepublisher.debversion import (
     Version as make_version,
     VersionError,
     )
-from lp.archivepublisher.interfaces.archivesigningkey import ISignableArchive
+from lp.archivepublisher.interfaces.archivegpgsigningkey import ISignableArchive
 from lp.services.librarian.utils import copy_and_close
 from lp.soyuz.interfaces.queue import (
     CustomUploadError,
diff --git a/lib/lp/archivepublisher/interfaces/archivesigningkey.py b/lib/lp/archivepublisher/interfaces/archivegpgsigningkey.py
similarity index 95%
rename from lib/lp/archivepublisher/interfaces/archivesigningkey.py
rename to lib/lp/archivepublisher/interfaces/archivegpgsigningkey.py
index 01e4a50..85d3bfb 100644
--- a/lib/lp/archivepublisher/interfaces/archivesigningkey.py
+++ b/lib/lp/archivepublisher/interfaces/archivegpgsigningkey.py
@@ -1,13 +1,13 @@
 # Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""ArchiveSigningKey interface."""
+"""ArchiveGPGSigningKey interface."""
 
 __metaclass__ = type
 
 __all__ = [
     'CannotSignArchive',
-    'IArchiveSigningKey',
+    'IArchiveGPGSigningKey',
     'ISignableArchive',
     ]
 
@@ -67,8 +67,8 @@ class ISignableArchive(Interface):
         """
 
 
-class IArchiveSigningKey(ISignableArchive):
-    """`ArchiveSigningKey` interface.
+class IArchiveGPGSigningKey(ISignableArchive):
+    """`ArchiveGPGSigningKey` interface.
 
     `IArchive` adapter for operations using its 'signing_key'.
 
diff --git a/lib/lp/archivepublisher/publishing.py b/lib/lp/archivepublisher/publishing.py
index 523c51c..3365c68 100644
--- a/lib/lp/archivepublisher/publishing.py
+++ b/lib/lp/archivepublisher/publishing.py
@@ -63,7 +63,7 @@ from lp.archivepublisher.indices import (
     build_source_stanza_fields,
     build_translations_stanza_fields,
     )
-from lp.archivepublisher.interfaces.archivesigningkey import ISignableArchive
+from lp.archivepublisher.interfaces.archivegpgsigningkey import ISignableArchive
 from lp.archivepublisher.model.ftparchive import FTPArchiveHandler
 from lp.archivepublisher.utils import (
     get_ppa_reference,
diff --git a/lib/lp/archivepublisher/tests/archive-signing.txt b/lib/lp/archivepublisher/tests/archive-signing.txt
index 853398e..f2dfca9 100644
--- a/lib/lp/archivepublisher/tests/archive-signing.txt
+++ b/lib/lp/archivepublisher/tests/archive-signing.txt
@@ -127,10 +127,10 @@ location defined by the system configuration.
     /var/tmp/ppa-signing-keys.test
 
 In order to manipulate 'signing_keys' securily the target archive
-object has to be adapted to `IArchiveSigningKey`.
+object has to be adapted to `IArchiveGPGSigningKey`.
 
-    >>> from lp.archivepublisher.interfaces.archivesigningkey import (
-    ...     IArchiveSigningKey)
+    >>> from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    ...     IArchiveGPGSigningKey)
 
 We will adapt Celso's PPA after modifing its distribution to allow
 proper publish configuration based on the sampledata.
@@ -142,15 +142,15 @@ proper publish configuration based on the sampledata.
     >>> cprov.archive.distribution = getUtility(
     ...     IDistributionSet).getByName('ubuntutest')
 
-    >>> archive_signing_key = IArchiveSigningKey(cprov.archive)
+    >>> archive_signing_key = IArchiveGPGSigningKey(cprov.archive)
 
-Once adapted `IArchiveSigningKey` is properly implemented.
+Once adapted `IArchiveGPGSigningKey` is properly implemented.
 
     >>> from zope.interface.verify import verifyObject
-    >>> verifyObject(IArchiveSigningKey, archive_signing_key)
+    >>> verifyObject(IArchiveGPGSigningKey, archive_signing_key)
     True
 
-`IArchiveSigningKey` object contain the corresponding IArchive
+`IArchiveGPGSigningKey` object contain the corresponding IArchive
 object.
 
     >>> print archive_signing_key.archive.displayname
@@ -185,7 +185,7 @@ in the expected path.
     ...     archive_signing_key.getPathForSecretKey(mock_key)).read()
     Secret True
 
-At this point we can use the `IArchiveSigningKey` to generate and
+At this point we can use the `IArchiveGPGSigningKey` to generate and
 assign a real signing_key, although this procedure depends heavily on
 machine entropy and ends up being very slow in our test machine.
 
@@ -193,7 +193,7 @@ machine entropy and ends up being very slow in our test machine.
 
 We will use a pre-existing key in our tree which is virtually
 identical to the one that would be generated. The key will be 'set' by
-using a method `IArchiveSigningKey` skips the key generation but uses
+using a method `IArchiveGPGSigningKey` skips the key generation but uses
 exactly the same procedure for setting the signing_key information.
 
     >>> import os
@@ -300,7 +300,7 @@ Default PPAs are always created first and thus get their keys generated
 before the named-ppa for the same owner. We submit the named-ppa to
 the key generation procedure, as it would be normally in production.
 
-    >>> named_ppa_signing_key = IArchiveSigningKey(named_ppa)
+    >>> named_ppa_signing_key = IArchiveGPGSigningKey(named_ppa)
     >>> named_ppa_signing_key.generateSigningKey()
 
 Instead of generating a new key, the signing key from the default ppa
@@ -348,7 +348,7 @@ in the default PPA context then propagated to the named-ppa. The key is
 named after the user, even if the default PPA name is something different.
 
     >>> cprov.display_name = "Not Celso Providelo"
-    >>> named_ppa_signing_key = IArchiveSigningKey(named_ppa)
+    >>> named_ppa_signing_key = IArchiveGPGSigningKey(named_ppa)
     >>> named_ppa_signing_key.generateSigningKey()
     Generating: Launchpad PPA for Not Celso Providelo
 
@@ -366,7 +366,7 @@ Restore the original functionality of GPGHandler.
 Signing PPA repository
 ----------------------
 
-`IArchiveSigningKey.signRepository` can be user to sign repositories
+`IArchiveGPGSigningKey.signRepository` can be user to sign repositories
 for archive which already contains a 'signing_key'.
 
 Celso's default PPA will uses the testing signing key.
diff --git a/lib/lp/archivepublisher/tests/test_archivesigningkey.py b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
similarity index 95%
rename from lib/lp/archivepublisher/tests/test_archivesigningkey.py
rename to lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
index a394823..47600b6 100644
--- a/lib/lp/archivepublisher/tests/test_archivesigningkey.py
+++ b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
@@ -1,7 +1,7 @@
 # Copyright 2016-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Test ArchiveSigningKey."""
+"""Test ArchiveGPGSigningKey."""
 
 from __future__ import absolute_import, print_function, unicode_literals
 
@@ -16,8 +16,8 @@ from twisted.internet import defer
 from zope.component import getUtility
 
 from lp.archivepublisher.config import getPubConfig
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     ISignableArchive,
     )
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
@@ -51,7 +51,7 @@ class TestSignableArchiveWithSigningKey(TestCaseWithFactory):
         with InProcessKeyServerFixture() as keyserver:
             yield keyserver.start()
             key_path = os.path.join(gpgkeysdir, '[e-mail]')
-            yield IArchiveSigningKey(self.archive).setSigningKey(
+            yield IArchiveGPGSigningKey(self.archive).setSigningKey(
                 key_path, async_keyserver=True)
 
     def test_signFile_absolute_within_archive(self):
diff --git a/lib/lp/archivepublisher/tests/test_customupload.py b/lib/lp/archivepublisher/tests/test_customupload.py
index a5f8a89..43a88db 100644
--- a/lib/lp/archivepublisher/tests/test_customupload.py
+++ b/lib/lp/archivepublisher/tests/test_customupload.py
@@ -33,8 +33,8 @@ from lp.archivepublisher.customupload import (
     CustomUploadTarballBadSymLink,
     CustomUploadTarballInvalidFileType,
     )
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
 from lp.archivepublisher.tests.test_run_parts import RunPartsMixin
@@ -260,7 +260,7 @@ class TestSigning(TestCaseWithFactory, RunPartsMixin):
         self.assertIsNone(self.archive.signing_key)
         self.useFixture(InProcessKeyServerFixture()).start()
         key_path = os.path.join(gpgkeysdir, '[e-mail]')
-        yield IArchiveSigningKey(self.archive).setSigningKey(
+        yield IArchiveGPGSigningKey(self.archive).setSigningKey(
             key_path, async_keyserver=True)
         self.assertIsNotNone(self.archive.signing_key)
         custom_processor = CustomUpload()
@@ -280,7 +280,8 @@ class TestSigning(TestCaseWithFactory, RunPartsMixin):
         write_file(filename, b"contents")
         self.assertIsNone(self.archive.signing_key)
         run_parts_fixture = self.useFixture(MonkeyPatch(
-            "lp.archivepublisher.archivesigningkey.run_parts", FakeMethod()))
+            "lp.archivepublisher.archivegpgsigningkey.run_parts",
+            FakeMethod()))
         custom_processor = CustomUpload()
         custom_processor.sign(self.archive, "suite", filename)
         args, kwargs = run_parts_fixture.new_value.calls[0]
diff --git a/lib/lp/archivepublisher/tests/test_publishdistro.py b/lib/lp/archivepublisher/tests/test_publishdistro.py
index d81421e..3d6d699 100644
--- a/lib/lp/archivepublisher/tests/test_publishdistro.py
+++ b/lib/lp/archivepublisher/tests/test_publishdistro.py
@@ -24,8 +24,8 @@ from zope.security.proxy import removeSecurityProxy
 
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.archivepublisher.config import getPubConfig
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
 from lp.archivepublisher.publishing import Publisher
@@ -256,7 +256,7 @@ class TestPublishDistro(TestNativePublishingBase):
         self.setUpRequireSigningKeys()
         yield self.useFixture(InProcessKeyServerFixture()).start()
         key_path = os.path.join(gpgkeysdir, '[e-mail]')
-        yield IArchiveSigningKey(cprov.archive).setSigningKey(
+        yield IArchiveGPGSigningKey(cprov.archive).setSigningKey(
             key_path, async_keyserver=True)
         name16.archive.signing_key_owner = cprov.archive.signing_key_owner
         name16.archive.signing_key_fingerprint = (
@@ -308,7 +308,7 @@ class TestPublishDistro(TestNativePublishingBase):
         self.setUpRequireSigningKeys()
         yield self.useFixture(InProcessKeyServerFixture()).start()
         key_path = os.path.join(gpgkeysdir, '[e-mail]')
-        yield IArchiveSigningKey(private_ppa).setSigningKey(
+        yield IArchiveGPGSigningKey(private_ppa).setSigningKey(
             key_path, async_keyserver=True)
 
         # Try a plain PPA run, to ensure the private one is NOT published.
@@ -413,7 +413,7 @@ class TestPublishDistro(TestNativePublishingBase):
         self.setUpRequireSigningKeys()
         yield self.useFixture(InProcessKeyServerFixture()).start()
         key_path = os.path.join(gpgkeysdir, '[e-mail]')
-        yield IArchiveSigningKey(archive).setSigningKey(
+        yield IArchiveGPGSigningKey(archive).setSigningKey(
             key_path, async_keyserver=True)
 
         self.layer.txn.commit()
diff --git a/lib/lp/archivepublisher/tests/test_publisher.py b/lib/lp/archivepublisher/tests/test_publisher.py
index ec60e1f..8fd5616 100644
--- a/lib/lp/archivepublisher/tests/test_publisher.py
+++ b/lib/lp/archivepublisher/tests/test_publisher.py
@@ -67,8 +67,8 @@ from zope.security.proxy import removeSecurityProxy
 
 from lp.archivepublisher.config import getPubConfig
 from lp.archivepublisher.diskpool import DiskPool
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.archivepublisher.publishing import (
     BY_HASH_STAY_OF_EXECUTION,
@@ -3211,7 +3211,7 @@ class TestPublisherRepositorySignatures(
 
         # Set a signing key for Celso's PPA.
         key_path = os.path.join(gpgkeysdir, '[e-mail]')
-        yield IArchiveSigningKey(cprov.archive).setSigningKey(
+        yield IArchiveGPGSigningKey(cprov.archive).setSigningKey(
             key_path, async_keyserver=True)
         self.assertTrue(cprov.archive.signing_key is not None)
 
diff --git a/lib/lp/archivepublisher/tests/test_signing.py b/lib/lp/archivepublisher/tests/test_signing.py
index 3966362..efe4ae6 100644
--- a/lib/lp/archivepublisher/tests/test_signing.py
+++ b/lib/lp/archivepublisher/tests/test_signing.py
@@ -34,8 +34,8 @@ from lp.archivepublisher.customupload import (
     CustomUploadAlreadyExists,
     CustomUploadBadUmask,
     )
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
 from lp.archivepublisher.signing import (
@@ -212,7 +212,7 @@ class TestSigningHelpers(TestCaseWithFactory):
         with InProcessKeyServerFixture() as keyserver:
             yield keyserver.start()
             key_path = os.path.join(gpgkeysdir, '[e-mail]')
-            yield IArchiveSigningKey(self.archive).setSigningKey(
+            yield IArchiveGPGSigningKey(self.archive).setSigningKey(
                 key_path, async_keyserver=True)
 
     def setUpUefiKeys(self, create=True, series=None):
@@ -1356,7 +1356,8 @@ class TestSigning(RunPartsMixin, TestSigningHelpers):
         # run_parts is called.
         self.enableRunParts(distribution_name=self.distro.name)
         run_parts_fixture = self.useFixture(MonkeyPatch(
-            "lp.archivepublisher.archivesigningkey.run_parts", FakeMethod()))
+            "lp.archivepublisher.archivegpgsigningkey.run_parts",
+            FakeMethod()))
         self.setUpUefiKeys()
         self.setUpKmodKeys()
         self.setUpOpalKeys()
diff --git a/lib/lp/code/model/tests/test_recipebuilder.py b/lib/lp/code/model/tests/test_recipebuilder.py
index fd96be5..c07fce7 100644
--- a/lib/lp/code/model/tests/test_recipebuilder.py
+++ b/lib/lp/code/model/tests/test_recipebuilder.py
@@ -19,8 +19,8 @@ from twisted.trial.unittest import TestCase as TrialTestCase
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interactor import BuilderInteractor
@@ -347,7 +347,7 @@ class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
         yield self.useFixture(InProcessKeyServerFixture()).start()
         archive = self.factory.makeArchive()
         key_path = os.path.join(gpgkeysdir, "[e-mail]")
-        yield IArchiveSigningKey(archive).setSigningKey(
+        yield IArchiveGPGSigningKey(archive).setSigningKey(
             key_path, async_keyserver=True)
         job = self.makeJob(archive=archive, with_builder=True)
         distroarchseries = job.build.distroseries.architectures[0]
diff --git a/lib/lp/snappy/tests/test_snapbuildbehaviour.py b/lib/lp/snappy/tests/test_snapbuildbehaviour.py
index 3a506c5..b397bba 100644
--- a/lib/lp/snappy/tests/test_snapbuildbehaviour.py
+++ b/lib/lp/snappy/tests/test_snapbuildbehaviour.py
@@ -54,8 +54,8 @@ from zope.publisher.xmlrpc import TestRequest
 from zope.security.proxy import removeSecurityProxy
 
 from lp.app.enums import InformationType
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.buildmaster.enums import (
     BuildBaseImageType,
@@ -649,7 +649,7 @@ class TestAsyncSnapBuildBehaviour(TestSnapBuildBehaviourBase):
         yield self.useFixture(InProcessKeyServerFixture()).start()
         archive = self.factory.makeArchive()
         key_path = os.path.join(gpgkeysdir, "[e-mail]")
-        yield IArchiveSigningKey(archive).setSigningKey(
+        yield IArchiveGPGSigningKey(archive).setSigningKey(
             key_path, async_keyserver=True)
         job = self.makeJob(archive=archive)
         self.factory.makeBinaryPackagePublishingHistory(
diff --git a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
index dbb2343..7cd3cad 100644
--- a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
+++ b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
@@ -20,8 +20,8 @@ from twisted.internet.threads import deferToThread
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
@@ -174,7 +174,7 @@ class TestSourcesList(TestCaseWithFactory):
         archive = self.factory.makeArchive(distribution=self.ubuntu, **kwargs)
         if signing_key_name is not None:
             key_path = os.path.join(gpgkeysdir, "%s.sec" % signing_key_name)
-            yield IArchiveSigningKey(archive).setSigningKey(
+            yield IArchiveGPGSigningKey(archive).setSigningKey(
                 key_path, async_keyserver=True)
         if publish_binary:
             self.publisher.getPubBinaries(
diff --git a/lib/lp/soyuz/scripts/ppakeygenerator.py b/lib/lp/soyuz/scripts/ppakeygenerator.py
index 00bebac..c1aa3f6 100644
--- a/lib/lp/soyuz/scripts/ppakeygenerator.py
+++ b/lib/lp/soyuz/scripts/ppakeygenerator.py
@@ -7,8 +7,8 @@ __all__ = [
 
 from zope.component import getUtility
 
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.services.scripts.base import (
     LaunchpadCronScript,
@@ -32,7 +32,7 @@ class PPAKeyGenerator(LaunchpadCronScript):
         self.logger.info(
             "Generating signing key for %s (%s)" %
             (archive.reference, archive.displayname))
-        archive_signing_key = IArchiveSigningKey(archive)
+        archive_signing_key = IArchiveGPGSigningKey(archive)
         archive_signing_key.generateSigningKey()
         self.logger.info("Key %s" % archive.signing_key.fingerprint)
 
diff --git a/lib/lp/soyuz/tests/test_archive.py b/lib/lp/soyuz/tests/test_archive.py
index 20b7b2f..8660e70 100644
--- a/lib/lp/soyuz/tests/test_archive.py
+++ b/lib/lp/soyuz/tests/test_archive.py
@@ -37,8 +37,8 @@ from zope.security.proxy import removeSecurityProxy
 
 from lp.app.errors import NotFoundError
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.buildmaster.enums import (
     BuildQueueStatus,
@@ -1827,7 +1827,7 @@ class TestArchiveDependencies(TestCaseWithFactory):
         with InProcessKeyServerFixture() as keyserver:
             yield keyserver.start()
             key_path = os.path.join(gpgkeysdir, '[e-mail]')
-            yield IArchiveSigningKey(p3a).setSigningKey(
+            yield IArchiveGPGSigningKey(p3a).setSigningKey(
                 key_path, async_keyserver=True)
         dependency = self.factory.makeArchive(
             name='dependency', private=True, owner=p3a.owner)
diff --git a/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py b/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
index 61e4847..cc08bc5 100644
--- a/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
+++ b/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
@@ -22,8 +22,8 @@ from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
 from lp.archivepublisher.diskpool import poolify
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.buildmaster.enums import (
     BuilderCleanStatus,
@@ -354,7 +354,7 @@ class TestBinaryBuildPackageBehaviour(TestCaseWithFactory):
         archive = self.factory.makeArchive()
         builder = self.factory.makeBuilder()
         key_path = os.path.join(gpgkeysdir, "[e-mail]")
-        yield IArchiveSigningKey(archive).setSigningKey(
+        yield IArchiveGPGSigningKey(archive).setSigningKey(
             key_path, async_keyserver=True)
         build = self.factory.makeBinaryPackageBuild(archive=archive)
         self.factory.makeBinaryPackagePublishingHistory(
diff --git a/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py b/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py
index 29e697e..95e9694 100644
--- a/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py
+++ b/lib/lp/soyuz/tests/test_livefsbuildbehaviour.py
@@ -20,8 +20,8 @@ from twisted.trial.unittest import TestCase as TrialTestCase
 from zope.component import getUtility
 from zope.security.proxy import Proxy
 
-from lp.archivepublisher.interfaces.archivesigningkey import (
-    IArchiveSigningKey,
+from lp.archivepublisher.interfaces.archivegpgsigningkey import (
+    IArchiveGPGSigningKey,
     )
 from lp.buildmaster.enums import (
     BuildBaseImageType,
@@ -247,7 +247,7 @@ class TestAsyncLiveFSBuildBehaviour(TestLiveFSBuildBehaviourBase):
         yield self.useFixture(InProcessKeyServerFixture()).start()
         archive = self.factory.makeArchive()
         key_path = os.path.join(gpgkeysdir, "[e-mail]")
-        yield IArchiveSigningKey(archive).setSigningKey(
+        yield IArchiveGPGSigningKey(archive).setSigningKey(
             key_path, async_keyserver=True)
         job = self.makeJob(archive=archive, with_builder=True)
         self.factory.makeBinaryPackagePublishingHistory(