Merge lp:~wgrant/launchpad/gpgkey-fks-final-semi-final into lp:launchpad

[William Grant]

Stop setting the old GPGKey foreign key columns.

Stop setting the old GPGKey foreign key columns.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lib/lp/archivepublisher/archivesigningkey.py'
--- lib/lp/archivepublisher/archivesigningkey.py	2016-03-02 14:13:39 +0000
+++ lib/lp/archivepublisher/archivesigningkey.py	2016-03-16 11:37:15 +0000
@@ -72,7 +72,6 @@
             if default_ppa.signing_key is None:
                 IArchiveSigningKey(default_ppa).generateSigningKey()
             key = default_ppa.signing_key
-            self.archive._signing_key = key
             self.archive.signing_key_owner = key.owner
             self.archive.signing_key_fingerprint = key.fingerprint
             del get_property_cache(self.archive).signing_key
@@ -113,7 +112,6 @@
         key = getUtility(IGPGKeySet).new(
             key_owner, pub_key.keyid, pub_key.fingerprint, pub_key.keysize,
             algorithm, active=True, can_encrypt=pub_key.can_encrypt)
-        self.archive._signing_key = key
         self.archive.signing_key_owner = key.owner
         self.archive.signing_key_fingerprint = key.fingerprint
         del get_property_cache(self.archive).signing_key
 
=== modified file 'lib/lp/registry/model/codeofconduct.py'
--- lib/lp/registry/model/codeofconduct.py	2016-03-02 14:13:39 +0000
+++ lib/lp/registry/model/codeofconduct.py	2016-03-16 11:37:15 +0000
@@ -181,8 +181,6 @@
 
     signedcode = StringCol(dbName='signedcode', notNull=False, default=None)
 
-    _signingkey = ForeignKey(foreignKey="GPGKey", dbName="signingkey",
-                            notNull=False, default=None)
     signing_key_fingerprint = Unicode()
 
     datecreated = UtcDateTimeCol(dbName='datecreated', notNull=True,
@@ -315,7 +313,7 @@
 
         # Store the signature
         signed = SignedCodeOfConduct(
-            owner=user, _signingkey=gpg,
+            owner=user,
             signing_key_fingerprint=gpg.fingerprint if gpg else None,
             signedcode=signedcode, active=True)
 
 
=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2016-03-02 14:13:39 +0000
+++ lib/lp/registry/model/distroseries.py	2016-03-16 11:37:15 +0000
@@ -1164,7 +1164,6 @@
             architecturehintlist=architecturehintlist, component=component,
             creator=creator, urgency=urgency, changelog=changelog,
             changelog_entry=changelog_entry, dsc=dsc,
-            _dscsigningkey=dscsigningkey,
             signing_key_owner=dscsigningkey.owner if dscsigningkey else None,
             signing_key_fingerprint=(
                 dscsigningkey.fingerprint if dscsigningkey else None),
@@ -1353,7 +1352,6 @@
         return PackageUpload(
             distroseries=self, status=PackageUploadStatus.NEW,
             pocket=pocket, archive=archive, changesfile=changes_file_alias,
-            _signing_key=signing_key,
             signing_key_owner=signing_key.owner if signing_key else None,
             signing_key_fingerprint=(
                 signing_key.fingerprint if signing_key else None),
 
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2016-03-02 14:13:39 +0000
+++ lib/lp/soyuz/configure.zcml	2016-03-16 11:37:15 +0000
@@ -390,7 +390,7 @@
         <require
             permission="launchpad.InternalScriptsOnly"
             attributes="signing_key_owner"
-            set_attributes="distribution _signing_key signing_key_owner
+            set_attributes="distribution signing_key_owner
                             signing_key_fingerprint"/>
     </class>
     <adapter
 
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2016-03-02 17:51:02 +0000
+++ lib/lp/soyuz/model/archive.py	2016-03-16 11:37:15 +0000
@@ -339,8 +339,6 @@
 
     date_created = UtcDateTimeCol(dbName='date_created')
 
-    _signing_key = ForeignKey(
-        foreignKey='GPGKey', dbName='signing_key', notNull=False)
     signing_key_owner_id = Int(name="signing_key_owner")
     signing_key_owner = Reference(signing_key_owner_id, 'Person.id')
     signing_key_fingerprint = Unicode()
@@ -2541,7 +2539,7 @@
         new_archive = Archive(
             owner=owner, distribution=distribution, name=name,
             displayname=displayname, description=description,
-            purpose=purpose, publish=publish, _signing_key=signing_key,
+            purpose=purpose, publish=publish,
             signing_key_owner=signing_key.owner if signing_key else None,
             signing_key_fingerprint=(
                 signing_key.fingerprint if signing_key else None),
 
=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2016-03-02 14:13:39 +0000
+++ lib/lp/soyuz/model/queue.py	2016-03-16 11:37:15 +0000
@@ -185,8 +185,6 @@
 
     archive = ForeignKey(dbName="archive", foreignKey="Archive", notNull=True)
 
-    _signing_key = ForeignKey(
-        foreignKey='GPGKey', dbName='signing_key', notNull=False)
     signing_key_owner_id = Int(name="signing_key_owner")
     signing_key_owner = Reference(signing_key_owner_id, 'Person.id')
     signing_key_fingerprint = Unicode()
 
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2016-03-02 14:13:39 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2016-03-16 11:37:15 +0000
@@ -91,7 +91,6 @@
     maintainer = ForeignKey(
         dbName='maintainer', foreignKey='Person',
         storm_validator=validate_public_person, notNull=True)
-    _dscsigningkey = ForeignKey(foreignKey='GPGKey', dbName='dscsigningkey')
     signing_key_owner_id = Int(name="signing_key_owner")
     signing_key_owner = Reference(signing_key_owner_id, 'Person.id')
     signing_key_fingerprint = Unicode()
 
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py	2016-03-02 14:13:39 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py	2016-03-16 11:37:15 +0000
@@ -615,7 +615,6 @@
             component=componentID,
             sourcepackagename=name.id,
             maintainer=maintainer.id,
-            _dscsigningkey=key,
             signing_key_owner=key.owner if key else None,
             signing_key_fingerprint=key.fingerprint if key else None,
             urgency=ChangesFile.urgency_map[src.urgency],
 
=== modified file 'lib/lp/soyuz/tests/test_build_notify.py'
--- lib/lp/soyuz/tests/test_build_notify.py	2016-03-02 15:52:33 +0000
+++ lib/lp/soyuz/tests/test_build_notify.py	2016-03-16 11:37:15 +0000
@@ -84,7 +84,6 @@
                     self.factory.getUniqueInteger(), status.value),
                 distroseries=self.distroseries, architecturehintlist='any',
                 creator=self.creator, archive=archive)
-            spph.sourcepackagerelease._dscsigningkey = self.gpgkey
             spph.sourcepackagerelease.signing_key_fingerprint = (
                 self.gpgkey.fingerprint)
             spph.sourcepackagerelease.signing_key_owner = (