[cloud plugin] Add serverless projectName to configuration and contract

test/plugin_functional/test_suites/core_plugins/rendering.ts

@@ -230,6 +230,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'xpack.cloud.projects_url (any)', // It's a string (any because schema.conditional)
         // can't be used to infer urls or customer id from the outside
         'xpack.cloud.serverless.project_id (string)',
+        'xpack.cloud.serverless.project_name (string)',
         'xpack.discoverEnhanced.actions.exploreDataInChart.enabled (boolean)',
         'xpack.discoverEnhanced.actions.exploreDataInContextMenu.enabled (boolean)',
         'xpack.fleet.agents.enabled (boolean)',

x-pack/plugins/cloud/public/mocks.tsx

@@ -29,6 +29,7 @@ function createSetupMock(): jest.Mocked<CloudSetup> {
     isServerlessEnabled: false,
     serverless: {
       projectId: undefined,
+      projectName: undefined,
     },
   };
 }

x-pack/plugins/cloud/public/plugin.test.ts

@@ -148,6 +148,16 @@ describe('Cloud Plugin', () => {
         });
         expect(setup.serverless.projectId).toBe('my-awesome-project');
       });
+
+      it('exposes `serverless.projectName`', () => {
+        const { setup } = setupPlugin({
+          serverless: {
+            project_id: 'my-awesome-project',
+            project_name: 'My Awesome Project',
+          },
+        });
+        expect(setup.serverless.projectName).toBe('My Awesome Project');
+      });
     });
   });
 
@@ -222,5 +232,17 @@ describe('Cloud Plugin', () => {
       const start = plugin.start(coreStart);
       expect(start.serverless.projectId).toBe('my-awesome-project');
     });
+
+    it('exposes `serverless.projectName`', () => {
+      const { plugin } = startPlugin({
+        serverless: {
+          project_id: 'my-awesome-project',
+          project_name: 'My Awesome Project',
+        },
+      });
+      const coreStart = coreMock.createStart();
+      const start = plugin.start(coreStart);
+      expect(start.serverless.projectName).toBe('My Awesome Project');
+    });
   });
 });

x-pack/plugins/cloud/public/plugin.tsx

@@ -31,6 +31,7 @@ export interface CloudConfigType {
   is_elastic_staff_owned?: boolean;
   serverless?: {
     project_id: string;
+    project_name?: string;
   };
 }
 
@@ -91,6 +92,7 @@ export class CloudPlugin implements Plugin<CloudSetup> {
       isServerlessEnabled: this.isServerlessEnabled,
       serverless: {
         projectId: this.config.serverless?.project_id,
+        projectName: this.config.serverless?.project_name,
       },
       registerCloudService: (contextProvider) => {
         this.contextProviders.push(contextProvider);
@@ -145,6 +147,7 @@ export class CloudPlugin implements Plugin<CloudSetup> {
       isServerlessEnabled: this.isServerlessEnabled,
       serverless: {
         projectId: this.config.serverless?.project_id,
+        projectName: this.config.serverless?.project_name,
       },
       performanceUrl,
       usersAndRolesUrl,

x-pack/plugins/cloud/public/types.ts

@@ -72,6 +72,11 @@ export interface CloudStart {
      * Will always be present if `isServerlessEnabled` is `true`
      */
     projectId?: string;
+    /**
+     * The serverless project name.
+     * Will always be present if `isServerlessEnabled` is `true`
+     */
+    projectName?: string;
   };
 }
 
@@ -172,5 +177,10 @@ export interface CloudSetup {
      * Will always be present if `isServerlessEnabled` is `true`
      */
     projectId?: string;
+    /**
+     * The serverless project name.
+     * Will always be present if `isServerlessEnabled` is `true`
+     */
+    projectName?: string;
   };
 }

x-pack/plugins/cloud/server/config.test.ts

@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { config } from './config';
+
+describe('Cloud plugin config', () => {
+  it('evicts unknown properties under the `serverless` structure', () => {
+    const output = config.schema.validate({
+      serverless: {
+        project_id: 'project_id',
+        unknown_prop: 'some unknown prop',
+      },
+    });
+
+    expect(output.serverless).toEqual({
+      project_id: 'project_id',
+    });
+  });
+});

x-pack/plugins/cloud/server/config.ts

@@ -33,9 +33,14 @@ const configSchema = schema.object({
   trial_end_date: schema.maybe(schema.string()),
   is_elastic_staff_owned: schema.maybe(schema.boolean()),
   serverless: schema.maybe(
-    schema.object({
-      project_id: schema.string(),
-    })
+    schema.object(
+      {
+        project_id: schema.string(),
+        project_name: schema.maybe(schema.string()),
+      },
+      // avoid future chicken-and-egg situation with the component populating the config
+      { unknowns: 'ignore' }
+    )
   ),
 });
 
@@ -57,6 +62,7 @@ export const config: PluginConfigDescriptor<CloudConfigType> = {
     is_elastic_staff_owned: true,
     serverless: {
       project_id: true,
+      project_name: true,
     },
   },
   schema: configSchema,

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

@@ -28,6 +28,7 @@ function createSetupMock(): jest.Mocked<CloudSetup> {
     isServerlessEnabled: false,
     serverless: {
       projectId: undefined,
+      projectName: undefined,
     },
   };
 }

x-pack/plugins/cloud/server/plugin.test.ts

@@ -124,6 +124,16 @@ describe('Cloud Plugin', () => {
         });
         expect(setup.serverless.projectId).toBe('my-awesome-project');
       });
+
+      it('exposes `serverless.projectName`', () => {
+        const { setup } = setupPlugin({
+          serverless: {
+            project_id: 'my-awesome-project',
+            project_name: 'My Awesome Project',
+          },
+        });
+        expect(setup.serverless.projectName).toBe('My Awesome Project');
+      });
     });
   });
 

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

@@ -106,6 +106,11 @@ export interface CloudSetup {
      * Will always be present if `isServerlessEnabled` is `true`
      */
     projectId?: string;
+    /**
+     * The serverless project name.
+     * Will always be present if `isServerlessEnabled` is `true`
+     */
+    projectName?: string;
   };
 }
 
@@ -175,6 +180,7 @@ export class CloudPlugin implements Plugin<CloudSetup, CloudStart> {
       isServerlessEnabled,
       serverless: {
         projectId: this.config.serverless?.project_id,
+        projectName: this.config.serverless?.project_name,
       },
     };
   }

x-pack/plugins/fleet/.storybook/context/cloud.ts

@@ -21,6 +21,7 @@ export const getCloud = ({ isCloudEnabled }: { isCloudEnabled: boolean }) => {
     isServerlessEnabled: false,
     serverless: {
       projectId: undefined,
+      projectName: undefined,
     },
   };