[Fleet] Add auth fields to agent binary download source

packages/kbn-check-saved-objects-cli/current_fields.json

@@ -323,14 +323,10 @@
     "version"
   ],
   "data_connector": [
-    "config",
-    "createdAt",
-    "features",
     "kscIds",
     "name",
     "toolIds",
     "type",
-    "updatedAt",
     "workflowIds"
   ],
   "data_stream-config": [
@@ -342,12 +338,7 @@
     "job_info.job_type",
     "job_info.status",
     "metadata",
-    "metadata.created_at",
-    "metadata.sample_count",
-    "metadata.version",
-    "result",
-    "result.field_mapping",
-    "result.ingest_pipeline"
+    "result"
   ],
   "dynamic-config-overrides": [],
   "endpoint:unified-user-artifact-manifest": [
@@ -850,6 +841,7 @@
     "delete_unenrolled_agents",
     "delete_unenrolled_agents.enabled",
     "delete_unenrolled_agents.is_preconfigured",
+    "download_source_auth_secret_storage_requirements_met",
     "fleet_server_hosts",
     "has_seen_add_data_notice",
     "ilm_migration_status",
@@ -866,10 +858,6 @@
     "data_stream_count",
     "integration_id",
     "metadata",
-    "metadata.created_at",
-    "metadata.description",
-    "metadata.title",
-    "metadata.version",
     "status"
   ],
   "intercept_interaction_record": [],

packages/kbn-check-saved-objects-cli/current_mappings.json

@@ -2785,6 +2785,9 @@
           }
         }
       },
+      "download_source_auth_secret_storage_requirements_met": {
+        "type": "boolean"
+      },
       "fleet_server_hosts": {
         "type": "keyword"
       },

packages/kbn-check-saved-objects-cli/src/migrations/__fixtures__/ingest_manager_settings/10.8.0.json

@@ -0,0 +1,53 @@
+{
+  "10.7.0": [
+    {
+      "has_seen_add_data_notice": true,
+      "prerelease_integrations_enabled": false,
+      "id": "id",
+      "version": "1",
+      "preconfigured_fields": ["fleet_server_hosts"],
+      "secret_storage_requirements_met": true,
+      "output_secret_storage_requirements_met": true,
+      "action_secret_storage_requirements_met": true,
+      "use_space_awareness_migration_status": "success",
+      "use_space_awareness_migration_started_at": "2022-10-11T13:45:20.123Z",
+      "delete_unenrolled_agents": {
+          "enabled": true,
+          "is_preconfigured": false
+      },
+      "ilm_migration_status": {
+          "logs": "success",
+          "metrics": "success",
+          "synthetics": null
+      },
+      "ssl_secret_storage_requirements_met": true,
+      "integration_knowledge_enabled": true
+    }
+  ],
+  "10.8.0": [
+    {
+      "has_seen_add_data_notice": true,
+      "prerelease_integrations_enabled": false,
+      "id": "id",
+      "version": "1",
+      "preconfigured_fields": ["fleet_server_hosts"],
+      "secret_storage_requirements_met": true,
+      "output_secret_storage_requirements_met": true,
+      "action_secret_storage_requirements_met": true,
+      "use_space_awareness_migration_status": "success",
+      "use_space_awareness_migration_started_at": "2022-10-11T13:45:20.123Z",
+      "delete_unenrolled_agents": {
+          "enabled": true,
+          "is_preconfigured": false
+      },
+      "ilm_migration_status": {
+          "logs": "success",
+          "metrics": "success",
+          "synthetics": null
+      },
+      "ssl_secret_storage_requirements_met": true,
+      "integration_knowledge_enabled": true,
+      "download_source_auth_secret_storage_requirements_met": true
+    }
+  ]
+}

src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts

@@ -133,7 +133,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "ingest-download-sources": "c87e062ef293585e85fccec0c865d7cef48e0ff9a919d7781d5f7627d275484b",
         "ingest-outputs": "4f3451469b080548fd0f2ca414a81d91bd0d5690c34378376433ab1ae960ce5c",
         "ingest-package-policies": "9b9a83b94a99e0574a69999310b00917ddd5bfd44a6079badf54026029fed597",
-        "ingest_manager_settings": "2fc06a303cbfea707b191b39d6e3ee31ca888cfe4cb1b58542c52443a46f4cd3",
+        "ingest_manager_settings": "6cd91fe6c52c516676d99021f51a4b3a162686880198ba3c556983f5fffbb5a3",
         "intercept_interaction_record": "02437dc1b92c7bc77563f8e8d758a13435080d493d21a5fd49d124d468cdeb20",
         "intercept_trigger_record": "141c827f6553a4b758290690e9ac3ec26f4e6aeedc05a8fc9e0ea163ebfcd8db",
         "inventory-view": "0583a6777ec2687968aa10e9a184670402a61f30478e8c944f7353e1488ad51e",
@@ -859,8 +859,9 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "ingest-package-policies|warning: The SO type owner should ensure these transform functions DO NOT mutate after they are defined.",
         "================================================================================================================================",
         "ingest_manager_settings|global: aa0735c39adb396365f28cf118204854b9d5d71e",
-        "ingest_manager_settings|mappings: 8c1c22339d8aaa9999dd904bcb03612ef17b51dc",
+        "ingest_manager_settings|mappings: aea7fc3b25c3ec5a35700c777ed9810e0eef6b4a",
         "ingest_manager_settings|schemas: da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "ingest_manager_settings|10.8.0: e85118e8403d2a79da4c4d7ce6511a90203b7edf51160d3742efc526804379f2",
         "ingest_manager_settings|10.7.0: ebe7556e3d57d040e577a0e1fbfc4f335182f47a95c95d94d218d8acb2f9ed86",
         "ingest_manager_settings|10.6.0: 71fa87e5b51ef3832975e22dbdb5f7a1d2604d067c56f7f4877a310b7fe928af",
         "ingest_manager_settings|10.5.0: 773163d78cfbd807f1c5f615e18a27d885044bb4cbcd99cd6dab00e42dcead22",
@@ -1393,7 +1394,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "ingest-download-sources": "10.1.0",
         "ingest-outputs": "10.8.0",
         "ingest-package-policies": "10.21.0",
-        "ingest_manager_settings": "10.7.0",
+        "ingest_manager_settings": "10.8.0",
         "intercept_interaction_record": "10.1.0",
         "intercept_trigger_record": "10.1.0",
         "inventory-view": "10.2.0",
@@ -1548,7 +1549,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "ingest-download-sources": "10.1.0",
         "ingest-outputs": "10.8.0",
         "ingest-package-policies": "10.21.0",
-        "ingest_manager_settings": "10.7.0",
+        "ingest_manager_settings": "10.8.0",
         "intercept_interaction_record": "10.1.0",
         "intercept_trigger_record": "10.1.0",
         "inventory-view": "10.2.0",

x-pack/platform/plugins/shared/encrypted_saved_objects/integration_tests/ci_checks/check_registered_types.test.ts

@@ -75,7 +75,7 @@ describe('checking changes on all registered encrypted SO types', () => {
         "fleet-fleet-server-host": "3b8d0809aaf8a133596307bc29328207c7ceee1dc72233da75141ec47ad8d327",
         "fleet-message-signing-keys": "5cdcf6bf85247267f8876bda4226e871dbfefe01f050e898db7cbc267d57a275",
         "fleet-uninstall-tokens": "6e7d75921dcce46e566f175eab1b0e3825fe565f20cdb3c984e7037934d61e23",
-        "ingest-download-sources": "23eb3cf789fe13b4899215c6f919705b8a44b89f8feba7181e1f5db3c7699d40",
+        "ingest-download-sources": "b3740796eab0a91736e43bd22f7489cbf6f2ad0241ae370d1c8195b6a8d8ad52",
         "ingest-outputs": "d66716d5333484a25c57f7917bead5ac2576ec57a4b9eb61701b573f35ab62ad",
         "privmon-api-key": "7d7b76b3bc5287a784518731ba66d4f761052177fc04b1a85e5605846ab9de42",
         "synthetics-monitor": "f1c060b7be3b30187c4adcb35d74f1fa8a4290bd7faf04fec869de2aa387e21b",

x-pack/platform/plugins/shared/fleet/common/constants/secrets.ts

@@ -11,3 +11,4 @@ export const SECRETS_MINIMUM_FLEET_SERVER_VERSION = '8.10.0';
 export const OUTPUT_SECRETS_MINIMUM_FLEET_SERVER_VERSION = '8.12.0';
 export const ACTION_SECRETS_MINIMUM_FLEET_SERVER_VERSION = '9.2.0';
 export const SSL_SECRETS_MINIMUM_FLEET_SERVER_VERSION = '9.3.0';
+export const DOWNLOAD_SOURCE_AUTH_SECRETS_MINIMUM_FLEET_SERVER_VERSION = '9.4.0';

x-pack/platform/plugins/shared/fleet/common/types/models/agent_policy.ts

@@ -191,10 +191,30 @@ export interface FullAgentPolicyMonitoring {
     };
   };
 }
+export interface FullAgentPolicyDownloadAuth {
+  username?: string;
+  password?: string;
+  api_key?: string;
+  headers?: Array<{
+    key: string;
+    value: string;
+  }>;
+}
+
+export interface FullAgentPolicyDownloadAuthSecrets {
+  password?: { id: string };
+  api_key?: { id: string };
+}
+
+export interface FullAgentPolicyDownloadSecrets extends BaseSSLSecrets {
+  auth?: FullAgentPolicyDownloadAuthSecrets;
+}
+
 export interface FullAgentPolicyDownload {
   sourceURI: string;
   ssl?: BaseSSLConfig;
-  secrets?: BaseSSLSecrets;
+  auth?: FullAgentPolicyDownloadAuth;
+  secrets?: FullAgentPolicyDownloadSecrets;
   proxy_url?: string;
   proxy_headers?: any;
 }

x-pack/platform/plugins/shared/fleet/common/types/models/download_sources.ts

@@ -5,7 +5,14 @@
  * 2.0.
  */
 
-import type { BaseSSLSecrets } from './secret';
+import type { BaseSSLSecrets, SOSecret } from './secret';
+
+export interface DownloadSourceSecrets extends BaseSSLSecrets {
+  auth?: {
+    password?: SOSecret;
+    api_key?: SOSecret;
+  };
+}
 
 export interface DownloadSourceBase {
   name: string;
@@ -17,7 +24,16 @@ export interface DownloadSourceBase {
     certificate?: string;
     key?: string;
   };
-  secrets?: BaseSSLSecrets;
+  auth?: {
+    headers?: Array<{
+      key: string;
+      value: string;
+    }>;
+    username?: string;
+    password?: string;
+    api_key?: string;
+  };
+  secrets?: DownloadSourceSecrets;
 }
 
 export type DownloadSource = DownloadSourceBase & {

x-pack/platform/plugins/shared/fleet/common/types/models/settings.ts

@@ -15,6 +15,7 @@ export interface BaseSettings {
   output_secret_storage_requirements_met?: boolean;
   action_secret_storage_requirements_met?: boolean;
   ssl_secret_storage_requirements_met?: boolean;
+  download_source_auth_secret_storage_requirements_met?: boolean;
   delete_unenrolled_agents?: {
     enabled: boolean;
     is_preconfigured: boolean;

x-pack/platform/plugins/shared/fleet/common/types/rest_spec/download_sources.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DownloadSourceBase, DownloadSource, BaseSSLSecrets } from '../models';
+import type { DownloadSourceBase, DownloadSource, DownloadSourceSecrets } from '../models';
 
 import type { ListResult } from './common';
 
@@ -36,7 +36,13 @@ export interface PutDownloadSourceRequest {
       certificate?: string;
       key?: string;
     };
-    secrets?: BaseSSLSecrets;
+    auth?: {
+      username?: string;
+      password?: string;
+      api_key?: string;
+      headers?: Array<{ key: string; value: string }>;
+    } | null;
+    secrets?: DownloadSourceSecrets;
   };
 }
 
@@ -52,7 +58,13 @@ export interface PostDownloadSourceRequest {
       certificate?: string;
       key?: string;
     };
-    secrets?: BaseSSLSecrets;
+    auth?: {
+      username?: string;
+      password?: string;
+      api_key?: string;
+      headers?: Array<{ key: string; value: string }>;
+    } | null;
+    secrets?: DownloadSourceSecrets;
   };
 }