[7.x] [Ingest Manager] Don't send kibana version to registry on master. (#73415)

x-pack/plugins/ingest_manager/server/mocks.ts

@@ -18,6 +18,7 @@ export const createAppContextStartContractMock = (): IngestManagerAppContext =>
     logger: loggingSystemMock.create().get(),
     isProductionMode: true,
     kibanaVersion: '8.0.0',
+    kibanaBranch: 'master',
   };
 };
 

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

@@ -15,6 +15,7 @@ import {
   HttpServiceSetup,
 } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import packageJSON from '../../../../package.json';
 import { LicensingPluginSetup, ILicense } from '../../licensing/server';
 import {
   EncryptedSavedObjectsPluginStart,
@@ -85,6 +86,7 @@ export interface IngestManagerAppContext {
   savedObjects: SavedObjectsServiceStart;
   isProductionMode: boolean;
   kibanaVersion: string;
+  kibanaBranch: string;
   cloud?: CloudSetup;
   logger?: Logger;
   httpSetup?: HttpServiceSetup;
@@ -145,13 +147,15 @@ export class IngestManagerPlugin
 
   private isProductionMode: boolean;
   private kibanaVersion: string;
+  private kibanaBranch: string;
   private httpSetup: HttpServiceSetup | undefined;
   private encryptedSavedObjectsSetup: EncryptedSavedObjectsPluginSetup | undefined;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.config$ = this.initializerContext.config.create<IngestManagerConfigType>();
     this.isProductionMode = this.initializerContext.env.mode.prod;
     this.kibanaVersion = this.initializerContext.env.packageInfo.version;
+    this.kibanaBranch = packageJSON.branch;
     this.logger = this.initializerContext.logger.get();
   }
 
@@ -257,6 +261,7 @@ export class IngestManagerPlugin
       savedObjects: core.savedObjects,
       isProductionMode: this.isProductionMode,
       kibanaVersion: this.kibanaVersion,
+      kibanaBranch: this.kibanaBranch,
       httpSetup: this.httpSetup,
       cloud: this.cloud,
       logger: this.logger,

x-pack/plugins/ingest_manager/server/services/app_context.ts

@@ -24,6 +24,7 @@ class AppContextService {
   private savedObjects: SavedObjectsServiceStart | undefined;
   private isProductionMode: boolean = false;
   private kibanaVersion: string | undefined;
+  private kibanaBranch: string | undefined;
   private cloud?: CloudSetup;
   private logger: Logger | undefined;
   private httpSetup?: HttpServiceSetup;
@@ -38,6 +39,7 @@ class AppContextService {
     this.cloud = appContext.cloud;
     this.logger = appContext.logger;
     this.kibanaVersion = appContext.kibanaVersion;
+    this.kibanaBranch = appContext.kibanaBranch;
     this.httpSetup = appContext.httpSetup;
 
     if (appContext.config$) {
@@ -125,6 +127,13 @@ class AppContextService {
     return this.kibanaVersion;
   }
 
+  public getKibanaBranch() {
+    if (!this.kibanaBranch) {
+      throw new Error('Kibana branch is not set.');
+    }
+    return this.kibanaBranch;
+  }
+
   public addExternalCallback(type: ExternalCallback[0], callback: ExternalCallback[1]) {
     if (!this.externalCallbacks.has(type)) {
       this.externalCallbacks.set(type, new Set());

x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts

@@ -40,6 +40,8 @@ export const pkgToPkgKey = ({ name, version }: { name: string; version: string }
 export async function fetchList(params?: SearchParams): Promise<RegistrySearchResults> {
   const registryUrl = getRegistryUrl();
   const url = new URL(`${registryUrl}/search`);
+  const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
+  const kibanaBranch = appContextService.getKibanaBranch();
   if (params) {
     if (params.category) {
       url.searchParams.set('category', params.category);
@@ -48,8 +50,9 @@ export async function fetchList(params?: SearchParams): Promise<RegistrySearchRe
       url.searchParams.set('experimental', params.experimental.toString());
     }
   }
-  const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be 8.0.0-SNAPSHOT
-  if (kibanaVersion) {
+
+  // on master, request all packages regardless of version
+  if (kibanaVersion && kibanaBranch !== 'master') {
     url.searchParams.set('kibana.version', kibanaVersion);
   }
 
@@ -58,11 +61,14 @@ export async function fetchList(params?: SearchParams): Promise<RegistrySearchRe
 
 export async function fetchFindLatestPackage(packageName: string): Promise<RegistrySearchResult> {
   const registryUrl = getRegistryUrl();
+  const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
+  const kibanaBranch = appContextService.getKibanaBranch();
   const url = new URL(
     `${registryUrl}/search?package=${packageName}&internal=true&experimental=true`
   );
-  const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be 8.0.0-SNAPSHOT
-  if (kibanaVersion) {
+
+  // on master, request all packages regardless of version
+  if (kibanaVersion && kibanaBranch !== 'master') {
     url.searchParams.set('kibana.version', kibanaVersion);
   }
   const res = await fetchUrl(url.toString());