Use go module as dependency tool instead of glide

[src/xds/xds-agent.git] / lib / agent / project-st.go

diff --git a/lib/agent/project-st.go b/lib/agent/project-st.go
index c4e8fce..fb88b05 100644 (file)
--- a/lib/agent/project-st.go
+++ b/lib/agent/project-st.go
@@ -1,10 +1,29 @@
+/*
+ * Copyright (C) 2017-2018 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package agent
 
 import (
+       "encoding/json"
        "fmt"
 
-       "github.com/iotbzh/xds-agent/lib/apiv1"
-       st "github.com/iotbzh/xds-agent/lib/syncthing"
+       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/syncthing"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 
 // IPROJECT interface implementation for syncthing projects
@@ -13,7 +32,7 @@ import (
 type STProject struct {
        *Context
        server   *XdsServer
-       folder   *XdsFolderConfig
+       folder   *xsapiv1.FolderConfig
        eventIDs []int
 }
 
@@ -22,13 +41,13 @@ func NewProjectST(ctx *Context, svr *XdsServer) *STProject {
        p := STProject{
                Context: ctx,
                server:  svr,
-               folder:  &XdsFolderConfig{},
+               folder:  &xsapiv1.FolderConfig{},
        }
        return &p
 }
 
 // Add a new project
-func (p *STProject) Add(cfg apiv1.ProjectConfig) (*apiv1.ProjectConfig, error) {
+func (p *STProject) Add(cfg xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
        var err error
 
        // Add project/folder into XDS Server
@@ -51,7 +70,7 @@ func (p *STProject) Add(cfg apiv1.ProjectConfig) (*apiv1.ProjectConfig, error) {
 
        locPrj, err := p.SThg.FolderConfigGet(id)
        if err != nil {
-               svrPrj.Status = apiv1.StatusErrorConfig
+               svrPrj.Status = xaapiv1.StatusErrorConfig
                return nil, err
        }
        if svrPrj.ID != locPrj.ID {
@@ -73,23 +92,22 @@ func (p *STProject) Delete() error {
 }
 
 // GetProject Get public part of project config
-func (p *STProject) GetProject() *apiv1.ProjectConfig {
+func (p *STProject) GetProject() *xaapiv1.ProjectConfig {
        prj := p.server.FolderToProject(*p.folder)
        prj.ServerID = p.server.ID
        return &prj
 }
 
 // Setup Setup local project config
-func (p *STProject) Setup(prj apiv1.ProjectConfig) (*apiv1.ProjectConfig, error) {
+func (p *STProject) Setup(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
        // Update folder
        p.folder = p.server.ProjectToFolder(prj)
        svrPrj := p.GetProject()
 
        // Register events to update folder status
        // Register to XDS Server events
-       p.server.EventOn("event:folder-state-change", "", p._cbServerFolderChanged)
-       if err := p.server.EventRegister("folder-state-change", svrPrj.ID); err != nil {
-               p.Log.Warningf("XDS Server EventRegister failed: %v", err)
+       if _, err := p.server.EventOn(xsapiv1.EVTFolderStateChange, "", p._cbServerFolderChanged); err != nil {
+               p.Log.Errorf("XDS Server EventOn '%s' failed: %v", xsapiv1.EVTFolderStateChange, err)
                return svrPrj, err
        }
 
@@ -106,7 +124,7 @@ func (p *STProject) Setup(prj apiv1.ProjectConfig) (*apiv1.ProjectConfig, error)
 }
 
 // Update Update some field of a project
-func (p *STProject) Update(prj apiv1.ProjectConfig) (*apiv1.ProjectConfig, error) {
+func (p *STProject) Update(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) {
 
        if p.folder.ID != prj.ID {
                return nil, fmt.Errorf("Invalid id")
@@ -146,20 +164,34 @@ func (p *STProject) IsInSync() (bool, error) {
 // callback use to update (XDS Server) folder IsInSync status
 
 func (p *STProject) _cbServerFolderChanged(pData interface{}, data interface{}) error {
-       evt := data.(XdsEventFolderChange)
+       evt := xsapiv1.EventMsg{}
+       d, err := json.Marshal(data)
+       if err != nil {
+               p.Log.Errorf("Cannot marshal XDS Server event folder-change err=%v", err)
+               return err
+       }
+       if err = json.Unmarshal(d, &evt); err != nil {
+               p.Log.Errorf("Cannot unmarshal XDS Server event folder-change err=%v", err)
+               return err
+       }
+
+       fld, err := evt.DecodeFolderConfig()
+       if err != nil {
+               p.Log.Errorf("Cannot decode FolderChanged event: %v", data)
+       }
 
        // Only process event that concerns this project/folder ID
-       if p.folder.ID != evt.Folder.ID {
+       if p.folder.ID != fld.ID {
                return nil
        }
 
-       if evt.Folder.IsInSync != p.folder.DataCloudSync.STSvrIsInSync ||
-               evt.Folder.Status != p.folder.DataCloudSync.STSvrStatus {
+       if fld.IsInSync != p.folder.DataCloudSync.STSvrIsInSync ||
+               fld.Status != p.folder.DataCloudSync.STSvrStatus {
 
-               p.folder.DataCloudSync.STSvrIsInSync = evt.Folder.IsInSync
-               p.folder.DataCloudSync.STSvrStatus = evt.Folder.Status
+               p.folder.DataCloudSync.STSvrIsInSync = fld.IsInSync
+               p.folder.DataCloudSync.STSvrStatus = fld.Status
 
-               if err := p.events.Emit(apiv1.EVTProjectChange, p.server.FolderToProject(*p.folder), ""); err != nil {
+               if err := p.events.Emit(xaapiv1.EVTProjectChange, p.server.FolderToProject(*p.folder), ""); err != nil {
                        p.Log.Warningf("Cannot notify project change (from server): %v", err)
                }
        }
@@ -180,15 +212,15 @@ func (p *STProject) _cbLocalSTEvents(ev st.Event, data *st.EventsCBData) {
                to := ev.Data["to"]
                switch to {
                case "scanning", "syncing":
-                       sts = apiv1.StatusSyncing
+                       sts = xaapiv1.StatusSyncing
                case "idle":
-                       sts = apiv1.StatusEnable
+                       sts = xaapiv1.StatusEnable
                }
                inSync = (to == "idle")
 
        case st.EventFolderPaused:
-               if sts == apiv1.StatusEnable {
-                       sts = apiv1.StatusPause
+               if sts == xaapiv1.StatusEnable {
+                       sts = xaapiv1.StatusPause
                }
                inSync = false
        }
@@ -198,7 +230,7 @@ func (p *STProject) _cbLocalSTEvents(ev st.Event, data *st.EventsCBData) {
                p.folder.DataCloudSync.STLocIsInSync = inSync
                p.folder.DataCloudSync.STLocStatus = sts
 
-               if err := p.events.Emit(apiv1.EVTProjectChange, p.server.FolderToProject(*p.folder), ""); err != nil {
+               if err := p.events.Emit(xaapiv1.EVTProjectChange, p.server.FolderToProject(*p.folder), ""); err != nil {
                        p.Log.Warningf("Cannot notify project change (local): %v", err)
                }
        }