REST API - adds href attributes for plugin resources

intelsdi-x · Nov 21, 2015 · d51b85b · d51b85b
1 parent 2483d23
commit d51b85b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/mgmt/rest/plugin.go b/mgmt/rest/plugin.go
@@ -23,6 +23,7 @@ import (
 	"compress/gzip"
 	"crypto/sha256"
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"mime"
@@ -179,7 +180,7 @@ func (s *Server) loadPlugin(w http.ResponseWriter, r *http.Request, _ httprouter
 			respond(ec, rb, w)
 			return
 		}
-		lp.LoadedPlugins = append(lp.LoadedPlugins, *catalogedPluginToLoaded(pl))
+		lp.LoadedPlugins = append(lp.LoadedPlugins, *catalogedPluginToLoaded(r.Host, pl))
 		respond(201, lp, w)
 	}
 }
@@ -270,7 +271,7 @@ func (s *Server) getPlugins(w http.ResponseWriter, r *http.Request, _ httprouter
 	plCatalog := s.mm.PluginCatalog()
 	plugins.LoadedPlugins = make([]rbody.LoadedPlugin, len(plCatalog))
 	for i, p := range s.mm.PluginCatalog() {
-		plugins.LoadedPlugins[i] = *catalogedPluginToLoaded(p)
+		plugins.LoadedPlugins[i] = *catalogedPluginToLoaded(r.Host, p)
 	}
 
 	if detail {
@@ -291,14 +292,15 @@ func (s *Server) getPlugins(w http.ResponseWriter, r *http.Request, _ httprouter
 	respond(200, plugins, w)
 }
 
-func catalogedPluginToLoaded(c core.CatalogedPlugin) *rbody.LoadedPlugin {
+func catalogedPluginToLoaded(host string, c core.CatalogedPlugin) *rbody.LoadedPlugin {
 	return &rbody.LoadedPlugin{
 		Name:            c.Name(),
 		Version:         c.Version(),
 		Type:            c.TypeName(),
 		Signed:          c.IsSigned(),
 		Status:          c.Status(),
 		LoadedTimestamp: c.LoadedTimestamp().Unix(),
+		Href:            catalogedPluginURI(host, c),
 	}
 }
 
@@ -384,7 +386,12 @@ func (s *Server) getPlugin(w http.ResponseWriter, r *http.Request, p httprouter.
 			Signed:          plugin.IsSigned(),
 			Status:          plugin.Status(),
 			LoadedTimestamp: plugin.LoadedTimestamp().Unix(),
+			Href:            catalogedPluginURI(r.Host, plugin),
 		}
 		respond(200, pluginRet, w)
 	}
 }
+
+func catalogedPluginURI(host string, c core.CatalogedPlugin) string {
+	return fmt.Sprintf("%s://%s/v1/plugins/%s/%s/%d", protocolPrefix, host, c.TypeName(), c.Name(), c.Version())
+}
diff --git a/mgmt/rest/rbody/plugin.go b/mgmt/rest/rbody/plugin.go
@@ -95,6 +95,7 @@ type LoadedPlugin struct {
 	Signed          bool   `json:"signed"`
 	Status          string `json:"status"`
 	LoadedTimestamp int64  `json:"loaded_timestamp"`
+	Href            string `json:"href"`
 }
 
 type AvailablePlugin struct {
@@ -104,4 +105,5 @@ type AvailablePlugin struct {
 	HitCount         int    `json:"hitcount"`
 	LastHitTimestamp int64  `json:"last_hit_timestamp"`
 	ID               uint32 `json:"id"`
+	Href             string `json:"href"`
 }
diff --git a/mgmt/rest/server.go b/mgmt/rest/server.go
@@ -68,7 +68,8 @@ const (
 var (
 	ErrBadCert = errors.New("Invalid certificate given")
 
-	restLogger = log.WithField("_module", "_mgmt-rest")
+	restLogger     = log.WithField("_module", "_mgmt-rest")
+	protocolPrefix = "http"
 )
 
 type managesMetrics interface {
@@ -135,6 +136,7 @@ func New(https bool, cpath, kpath string) (*Server, error) {
 		if err != nil {
 			return nil, err
 		}
+		protocolPrefix = "https"
 	}
 
 	restLogger.Info(fmt.Sprintf("Configuring REST API with HTTPS set to: %v", https))