[APM] Change plugin id for apm_oss to apmOss (#66164)

* Change apm oss plugin name from apm_oss to apmOss * change plugin name * update apm_oss -> apmOss inn requiredPlugins Co-authored-by: mohinderps <[email protected]>
elastic · May 12, 2020 · 531eb7c · 531eb7c
1 parent 1a43feb
commit 531eb7c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/plugins/apm_oss/kibana.json b/src/plugins/apm_oss/kibana.json
@@ -1,5 +1,5 @@
 {
-  "id": "apm_oss",
+  "id": "apmOss",
   "version": "8.0.0",
   "server": true,
   "kibanaVersion": "kibana",

diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
@@ -4,7 +4,7 @@
   "kibanaVersion": "kibana",
   "requiredPlugins": [
     "features",
-    "apm_oss",
+    "apmOss",
     "data",
     "home",
     "licensing",

diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
@@ -50,7 +50,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> {
   public async setup(
     core: CoreSetup,
     plugins: {
-      apm_oss: APMOSSPluginSetup;
+      apmOss: APMOSSPluginSetup;
       home: HomeServerPluginSetup;
       licensing: LicensingPluginSetup;
       cloud?: CloudSetup;
@@ -65,7 +65,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> {
   ) {
     this.logger = this.initContext.logger.get();
     const config$ = this.initContext.config.create<APMXPackConfig>();
-    const mergedConfig$ = combineLatest(plugins.apm_oss.config$, config$).pipe(
+    const mergedConfig$ = combineLatest(plugins.apmOss.config$, config$).pipe(
       map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
     );