variadic usage (#102)

aegershman · Dec 8, 2019 · d8d87e2 · d8d87e2
1 parent 849b3fc
commit d8d87e2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -236,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.1.0/cf-report-usage-plugin-darwin
+cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.1.1/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.1.0/cf-report-usage-plugin-linux-amd64
+cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.1.1/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.1.0/cf-report-usage-plugin-windows-amd64.exe
+cf install-plugin -f https://github.com/aegershman/cf-report-usage-plugin/releases/download/3.1.1/cf-report-usage-plugin-windows-amd64.exe
 ```
 
 ## backwards compatibility

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -25,4 +25,7 @@ tasks:
       - 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
+      # TODO long running / test failures
+      - cf report-usage --format table-org-quota
+      - cf report-usage -o not-real-org
       - task: uninstall
diff --git a/cmd/reportusage/main.go b/cmd/reportusage/main.go
@@ -49,7 +49,7 @@ func (cmd *reportUsageCmd) reportUsageCommand(cli plugin.CliConnection, args []s
 	log.SetLevel(logLevel)
 
 	reporter := report.NewClient(cli)
-	summaryReport, err := reporter.GetSummaryReportByOrgNames(orgNamesFlag.names)
+	summaryReport, err := reporter.GetSummaryReportByOrgNames(orgNamesFlag.names...)
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -76,7 +76,7 @@ func (cmd *reportUsageCmd) GetMetadata() plugin.PluginMetadata {
 		Version: plugin.VersionType{
 			Major: 3,
 			Minor: 1,
-			Build: 0,
+			Build: 1,
 		},
 		Commands: []plugin.Command{
 			{

diff --git a/internal/report/client.go b/internal/report/client.go
@@ -18,8 +18,8 @@ func NewClient(cli plugin.CliConnection) *Client {
 }
 
 // GetSummaryReportByOrgNames -
-func (r *Client) GetSummaryReportByOrgNames(orgNames []string) (*SummaryReport, error) {
-	populatedOrgs, err := r.getOrgs(orgNames)
+func (r *Client) GetSummaryReportByOrgNames(orgNames ...string) (*SummaryReport, error) {
+	populatedOrgs, err := r.getOrgs(orgNames...)
 	if err != nil {
 		return &SummaryReport{}, nil
 	}
@@ -28,11 +28,11 @@ func (r *Client) GetSummaryReportByOrgNames(orgNames []string) (*SummaryReport,
 	for _, org := range populatedOrgs {
 		spaceReports := r.getSpaceReportsByOrg(org)
 		orgQuota, _ := r.client.OrgQuotas.GetOrgQuota(org.QuotaURL)
-		orgReport := *NewOrgReport(orgQuota, org, spaceReports)
+		orgReport := *NewOrgReport(orgQuota, org, spaceReports...)
 		orgReports = append(orgReports, orgReport)
 	}
 
-	return NewSummaryReport(orgReports), nil
+	return NewSummaryReport(orgReports...), nil
 }
 
 func (r *Client) getSpaceReportsByOrg(org v2client.Org) []SpaceReport {
@@ -44,7 +44,7 @@ func (r *Client) getSpaceReportsByOrg(org v2client.Org) []SpaceReport {
 	return spaceReports
 }
 
-func (r *Client) getOrgs(orgNames []string) ([]v2client.Org, error) {
+func (r *Client) getOrgs(orgNames ...string) ([]v2client.Org, error) {
 	var rawOrgs []v2client.Org
 
 	if len(orgNames) > 0 {

diff --git a/internal/report/org_report.go b/internal/report/org_report.go
@@ -13,7 +13,7 @@ type OrgReport struct {
 }
 
 // NewOrgReport -
-func NewOrgReport(orgQuota v2client.OrgQuota, org v2client.Org, spaceReports []SpaceReport) *OrgReport {
+func NewOrgReport(orgQuota v2client.OrgQuota, org v2client.Org, spaceReports ...SpaceReport) *OrgReport {
 	self := &OrgReport{
 		OrgQuota:     orgQuota,
 		orgRef:       org,

diff --git a/internal/report/summary_report.go b/internal/report/summary_report.go
@@ -13,7 +13,7 @@ type SummaryReport struct {
 }
 
 // NewSummaryReport -
-func NewSummaryReport(orgReports []OrgReport) *SummaryReport {
+func NewSummaryReport(orgReports ...OrgReport) *SummaryReport {
 	self := &SummaryReport{
 		OrgReports: orgReports,
 	}