[SR] Fix linting and add (de)serialization for repositories

x-pack/plugins/snapshot_restore/common/types/repository.ts

@@ -29,9 +29,9 @@ export interface FSRepository {
   settings: {
     location: string;
     compress?: boolean;
-    chunk_size?: string | null;
-    max_restore_bytes_per_sec?: string;
-    max_snapshot_bytes_per_sec?: string;
+    chunkSize?: string | null;
+    maxRestoreBytesPerSec?: string;
+    maxSnapshotBytesPerSec?: string;
     readonly?: boolean;
   };
 }
@@ -50,13 +50,13 @@ export interface S3Repository {
   settings: {
     bucket: string;
     client?: string;
-    base_path?: string;
+    basePath?: string;
     compress?: boolean;
-    chunk_size?: string | null;
-    server_side_encryption?: boolean;
-    buffer_size?: string;
-    canned_acl?: string;
-    storage_class?: string;
+    chunkSize?: string | null;
+    serverSideEncryption?: boolean;
+    bufferSize?: string;
+    cannedAcl?: string;
+    storageClass?: string;
   };
 }
 
@@ -66,9 +66,9 @@ export interface HDFSRepository {
   settings: {
     uri: string;
     path: string;
-    load_defaults?: boolean;
+    loadDefaults?: boolean;
     compress?: boolean;
-    chunk_size?: string | null;
+    chunkSize?: string | null;
     ['security.principal']?: string;
     [key: string]: any; // For conf.* settings
   };
@@ -80,11 +80,11 @@ export interface AzureRepository {
   settings: {
     client?: string;
     container?: string;
-    base_path?: string;
+    basePath?: string;
     compress?: boolean;
-    chunk_size?: string | null;
+    chunkSize?: string | null;
     readonly?: boolean;
-    location_mode?: string;
+    locationMode?: string;
   };
 }
 
@@ -94,9 +94,9 @@ export interface GCSRepository {
   settings: {
     bucket: string;
     client?: string;
-    base_path?: string;
+    basePath?: string;
     compress?: boolean;
-    chunk_size?: string | null;
+    chunkSize?: string | null;
   };
 }
 
@@ -125,7 +125,7 @@ export type SourceRepositorySettings<T> = T extends FSRepositoryType
   : T extends GCSRepositoryType
   ? GCSRepository['settings']
   : any & {
-      delegate_type: T;
+      delegateType: T;
     };
 
 export type Repository<T = null> =

x-pack/plugins/snapshot_restore/public/app/components/repository_delete_provider.tsx

@@ -5,12 +5,11 @@
  */
 
 import React, { Fragment, useRef, useState } from 'react';
+import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
 import { Repository } from '../../../common/types';
 import { useAppDependencies } from '../index';
 import { deleteRepositories } from '../services/http';
 
-import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
-
 interface Props {
   children: (deleteRepository: DeleteRepository) => React.ReactElement;
 }

x-pack/plugins/snapshot_restore/public/app/components/repository_form/repository_form.tsx

@@ -5,17 +5,6 @@
  */
 import React, { Fragment, useEffect, useState } from 'react';
 
-import { PLUGIN_REPOSITORY_TYPES, REPOSITORY_TYPES } from '../../../../common/constants';
-import { Repository, RepositoryType } from '../../../../common/types';
-
-import { useAppDependencies } from '../../index';
-import { documentationLinksService } from '../../services/documentation';
-import { loadRepositoryTypes } from '../../services/http';
-import { textService } from '../../services/text';
-
-import { SectionError } from '../section_error';
-import { TypeSettings } from './type_settings';
-
 import {
   EuiButton,
   EuiButtonEmpty,
@@ -30,6 +19,16 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
+import { PLUGIN_REPOSITORY_TYPES, REPOSITORY_TYPES } from '../../../../common/constants';
+import { Repository, RepositoryType } from '../../../../common/types';
+
+import { useAppDependencies } from '../../index';
+import { documentationLinksService } from '../../services/documentation';
+import { loadRepositoryTypes } from '../../services/http';
+import { textService } from '../../services/text';
+
+import { SectionError } from '../section_error';
+import { TypeSettings } from './type_settings';
 
 interface Props {
   repository: Repository;
@@ -89,10 +88,10 @@ export const RepositoryForm: React.FunctionComponent<Props> = ({
   const updateRepository = (updatedFields: Partial<Repository>): void => {
     const newRepository: Repository = { ...repository, ...updatedFields };
     const { type, settings } = newRepository;
-    if (type === REPOSITORY_TYPES.source && !settings.delegate_type) {
-      settings.delegate_type = REPOSITORY_TYPES.fs;
-    } else if (type !== REPOSITORY_TYPES.source && settings.delegate_type) {
-      delete settings.delegate_type;
+    if (type === REPOSITORY_TYPES.source && !settings.delegateType) {
+      settings.delegateType = REPOSITORY_TYPES.fs;
+    } else if (type !== REPOSITORY_TYPES.source && settings.delegateType) {
+      delete settings.delegateType;
     }
     setRepository(newRepository);
   };
@@ -242,8 +241,8 @@ export const RepositoryForm: React.FunctionComponent<Props> = ({
     if (repository.type !== REPOSITORY_TYPES.source) {
       return null;
     }
-    const typeValue = availableRepositoryTypes.includes(repository.settings.delegate_type)
-      ? repository.settings.delegate_type
+    const typeValue = availableRepositoryTypes.includes(repository.settings.delegateType)
+      ? repository.settings.delegateType
       : REPOSITORY_TYPES.fs;
 
     return (
@@ -295,7 +294,7 @@ export const RepositoryForm: React.FunctionComponent<Props> = ({
               onChange={e => {
                 updateRepository({
                   settings: {
-                    delegate_type: e.target.value,
+                    delegateType: e.target.value,
                   },
                 });
               }}

x-pack/plugins/snapshot_restore/public/app/components/repository_form/type_settings/azure_settings.tsx

@@ -5,9 +5,6 @@
  */
 
 import React, { Fragment } from 'react';
-import { AzureRepository, Repository } from '../../../../../common/types';
-import { useAppDependencies } from '../../../index';
-
 import {
   EuiCode,
   EuiDescribedFormGroup,
@@ -17,6 +14,8 @@ import {
   EuiSwitch,
   EuiTitle,
 } from '@elastic/eui';
+import { AzureRepository, Repository } from '../../../../../common/types';
+import { useAppDependencies } from '../../../index';
 
 interface Props {
   repository: AzureRepository;
@@ -36,7 +35,7 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
     },
   } = useAppDependencies();
   const {
-    settings: { client, container, base_path, compress, chunk_size, readonly, location_mode },
+    settings: { client, container, basePath, compress, chunkSize, readonly, locationMode },
   } = repository;
 
   const locationModeOptions = ['primary_only', 'secondary_only'].map(option => ({
@@ -164,11 +163,11 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
           describedByIds={['azureRepositoryBasePathDescription']}
         >
           <EuiFieldText
-            defaultValue={base_path || ''}
+            defaultValue={basePath || ''}
             fullWidth
             onChange={e => {
               updateRepositorySettings({
-                base_path: e.target.value,
+                basePath: e.target.value,
               });
             }}
           />
@@ -253,11 +252,11 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
           describedByIds={['azureRepositoryChunkSizeDescription']}
         >
           <EuiFieldText
-            defaultValue={chunk_size || ''}
+            defaultValue={chunkSize || ''}
             fullWidth
             onChange={e => {
               updateRepositorySettings({
-                chunk_size: e.target.value,
+                chunkSize: e.target.value,
               });
             }}
           />
@@ -291,7 +290,7 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
           describedByIds={['azureRepositoryReadonlyDescription']}
         >
           <EuiSwitch
-            disabled={location_mode === locationModeOptions[1].value}
+            disabled={locationMode === locationModeOptions[1].value}
             label={
               <FormattedMessage
                 id="xpack.snapshotRestore.repositoryForm.typeAzure.readonlyLabel"
@@ -301,7 +300,7 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
             checked={!!readonly}
             onChange={e => {
               updateRepositorySettings({
-                readonly: location_mode === locationModeOptions[1].value ? true : e.target.checked,
+                readonly: locationMode === locationModeOptions[1].value ? true : e.target.checked,
               });
             }}
           />
@@ -344,10 +343,10 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
         >
           <EuiSelect
             options={locationModeOptions}
-            value={location_mode || locationModeOptions[0].value}
+            value={locationMode || locationModeOptions[0].value}
             onChange={e => {
               updateRepositorySettings({
-                location_mode: e.target.value,
+                locationMode: e.target.value,
                 readonly: e.target.value === locationModeOptions[1].value ? true : readonly,
               });
             }}

x-pack/plugins/snapshot_restore/public/app/components/repository_form/type_settings/fs_settings.tsx

@@ -5,9 +5,6 @@
  */
 
 import React, { Fragment } from 'react';
-import { FSRepository, Repository } from '../../../../../common/types';
-import { useAppDependencies } from '../../../index';
-
 import {
   EuiCode,
   EuiDescribedFormGroup,
@@ -17,6 +14,8 @@ import {
   EuiSwitch,
   EuiTitle,
 } from '@elastic/eui';
+import { FSRepository, Repository } from '../../../../../common/types';
+import { useAppDependencies } from '../../../index';
 
 interface Props {
   repository: FSRepository;
@@ -39,9 +38,9 @@ export const FSSettings: React.FunctionComponent<Props> = ({
     settings: {
       location,
       compress,
-      chunk_size,
-      max_restore_bytes_per_sec,
-      max_snapshot_bytes_per_sec,
+      chunkSize,
+      maxRestoreBytesPerSec,
+      maxSnapshotBytesPerSec,
       readonly,
     },
   } = repository;
@@ -179,11 +178,11 @@ export const FSSettings: React.FunctionComponent<Props> = ({
           describedByIds={['fsRepositoryChunkSizeDescription']}
         >
           <EuiFieldText
-            defaultValue={chunk_size || ''}
+            defaultValue={chunkSize || ''}
             fullWidth
             onChange={e => {
               updateRepositorySettings({
-                chunk_size: e.target.value,
+                chunkSize: e.target.value,
               });
             }}
           />
@@ -222,11 +221,11 @@ export const FSSettings: React.FunctionComponent<Props> = ({
           describedByIds={['fsRepositoryMaxRestoreBytesDescription']}
         >
           <EuiFieldText
-            defaultValue={max_restore_bytes_per_sec || ''}
+            defaultValue={maxRestoreBytesPerSec || ''}
             fullWidth
             onChange={e => {
               updateRepositorySettings({
-                max_restore_bytes_per_sec: e.target.value,
+                maxRestoreBytesPerSec: e.target.value,
               });
             }}
           />
@@ -265,11 +264,11 @@ export const FSSettings: React.FunctionComponent<Props> = ({
           describedByIds={['fsRepositoryMaxSnapshotBytesDescription']}
         >
           <EuiFieldText
-            defaultValue={max_snapshot_bytes_per_sec || ''}
+            defaultValue={maxSnapshotBytesPerSec || ''}
             fullWidth
             onChange={e => {
               updateRepositorySettings({
-                max_snapshot_bytes_per_sec: e.target.value,
+                maxSnapshotBytesPerSec: e.target.value,
               });
             }}
           />

x-pack/plugins/snapshot_restore/public/app/components/repository_form/type_settings/gcs_settings.tsx

@@ -5,11 +5,10 @@
  */
 
 import React, { Fragment } from 'react';
+import { EuiDescribedFormGroup, EuiFieldText, EuiFormRow, EuiSwitch, EuiTitle } from '@elastic/eui';
 import { GCSRepository, Repository } from '../../../../../common/types';
 import { useAppDependencies } from '../../../index';
 
-import { EuiDescribedFormGroup, EuiFieldText, EuiFormRow, EuiSwitch, EuiTitle } from '@elastic/eui';
-
 interface Props {
   repository: GCSRepository;
   updateRepositorySettings: (
@@ -28,7 +27,7 @@ export const GCSSettings: React.FunctionComponent<Props> = ({
     },
   } = useAppDependencies();
   const {
-    settings: { bucket, client, base_path, compress, chunk_size },
+    settings: { bucket, client, basePath, compress, chunkSize },
   } = repository;
 
   return (
@@ -151,11 +150,11 @@ export const GCSSettings: React.FunctionComponent<Props> = ({
           describedByIds={['gcsRepositoryBasePathDescription']}
         >
           <EuiFieldText
-            defaultValue={base_path || ''}
+            defaultValue={basePath || ''}
             fullWidth
             onChange={e => {
               updateRepositorySettings({
-                base_path: e.target.value,
+                basePath: e.target.value,
               });
             }}
           />
@@ -240,11 +239,11 @@ export const GCSSettings: React.FunctionComponent<Props> = ({
           describedByIds={['gcsRepositoryChunkSizeDescription']}
         >
           <EuiFieldText
-            defaultValue={chunk_size || ''}
+            defaultValue={chunkSize || ''}
             fullWidth
             onChange={e => {
               updateRepositorySettings({
-                chunk_size: e.target.value,
+                chunkSize: e.target.value,
               });
             }}
           />