lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: Resources package rewrite

Browse Source 
This giant patch makes some much needed improvements to the code base.

* The engine has been rewritten and lives within engine/graph/
* All of the common interfaces and code now live in engine/
* All of the resources are in one package called engine/resources/
* The Res API can use different "traits" from engine/traits/
* The Res API has been simplified to hide many of the old internals
* The Watch & Process loops were previously inverted, but is now fixed
* The likelihood of package cycles has been reduced drastically
* And much, much more...

Unfortunately, some code had to be temporarily removed. The remote code
had to be taken out, as did the prometheus code. We hope to have these
back in new forms as soon as possible.
This commit is contained in:
James Shubin
2018-03-13 12:02:44 -04:00
parent ef49aa7e08
commit 9969286224
140 changed files with 9130 additions and 8764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
yamlgraph/gapi.go
View File

@@ -19,12 +19,11 @@ package yamlgraph
import (
"fmt"
"log"
"sync"
"github.com/purpleidea/mgmt/engine"
"github.com/purpleidea/mgmt/gapi"
"github.com/purpleidea/mgmt/pgraph"
"github.com/purpleidea/mgmt/resources"
errwrap "github.com/pkg/errors"
"github.com/urfave/cli"
@@ -55,7 +54,7 @@ type GAPI struct {
// should take the prefix of the registered name. On activation, if there are
// any validation problems, you should return an error. If this was not
// activated, then you should return a nil GAPI and a nil error.
func (obj *GAPI) Cli(c *cli.Context, fs resources.Fs) (*gapi.Deploy, error) {
func (obj *GAPI) Cli(c *cli.Context, fs engine.Fs) (*gapi.Deploy, error) {
if s := c.String(Name); c.IsSet(Name) {
if s == "" {
return nil, fmt.Errorf("input yaml is empty")
@@ -120,9 +119,17 @@ func (obj *GAPI) Graph() (*pgraph.Graph, error) {
return nil, errwrap.Wrapf(err, "can't read yaml from file `%s`", Start)
}
config := ParseConfigFromFile(b)
debug := obj.data.Debug
logf := func(format string, v ...interface{}) {
// TODO: add the Name prefix in parent logger
obj.data.Logf(Name+": "+format, v...)
}
config, err := NewGraphConfigFromFile(b, debug, logf)
if err != nil {
return nil, err
}
if config == nil {
return nil, fmt.Errorf("%s: ParseConfigFromFile returned nil", Name)
return nil, fmt.Errorf("%s: NewGraphConfigFromFile returned nil", Name)
}
g, err := config.NewGraphFromConfig(obj.data.Hostname, obj.data.World, obj.data.Noop)
@@ -169,7 +176,7 @@ func (obj *GAPI) Next() chan gapi.Next {
return
}
log.Printf("%s: Generating new graph...", Name)
obj.data.Logf("generating new graph...")
next := gapi.Next{
//Exit: true, // TODO: for permanent shutdown!
Err: err,