Merge lp:~cjwatson/launchpad/snap-upload-model into lp:launchpad

[Colin Watson]

Add basic model for Snap/SnapBuild store upload columns.

Add basic model for Snap/SnapBuild store upload columns. This doesn't do anything interesting yet and I haven't exported any of the attributes; I just wanted to have this in place to make it easier to submit subsequent branches.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/snappy/interfaces/snap.py'
--- lib/lp/snappy/interfaces/snap.py	2016-02-28 17:23:53 +0000
+++ lib/lp/snappy/interfaces/snap.py	2016-05-09 15:49:50 +0000
@@ -86,6 +86,7 @@
     PublicPersonChoice,
     )
 from lp.services.webhooks.interfaces import IWebhookTarget
+from lp.snappy.interfaces.snappyseries import ISnappySeries
 from lp.soyuz.interfaces.archive import IArchive
 from lp.soyuz.interfaces.distroarchseries import IDistroArchSeries
 
@@ -354,6 +355,34 @@
             "The Git branch containing a snapcraft.yaml recipe at the top "
             "level.")))
 
+    store_upload = Bool(
+        title=_("Automatically upload to store"),
+        required=True, readonly=False,
+        description=_(
+            "Whether builds of this snap package are automatically uploaded "
+            "to the store."))
+
+    store_series = ReferenceChoice(
+        title=_("Store series"),
+        schema=ISnappySeries, vocabulary="SnappySeries",
+        required=False, readonly=False,
+        description=_(
+            "The series in which this snap package should be published in the "
+            "store."))
+
+    store_name = TextLine(
+        title=_("Registered store package name"),
+        required=False, readonly=False,
+        description=_(
+            "The registered name of this snap package in the store."))
+
+    store_secrets = List(
+        value_type=TextLine(), title=_("Store upload tokens"),
+        required=False, readonly=False,
+        description=_(
+            "Serialized secrets issued by the store and the login service to "
+            "authorize uploads of this snap package."))
+
 
 class ISnapAdminAttributes(Interface):
     """`ISnap` attributes that can be edited by admins.
@@ -401,7 +430,9 @@
     @operation_for_version("devel")
     def new(registrant, owner, distro_series, name, description=None,
             branch=None, git_ref=None, require_virtualized=True,
-            processors=None, date_created=None, private=False):
+            processors=None, date_created=None, private=False,
+            store_upload=False, store_series=None, store_name=None,
+            store_secrets=None):
         """Create an `ISnap`."""
 
     def exists(owner, name):

=== modified file 'lib/lp/snappy/model/snap.py'
--- lib/lp/snappy/model/snap.py	2016-02-28 17:40:10 +0000
+++ lib/lp/snappy/model/snap.py	2016-05-09 15:49:50 +0000
@@ -12,6 +12,7 @@
     DateTime,
     Desc,
     Int,
+    JSON,
     Not,
     Reference,
     Store,
@@ -148,10 +149,20 @@
 
     private = Bool(name='private')
 
+    store_upload = Bool(name='store_upload', allow_none=False)
+
+    store_series_id = Int(name='store_series', allow_none=True)
+    store_series = Reference(store_series_id, 'SnappySeries.id')
+
+    store_name = Unicode(name='store_name', allow_none=True)
+
+    store_secrets = JSON('store_secrets', allow_none=True)
+
     def __init__(self, registrant, owner, distro_series, name,
                  description=None, branch=None, git_ref=None,
                  require_virtualized=True, date_created=DEFAULT,
-                 private=False):
+                 private=False, store_upload=False, store_series=None,
+                 store_name=None, store_secrets=None):
         """Construct a `Snap`."""
         if not getFeatureFlag(SNAP_FEATURE_FLAG):
             raise SnapFeatureDisabled
@@ -168,6 +179,10 @@
         self.date_created = date_created
         self.date_last_modified = date_created
         self.private = private
+        self.store_upload = store_upload
+        self.store_series = store_series
+        self.store_name = store_name
+        self.store_secrets = store_secrets
 
     @property
     def valid_webhook_event_types(self):
@@ -389,7 +404,9 @@
 
     def new(self, registrant, owner, distro_series, name, description=None,
             branch=None, git_ref=None, require_virtualized=True,
-            processors=None, date_created=DEFAULT, private=False):
+            processors=None, date_created=DEFAULT, private=False,
+            store_upload=False, store_series=None, store_name=None,
+            store_secrets=None):
         """See `ISnapSet`."""
         if not registrant.inTeam(owner):
             if owner.is_team:
@@ -414,7 +431,9 @@
             registrant, owner, distro_series, name, description=description,
             branch=branch, git_ref=git_ref,
             require_virtualized=require_virtualized, date_created=date_created,
-            private=private)
+            private=private, store_upload=store_upload,
+            store_series=store_series, store_name=store_name,
+            store_secrets=store_secrets)
         store.add(snap)
 
         if processors is None:

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2016-05-09 15:49:49 +0000
+++ lib/lp/testing/factory.py	2016-05-09 15:49:50 +0000
@@ -4607,7 +4607,8 @@
     def makeSnap(self, registrant=None, owner=None, distroseries=None,
                  name=None, branch=None, git_ref=None,
                  require_virtualized=True, processors=None,
-                 date_created=DEFAULT, private=False):
+                 date_created=DEFAULT, private=False, store_upload=False,
+                 store_series=None, store_name=None, store_secrets=None):
         """Make a new Snap."""
         if registrant is None:
             registrant = self.makePerson()
@@ -4623,7 +4624,9 @@
             registrant, owner, distroseries, name,
             require_virtualized=require_virtualized, processors=processors,
             date_created=date_created, branch=branch, git_ref=git_ref,
-            private=private)
+            private=private, store_upload=store_upload,
+            store_series=store_series, store_name=store_name,
+            store_secrets=store_secrets)
         IStore(snap).flush()
         return snap