Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Go fmt.
  • Loading branch information
lazartravica committed Apr 9, 2016
commit df49397b0cd408bd27c89e21513d3d88213d0a40
72 changes: 36 additions & 36 deletions cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,58 +8,58 @@ import (

func gatherResources(s *state) map[string]interface{} {
groups := make(map[string]interface{}, 0)
for _, res := range s.resources() {
for _, grp := range res.Groups() {
for _, res := range s.resources() {
for _, grp := range res.Groups() {

_, ok := groups[grp]
if !ok {
groups[grp] = []string{}
}
_, ok := groups[grp]
if !ok {
groups[grp] = []string{}
}

groups[grp] = append(groups[grp].([]string), res.Address())
groups[grp] = append(groups[grp].([]string), res.Address())
}
}
}

if(len(s.outputs()) > 0) {
if len(s.outputs()) > 0 {
groups["all"] = make(map[string]string, 0)
for _, out := range s.outputs() {
groups["all"].(map[string]string)[out.keyName] = out.value
}
}
return groups
return groups
}

func cmdList(stdout io.Writer, stderr io.Writer, s *state) int {
return output(stdout, stderr, gatherResources(s))
}

func cmdInventory(stdout io.Writer, stderr io.Writer, s *state) int {
groups := gatherResources(s)
for group, res := range groups {

_, err := io.WriteString(stdout, "["+group+"]\n")
if err != nil {
fmt.Fprintf(stderr, "Error writing Invetory: %s\n", err)
return 1;
}

for _, ress := range res.([]string) {

_, err := io.WriteString(stdout, ress + "\n")
if err != nil {
fmt.Fprintf(stderr, "Error writing Invetory: %s\n", err)
return 1;
}
}

_, err = io.WriteString(stdout, "\n")
if err != nil {
fmt.Fprintf(stderr, "Error writing Invetory: %s\n", err)
return 1;
}
}

return 0;
groups := gatherResources(s)
for group, res := range groups {

_, err := io.WriteString(stdout, "["+group+"]\n")
if err != nil {
fmt.Fprintf(stderr, "Error writing Invetory: %s\n", err)
return 1
}

for _, ress := range res.([]string) {

_, err := io.WriteString(stdout, ress+"\n")
if err != nil {
fmt.Fprintf(stderr, "Error writing Invetory: %s\n", err)
return 1
}
}

_, err = io.WriteString(stdout, "\n")
if err != nil {
fmt.Fprintf(stderr, "Error writing Invetory: %s\n", err)
return 1
}
}

return 0
}

func cmdHost(stdout io.Writer, stderr io.Writer, s *state, hostname string) int {
Expand Down
5 changes: 2 additions & 3 deletions output.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type Output struct {

// The keyName and value of the output
keyName string
value string
value string
}

func NewOutput(keyName string, value string) (*Output, error) {
Expand All @@ -20,7 +20,6 @@ func NewOutput(keyName string, value string) (*Output, error) {

return &Output{
keyName: keyName,
value: value,
value: value,
}, nil
}

2 changes: 1 addition & 1 deletion parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (s *state) resources() []*Resource {

type moduleState struct {
ResourceStates map[string]resourceState `json:"resources"`
Outputs map[string]string `json:"outputs"`
Outputs map[string]string `json:"outputs"`
}

// resourceKeys returns a sorted slice of the key names of the resources in this
Expand Down