stable filemode for zip distributions (#30854)

andyb-elastic · web-flow · commit 116d08303e73 · 2018-05-29T17:32:06.000-07:00
Applies default file and directory permissions to zip distributions similar to how they're set for the tar distributions. Previously zip distributions would retain permissions they had on the build host's working tree, which could vary depending on its umask For #30799
diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle
@@ -106,15 +106,23 @@ tasks.withType(AbstractArchiveTask) {
   baseName = "elasticsearch${ subdir.contains('oss') ? '-oss' : ''}"
 }
 
+Closure commonZipConfig = {
+  dirMode 0755
+  fileMode 0644
+}
+
 task buildIntegTestZip(type: Zip) {
+  configure(commonZipConfig)
   with archiveFiles(transportModulesFiles, 'zip', false)
 }
 
 task buildZip(type: Zip) {
+  configure(commonZipConfig)
   with archiveFiles(modulesFiles(false), 'zip', false)
 }
 
 task buildOssZip(type: Zip) {
+  configure(commonZipConfig)
   with archiveFiles(modulesFiles(true), 'zip', true)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,15 +106,23 @@ tasks.withType(AbstractArchiveTask) {`
`106`	`106`	`baseName = "elasticsearch${ subdir.contains('oss') ? '-oss' : ''}"`
`107`	`107`	`}`
`108`	`108`
	`109`	`+Closure commonZipConfig = {`
	`110`	`+ dirMode 0755`
	`111`	`+ fileMode 0644`
	`112`	`+}`
	`113`	`+`
`109`	`114`	`task buildIntegTestZip(type: Zip) {`
	`115`	`+ configure(commonZipConfig)`
`110`	`116`	`with archiveFiles(transportModulesFiles, 'zip', false)`
`111`	`117`	`}`
`112`	`118`
`113`	`119`	`task buildZip(type: Zip) {`
	`120`	`+ configure(commonZipConfig)`
`114`	`121`	`with archiveFiles(modulesFiles(false), 'zip', false)`
`115`	`122`	`}`
`116`	`123`
`117`	`124`	`task buildOssZip(type: Zip) {`
	`125`	`+ configure(commonZipConfig)`
`118`	`126`	`with archiveFiles(modulesFiles(true), 'zip', true)`
`119`	`127`	`}`
`120`	`128`