Fix upload issues

Author: sivakumar-kailasam

lib/s3-sync.js

@@ -4,6 +4,7 @@ import ora from 'ora'
 import http from 'http'
 import https from 'https'
 import humanSize from 'human-size'
+import { merge } from 'lodash'
 
 // To increase s3's download & upload dir perf
 http.globalAgent.maxSockets = https.globalAgent.maxSockets = 30
@@ -25,29 +26,29 @@ const jsonDocsDirDownloadOptions = {
 	},
 }
 
-const jsonDocsDirUploadOptions = {
-	localDir: 'tmp/json-docs',
+const jsonDocsDirUploadOptions = merge({}, jsonDocsDirDownloadOptions, {
 	s3Params: {
-		//ACL: 'public-read',
-		Bucket: 'api-docs.emberjs.com',
+		ACL: 'public-read',
 		CacheControl: 'max-age=365000000, immutable',
 		GrantRead: 'uri=http://acs.amazonaws.com/groups/global/AllUsers',
-		//maxRetries: 5,
-		Prefix: 'json-docs',
 	},
-}
+})
 
-const revDocsDirUploadOptions = {
+let revDocsDirDownloadOptions = {
 	localDir: 'tmp/rev-index',
 	s3Params: {
-		//ACL: 'public-read',
 		Bucket: 'api-docs.emberjs.com',
-		GrantRead: 'uri=http://acs.amazonaws.com/groups/global/AllUsers',
-		//maxRetries: 5,
 		Prefix: 'rev-index',
 	},
 }
 
+const revDocsDirUploadOptions = merge({}, revDocsDirDownloadOptions, {
+	s3Params: {
+		ACL: 'public-read',
+		GrantRead: 'uri=http://acs.amazonaws.com/groups/global/AllUsers',
+	},
+})
+
 const syncDir = (operation, options) => {
 	return new Promise((resolve, reject) => {
 		let isDownload = operation === 'download'
@@ -75,9 +76,6 @@ const syncDir = (operation, options) => {
 }
 
 export function downloadExistingDocsToLocal() {
-	let revDocsDirDownloadOptions = revDocsDirUploadOptions
-	delete revDocsDirDownloadOptions.s3Params.GrantRead
-
 	return waitForAllPromises([
 		syncDir('download', jsonDocsDirDownloadOptions),
 		syncDir('download', revDocsDirDownloadOptions),