[7.x] [APM] Change plugin id for apm_oss to apmOss (#66164) (#66330)

* [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]>

* Updates apm_oss -> apmOss plugin id in upgrade_assistant

Co-authored-by: mohinderps <[email protected]>
Co-authored-by: Elastic Machine <[email protected]>

Author: 3 people

src/plugins/apm_oss/kibana.json

@@ -1,5 +1,5 @@
 {
-  "id": "apm_oss",
+  "id": "apmOss",
   "version": "8.0.0",
   "server": true,
   "kibanaVersion": "kibana",

x-pack/plugins/apm/kibana.json

@@ -4,7 +4,7 @@
   "kibanaVersion": "kibana",
   "requiredPlugins": [
     "features",
-    "apm_oss",
+    "apmOss",
     "data",
     "home",
     "licensing",

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))
     );
 

x-pack/plugins/upgrade_assistant/kibana.json

@@ -4,6 +4,6 @@
   "server": true,
   "ui": true,
   "configPath": ["xpack", "upgrade_assistant"],
-  "requiredPlugins": ["management", "licensing", "apm_oss"],
+  "requiredPlugins": ["management", "licensing", "apmOss"],
   "optionalPlugins": ["cloud", "usageCollection"]
 }

x-pack/plugins/upgrade_assistant/server/plugin.ts

@@ -38,7 +38,7 @@ import { RouteDependencies } from './types';
 interface PluginsSetup {
   usageCollection: UsageCollectionSetup;
   licensing: LicensingPluginSetup;
-  apm_oss: APMOSSPluginSetup;
+  apmOss: APMOSSPluginSetup;
   cloud?: CloudSetup;
 }
 
@@ -68,7 +68,7 @@ export class UpgradeAssistantServerPlugin implements Plugin {
 
   setup(
     { http, getStartServices, capabilities, savedObjects }: CoreSetup,
-    { usageCollection, cloud, licensing, apm_oss: apmOSS }: PluginsSetup
+    { usageCollection, cloud, licensing, apmOss: apmOSS }: PluginsSetup
   ) {
     this.licensing = licensing;
     this.apmOSS = apmOSS;