[Osquery] Update eslint config

.eslintrc.js

@@ -1452,6 +1452,20 @@ module.exports = {
       plugins: ['react', '@typescript-eslint'],
       files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
       rules: {
+        'padding-line-between-statements': [
+          'error',
+          {
+            blankLine: 'always',
+            prev: ['block-like'],
+            next: ['*'],
+          },
+          {
+            blankLine: 'always',
+            prev: ['*'],
+            next: ['return'],
+          },
+        ],
+        'padded-blocks': ['error', 'always'],
         'arrow-body-style': ['error', 'as-needed'],
         'prefer-arrow-callback': 'error',
         'no-unused-vars': 'off',

x-pack/plugins/osquery/common/ecs/ecs_fields/extend_map.ts

@@ -11,5 +11,6 @@ export const extendMap = (
 ): Readonly<Record<string, string>> =>
   Object.entries(map).reduce<Record<string, string>>((accum, [key, value]) => {
     accum[`${path}.${key}`] = `${path}.${value}`;
+
     return accum;
   }, {});

x-pack/plugins/osquery/cypress/plugins/index.ts

@@ -25,6 +25,7 @@
 module.exports = (on: any, config: any) => {
   // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-extraneous-dependencies
   require('@cypress/code-coverage/task')(on, config);
+
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
   return config;

x-pack/plugins/osquery/cypress/tasks/login.ts

@@ -64,6 +64,7 @@ export const getUrlWithRoute = (role: ROLES, route: string) => {
     port: kibana.port,
   } as UrlObject)}${route.startsWith('/') ? '' : '/'}${route}`;
   cy.log(`origin: ${theUrl}`);
+
   return theUrl;
 };
 
@@ -92,6 +93,7 @@ export const constructUrlWithUser = (user: User, route: string) => {
   const builtUrl = new URL(strUrl);
 
   cy.log(`origin: ${builtUrl.href}`);
+
   return builtUrl.href;
 };
 

x-pack/plugins/osquery/public/action_results/action_agents_status_bar.tsx

@@ -27,15 +27,18 @@ export const AgentStatusBar: React.FC<{
 }> = ({ agentStatus }) => {
   const palette = useMemo(() => {
     let stop = 0;
+
     return AGENT_STATUSES.reduce((acc, status) => {
       stop += agentStatus[status] || 0;
       acc.push({
         stop,
         color: getColorForAgentStatus(status),
       });
+
       return acc;
     }, [] as Array<{ stop: number; color: string }>);
   }, [agentStatus]);
+
   return (
     <StyledEuiColorPaletteDisplay
       className="osquery-action-agent-status-bar"

x-pack/plugins/osquery/public/agents/agent_grouper.test.ts

@@ -40,6 +40,7 @@ export function genAgent(policyId: string, hostname: string, id: string): Groupe
     },
   };
 }
+
 export const groupData: GroupData = {
   [AGENT_GROUP_KEY.Platform]: new Array(3).fill('test platform ').map((el, i) => genGroup(el + i)),
   [AGENT_GROUP_KEY.Policy]: new Array(3).fill('test policy ').map((el, i) => genGroup(el + i)),
@@ -109,6 +110,7 @@ describe('AgentGrouper', () => {
         });
       };
     }
+
     it('should generate policy options', genGroupTest(AGENT_GROUP_KEY.Policy, 'policy'));
     it('should generate platform options', genGroupTest(AGENT_GROUP_KEY.Platform, 'platform'));
   });

x-pack/plugins/osquery/public/agents/agent_grouper.ts

@@ -78,19 +78,22 @@ export class AgentGrouper {
     if (!data?.length || key === AGENT_GROUP_KEY.All) {
       return;
     }
+
     const group = this.groups[key];
     if (append) {
       group.data.push(...data);
     } else {
       group.data = data;
     }
+
     group.size = data.length;
   }
 
   setTotalAgents(total: number): void {
     if (total < 0) {
       return;
     }
+
     this.groups[AGENT_GROUP_KEY.All].size = total;
   }
 
@@ -124,6 +127,7 @@ export class AgentGrouper {
           break;
       }
     }
+
     return opts;
   }
 }

x-pack/plugins/osquery/public/agents/agents_table.tsx

@@ -108,6 +108,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
             getNumOverlapped(selectedGroups, groups.overlap)
         );
       }
+
       onChange(newAgentSelection);
       setSelectedOptions(selection);
     },
@@ -131,6 +132,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
         }
       }
     };
+
     if (agentSelection && !defaultValueInitialized.current && options.length) {
       if (agentSelection.allAgentsSelected) {
         const allAgentsOptions = find(['label', ALL_AGENTS_LABEL], options);
@@ -175,6 +177,7 @@ const AgentsTableComponent: React.FC<AgentsTableProps> = ({ agentSelection, onCh
 
   const renderOption = useCallback((option, searchVal, contentClassName) => {
     const { label, value } = option;
+
     return value?.groupType === AGENT_GROUP_KEY.Agent ? (
       <EuiHealth color={value?.status === 'online' ? 'success' : 'danger'}>
         <span className={contentClassName}>

x-pack/plugins/osquery/public/agents/helpers.ts

@@ -30,8 +30,10 @@ export const getNumOverlapped = (
       sum += policies[pol] ?? 0;
     });
   });
+
   return sum;
 };
+
 interface Aggs extends estypes.AggregationsTermsAggregateBase {
   buckets: AggregationDataPoint[];
 }
@@ -51,6 +53,7 @@ export const processAggregations = (aggs: Record<string, estypes.AggregationsAgg
       if (platformPolicies?.buckets && policies.length > 0) {
         overlap[key] = platformPolicies.buckets.reduce((acc: { [key: string]: number }, pol) => {
           acc[pol.key] = pol.doc_count;
+
           return acc;
         }, {} as { [key: string]: number });
       }
@@ -63,13 +66,16 @@ export const processAggregations = (aggs: Record<string, estypes.AggregationsAgg
     policies,
   };
 };
+
 export const generateColorPicker = () => {
   const visColorsBehindText = euiPaletteColorBlindBehindText();
   const typeColors = new Map<AGENT_GROUP_KEY, string>();
+
   return (type: AGENT_GROUP_KEY) => {
     if (!typeColors.has(type)) {
       typeColors.set(type, visColorsBehindText[typeColors.size]);
     }
+
     return typeColors.get(type);
   };
 };
@@ -80,6 +86,7 @@ export const getNumAgentsInGrouping = (selectedGroups: SelectedGroups) => {
     const group = selectedGroups[g];
     sum += Object.keys(group).reduce((acc, k) => acc + group[k], 0);
   });
+
   return sum;
 };
 
@@ -90,6 +97,7 @@ export const generateAgentCheck =
       .map((group) => {
         const selectedGroup = selectedGroups[group];
         const agentGroup = groups[group];
+
         // check if the agent platform/policy is selected
         return selectedGroup[agentGroup];
       })
@@ -124,6 +132,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to calculate diffs when all agents are selected
           selectedGroups.platform[key] = value.size;
         }
+
         newAgentSelection.platformsSelected.push(key);
         break;
       case AGENT_GROUP_KEY.Policy:
@@ -132,6 +141,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to calculate diffs when all agents are selected
           selectedGroups.policy[key] = value.size;
         }
+
         newAgentSelection.policiesSelected.push(key);
         break;
       case AGENT_GROUP_KEY.Agent:
@@ -140,6 +150,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
           // we don't need to count how many agents are selected if they are all selected
           selectedAgents.push(value);
         }
+
         newAgentSelection.agents.push(key);
         break;
       default:
@@ -148,5 +159,6 @@ export const generateAgentSelection = (selection: GroupOption[]) => {
         console.error(`unknown group type ${groupType}`);
     }
   }
+
   return { newAgentSelection, selectedGroups, selectedAgents };
 };

x-pack/plugins/osquery/public/agents/use_agent_details.ts

@@ -21,6 +21,7 @@ interface UseAgentDetails {
 export const useAgentDetails = ({ agentId, silent, skip }: UseAgentDetails) => {
   const { http } = useKibana().services;
   const setErrorToast = useErrorToast();
+
   return useQuery<GetOneAgentResponse, unknown, GetOneAgentResponse['item']>(
     ['agentDetails', agentId],
     () => http.get(`/internal/osquery/fleet_wrapper/agents/${agentId}`),

x-pack/plugins/osquery/public/agents/use_agent_groups.ts

@@ -88,6 +88,7 @@ export const useAgentGroups = ({ osqueryPolicies, osqueryPoliciesLoading }: UseA
         setPolicies(
           newPolicies.map((p) => {
             const name = agentPolicyById[p.id]?.name ?? p.name;
+
             return {
               ...p,
               name,

x-pack/plugins/osquery/public/agents/use_osquery_policies.ts

@@ -33,6 +33,7 @@ export const useOsqueryPolicies = () => {
         }),
     }
   );
+
   return useMemo(
     () => ({ osqueryPoliciesLoading, osqueryPolicies }),
     [osqueryPoliciesLoading, osqueryPolicies]

x-pack/plugins/osquery/public/common/helpers.ts

@@ -26,6 +26,7 @@ export const generateTablePaginationOptions = (
   limit: number
 ): PaginationInputPaginated => {
   const cursorStart = activePage * limit;
+
   return {
     activePage,
     cursorStart,

x-pack/plugins/osquery/public/common/hooks/use_breadcrumbs.tsx

@@ -163,6 +163,7 @@ export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
       const href = breadcrumb.href
         ? http.basePath.prepend(`${BASE_PATH}${breadcrumb.href}`)
         : undefined;
+
       return {
         ...breadcrumb,
         href,
@@ -171,6 +172,7 @@ export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
               if (ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey) {
                 return;
               }
+
               ev.preventDefault();
               application.navigateToUrl(href);
             }

x-pack/plugins/osquery/public/common/hooks/use_discover_link.tsx

@@ -43,6 +43,7 @@ export const useDiscoverLink = ({ filters }: UseDiscoverLink) => {
       });
       setDiscoverUrl(newUrl);
     };
+
     getDiscoverUrl();
   }, [filters, locator]);
 

x-pack/plugins/osquery/public/common/hooks/use_error_toast.tsx

@@ -14,10 +14,12 @@ export const useErrorToast = () => {
   const {
     notifications: { toasts },
   } = useKibana().services;
+
   return (error?: unknown, opts?: ErrorToastOptions) => {
     if (errorToast) {
       toasts.remove(errorToast);
     }
+
     if (error) {
       setErrorToast(
         // @ts-expect-error update types

x-pack/plugins/osquery/public/common/lib/kibana/kibana_react.ts

@@ -36,6 +36,7 @@ const useRouterNavigate = (
   onClickCallback?: Parameters<typeof reactRouterNavigate>[2]
 ) => {
   const history = useHistory();
+
   return reactRouterNavigate(history, to, onClickCallback);
 };
 

x-pack/plugins/osquery/public/components/empty_state.tsx

@@ -38,6 +38,7 @@ const OsqueryAppEmptyStateComponent = () => {
     (event) => {
       if (!isModifiedEvent(event) && isLeftClickEvent(event)) {
         event.preventDefault();
+
         return navigateToApp(INTEGRATIONS_PLUGIN_ID, {
           path: pagePathGetters.integration_details_overview({
             pkgkey: OSQUERY_INTEGRATION_NAME,

x-pack/plugins/osquery/public/components/main_navigation.tsx

@@ -22,6 +22,7 @@ enum Section {
 export const MainNavigation = () => {
   const location = useLocation();
   const section = useMemo(() => location.pathname.split('/')[1] ?? 'overview', [location.pathname]);
+
   return (
     <Nav>
       <EuiFlexGroup gutterSize="l" alignItems="center">

x-pack/plugins/osquery/public/components/manage_integration_link.tsx

@@ -33,6 +33,7 @@ const ManageIntegrationLinkComponent = () => {
     (event) => {
       if (!isModifiedEvent(event) && isLeftClickEvent(event)) {
         event.preventDefault();
+
         return navigateToApp(INTEGRATIONS_PLUGIN_ID, {
           path: pagePathGetters.integration_details_policies({
             pkgkey: OSQUERY_INTEGRATION_NAME,

x-pack/plugins/osquery/public/editor/index.tsx

@@ -40,6 +40,7 @@ const OsqueryEditorComponent: React.FC<OsqueryEditorProps> = ({
   ]);
 
   useEffect(() => setEditorValue(defaultValue), [defaultValue]);
+
   return (
     <EuiCodeEditor
       value={editorValue}

x-pack/plugins/osquery/public/editor/osquery_tables.ts

@@ -13,11 +13,14 @@ type TablesJSON = Array<{
 export const normalizeTables = (tablesJSON: TablesJSON) => sortBy(tablesJSON, 'name');
 
 let osqueryTables: TablesJSON | null = null;
+
 export const getOsqueryTables = () => {
   if (!osqueryTables) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     osqueryTables = normalizeTables(require('../common/schemas/osquery/v5.2.2.json'));
   }
+
   return osqueryTables;
 };
+
 export const getOsqueryTableNames = () => flatMap(getOsqueryTables(), 'name');

x-pack/plugins/osquery/public/fleet_integration/config_uploader.tsx

@@ -48,6 +48,7 @@ const ConfigUploaderComponent: React.FC<ConfigUploaderProps> = ({ onChange }) =>
           // remove any multiple spaces from the query
           return value.replaceAll(/\s(?=\s)/gm, '');
         }
+
         return value;
       });
 
@@ -95,6 +96,7 @@ const ConfigUploaderComponent: React.FC<ConfigUploaderProps> = ({ onChange }) =>
         );
         // @ts-expect-error update types
         filePickerRef.current?.removeFiles(new Event('fake'));
+
         return;
       }
 

x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_custom_button_extension.tsx

@@ -13,6 +13,7 @@ export const LazyOsqueryManagedCustomButtonExtension = lazy<PackageCustomExtensi
     const { OsqueryManagedCustomButtonExtension } = await import(
       './osquery_managed_custom_button_extension'
     );
+
     return {
       default: OsqueryManagedCustomButtonExtension,
     };

x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_create_import_extension.tsx

@@ -13,6 +13,7 @@ export const LazyOsqueryManagedPolicyCreateImportExtension =
     const { OsqueryManagedPolicyCreateImportExtension } = await import(
       './osquery_managed_policy_create_import_extension'
     );
+
     return {
       default: OsqueryManagedPolicyCreateImportExtension,
     };

x-pack/plugins/osquery/public/fleet_integration/lazy_osquery_managed_policy_edit_extension.tsx

@@ -13,6 +13,7 @@ export const LazyOsqueryManagedPolicyEditExtension = lazy<PackagePolicyEditExten
     const { OsqueryManagedPolicyCreateImportExtension } = await import(
       './osquery_managed_policy_create_import_extension'
     );
+
     return {
       default: OsqueryManagedPolicyCreateImportExtension,
     };