Updated vendor, added expose flag

Signed-off-by: Vishal Rana <[email protected]>

Author: Vishal Rana

Gopkg.lock

@@ -65,6 +65,10 @@
   name = "github.com/labstack/labstack-go"
   version = "0.22.1"
 
+[[constraint]]
+  name = "github.com/labstack/tunnel"
+  version = "0.1.3"
+
 [[constraint]]
   branch = "master"
   name = "github.com/lib/pq"
@@ -77,6 +81,10 @@
   branch = "master"
   name = "github.com/mitchellh/mapstructure"
 
+[[constraint]]
+  name = "github.com/spf13/cobra"
+  version = "0.0.2"
+
 [[constraint]]
   name = "github.com/stretchr/testify"
   version = "1.2.1"

Gopkg.toml

@@ -1,6 +1,10 @@
 IMAGE = labstack/armor
 VERSION = 0.4.5
 
+run:
+	ENV=development
+	go run cmd/armor/main.go
+
 publish:
 	git tag $(VERSION)
 	git push origin --tags

Makefile

@@ -21,7 +21,9 @@ func Start(a *armor.Armor) {
 	e := echo.New()
 	e.HideBanner = true
 	e.HidePort = true
-	a.Colorer.Printf("⇨ admin server started on %s\n", a.Colorer.Green(a.Admin.Address))
+	if !a.DefaultConfig {
+		a.Colorer.Printf("⇨ admin server started on %s\n", a.Colorer.Green(a.Admin.Address))
+	}
 	// e.Use(middleware.BasicAuth(func(usr, pwd string, _ echo.Context) (bool, error) {
 	// 	return usr == "admin" && pwd == "L@B$t@ck0709", nil
 	// }))

admin/admin.go

@@ -8,31 +8,33 @@ import (
 
 	"github.com/labstack/armor/plugin"
 	"github.com/labstack/armor/store"
+	"github.com/labstack/armor/util"
 	"github.com/labstack/echo"
 	"github.com/labstack/gommon/color"
 	"github.com/labstack/gommon/log"
 )
 
 type (
 	Armor struct {
-		mutex        sync.RWMutex
-		Name         string             `json:"name"`
-		Address      string             `json:"address"`
-		TLS          *TLS               `json:"tls"`
-		Admin        *Admin             `json:"admin"`
-		Storm        *Storm             `json:"storm"`
-		Postgres     *Postgres          `json:"postgres"`
-		Cluster      *Cluster           `json:"cluster"`
-		ReadTimeout  time.Duration      `json:"read_timeout"`
-		WriteTimeout time.Duration      `json:"write_timeout"`
-		RawPlugins   []plugin.RawPlugin `json:"plugins"`
-		Hosts        Hosts              `json:"hosts"`
-		HomeDir      string             `json:"-"`
-		Store        store.Store        `json:"-"`
-		Plugins      []plugin.Plugin    `json:"-"`
-		Echo         *echo.Echo         `json:"-"`
-		Logger       *log.Logger        `json:"-"`
-		Colorer      *color.Color       `json:"-"`
+		mutex         sync.RWMutex
+		Name          string             `json:"name"`
+		Address       string             `json:"address"`
+		TLS           *TLS               `json:"tls"`
+		Admin         *Admin             `json:"admin"`
+		Storm         *Storm             `json:"storm"`
+		Postgres      *Postgres          `json:"postgres"`
+		Cluster       *Cluster           `json:"cluster"`
+		ReadTimeout   time.Duration      `json:"read_timeout"`
+		WriteTimeout  time.Duration      `json:"write_timeout"`
+		RawPlugins    []plugin.RawPlugin `json:"plugins"`
+		Hosts         Hosts              `json:"hosts"`
+		HomeDir       string             `json:"-"`
+		Store         store.Store        `json:"-"`
+		Plugins       []plugin.Plugin    `json:"-"`
+		Echo          *echo.Echo         `json:"-"`
+		Logger        *log.Logger        `json:"-"`
+		Colorer       *color.Color       `json:"-"`
+		DefaultConfig bool               `json:"-"`
 	}
 
 	TLS struct {
@@ -177,6 +179,60 @@ func (a *Armor) LoadPlugin(p *store.Plugin, update bool) {
 	}
 }
 
+func (a *Armor) SavePlugins() {
+	plugins := []*store.Plugin{}
+
+	// Global plugins
+	for _, rp := range a.RawPlugins {
+		plugins = append(plugins, &store.Plugin{
+			Name:   rp.Name(),
+			Config: rp.JSON(),
+		})
+	}
+
+	for hn, host := range a.Hosts {
+		// Host plugins
+		for _, rp := range host.RawPlugins {
+			plugins = append(plugins, &store.Plugin{
+				Name:   rp.Name(),
+				Host:   hn,
+				Config: rp.JSON(),
+			})
+		}
+
+		for pn, path := range host.Paths {
+			// Path plugins
+			for _, rp := range path.RawPlugins {
+				plugins = append(plugins, &store.Plugin{
+					Name:   rp.Name(),
+					Host:   hn,
+					Path:   pn,
+					Config: rp.JSON(),
+				})
+			}
+		}
+	}
+
+	// Delete
+	if err := a.Store.DeleteBySource("file"); err != nil {
+		panic(err)
+	}
+
+	// Save
+	for _, p := range plugins {
+		p.Source = store.File
+		p.ID = util.ID()
+		now := time.Now()
+		p.CreatedAt = now
+		p.UpdatedAt = now
+
+		// Insert
+		if err := a.Store.AddPlugin(p); err != nil {
+			panic(err)
+		}
+	}
+}
+
 func (h *Host) FindPath(name string) (p *Path) {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()