[grunt/s3] upgrade to aws_s3 package, grunt-s3 package is broken

grunt/browser_clients.js

@@ -57,7 +57,7 @@ module.exports = function (grunt) {
       'copy:dist_to_named_dir',
       'compress:' + type + '_zip',
       'compress:' + type + '_tarball',
-      's3:upload_archives'
+      'aws_s3:upload_archives'
     ]);
   });
 

grunt/config/aws_s3.js

@@ -5,20 +5,21 @@ try {
 
 module.exports = {
   upload_archives: {
-    upload: [
+    files: [
       {
-        src: '<%= distDir %>/archives/*',
+        expand: true,
+        cwd: '<%= distDir %>/archives',
+        src: '*',
         dest: 'elasticsearch/elasticsearch-js/'
-      }
+      },
     ],
     options: {
-      key: config.key || process.env.AWS_KEY,
-      secret: config.secret || process.env.AWS_SECRET,
+      accessKeyId: config.key || process.env.AWS_KEY,
+      secretAccessKey: config.secret || process.env.AWS_SECRET,
       bucket: 'download.elasticsearch.org',
       access: 'public-read',
-      headers: {
-        'X-Content-Type-Options': 'nosniff',
-        'Content-Disposition': 'attachment'
+      params: {
+        'ContentDisposition': 'attachment'
       }
     }
   }

package.json

@@ -58,6 +58,7 @@
     "find-root": "~0.1.1",
     "glob": "~3.2.7",
     "grunt": "^1.0.1",
+    "grunt-aws-s3": "^2.0.0",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-compress": "^1.2.0",
@@ -70,7 +71,6 @@
     "grunt-open": "~0.2.2",
     "grunt-prompt": "^1.3.3",
     "grunt-run": "^0.6.0",
-    "grunt-s3": "~0.2.0-alpha.3",
     "grunt-saucelabs": "^8.6.2",
     "grunt-webpack": "^1.0.11",
     "jquery": "^2.2.3",
@@ -116,4 +116,4 @@
   "engines": {
     "node": ">=0.8"
   }
-}
+}