[8.x] [Cloud] Add configuration for CSP value (#190491) (#192821)

# Backport This will backport the following commits from `main` to `8.x`: - [[Cloud] Add configuration for CSP value (#190491)](https://github.com/elastic/kibana/pull/190491)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Jean-Louis Leysens <jeanlouis.leysens@elastic.co>
2025-04-23 09:19:04 -04:00 · 2024-09-13 20:28:12 +10:00 · 2024-09-13 20:28:12 +10:00 · 0be79333f8
commit 0be79333f8
parent 0457580d30
8 changed files with 32 additions and 0 deletions
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@ -229,6 +229,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
        'xpack.ccr.ui.enabled (boolean?)',
        'xpack.cloud.base_url (string?)',
        'xpack.cloud.cname (string?)',
+        'xpack.cloud.csp (string?)',
        'xpack.cloud.deployment_url (string?)',
        'xpack.cloud.deployments_url (string?)',
        'xpack.cloud.is_elastic_staff_owned (boolean?)',
--- a/x-pack/plugins/cloud/public/plugin.test.ts
+++ b/x-pack/plugins/cloud/public/plugin.test.ts
@ -31,6 +31,7 @@ describe('Cloud Plugin', () => {
          ...baseConfig,
          id: 'cloudId',
          cname: 'cloud.elastic.co',
+          csp: 'aws',
          ...configParts,
        });
        const plugin = new CloudPlugin(initContext);
@ -86,6 +87,11 @@ describe('Cloud Plugin', () => {
        expect(setup.cname).toBe('cloud.elastic.co');
      });

+      it('exposes csp', () => {
+        const { setup } = setupPlugin();
+        expect(setup.csp).toBe('aws');
+      });
+
      it('exposes registerCloudService', () => {
        const { setup } = setupPlugin();
        expect(setup.registerCloudService).toBeDefined();
--- a/x-pack/plugins/cloud/public/plugin.tsx
+++ b/x-pack/plugins/cloud/public/plugin.tsx
@ -23,6 +23,7 @@ export interface CloudConfigType {
  id?: string;
  organization_id?: string;
  cname?: string;
+  csp?: string;
  base_url?: string;
  profile_url?: string;
  deployments_url?: string;
@ -82,6 +83,7 @@ export class CloudPlugin implements Plugin<CloudSetup> {
      base_url: baseUrl,
      trial_end_date: trialEndDate,
      is_elastic_staff_owned: isElasticStaffOwned,
+      csp,
    } = this.config;

    let decodedId: DecodedCloudId | undefined;
@ -94,6 +96,7 @@ export class CloudPlugin implements Plugin<CloudSetup> {
      organizationId: this.config.organization_id,
      deploymentId: parseDeploymentIdFromDeploymentUrl(this.config.deployment_url),
      cname,
+      csp,
      baseUrl,
      ...this.getCloudUrls(),
      elasticsearchUrl: decodedId?.elasticsearchUrl,
--- a/x-pack/plugins/cloud/public/types.ts
+++ b/x-pack/plugins/cloud/public/types.ts
@ -111,6 +111,12 @@ export interface CloudSetup {
   * @example `cloud.elastic.co`
   */
  cname?: string;
+  /**
+   * The cloud service provider identifier.
+   *
+   * @note Expected to be one of `aws`, `gcp` or `azure`, but could be something different.
+   */
+  csp?: string;
  /**
   * This is the URL of the Cloud interface.
   */
--- a/x-pack/plugins/cloud/server/snapshots/plugin.test.ts.snap
+++ b/x-pack/plugins/cloud/server/snapshots/plugin.test.ts.snap
@ -10,6 +10,7 @@ Object {
  "cloudDefaultPort": undefined,
  "cloudHost": undefined,
  "cloudId": "cloudId",
+  "csp": "aws",
  "deploymentId": "deployment-id",
  "elasticsearchUrl": undefined,
  "instanceSizeMb": undefined,
--- a/x-pack/plugins/cloud/server/config.ts
+++ b/x-pack/plugins/cloud/server/config.ts
@ -22,6 +22,7 @@ const configSchema = schema.object({
  apm: schema.maybe(apmConfigSchema),
  base_url: schema.maybe(schema.string()),
  cname: schema.maybe(schema.string()),
+  csp: schema.maybe(schema.string()),
  deployments_url: schema.string({ defaultValue: '/deployments' }),
  deployment_url: schema.maybe(schema.string()),
  id: schema.maybe(schema.string()),
@ -59,6 +60,7 @@ export const config: PluginConfigDescriptor<CloudConfigType> = {
  exposeToBrowser: {
    base_url: true,
    cname: true,
+    csp: true,
    deployments_url: true,
    deployment_url: true,
    id: true,
--- a/x-pack/plugins/cloud/server/plugin.test.ts
+++ b/x-pack/plugins/cloud/server/plugin.test.ts
@ -30,6 +30,7 @@ describe('Cloud Plugin', () => {
      ...baseConfig,
      id: 'cloudId',
      cname: 'cloud.elastic.co',
+      csp: 'aws',
      ...configParts,
    });
    const plugin = new CloudPlugin(initContext);
@ -77,6 +78,11 @@ describe('Cloud Plugin', () => {
        );
      });

+      it('exposes csp', () => {
+        const { setup } = setupPlugin();
+        expect(setup.csp).toBe('aws');
+      });
+
      it('exposes components decoded from the cloudId', () => {
        const decodedId: DecodedCloudId = {
          defaultPort: '9000',
--- a/x-pack/plugins/cloud/server/plugin.ts
+++ b/x-pack/plugins/cloud/server/plugin.ts
@ -35,6 +35,12 @@ export interface CloudSetup {
   * @note The `cloudId` is a concatenation of the deployment name and a hash. Users can update the deployment name, changing the `cloudId`. However, the changed `cloudId` will not be re-injected into `kibana.yml`. If you need the current `cloudId` the best approach is to split the injected `cloudId` on the semi-colon, and replace the first element with the `persistent.cluster.metadata.display_name` value as provided by a call to `GET _cluster/settings`.
   */
  cloudId?: string;
+  /**
+   * The cloud service provider identifier.
+   *
+   * @note Expected to be one of `aws`, `gcp` or `azure`, but could be something different.
+   */
+  csp?: string;
  /**
   * The Elastic Cloud Organization that owns this deployment/project.
   */
@ -199,6 +205,7 @@ export class CloudPlugin implements Plugin<CloudSetup, CloudStart> {
    return {
      ...this.getCloudUrls(),
      cloudId: this.config.id,
+      csp: this.config.csp,
      organizationId,
      instanceSizeMb: readInstanceSizeMb(),
      deploymentId,