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

hcl: Consistent formatting

Browse Source 
Nit picks.
This commit is contained in:
James Shubin
2017-06-16 23:01:46 -04:00
parent 8102e0a468
commit 5a3bd3ca67
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hcl/parse.go
View File

@@ -91,12 +91,12 @@ func graphFromConfig(c *Config, data gapi.Data) (*pgraph.Graph, error) {
var keep []pgraph.Vertex var keep []pgraph.Vertex
var resourceList []resources.Res var resourceList []resources.Res
log.Printf("HCL: parsing %d resources", len(c.Resources)) log.Printf("hcl: parsing %d resources", len(c.Resources))
for _, r := range c.Resources { for _, r := range c.Resources {
res := r.resource res := r.resource
kind := r.resource.GetKind() kind := r.resource.GetKind()
log.Printf("HCL: resource \"%s\" \"%s\"", kind, r.Name) log.Printf("hcl: resource \"%s\" \"%s\"", kind, r.Name)
if !strings.HasPrefix(res.GetName(), "@@") { if !strings.HasPrefix(res.GetName(), "@@") {
fn := func(v pgraph.Vertex) (bool, error) { fn := func(v pgraph.Vertex) (bool, error) {
return resources.VtoR(v).Compare(res), nil return resources.VtoR(v).Compare(res), nil
@@ -324,7 +324,7 @@ func loadResourcesHcl(list *ast.ObjectList) ([]*Resource, error) {
var config map[string]interface{} var config map[string]interface{}
if err := hcl.DecodeObject(&config, item.Val); err != nil { if err := hcl.DecodeObject(&config, item.Val); err != nil {
log.Printf("HCL: unable to decode body: %v", err) log.Printf("hcl: unable to decode body: %v", err)
return nil, fmt.Errorf( return nil, fmt.Errorf(
"Error reading config for %s: %s", "Error reading config for %s: %s",
name, name,
@@ -359,14 +359,14 @@ func loadResourcesHcl(list *ast.ObjectList) ([]*Resource, error) {
res, err := resources.NewResource(kind) res, err := resources.NewResource(kind)
if err != nil { if err != nil {
log.Printf("HCLParse: unable to parse resource: %v", err) log.Printf("hcl: unable to parse resource: %v", err)
return nil, err return nil, err
} }
res.SetName(name) res.SetName(name)
if err := hcl.DecodeObject(res, item.Val); err != nil { if err := hcl.DecodeObject(res, item.Val); err != nil {
log.Printf("HCLParse: unable to decode body: %v", err) log.Printf("hcl: unable to decode body: %v", err)
return nil, fmt.Errorf( return nil, fmt.Errorf(
"Error reading config for %s: %s", "Error reading config for %s: %s",
name, name,

2
resources/sendrecv.go
View File

@@ -173,7 +173,7 @@ type Send struct {
Changed bool // set to true if this key was updated, read only! Changed bool // set to true if this key was updated, read only!
} }
// SetRecv sets the Res Recv field to given map of Send structs // SetRecv sets the Res Recv field to given map of Send structs.
func (obj *BaseRes) SetRecv(recv map[string]*Send) { func (obj *BaseRes) SetRecv(recv map[string]*Send) {
obj.Recv = recv obj.Recv = recv
} }