Merge pull request #101 from nerdalize/feature/project-set

Show project slug and dataset size

VERSION

@@ -1 +1 @@
-0.4.15
+0.4.16

command/dataset_list.go

@@ -1,11 +1,14 @@
 package command
 
 import (
+	"context"
 	"os"
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/mitchellh/cli"
+	"github.com/nerdalize/nerd/nerd/aws"
+	v1datatransfer "github.com/nerdalize/nerd/nerd/service/datatransfer/v1"
 	"github.com/olekukonko/tablewriter"
 	"github.com/pkg/errors"
 )
@@ -40,18 +43,31 @@ func (cmd *DatasetList) DoRun(args []string) (err error) {
 	if err != nil {
 		HandleError(err)
 	}
+	dataOps, err := aws.NewDataClient(
+		aws.NewNerdalizeCredentials(bclient, ss.Project.Name),
+		ss.Project.AWSRegion,
+	)
+	if err != nil {
+		HandleError(errors.Wrap(err, "could not create aws dataops client"))
+	}
 	out, err := bclient.ListDatasets(ss.Project.Name)
 	if err != nil {
 		HandleError(err)
 	}
 
 	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"ProjectID", "DatasetID", "Created"})
+	table.SetHeader([]string{"ProjectID", "DatasetID", "Created", "Size"})
 	for _, t := range out.Datasets {
+		var size int64
+		size, err = v1datatransfer.GetRemoteDatasetSize(context.Background(), bclient, dataOps, ss.Project.Name, t.DatasetID)
+		if err != nil {
+			HandleError(err)
+		}
 		row := []string{}
 		row = append(row, t.ProjectID)
 		row = append(row, t.DatasetID)
 		row = append(row, humanize.Time(time.Unix(t.CreatedAt, 0)))
+		row = append(row, humanize.Bytes(uint64(size)))
 		table.Append(row)
 	}
 

command/project_list.go

@@ -51,7 +51,7 @@ func (cmd *ProjectList) DoRun(args []string) (err error) {
 		HandleError(err)
 	}
 	for _, project := range projects.Projects {
-		fmt.Printf("%v\n", project.Code)
+		fmt.Printf("%v\n", project.Slug)
 	}
 
 	return nil

nerd/client/auth/v1/payload/project.go

@@ -9,5 +9,5 @@ type ListProjectsOutput struct {
 type Project struct {
 	ID   int    `json:"id"`
 	URL  string `json:"url"`
-	Code string `json:"code"`
+	Slug string `json:"slug"`
 }