major refactor to use internal packages etc. (#9)

Author: aegershman

.goreleaser.yml

@@ -6,11 +6,13 @@ before:
 
 builds:
   - id: darwin
+    main: ./cmd/reverseservicelookup/main.go
     goos:
       - darwin
     goarch:
       - amd64
   - id: linux-windows
+    main: ./cmd/reverseservicelookup/main.go
     goos:
       - linux
       - windows

README.md

@@ -58,13 +58,13 @@ If you want to try it out, install it directly from [the github releases tab as
 
 ```sh
 # osx 64bit
-cf install-plugin -f https://github.com/aegershman/cf-reverse-service-lookup-plugin/releases/download/0.1.0/cf-reverse-service-lookup-plugin-darwin
+cf install-plugin -f https://github.com/aegershman/cf-reverse-service-lookup-plugin/releases/download/0.3.0/cf-reverse-service-lookup-plugin-darwin
 
 # linux 64bit (32bit and ARM6 also available)
-cf install-plugin -f https://github.com/aegershman/cf-reverse-service-lookup-plugin/releases/download/0.1.0/cf-reverse-service-lookup-plugin-amd64
+cf install-plugin -f https://github.com/aegershman/cf-reverse-service-lookup-plugin/releases/download/0.3.0/cf-reverse-service-lookup-plugin-amd64
 
 # windows 64bit (32bit also available)
-cf install-plugin -f https://github.com/aegershman/cf-reverse-service-lookup-plugin/releases/download/0.1.0/cf-reverse-service-lookup-plugin-windows-amd64.exe
+cf install-plugin -f https://github.com/aegershman/cf-reverse-service-lookup-plugin/releases/download/0.3.0/cf-reverse-service-lookup-plugin-windows-amd64.exe
 ```
 
 ## feedback welcome

Taskfile.yml

@@ -22,3 +22,4 @@ tasks:
       - task: install
       - cf reverse-service-lookup --service-guid 67e9e04e-8cc5-4744-8a5a-eb0a2d21c7ee
       - cf reverse-service-lookup --service-guid service-instance_67e9e04e-8cc5-4744-8a5a-eb0a2d21c7ee --format table
+      - task: uninstall

apihelper/apihelper.go

@@ -5,19 +5,14 @@ import (
 	"strings"
 
 	"code.cloudfoundry.org/cli/plugin"
-	"github.com/aegershman/cf-reverse-service-lookup-plugin/apihelper"
-	"github.com/aegershman/cf-reverse-service-lookup-plugin/models"
-	"github.com/aegershman/cf-reverse-service-lookup-plugin/presenters"
+	"github.com/aegershman/cf-reverse-service-lookup-plugin/internal/v2client"
 	log "github.com/sirupsen/logrus"
 )
 
-// ReverseServiceLookupCmd -
-type ReverseServiceLookupCmd struct {
-	apiHelper apihelper.CFAPIHelper
-}
+type reverseServiceLookupCmd struct{}
 
 // ReverseServiceLookupCommand -
-func (cmd *ReverseServiceLookupCmd) ReverseServiceLookupCommand(args []string) {
+func (cmd *reverseServiceLookupCmd) ReverseServiceLookupCommand(cli plugin.CliConnection, args []string) {
 	var (
 		formatFlag      string
 		logLevelFlag    string
@@ -44,28 +39,30 @@ func (cmd *ReverseServiceLookupCmd) ReverseServiceLookupCommand(args []string) {
 
 	trimmedServiceGUID := strings.TrimPrefix(serviceGUIDFlag, trimPrefixFlag)
 
-	serviceInstance, err := cmd.apiHelper.GetServiceInstanceByGUID(trimmedServiceGUID)
+	cf := v2client.NewClient(cli)
+
+	serviceInstance, err := cf.Services.GetServiceInstanceByGUID(trimmedServiceGUID)
 	if err != nil {
 		log.Fatalln(err)
 	}
 
-	serviceSpace, err := cmd.apiHelper.GetSpaceByGUID(serviceInstance.SpaceGUID)
+	serviceSpace, err := cf.Spaces.GetSpaceByGUID(serviceInstance.SpaceGUID)
 	if err != nil {
 		log.Fatalln(err)
 	}
 
-	serviceOrganization, err := cmd.apiHelper.GetOrganizationByGUID(serviceSpace.OrganizationGUID)
+	serviceOrganization, err := cf.Orgs.GetOrganizationByGUID(serviceSpace.OrganizationGUID)
 	if err != nil {
 		log.Fatalln(err)
 	}
 
-	serviceReport := models.ServiceReport{
+	serviceReport := v2client.ServiceReport{
 		Service:      serviceInstance,
 		Space:        serviceSpace,
 		Organization: serviceOrganization,
 	}
 
-	presenter := presenters.Presenter{
+	presenter := v2client.Presenter{
 		ServiceReport: serviceReport,
 		Format:        formatFlag,
 	}
@@ -75,12 +72,12 @@ func (cmd *ReverseServiceLookupCmd) ReverseServiceLookupCommand(args []string) {
 }
 
 // GetMetadata -
-func (cmd *ReverseServiceLookupCmd) GetMetadata() plugin.PluginMetadata {
+func (cmd *reverseServiceLookupCmd) GetMetadata() plugin.PluginMetadata {
 	return plugin.PluginMetadata{
 		Name: "cf-reverse-service-lookup-plugin",
 		Version: plugin.VersionType{
 			Major: 0,
-			Minor: 2,
+			Minor: 3,
 			Build: 0,
 		},
 		Commands: []plugin.Command{
@@ -102,13 +99,12 @@ func (cmd *ReverseServiceLookupCmd) GetMetadata() plugin.PluginMetadata {
 }
 
 // Run -
-func (cmd *ReverseServiceLookupCmd) Run(cli plugin.CliConnection, args []string) {
+func (cmd *reverseServiceLookupCmd) Run(cli plugin.CliConnection, args []string) {
 	if args[0] == "reverse-service-lookup" {
-		cmd.apiHelper = apihelper.New(cli)
-		cmd.ReverseServiceLookupCommand(args)
+		cmd.ReverseServiceLookupCommand(cli, args)
 	}
 }
 
 func main() {
-	plugin.Start(new(ReverseServiceLookupCmd))
+	plugin.Start(new(reverseServiceLookupCmd))
 }

apihelper/test-data/organizations.json

@@ -9,4 +9,6 @@ require (
 	github.com/onsi/ginkgo v1.10.3 // indirect
 	github.com/onsi/gomega v1.7.1 // indirect
 	github.com/sirupsen/logrus v1.4.2
+	golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 // indirect
+	golang.org/x/sys v0.0.0-20191008105621-543471e840be // indirect
 )