Skip to content

Commit d8636d0

Browse files
committed
Rename syskeygen
This commit renames syskeygen to elasticsearch-syskeygen
1 parent c7c0e33 commit d8636d0

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

x-pack/docs/en/commands/syskeygen.asciidoc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[role="xpack"]
22
[[syskeygen]]
3-
== syskeygen
3+
== elasticsearch-syskeygen
44

5-
The `syskeygen` command creates a system key file in `CONFIG_DIR/x-pack`.
5+
The `elasticsearch-syskeygen` command creates a system key file in the
6+
elasticsearch config directory.
67

78
[float]
89
=== Synopsis
910

1011
[source,shell]
1112
--------------------------------------------------
12-
bin/x-pack/syskeygen
13+
bin/elasticsearch-syskeygen
1314
[-E <KeyValuePair>] [-h, --help]
1415
([-s, --silent] | [-v, --verbose])
1516
--------------------------------------------------
@@ -46,5 +47,5 @@ default `$ES_HOME/config/x-pack` directory:
4647

4748
[source, sh]
4849
--------------------------------------------------
49-
bin/x-pack/syskeygen
50+
bin/elasticsearch-syskeygen
5051
--------------------------------------------------

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ private static SecretKey readSystemKey(InputStream in) throws IOException {
9292
final byte[] keyBytes = new byte[keySizeBytes];
9393
final int read = Streams.readFully(in, keyBytes);
9494
if (read != keySizeBytes) {
95-
throw new IllegalArgumentException("key size did not match expected value; was the key generated with syskeygen?");
95+
throw new IllegalArgumentException(
96+
"key size did not match expected value; was the key generated with elasticsearch-syskeygen?");
9697
}
9798
return new SecretKeySpec(keyBytes, KEY_ALGO);
9899
}

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/EncryptSensitiveDataBootstrapCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public BootstrapCheckResult check(BootstrapContext context) {
3737
"filesystem.\nRepeat this on every node in the cluster.";
3838
} else {
3939
message = "Encryption of sensitive data requires a key to be placed in the secure setting store. First run the " +
40-
"bin/x-pack/syskeygen tool to generate a key file.\nThen run 'bin/elasticsearch-keystore add-file " +
40+
"bin/elasticsearch-syskeygen tool to generate a key file.\nThen run 'bin/elasticsearch-keystore add-file " +
4141
WatcherField.ENCRYPTION_KEY_SETTING.getKey() + " " +
4242
systemKeyPath + "' to import the key into" +
4343
" the secure setting store. Finally, remove the system_key file from the filesystem.\n" +

x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ verify_xpack_installation() {
2929
'elasticsearch-sql-cli'
3030
'elasticsearch-sql-cli.bat'
3131
"elasticsearch-sql-cli-$(cat version).jar" # This jar is executable so we pitch it in bin so folks will find it
32-
'syskeygen'
33-
'syskeygen.bat'
32+
'elasticsearch-syskeygen'
33+
'elasticsearch-syskeygen.bat'
3434
'elasticsearch-users'
3535
'elasticsearch-users.bat'
3636
'x-pack-env'

0 commit comments

Comments
 (0)