Merge pull request #3113 from cozy/manifest

Remove explicit mapping for app manifests

Author: nono

client/apps.go

@@ -45,6 +45,7 @@ type AppManifest struct {
 		Messages     *json.RawMessage `json:"messages,omitempty"`
 		OAuth        *json.RawMessage `json:"oauth,omitempty"`
 		TimeInterval *json.RawMessage `json:"time_interval,omitempty"`
+		ClientSide   bool             `json:"clientSide,omitempty"`
 
 		Slug        string `json:"slug"`
 		State       string `json:"state"`

model/app/apps.go

@@ -78,9 +78,14 @@ type Manifest interface {
 	LastUpdate() time.Time
 	Terms() Terms
 
+	Name() string
+	Icon() string
+	Notifications() Notifications
+
 	SetError(err error)
 	Error() error
 
+	SetSlug(slug string)
 	SetSource(src *url.URL)
 	SetState(state State)
 	SetVersion(version string)

model/app/apps_test.go

@@ -8,13 +8,13 @@ import (
 
 func TestFindRoute(t *testing.T) {
 	manifest := &WebappManifest{}
-	manifest.Routes = make(Routes)
-	manifest.Routes["/foo"] = Route{Folder: "/foo", Index: "index.html"}
-	manifest.Routes["/foo/bar"] = Route{Folder: "/bar", Index: "index.html"}
-	manifest.Routes["/foo/qux"] = Route{Folder: "/qux", Index: "index.html"}
-	manifest.Routes["/public"] = Route{Folder: "/public", Index: "public.html", Public: true}
-	manifest.Routes["/admin"] = Route{Folder: "/admin", Index: "admin.html"}
-	manifest.Routes["/admin/special"] = Route{Folder: "/special", Index: "admin.html"}
+	manifest.val.Routes = make(Routes)
+	manifest.val.Routes["/foo"] = Route{Folder: "/foo", Index: "index.html"}
+	manifest.val.Routes["/foo/bar"] = Route{Folder: "/bar", Index: "index.html"}
+	manifest.val.Routes["/foo/qux"] = Route{Folder: "/qux", Index: "index.html"}
+	manifest.val.Routes["/public"] = Route{Folder: "/public", Index: "public.html", Public: true}
+	manifest.val.Routes["/admin"] = Route{Folder: "/admin", Index: "admin.html"}
+	manifest.val.Routes["/admin/special"] = Route{Folder: "/special", Index: "admin.html"}
 
 	ctx, rest := manifest.FindRoute("/admin")
 	assert.Equal(t, "/admin", ctx.Folder)
@@ -62,8 +62,8 @@ func TestFindRoute(t *testing.T) {
 
 func TestNoRegression217(t *testing.T) {
 	var man WebappManifest
-	man.Routes = make(Routes)
-	man.Routes["/"] = Route{
+	man.val.Routes = make(Routes)
+	man.val.Routes["/"] = Route{
 		Folder: "/",
 		Index:  "index.html",
 		Public: false,
@@ -79,7 +79,7 @@ func TestFindIntent(t *testing.T) {
 	found := man.FindIntent("PICK", "io.cozy.files")
 	assert.Nil(t, found)
 
-	man.Intents = []Intent{
+	man.val.Intents = []Intent{
 		{
 			Action: "PICK",
 			Types:  []string{"io.cozy.contacts", "io.cozy.calendars"},
@@ -117,7 +117,7 @@ func TestFindIntent(t *testing.T) {
 	assert.NotNil(t, found)
 	assert.Equal(t, "EDIT", found.Action)
 
-	man.Intents = []Intent{
+	man.val.Intents = []Intent{
 		{
 			Action: "PICK",
 			Href:   "/pick",

model/app/installer.go

@@ -15,6 +15,7 @@ import (
 	"github.com/cozy/cozy-stack/pkg/appfs"
 	"github.com/cozy/cozy-stack/pkg/config/config"
 	"github.com/cozy/cozy-stack/pkg/consts"
+	"github.com/cozy/cozy-stack/pkg/couchdb"
 	"github.com/cozy/cozy-stack/pkg/hooks"
 	"github.com/cozy/cozy-stack/pkg/logger"
 	"github.com/cozy/cozy-stack/pkg/prefixer"
@@ -46,7 +47,7 @@ type Installer struct {
 	db       prefixer.Prefixer
 	endState State
 
-	overridenParameters *json.RawMessage
+	overridenParameters map[string]interface{}
 	permissionsAcked    bool
 
 	man     Manifest
@@ -73,7 +74,7 @@ type InstallerOptions struct {
 	// Used to override the "Parameters" field of konnectors during installation.
 	// This modification is useful to allow the parameterization of a konnector
 	// at its installation as we do not have yet a registry up and running.
-	OverridenParameters *json.RawMessage
+	OverridenParameters map[string]interface{}
 }
 
 // Fetcher interface should be implemented by the underlying transport
@@ -203,15 +204,24 @@ func initManifest(db prefixer.Prefixer, opts *InstallerOptions) (man Manifest, e
 		switch opts.Type {
 		case consts.WebappType:
 			man = &WebappManifest{
-				DocID:   consts.Apps + "/" + slug,
-				DocSlug: slug,
+				doc: &couchdb.JSONDoc{
+					Type: consts.Apps,
+					M: map[string]interface{}{
+						"_id": consts.Apps + "/" + slug,
+					},
+				},
 			}
 		case consts.KonnectorType:
 			man = &KonnManifest{
-				DocID:   consts.Konnectors + "/" + slug,
-				DocSlug: slug,
+				doc: &couchdb.JSONDoc{
+					Type: consts.Konnectors,
+					M: map[string]interface{}{
+						"_id": consts.Konnectors + "/" + slug,
+					},
+				},
 			}
 		}
+		man.SetSlug(slug)
 	} else {
 		man, err = GetBySlug(db, slug, opts.Type)
 		if err != nil {
@@ -436,7 +446,7 @@ func (i *Installer) update() error {
 		i.man.SetState(i.endState)
 	} else {
 		if i.man.AppType() == consts.WebappType {
-			i.man.(*WebappManifest).oldServices = i.man.(*WebappManifest).Services
+			i.man.(*WebappManifest).oldServices = i.man.(*WebappManifest).val.Services
 		}
 		i.man.SetSource(i.src)
 		if availableVersion != "" {
@@ -510,7 +520,7 @@ func (i *Installer) ReadManifest(state State) (Manifest, error) {
 		i.src.Scheme != "registry")
 	if shouldOverrideParameters {
 		if m, ok := newManifest.(*KonnManifest); ok {
-			m.Parameters = i.overridenParameters
+			m.val.Parameters = i.overridenParameters
 		}
 	}
 

model/app/installer_webapp_test.go

@@ -306,8 +306,8 @@ func TestWebappInstallWithUpgrade(t *testing.T) {
 	version1 := man.Version()
 
 	manWebapp := man.(*app.WebappManifest)
-	if assert.NotNil(t, manWebapp.Services["service1"]) {
-		service1 := manWebapp.Services["service1"]
+	if assert.NotNil(t, manWebapp.Services()["service1"]) {
+		service1 := manWebapp.Services()["service1"]
 		assert.Equal(t, "/services/service1.js", service1.File)
 		assert.Equal(t, "@cron 0 0 0 * * *", service1.TriggerOptions)
 		assert.Equal(t, "node", service1.Type)
@@ -364,7 +364,7 @@ func TestWebappInstallWithUpgrade(t *testing.T) {
 	assert.NoError(t, err)
 	assert.True(t, ok, "The manifest has the right version")
 	manWebapp = man.(*app.WebappManifest)
-	assert.Nil(t, manWebapp.Services["service1"])
+	assert.Nil(t, manWebapp.Services()["service1"])
 }
 
 func TestWebappInstallAndUpgradeWithBranch(t *testing.T) {