Remove random upload path (close snowplow#538)

unbounce · Jan 9, 2017 · e333d60 · e333d60
1 parent 59d1179
commit e333d60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -224,7 +224,7 @@ module.exports = function(grunt) {
         files: [
           {
             src: ["dist/sp.js"],
-            dest: "<%= aws.uploadPath %>"
+            dest: "<%= pkg.version %>/sp.js"
           }
         ]
       },
@@ -237,7 +237,7 @@ module.exports = function(grunt) {
         files: [
           {
             src: ["dist/sp.js"],
-            dest: "<%= aws.uploadPath %>"
+            dest: "<%= pkg.pinnedVersion %>/sp.js"
           }
         ]
       }
@@ -252,14 +252,14 @@ module.exports = function(grunt) {
       not_pinned: {
         options: {
           invalidations: [
-            '/<%= aws.uploadPath %>'
+            '/<%= pkg.version %>/sp.js'
           ]
         }
       },
       pinned: {
         options: {
           invalidations: [
-            '/<%= aws.uploadPath %>'
+            '/<%= pkg.pinnedVersion %>/sp.js'
           ]
         }
       }

diff --git a/aws.sample.json b/aws.sample.json
@@ -3,6 +3,5 @@
   "secret": "ADD HERE",
   "bucket": "ADD HERE",
   "region": "ADD HERE",
-  "distribution": "ADD HERE",
-  "uploadPath": "ADD HERE"
+  "distribution": "ADD HERE"
 }
diff --git a/vagrant/push/publish-tracker.bash b/vagrant/push/publish-tracker.bash
@@ -84,14 +84,10 @@ then
 	read -e -s secret
 	echo "Please enter your AWS bucket"
 	read -e -s bucket
-	echo "Please enter your AWS region"
-	read -e -s region
 	echo "Please enter your AWS distribution"
 	read -e -s distribution
-	echo "Please enter your AWS bucket key-path (eg. 'test/b7IkgoKFWXLNbFk.js')"
-	read -e -s uploadPath
 
-	echo "{\"key\":\"$key\",\"secret\":\"$secret\",\"bucket\":\"$bucket\",\"distribution\":\"$distribution\",\"region\":\"$region\",\"uploadPath\":\"$uploadPath\"}" > aws.json
+	echo "{\"key\":\"$key\",\"secret\":\"$secret\",\"bucket\":\"$bucket\",\"distribution\":\"$distribution\"}" > aws.json
 
 	vagrant ssh -c "cd /vagrant && sudo npm install && grunt publish"