Fix uploaded file URL bug

Add tests, travis file

Author: djfarrelly

.travis.yml

@@ -0,0 +1,11 @@
+language: go
+
+go:
+  - "1.10"
+
+install:
+  - curl https://glide.sh/get | sh
+  - glide install
+
+notifications:
+  email: false

main.go

@@ -118,12 +118,12 @@ func HasPreviousUpload(svc *s3.S3, bucket string, filename string) bool {
 }
 
 // GetFileURL returns the final url of the file
-func GetFileURL(filename string, bucket string) string {
+func GetFileURL(bucket string, bucketFilename string) string {
 	// the static.buffer.com bucket has a domain alias
 	if bucket == defaultS3Bucket {
-		return "https://" + path.Join(bucket, filename)
+		return "https://" + path.Join(bucket, bucketFilename)
 	}
-	return "https://s3.amazonaws.com" + path.Join("/", filename)
+	return "https://s3.amazonaws.com" + path.Join("/", bucket, "/", bucketFilename)
 }
 
 // UploadFile uploads a given file to the s3 bucket
@@ -153,6 +153,8 @@ func VersionAndUploadFiles(
 ) (map[string]string, error) {
 	fileVersions := map[string]string{}
 
+	fmt.Printf("Uploading to %s/%s\n", bucket, directory)
+
 	for _, filename := range filenames {
 		file, err := os.Open(filename)
 		if err != nil {
@@ -170,7 +172,7 @@ func VersionAndUploadFiles(
 			uploadFilename = GetVersionedFilename(filename, checksum)
 		}
 		bucketFilename := path.Join(directory, uploadFilename)
-		fileURL := GetFileURL(filename, bucket)
+		fileURL := GetFileURL(bucket, bucketFilename)
 
 		shouldUpload := !HasPreviousUpload(svc, bucket, bucketFilename)
 		if shouldUpload && !dryRun {
@@ -181,9 +183,9 @@ func VersionAndUploadFiles(
 		}
 
 		if shouldUpload {
-			fmt.Printf("%-10s %s\n", "Uploaded", fileURL)
+			fmt.Printf("%-10s %s\n", "Uploaded", filename)
 		} else {
-			fmt.Printf("%-10s %s\n", "Skipped", fileURL)
+			fmt.Printf("%-10s %s\n", "Skipped", filename)
 		}
 
 		fileVersions[filename] = fileURL

main_test.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestGetFileURL(t *testing.T) {
+	tests := []struct {
+		bucket         string
+		bucketFilename string
+		expected       string
+	}{
+		{"some-bucket", "js/app.1234.js", "https://s3.amazonaws.com/some-bucket/js/app.1234.js"},
+		{"static.buffer.com", "dir/js/app.1234.js", "https://static.buffer.com/dir/js/app.1234.js"},
+	}
+
+	for _, test := range tests {
+		actual := GetFileURL(test.bucket, test.bucketFilename)
+		if actual != test.expected {
+			t.Errorf("File URL was incorrect, got: %s, expected %s", actual, test.expected)
+		}
+	}
+}