Change log messages, now conditional on dist: false not dev: true

src/core/server/elasticsearch/elasticsearch_config.test.ts

@@ -108,10 +108,10 @@ test('#ssl.certificateAuthorities accepts both string and array of strings', ()
   expect(configValue.ssl.certificateAuthorities).toEqual(['some-path', 'another-path']);
 });
 
-test('#username throws if equal to "elastic", only while in dev mode', () => {
+test('#username throws if equal to "elastic", only while running from source', () => {
   const obj = {
     username: 'elastic',
   };
-  expect(() => config.schema.validate(obj, { dev: true })).toThrowErrorMatchingSnapshot();
-  expect(() => config.schema.validate(obj, { dev: false })).not.toThrow();
+  expect(() => config.schema.validate(obj, { dist: false })).toThrowErrorMatchingSnapshot();
+  expect(() => config.schema.validate(obj, { dist: true })).not.toThrow();
 });

src/core/server/elasticsearch/elasticsearch_config.ts

@@ -40,22 +40,22 @@ export const config = {
       defaultValue: 'http://localhost:9200',
     }),
     preserveHost: schema.boolean({ defaultValue: true }),
-    username: schema.conditional(
-      schema.contextRef('dev'),
-      true,
-      schema.maybe(
+    username: schema.maybe(
+      schema.conditional(
+        schema.contextRef('dist'),
+        false,
         schema.string({
           validate: rawConfig => {
             if (rawConfig === 'elastic') {
               return (
-                'value of "elastic" is forbidden in dev mode. This is a superuser account that can obfuscate privilege-related ' +
-                'issues. You should use the "kibana" user instead.'
+                'value of "elastic" is forbidden. This is a superuser account that can obfuscate ' +
+                'privilege-related issues. You should use the "kibana" user instead.'
               );
             }
           },
-        })
-      ),
-      schema.maybe(schema.string())
+        }),
+        schema.string()
+      )
     ),
     password: schema.maybe(schema.string()),
     requestHeadersWhitelist: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
@@ -215,9 +215,9 @@ export class ElasticsearchConfig {
 
     if (this.username === 'elastic' && log !== undefined) {
       // logger is optional / not used during tests
-      // TODO: logger can be removed when ISSUE#40255 is resolved to support deprecations in NP config service
+      // TODO: logger can be removed when issue #40255 is resolved to support deprecations in NP config service
       log.warn(
-        `Setting the elasticsearch username to "elastic" in production mode is deprecated. You should use the "kibana" user instead.`,
+        `Setting the elasticsearch username to "elastic" is deprecated. You should use the "kibana" user instead.`,
         { tags: ['deprecation'] }
       );
     }