Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rename] Refactored src/core/server/logging,metrics,plugins,rendering,root #90

Merged
merged 8 commits into from
Mar 13, 2021
Merged

[Rename] Refactored src/core/server/logging,metrics,plugins,rendering,root #90

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a0bd6b
[Rename] Refactored src/core/server/logging directory
mihirsoni Mar 7, 2021
88ed9de
[Rename] Refactored src/core/server/metrics directory
mihirsoni Mar 7, 2021
0d1d648
[Rename] Refactored src/core/server/plugins directory
mihirsoni Mar 7, 2021
ea53fcb
[Rename] Refactored src/core/server/rendering directory
mihirsoni Mar 7, 2021
ef6340d
[Rename] Refactored src/core/server/root directory
mihirsoni Mar 7, 2021
567b8af
[Rename] addressed review feedbacks
mihirsoni Mar 11, 2021
897a908
[Rename] addressed review feedbacks
mihirsoni Mar 11, 2021
81adfd6
[Rename] addressed PR comments
mihirsoni Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[Rename] addressed PR comments 
Signed-off-by: Mihir Soni <mihirsoni.123@gmail.com>
  • Loading branch information
@mihirsoni
mihirsoni committed Mar 13, 2021
commit 81adfd66dd7e754d89f5a4c9f7857c15030264b4
2 changes: 1 addition & 1 deletion src/core/server/logging/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Example of `%logger` output:
```bash
server
server.http
server.http.opensearchDashboards
server.http.OpenSearchDashboards
```

#### message
Expand Down
4 changes: 2 additions & 2 deletions src/core/server/plugins/plugin_context.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function createPluginManifest(manifestProps: Partial<PluginManifest> = {}): Plug
id: 'some-plugin-id',
version: 'some-version',
configPath: 'path',
OpenSearchDashboardsVersion: '7.0.0',
opensearchDashboardsVersion: '7.0.0',
requiredPlugins: ['some-required-dep'],
requiredBundles: [],
optionalPlugins: ['some-optional-dep'],
Expand Down Expand Up @@ -82,7 +82,7 @@ describe('createPluginInitializerContext', () => {
.pipe(first())
.toPromise();
expect(configObject).toStrictEqual({
OpenSearchDashboards: {
opensearchDashboards: {
index: '.opensearch-dashboards',
autocompleteTerminateAfter: duration(100000),
autocompleteTimeout: duration(1000),
Expand Down
4 changes: 2 additions & 2 deletions src/core/server/plugins/plugin_context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
PluginOpaqueId,
SharedGlobalConfigKeys,
} from './types';
import { OpenSearchDashboardsConfigType, config as OpenSearchDashboardsConfig } from '../opensearch_dashboards_config';
import { OpenSearchDashboardsConfigType, config as opensearchDashboardsConfig } from '../opensearch_dashboards_config';
import {
OpenSearchConfigType,
config as opensearchConfig,
Expand Down Expand Up @@ -93,7 +93,7 @@ export function createPluginInitializerContext(
* @deprecated
*/
globalConfig$: combineLatest([
coreContext.configService.atPath<OpenSearchDashboardsConfigType> OpenSearchDashboardsConfig.path),
coreContext.configService.atPath<OpenSearchDashboardsConfigType> opensearchDashboardsConfig.path),
coreContext.configService.atPath<OpenSearchConfigType>(opensearchConfig.path),
coreContext.configService.atPath<PathConfigType>(pathConfig.path),
coreContext.configService.atPath<SavedObjectsConfigType>(savedObjectsConfig.path),
Expand Down
4 changes: 2 additions & 2 deletions src/core/server/plugins/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { PathConfigType } from '@osd/utils';
import { ConfigPath, EnvironmentMode, PackageInfo, ConfigDeprecationProvider } from '../config';
import { LoggerFactory } from '../logging';
import { OpenSearchDashboardsConfigType } from '../opensearch_dashboards_config';
import { ConfigType } from '../opensearch/opensearch_config';
import { OpenSearchConfigType } from '../opensearch/opensearch_config';
import { SavedObjectsConfigType } from '../saved_objects/saved_objects_config';
import { CoreSetup, CoreStart } from '..';

Expand Down Expand Up @@ -272,7 +272,7 @@ export const SharedGlobalConfigKeys = {
*/
export type SharedGlobalConfig = RecursiveReadonly<{
opensearchDashboards: Pick<OpenSearchDashboardsConfigType, typeof SharedGlobalConfigKeys.opensearchDashboards[number]>;
opensearch: Pick<ConfigType, typeof SharedGlobalConfigKeys.opensearch[number]>;
opensearch: Pick<OpenSearchConfigType, typeof SharedGlobalConfigKeys.opensearch[number]>;
path: Pick<PathConfigType, typeof SharedGlobalConfigKeys.path[number]>;
savedObjects: Pick<SavedObjectsConfigType, typeof SharedGlobalConfigKeys.savedObjects[number]>;
}>;
Expand Down