[Ingest] cleanup names and files/paths to confirm to a standard format

x-pack/.i18nrc.json

@@ -10,11 +10,13 @@
     "xpack.crossClusterReplication": "legacy/plugins/cross_cluster_replication",
     "xpack.dashboardMode": "legacy/plugins/dashboard_mode",
     "xpack.fileUpload": "legacy/plugins/file_upload",
+    "xpack.fleet": "legacy/plugins/fleet",
     "xpack.graph": "legacy/plugins/graph",
     "xpack.grokDebugger": "legacy/plugins/grokdebugger",
     "xpack.idxMgmt": "legacy/plugins/index_management",
     "xpack.indexLifecycleMgmt": "legacy/plugins/index_lifecycle_management",
     "xpack.infra": "legacy/plugins/infra",
+    "xpack.ingest": "legacy/plugins/ingest",
     "xpack.kueryAutocomplete": "legacy/plugins/kuery_autocomplete",
     "xpack.licenseMgmt": "legacy/plugins/license_management",
     "xpack.maps": "legacy/plugins/maps",

x-pack/legacy/plugins/fleet/common/types/helpers.ts

@@ -5,3 +5,5 @@
  */
 
 export type FlatObject<T> = { [Key in keyof T]: string };
+export type RendererResult = React.ReactElement<any> | null;
+export type RendererFunction<RenderArgs, Result = RendererResult> = (args: RenderArgs) => Result;

x-pack/legacy/plugins/fleet/index.ts

@@ -5,7 +5,7 @@
  */
 import * as Joi from 'joi';
 import { resolve } from 'path';
-import { i18n } from '@kbn/i18n/src';
+import { i18n } from '@kbn/i18n';
 import { PLUGIN } from './common/constants';
 import { CONFIG_PREFIX } from './common/constants/plugin';
 import { initServerWithKibana } from './server/kibana.index';

x-pack/legacy/plugins/fleet/public/hooks/with_kuery_autocompletion.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { AutocompleteSuggestion } from 'ui/autocomplete_providers';
 
 import { FrontendLibs } from '../lib/types';
-import { RendererFunction } from '../utils/typed_react';
+import { RendererFunction } from '../../common/types/helpers';
 
 interface WithKueryAutocompletionLifecycleProps {
   libs: FrontendLibs;

x-pack/legacy/plugins/fleet/public/hooks/with_url_state.tsx

@@ -7,8 +7,7 @@
 import { parse, stringify } from 'querystring';
 import React from 'react';
 import { withRouter } from 'react-router-dom';
-import { FlatObject } from '../frontend_types';
-import { RendererFunction } from '../utils/typed_react';
+import { FlatObject, RendererFunction } from '../../common/types/helpers';
 
 type StateCallback<T> = (previousState: T) => T;
 

x-pack/legacy/plugins/fleet/public/lib/elasticsearch.ts

@@ -48,7 +48,7 @@ export class ElasticsearchLib {
         });
       }
 
-      return hiddenFieldsCheck.reduce((isvalid, field) => {
+      return hiddenFieldsCheck.reduce((isvalid: boolean, field) => {
         if (!isvalid) {
           return false;
         }

x-pack/legacy/plugins/fleet/public/routes.tsx

@@ -7,7 +7,6 @@
 import { get } from 'lodash';
 import React, { Component } from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
-import { REQUIRED_ROLES } from '../common/constants/security';
 import { Loading } from './components/loading';
 import { ChildRoutes } from './components/navigation/child_routes';
 import { URLStateProps, WithURLState } from './hooks/with_url_state';
@@ -59,19 +58,6 @@ export class AppRoutes extends Component<RouterProps, RouterState> {
             />
           )}
 
-          {/* Make sure the user has correct permissions */}
-          {!this.props.libs.framework.currentUserHasOneOfRoles(
-            REQUIRED_ROLES.concat(this.props.libs.framework.info.settings.defaultUserRoles)
-          ) && (
-            <Route
-              render={props =>
-                !props.location.pathname.includes('/error') ? (
-                  <Redirect to="/error/no_access" />
-                ) : null
-              }
-            />
-          )}
-
           {/* This app does not make use of a homepage. The mainpage is overview/enrolled_agents */}
           <Route path="/" exact={true} render={() => <Redirect to="/overview/enrolled_agents" />} />
         </Switch>
@@ -80,7 +66,7 @@ export class AppRoutes extends Component<RouterProps, RouterState> {
         <WithURLState>
           {(URLProps: URLStateProps) => (
             <ChildRoutes
-              routes={routeMap}
+              routes={[]}
               {...URLProps}
               {...{
                 libs: this.props.libs,

x-pack/legacy/plugins/ingest/server/kibana.index.ts

@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { compose } from './libs/compose/kibana';
+
 export const initServerWithKibana = (hapiServer: any) => {
-  hapiServer.route({
-    method: 'GET',
-    path: '/api/fleet/load',
-    handler: (request: any, h: any) => {
-      return 'Hello World!';
-    },
-  });
+  const libs = compose(hapiServer);
+  libs.framework.log('Ingest is composed -- debug message');
 };

x-pack/legacy/plugins/ingest/server/libs/adapters/configurations/adapter_types.ts

@@ -5,7 +5,6 @@
  */
 
 import * as t from 'io-ts';
-import { DateFromString } from '../../../../common/types/io_ts';
 
 export const RuntimeDatasourceInput = t.interface(
   {
@@ -48,13 +47,14 @@ export const NewRuntimeBackupConfigurationFile = t.interface(
   'BackupConfigurationFile'
 );
 
-const ExistingDocument = t.partial({
+const ExistingDocument = t.interface({
   id: t.string,
   shared_id: t.string,
   version: t.number,
-  updated_at: DateFromString,
+  active: t.boolean,
+  updated_at: t.string,
   created_by: t.union([t.undefined, t.string]),
-  updated_on: DateFromString,
+  updated_on: t.string,
   updated_by: t.union([t.undefined, t.string]),
 });
 

x-pack/legacy/plugins/ingest/server/libs/adapters/configurations/default.ts

@@ -4,30 +4,98 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  ConfigurationFile,
-  NewConfigurationFile,
-  DatasourceInput,
-  BackupConfigurationFile,
-} from './adapter_types';
-
-export class DefaultConfigAdapter {
+import { SODatabaseAdapter } from '../so_database/default';
+import { RuntimeConfigurationFile, NewConfigurationFile } from './adapter_types';
+
+import { ConfigurationFile, DatasourceInput, BackupConfigurationFile } from './adapter_types';
+
+export class ConfigAdapter {
+  constructor(private readonly so: SODatabaseAdapter) {}
+
   public async create(
     configuration: NewConfigurationFile
   ): Promise<{ id: string; shared_id: string; version: number }> {
+    const newSo = await this.so.create<ConfigurationFile>(
+      'configurations',
+      (configuration as any) as ConfigurationFile
+    );
+
     return {
-      id: 'fsdfsdf',
-      shared_id: 'wjkhefkjhfkjs',
-      version: 0,
+      id: newSo.id,
+      shared_id: newSo.attributes.shared_id,
+      version: newSo.attributes.version,
     };
   }
 
-  public async get(sharedID: string, version?: number): Promise<ConfigurationFile> {
-    return {} as ConfigurationFile;
+  public async get(id: string): Promise<ConfigurationFile> {
+    const config = await this.so.get<any>('configurations', id);
+
+    if (config.error) {
+      throw new Error(config.error.message);
+    }
+
+    if (!config.attributes) {
+      throw new Error(`No configuration found with ID of ${id}`);
+    }
+    if (RuntimeConfigurationFile.decode(config.attributes).isRight()) {
+      return config.attributes as ConfigurationFile;
+    } else {
+      throw new Error(`Invalid ConfigurationFile data. == ${config.attributes}`);
+    }
+  }
+
+  public async list(): Promise<ConfigurationFile[]> {
+    const configs = await this.so.find<any>({
+      type: 'configurations',
+      search: '*',
+      searchFields: ['shared_id'],
+    });
+    const uniqConfigurationFile = configs.saved_objects
+      .map<ConfigurationFile>(config => {
+        if (RuntimeConfigurationFile.decode(config.attributes).isRight()) {
+          return config.attributes;
+        } else {
+          throw new Error(`Invalid ConfigurationFile data. == ${config.attributes}`);
+        }
+      })
+      .reduce((acc, config: ConfigurationFile) => {
+        if (!acc.has(config.shared_id)) {
+          acc.set(config.shared_id, config);
+        }
+        const prevConfig = acc.get(config.shared_id);
+        if (prevConfig && prevConfig.version < config.version) {
+          acc.set(config.shared_id, config);
+        }
+
+        return acc;
+      }, new Map<string, ConfigurationFile>());
+
+    return [...uniqConfigurationFile.values()];
   }
 
-  public async list(sharedID: string, version?: number): Promise<ConfigurationFile[]> {
-    return [{} as ConfigurationFile];
+  public async listVersions(sharedID: string, activeOnly = true): Promise<ConfigurationFile[]> {
+    const configs = (await this.so.find<any>({
+      type: 'configurations',
+      search: sharedID,
+      searchFields: ['shared_id'],
+    })).saved_objects;
+
+    if (!activeOnly) {
+      const backupConfigs = await this.so.find<any>({
+        type: 'backup_configurations',
+        search: sharedID,
+        searchFields: ['shared_id'],
+      });
+      configs.concat(backupConfigs.saved_objects);
+    }
+
+    return configs.map<ConfigurationFile>(config => {
+      if (RuntimeConfigurationFile.decode(config.attributes).isRight()) {
+        return config.attributes;
+      } else {
+        throw new Error(`Invalid ConfigurationFile data. == ${config.attributes}`);
+      }
+    });
   }
 
   public async update(

x-pack/legacy/plugins/ingest/server/libs/adapters/database/adapter_types.ts → x-pack/legacy/plugins/ingest/server/libs/adapters/es_database/adapter_types.ts

@@ -3,41 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { FrameworkRequest, FrameworkUser } from '../framework/adapter_types';
-
-export interface DatabaseAdapter {
-  get<Source>(
-    user: FrameworkUser,
-    params: DatabaseGetParams
-  ): Promise<DatabaseGetDocumentResponse<Source>>;
-  create(
-    user: FrameworkUser,
-    params: DatabaseCreateDocumentParams
-  ): Promise<DatabaseCreateDocumentResponse>;
-  index<T>(
-    user: FrameworkUser,
-    params: DatabaseIndexDocumentParams<T>
-  ): Promise<DatabaseIndexDocumentResponse>;
-  delete(
-    user: FrameworkUser,
-    params: DatabaseDeleteDocumentParams
-  ): Promise<DatabaseDeleteDocumentResponse>;
-  deleteByQuery(
-    user: FrameworkUser,
-    params: DatabaseSearchParams
-  ): Promise<DatabaseDeleteDocumentResponse>;
-  mget<T>(user: FrameworkUser, params: DatabaseMGetParams): Promise<DatabaseMGetResponse<T>>;
-  bulk(
-    user: FrameworkUser,
-    params: DatabaseBulkIndexDocumentsParams
-  ): Promise<DatabaseBulkResponse>;
-  search<T>(user: FrameworkUser, params: DatabaseSearchParams): Promise<DatabaseSearchResponse<T>>;
-  searchAll<T>(
-    user: FrameworkUser,
-    params: DatabaseSearchParams
-  ): Promise<DatabaseSearchResponse<T>>;
-  putTemplate(name: string, template: any): Promise<any>;
-}
+import { FrameworkRequest } from '../framework/adapter_types';
 
 export interface DatabaseKbnESCluster {
   callWithInternalUser(esMethod: string, options: {}): Promise<any>;

x-pack/legacy/plugins/ingest/server/libs/adapters/database/kibana_database_adapter.ts → x-pack/legacy/plugins/ingest/server/libs/adapters/es_database/default.ts

@@ -6,7 +6,6 @@
 import { FrameworkUser } from '../framework/adapter_types';
 import { internalAuthData } from '../framework/adapter_types';
 import {
-  DatabaseAdapter,
   DatabaseBulkIndexDocumentsParams,
   DatabaseCreateDocumentParams,
   DatabaseCreateDocumentResponse,
@@ -23,7 +22,7 @@ import {
   DatabaseSearchResponse,
 } from './adapter_types';
 
-export class KibanaDatabaseAdapter implements DatabaseAdapter {
+export class ESDatabaseAdapter {
   private es: DatabaseKbnESCluster;
 
   constructor(kbnElasticSearch: DatabaseKbnESPlugin) {