Refactor to use urfav/cli

firehydrant · Feb 13, 2019 · ca9a1bb · ca9a1bb
1 parent 0ef018a
commit ca9a1bb
Show file tree

Hide file tree

Showing 13 changed files with 244 additions and 230 deletions.
diff --git a/cmd/event.go b/cmd/event.go
diff --git a/cmd/execute.go b/cmd/execute.go
diff --git a/cmd/main.go b/cmd/main.go
@@ -0,0 +1,18 @@
+package main
+
+import (
+	"log"
+	"os"
+
+	"github.com/firehydrant/fhcli/pkg/cli"
+)
+
+func main() {
+	app := cli.NewApp()
+
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+}
diff --git a/cmd/root.go b/cmd/root.go
diff --git a/cmd/version.go b/cmd/version.go
diff --git a/go.mod b/go.mod
@@ -11,4 +11,5 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/viper v1.3.1
+	github.com/urfave/cli v1.20.0
 )
diff --git a/go.sum b/go.sum
@@ -86,6 +86,8 @@ github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

diff --git a/main.go b/main.go
diff --git a/pkg/api_client/main.go b/pkg/api_client/main.go
@@ -0,0 +1,33 @@
+package api_client
+
+import (
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	fhclient "github.com/firehydrant/api-client-go/client"
+	transport "github.com/go-openapi/runtime/client"
+)
+
+type Config struct {
+	ApiHost string
+	ApiKey  string
+	Debug   bool
+}
+
+type ApiClient struct {
+	transport *transport.Runtime
+	Client    *fhclient.FireHydrant
+	Auth      runtime.ClientAuthInfoWriter
+}
+
+func NewApiClient(c Config) ApiClient {
+	client := ApiClient{}
+
+	client.transport = transport.New(c.ApiHost, "", []string{"http"})
+	client.transport.Debug = c.Debug
+
+	client.Client = fhclient.New(client.transport, strfmt.Default)
+	client.Auth = transport.BearerToken(c.ApiKey)
+
+	return client
+}
diff --git a/cmd/change_event.go → pkg/change_events/main.go b/cmd/change_event.go → pkg/change_events/main.go
@@ -1,9 +1,11 @@
-package cmd
+package events
 
 import (
 	"strings"
 	"time"
 
+	apiclient "github.com/firehydrant/fhcli/pkg/api_client"
+
 	"github.com/firehydrant/api-client-go/client/changes"
 	"github.com/firehydrant/api-client-go/models"
 	"github.com/go-openapi/strfmt"
@@ -13,7 +15,9 @@ type ChangeEvent struct {
 	Environment   string
 	Service       string
 	RawIdentities string
+	RawLabels     string
 	Identities    map[string]string
+	Labels        map[string]string
 	StartsAt      time.Time
 	EndsAt        time.Time
 	Summary       string
@@ -22,6 +26,7 @@ type ChangeEvent struct {
 func NewChangeEvent() ChangeEvent {
 	return ChangeEvent{
 		Identities: make(map[string]string),
+		Labels:     make(map[string]string),
 		StartsAt:   time.Now(),
 		EndsAt:     time.Now(),
 	}
@@ -49,9 +54,19 @@ func (ce *ChangeEvent) parseIdentities() {
 	}
 }
 
-func (ce *ChangeEvent) Submit() (string, error) {
+func (ce *ChangeEvent) parseLabels() {
+	for _, label := range strings.Split(ce.RawLabels, ",") {
+		lParts := strings.Split(label, "=")
+		if len(lParts) > 1 {
+			ce.Labels[lParts[0]] = lParts[1]
+		}
+	}
+}
+
+func (ce *ChangeEvent) Submit(client apiclient.ApiClient) (string, error) {
 	c := changes.NewPostV1ChangesEventsParams()
 	ce.parseIdentities()
+	ce.parseLabels()
 
 	envList := []string{}
 	if len(ce.Environment) > 0 {
@@ -70,9 +85,10 @@ func (ce *ChangeEvent) Submit() (string, error) {
 		EndsAt:           strfmt.DateTime(ce.EndsAt),
 		Summary:          &ce.Summary,
 		ChangeIdentities: ce.identitiesToAPI(),
+		Labels:           ce.Labels,
 	}
 
-	resp, err := client.client.Changes.PostV1ChangesEvents(c, client.auth)
+	resp, err := client.Client.Changes.PostV1ChangesEvents(c, client.Auth)
 
 	if err != nil {
 		return "", err

diff --git a/pkg/cli/event.go b/pkg/cli/event.go
@@ -0,0 +1,30 @@
+package cli
+
+import (
+	"fmt"
+	"strings"
+
+	changeevents "github.com/firehydrant/fhcli/pkg/change_events"
+	"github.com/urfave/cli"
+)
+
+func eventCmd(c *cli.Context) error {
+	client := NewApiClient(c)
+
+	ce := changeevents.NewChangeEvent()
+
+	ce.Summary = strings.Join(c.Args(), " ")
+	ce.Environment = c.String("environment")
+	ce.Service = c.String("service")
+	ce.RawIdentities = c.String("identities")
+	ce.RawLabels = c.String("labels")
+
+	id, err := ce.Submit(client)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println(fmt.Sprintf("Created event %s", id))
+
+	return nil
+}