incorporate org quota (#101)

Author: aegershman

README.md

@@ -71,6 +71,18 @@ This example is going to be a bit cluttered, so it's recommended using `jq` to p
   "summary_report": {
     "org_reports": [
       {
+        "org_quota": {
+          "name": "voyager",
+          "total_services": -1,
+          "total_routes": -1,
+          "total_private_domains": -1,
+          "memory_limit": 83968,
+          "instance_memory_limit": -1,
+          "app_instance_limit": 38,
+          "app_task_limit": -1,
+          "total_service_keys": -1,
+          "total_reserved_route_ports": -1
+        },
         "app_instances_count": 37,
         "apps_count": 28,
         "billable_app_instances_count": 40,
@@ -121,6 +133,18 @@ This example is going to be a bit cluttered, so it's recommended using `jq` to p
         ]
       },
       {
+        "org_quota": {
+          "name": "tenzing",
+          "total_services": -1,
+          "total_routes": -1,
+          "total_private_domains": -1,
+          "memory_limit": 83968,
+          "instance_memory_limit": -1,
+          "app_instance_limit": 0,
+          "app_task_limit": -1,
+          "total_service_keys": -1,
+          "total_reserved_route_ports": -1
+        },
         "app_instances_count": 0,
         "apps_count": 21,
         "billable_app_instances_count": 5,
@@ -212,13 +236,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-report-usage-plugin/releases/download/3.0.0/cf-report-usage-plugin-darwin
+cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.1.0/cf-report-usage-plugin-darwin
 
 # linux 64bit (32bit and ARM6 also available)
-cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.0.0/cf-report-usage-plugin-linux-amd64
+cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.1.0/cf-report-usage-plugin-linux-amd64
 
 # windows 64bit (32bit also available)
-cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.0.0/cf-report-usage-plugin-windows-amd64.exe
+cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.1.0/cf-report-usage-plugin-windows-amd64.exe
 ```
 
 ## backwards compatibility

Taskfile.yml

@@ -23,4 +23,6 @@ tasks:
       - cf report-usage -o voyager -o tenzing --format string
       - cf report-usage -o voyager -o tenzing --format table
       - cf report-usage -o voyager -o tenzing --format json
+      # TODO will remove this last line, shouldn't be displayed in README
+      - cf report-usage -o voyager -o tenzing --format table-org-quota
       - task: uninstall

cmd/reportusage/main.go

@@ -75,8 +75,8 @@ func (cmd *reportUsageCmd) GetMetadata() plugin.PluginMetadata {
 		Name: "cf-report-usage-plugin",
 		Version: plugin.VersionType{
 			Major: 3,
-			Minor: 0,
-			Build: 1,
+			Minor: 1,
+			Build: 0,
 		},
 		Commands: []plugin.Command{
 			{

internal/presentation/json_presenter.go internal/presentation/json.gointernal/presentation/json_presenter.go renamed to internal/presentation/json.go

@@ -21,12 +21,14 @@ func NewPresenter(r report.SummaryReport, format string) Presenter {
 // Render -
 func (p *Presenter) Render() {
 	switch p.Format {
+	case "json":
+		p.asJSON()
 	case "string":
 		p.asString()
+	case "table-org-quota": // again, TODO, bleh
+		p.asTableOrgQuota()
 	case "table":
 		p.asTable()
-	case "json":
-		p.asJSON()
 	default:
 		// TODO
 		// yeah this is kind of awful I know, I'm sorry, I'm still learning,

internal/presentation/presenter.go

@@ -0,0 +1,43 @@
+package presentation
+
+import (
+	"os"
+	"strconv"
+
+	"github.com/olekukonko/tablewriter"
+)
+
+// TODO this is ugly as sin, I know, it's temporary
+// I just need to get this out for working on a project
+func (p *Presenter) asTableOrgQuota() {
+	table := tablewriter.NewWriter(os.Stdout)
+	table.SetAlignment(tablewriter.ALIGN_CENTER)
+	table.SetHeader([]string{
+		"Org",
+		"AI Quota",
+		"Deployed AIs",
+		"Running AIs",
+		"Stopped AIs",
+	})
+
+	for _, orgReport := range p.SummaryReport.OrgReports {
+		table.Append([]string{
+			orgReport.Name,
+			strconv.Itoa(orgReport.OrgQuota.AppInstanceLimit),
+			strconv.Itoa(orgReport.AppInstancesCount),
+			strconv.Itoa(orgReport.RunningAppInstancesCount),
+			strconv.Itoa(orgReport.StoppedAppInstancesCount),
+		})
+	}
+
+	table.SetFooter([]string{
+		"Total",
+		"-",
+		strconv.Itoa(p.SummaryReport.AppInstancesCount),
+		strconv.Itoa(p.SummaryReport.RunningAppInstancesCount),
+		strconv.Itoa(p.SummaryReport.StoppedAppInstancesCount),
+	})
+
+	table.Render()
+
+}

internal/presentation/string_presenter.go internal/presentation/string.gointernal/presentation/string_presenter.go renamed to internal/presentation/string.go

@@ -27,7 +27,8 @@ func (r *Client) GetSummaryReportByOrgNames(orgNames []string) (*SummaryReport,
 	var orgReports []OrgReport
 	for _, org := range populatedOrgs {
 		spaceReports := r.getSpaceReportsByOrg(org)
-		orgReport := *NewOrgReport(org, spaceReports)
+		orgQuota, _ := r.client.OrgQuotas.GetOrgQuota(org.QuotaURL)
+		orgReport := *NewOrgReport(orgQuota, org, spaceReports)
 		orgReports = append(orgReports, orgReport)
 	}
 
@@ -92,10 +93,13 @@ func (r *Client) getOrgDetails(o v2client.Org) (v2client.Org, error) {
 	}
 
 	return v2client.Org{
-		Name:        o.Name,
 		MemoryQuota: quota.MemoryLimit,
 		MemoryUsage: int(usage),
+		Name:        o.Name,
+		QuotaURL:    o.QuotaURL,
 		Spaces:      spaces,
+		SpacesURL:   o.SpacesURL,
+		URL:         o.URL,
 	}, nil
 }