From 48fd3a67b3c09249e3f7ee35c101e272077e7ca6 Mon Sep 17 00:00:00 2001
From: Pedro Cunha <pkunha@gmail.com>
Date: Mon, 25 Sep 2017 17:07:19 +0100
Subject: [PATCH] Refactor struct to its own file

---
 cli/data/get.go      | 25 +++++--------------------
 cli/data/s3source.go | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 cli/data/s3source.go

diff --git a/cli/data/get.go b/cli/data/get.go
index eb6b857..a3bd501 100644
--- a/cli/data/get.go
+++ b/cli/data/get.go
@@ -27,21 +27,6 @@ import (
 	"strings"
 )
 
-type S3Target struct {
-	bucket string
-	prefix string
-	path string
-}
-
-func (s *S3Target) copy() *S3Target {
-	clone := *s
-	return &clone
-}
-
-func (t *S3Target) fullPath() string {
-	return fmt.Sprintf("%s/%s/%s", t.bucket, t.prefix, t.path);
-}
-
 var getBranch string
 var getCommitPath string
 
@@ -60,7 +45,7 @@ $ paddle data get -b experimental trained-model/version1 dest/path
 			exitErrorf("Bucket not defined. Please define 'bucket' in your config file.")
 		}
 
-		source := S3Target{
+		source := S3Source{
 			bucket: viper.GetString("bucket"),
 			prefix: fmt.Sprintf("%s/%s", args[0], getBranch),
 			path: getCommitPath,
@@ -75,7 +60,7 @@ func init() {
 	getCmd.Flags().StringVarP(&getCommitPath, "path", "p", "HEAD", "Path to fetch (instead of HEAD)")
 }
 
-func copyPathToDestination(source *S3Target, destination string) {
+func copyPathToDestination(source *S3Source, destination string) {
 	session := session.Must(session.NewSessionWithOptions(session.Options{
 		SharedConfigState: session.SharedConfigEnable,
 	}))
@@ -92,7 +77,7 @@ func copyPathToDestination(source *S3Target, destination string) {
 	copy(session, source, destination)
 }
 
-func readHEAD(session *session.Session, source *S3Target) string {
+func readHEAD(session *session.Session, source *S3Source) string {
 	svc := s3.New(session)
 	key := fmt.Sprintf("%s/HEAD", source.prefix)
 
@@ -110,7 +95,7 @@ func readHEAD(session *session.Session, source *S3Target) string {
 	return buf.String()
 }
 
-func copy(session *session.Session, source *S3Target, destination string) {
+func copy(session *session.Session, source *S3Source, destination string) {
 	query := &s3.ListObjectsV2Input{
 		Bucket: aws.String(source.bucket),
 		Prefix: aws.String(source.prefix + "/" + source.path),
@@ -134,7 +119,7 @@ func copy(session *session.Session, source *S3Target, destination string) {
 	}
 }
 
-func copyToLocalFiles(s3Client *s3.S3, objects []*s3.Object, source *S3Target, destination string) {
+func copyToLocalFiles(s3Client *s3.S3, objects []*s3.Object, source *S3Source, destination string) {
 	for _, key := range objects {
 		destFilename := *key.Key
 		if strings.HasSuffix(*key.Key, "/") {
diff --git a/cli/data/s3source.go b/cli/data/s3source.go
new file mode 100644
index 0000000..b7abe54
--- /dev/null
+++ b/cli/data/s3source.go
@@ -0,0 +1,20 @@
+package data
+
+import (
+	"fmt"
+)
+
+type S3Source struct {
+	bucket string
+	prefix string
+	path string
+}
+
+func (s *S3Source) copy() *S3Source {
+	clone := *s
+	return &clone
+}
+
+func (t *S3Source) fullPath() string {
+	return fmt.Sprintf("%s/%s/%s", t.bucket, t.prefix, t.path);
+}