Skip to content

Commit

Permalink
Set explicit file permissions in NoticeTask (#99206)
Browse files Browse the repository at this point in the history
  • Loading branch information
brianseeders authored Sep 5, 2023
1 parent 3e38d30 commit 0ec47aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 3 additions & 1 deletion distribution/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
if (testDistro) {
from buildServerNoticeTaskProvider
} else {
from buildDefaultNoticeTaskProvider
from (buildDefaultNoticeTaskProvider) {
fileMode = 0644
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,17 @@ public static void cleanupFiles() {
FileUtils.rm(instancesFile, certificatesFile);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test10Install() throws Exception {
install();
// Disable security auto-configuration as we want to generate keys/certificates manually here
ServerUtils.disableSecurityAutoConfiguration(installation);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test20Help() {
Shell.Result result = installation.executables().certgenTool.run("--help");
assertThat(result.stdout(), containsString("Simplifies certificate creation"));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test30Generate() throws Exception {
final List<String> lines = new ArrayList<>();
lines.add("instances:");
Expand All @@ -75,7 +72,6 @@ public void test30Generate() throws Exception {
assertThat(certificatesFile, file(File, owner, owner, p600));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test31ExtractCerts() throws Exception {
// windows 2012 r2 has powershell 4.0, which lacks Expand-Archive
assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2"));
Expand All @@ -94,7 +90,6 @@ public void test31ExtractCerts() throws Exception {
FileUtils.cp(certsDir, installation.config("certs"));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test40RunWithCert() throws Exception {
// windows 2012 r2 has powershell 4.0, which lacks Expand-Archive
assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2"));
Expand Down

0 comments on commit 0ec47aa

Please sign in to comment.