Rename kibana_namespace => space_id

elastic · May 21, 2024 · 7fbd009 · 7fbd009
1 parent d9aca86
commit 7fbd009
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/x-pack/plugins/fleet/common/types/models/preconfiguration.ts b/x-pack/plugins/fleet/common/types/models/preconfiguration.ts
@@ -24,7 +24,7 @@ export type InputsOverride = Partial<NewPackagePolicyInput> & {
 
 export interface PreconfiguredAgentPolicy extends Omit<NewAgentPolicy, 'namespace' | 'id'> {
   id: string | number;
-  kibana_namespace?: string;
+  space_id?: string;
   namespace?: string;
   package_policies: Array<
     | (Partial<Omit<NewPackagePolicy, 'inputs' | 'package'>> & {

diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -197,7 +197,7 @@ class AgentPolicyService {
   }> {
     const {
       id,
-      kibana_namespace: kibanaNamespace,
+      space_id: kibanaSpaceId,
       ...preconfiguredAgentPolicy
     } = omit(config, 'package_policies');
     const newAgentPolicyDefaults: Pick<NewAgentPolicy, 'namespace' | 'monitoring_enabled'> = {

diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.test.ts b/x-pack/plugins/fleet/server/services/preconfiguration.test.ts
@@ -1126,7 +1126,7 @@ describe('policy preconfiguration', () => {
       expect(nonFatalErrorsB.length).toBe(0);
     });
 
-    it('should used a namespaced saved objet client if the agent policy kibana_namespace is set', async () => {
+    it('should used a namespaced saved objet client if the agent policy space_id is set', async () => {
       const TEST_NAMESPACE = 'test';
       const namespacedSOClient = getPutPreconfiguredPackagesMock();
       const soClient = getPutPreconfiguredPackagesMock();
@@ -1144,7 +1144,7 @@ describe('policy preconfiguration', () => {
             name: 'Test policy',
             namespace: 'default',
             id: 'test-id',
-            kibana_namespace: TEST_NAMESPACE,
+            space_id: TEST_NAMESPACE,
             is_managed: true,
             package_policies: [
               {

diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.ts b/x-pack/plugins/fleet/server/services/preconfiguration.ts
@@ -174,16 +174,14 @@ export async function ensurePreconfiguredPackagesAndPolicies(
         );
       }
 
-      const namespacedSoClient = preconfiguredAgentPolicy.kibana_namespace
-        ? appContextService.getInternalUserSOClientForSpaceId(
-            preconfiguredAgentPolicy.kibana_namespace
-          )
+      const namespacedSoClient = preconfiguredAgentPolicy.space_id
+        ? appContextService.getInternalUserSOClientForSpaceId(preconfiguredAgentPolicy.space_id)
         : soClient;
 
       const { created, policy } = await agentPolicyService.ensurePreconfiguredAgentPolicy(
         namespacedSoClient,
         esClient,
-        omit(preconfiguredAgentPolicy, 'is_managed', 'kibana_namespace') // Don't add `is_managed` until the policy has been fully configured
+        omit(preconfiguredAgentPolicy, 'is_managed', 'space_id') // Don't add `is_managed` until the policy has been fully configured
       );
 
       if (!created) {
@@ -354,7 +352,7 @@ export function comparePreconfiguredPolicyToCurrent(
     'package_policies',
     'id',
     'namespace',
-    'kibana_namespace'
+    'space_id'
   );
   const currentTopLevelFields = pick(currentPolicy, ...Object.keys(configTopLevelFields));
 

diff --git a/x-pack/plugins/fleet/server/types/models/preconfiguration.ts b/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
@@ -134,7 +134,7 @@ export const PreconfiguredFleetProxiesSchema = schema.arrayOf(
 export const PreconfiguredAgentPoliciesSchema = schema.arrayOf(
   schema.object({
     ...AgentPolicyBaseSchema,
-    kibana_namespace: schema.maybe(schema.string()),
+    space_id: schema.maybe(schema.string()),
     namespace: schema.maybe(AgentPolicyNamespaceSchema),
     id: schema.maybe(schema.oneOf([schema.string(), schema.number()])),
     is_default: schema.maybe(schema.boolean()),