revert some unintended changes

integration-tests-ex/cases/cluster.sh

@@ -129,7 +129,7 @@ function show_status {
 function build_shared_dir {
   mkdir -p $SHARED_DIR
   # Must start with an empty DB to keep MySQL happy
-  rm -rf $SHARED_DIR/db
+  sudo rm -rf $SHARED_DIR/db
   mkdir -p $SHARED_DIR/logs
   mkdir -p $SHARED_DIR/tasklogs
   mkdir -p $SHARED_DIR/db
@@ -139,7 +139,7 @@ function build_shared_dir {
   # Permissions in some build setups are screwed up. See above. The user
   # which runs Docker does not have permission to write into the /shared
   # directory. Force ownership to allow writing.
-  chmod -R a+rwx $SHARED_DIR
+  sudo chmod -R a+rwx $SHARED_DIR
 }
 
 # Either generate the docker compose file, or use "static" versions.
@@ -252,7 +252,7 @@ case $CMD in
     cd $COMPOSE_DIR
     $DOCKER_COMPOSE $DOCKER_ARGS up -d
     # Enable the following for debugging
-    show_status
+    # show_status
     ;;
   "status" )
     check_env_file

web-console/src/ace-modes/dsql.ts

@@ -21,14 +21,14 @@
 // Originally licensed under the MIT license (https://github.com/thlorenz/brace/blob/master/LICENSE)
 // This file was modified to make the list of keywords more closely adhere to what is found in DruidSQL
 
-import type {Ace} from 'ace-builds';
+import type { Ace } from 'ace-builds';
 import ace from 'ace-builds/src-noconflict/ace';
 
 import * as druidKeywords from '../../lib/keywords';
 import * as druidFunctions from '../../lib/sql-docs';
 
-import type {ItemDescription} from './make-doc-html';
-import {makeDocHtml} from './make-doc-html';
+import type { ItemDescription } from './make-doc-html';
+import { makeDocHtml } from './make-doc-html';
 
 ace.define(
   'ace/mode/dsql_highlight_rules',

web-console/src/ace-modes/make-doc-html.spec.ts

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import {makeDocHtml} from './make-doc-html';
+import { makeDocHtml } from './make-doc-html';
 
 describe('makeDocHtml', () => {
   it('correctly formats helper HTML', () => {

web-console/src/components/header-bar/header-bar.tsx

@@ -30,9 +30,9 @@ import {
   Position,
   Tag,
 } from '@blueprintjs/core';
-import {IconNames} from '@blueprintjs/icons';
-import {Popover2} from '@blueprintjs/popover2';
-import React, {useState} from 'react';
+import { IconNames } from '@blueprintjs/icons';
+import { Popover2 } from '@blueprintjs/popover2';
+import React, { useState } from 'react';
 
 import {
   AboutDialog,
@@ -41,12 +41,18 @@ import {
   DoctorDialog,
   OverlordDynamicConfigDialog,
 } from '../../dialogs';
-import {Capabilities} from '../../helpers';
-import {getLink} from '../../links';
-import {localStorageGetJson, LocalStorageKeys, localStorageRemove, localStorageSetJson, oneOf,} from '../../utils';
-import {PopoverText} from '../popover-text/popover-text';
+import { Capabilities } from '../../helpers';
+import { getLink } from '../../links';
+import {
+  localStorageGetJson,
+  LocalStorageKeys,
+  localStorageRemove,
+  localStorageSetJson,
+  oneOf,
+} from '../../utils';
+import { PopoverText } from '../popover-text/popover-text';
 
-import {RestrictedMode} from './restricted-mode/restricted-mode';
+import { RestrictedMode } from './restricted-mode/restricted-mode';
 
 import './header-bar.scss';
 

web-console/src/components/header-bar/restricted-mode/restricted-mode.spec.tsx

@@ -18,10 +18,10 @@
 
 import React from 'react';
 
-import {Capabilities} from '../../../helpers';
-import {shallow} from '../../../utils/shallow-renderer';
+import { Capabilities } from '../../../helpers';
+import { shallow } from '../../../utils/shallow-renderer';
 
-import {RestrictedMode} from './restricted-mode';
+import { RestrictedMode } from './restricted-mode';
 
 describe('RestrictedMode', () => {
   it('matches snapshot when in auto capability detection mode', () => {

web-console/src/components/header-bar/restricted-mode/restricted-mode.tsx

@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-import {Button, Intent, Position} from '@blueprintjs/core';
-import {IconNames} from '@blueprintjs/icons';
-import {Popover2} from '@blueprintjs/popover2';
-import React, {type JSX} from 'react';
+import { Button, Intent, Position } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { Popover2 } from '@blueprintjs/popover2';
+import React, { type JSX } from 'react';
 
-import {Capabilities} from '../../../helpers';
-import {getLink} from '../../../links';
-import {ExternalLink} from '../../external-link/external-link';
-import {PopoverText} from '../../popover-text/popover-text';
+import { Capabilities } from '../../../helpers';
+import { getLink } from '../../../links';
+import { ExternalLink } from '../../external-link/external-link';
+import { PopoverText } from '../../popover-text/popover-text';
 
 export interface RestrictedModeProps {
   capabilities: Capabilities;

web-console/src/components/query-error-pane/query-error-pane.tsx

@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-import type {JSX} from 'react';
-import React, {useState} from 'react';
+import type { JSX } from 'react';
+import React, { useState } from 'react';
 
-import type {DruidError, RowColumn} from '../../utils';
-import {HighlightText} from '../highlight-text/highlight-text';
+import type { DruidError, RowColumn } from '../../utils';
+import { HighlightText } from '../highlight-text/highlight-text';
 
 import './query-error-pane.scss';
 

web-console/src/components/record-table-pane/record-table-pane.tsx

@@ -16,23 +16,29 @@
  * limitations under the License.
  */
 
-import {Button, Icon} from '@blueprintjs/core';
-import {IconNames} from '@blueprintjs/icons';
-import {Popover2} from '@blueprintjs/popover2';
-import type {Column, QueryResult} from '@druid-toolkit/query';
+import { Button, Icon } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { Popover2 } from '@blueprintjs/popover2';
+import type { Column, QueryResult } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import React, {useEffect, useState} from 'react';
-import type {RowRenderProps} from 'react-table';
+import React, { useEffect, useState } from 'react';
+import type { RowRenderProps } from 'react-table';
 import ReactTable from 'react-table';
 
-import {ShowValueDialog} from '../../dialogs/show-value-dialog/show-value-dialog';
-import {SMALL_TABLE_PAGE_SIZE, SMALL_TABLE_PAGE_SIZE_OPTIONS} from '../../react-table';
-import type {Pagination} from '../../utils';
-import {columnToIcon, columnToSummary, columnToWidth, formatNumber, getNumericColumnBraces,} from '../../utils';
-import {BracedText} from '../braced-text/braced-text';
-import {CellFilterMenu} from '../cell-filter-menu/cell-filter-menu';
-import {Deferred} from '../deferred/deferred';
-import {TableCell} from '../table-cell/table-cell';
+import { ShowValueDialog } from '../../dialogs/show-value-dialog/show-value-dialog';
+import { SMALL_TABLE_PAGE_SIZE, SMALL_TABLE_PAGE_SIZE_OPTIONS } from '../../react-table';
+import type { Pagination } from '../../utils';
+import {
+  columnToIcon,
+  columnToSummary,
+  columnToWidth,
+  formatNumber,
+  getNumericColumnBraces,
+} from '../../utils';
+import { BracedText } from '../braced-text/braced-text';
+import { CellFilterMenu } from '../cell-filter-menu/cell-filter-menu';
+import { Deferred } from '../deferred/deferred';
+import { TableCell } from '../table-cell/table-cell';
 
 import './record-table-pane.scss';
 

web-console/src/components/segment-timeline/segment-timeline.tsx

@@ -16,22 +16,29 @@
  * limitations under the License.
  */
 
-import {Button, FormGroup, MenuItem, Radio, RadioGroup, ResizeSensor} from '@blueprintjs/core';
-import {IconNames} from '@blueprintjs/icons';
-import type {ItemPredicate, ItemRenderer} from '@blueprintjs/select';
-import {Select2} from '@blueprintjs/select';
-import type {AxisScale} from 'd3-axis';
-import {scaleLinear, scaleUtc} from 'd3-scale';
+import { Button, FormGroup, MenuItem, Radio, RadioGroup, ResizeSensor } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import type { ItemPredicate, ItemRenderer } from '@blueprintjs/select';
+import { Select2 } from '@blueprintjs/select';
+import type { AxisScale } from 'd3-axis';
+import { scaleLinear, scaleUtc } from 'd3-scale';
 import React from 'react';
 
-import type {Capabilities} from '../../helpers';
-import {Api} from '../../singletons';
-import {ceilToUtcDay, formatBytes, formatInteger, queryDruidSql, QueryManager, uniq,} from '../../utils';
-import {DateRangeSelector} from '../date-range-selector/date-range-selector';
-import {Loader} from '../loader/loader';
-
-import type {BarUnitData} from './stacked-bar-chart';
-import {StackedBarChart} from './stacked-bar-chart';
+import type { Capabilities } from '../../helpers';
+import { Api } from '../../singletons';
+import {
+  ceilToUtcDay,
+  formatBytes,
+  formatInteger,
+  queryDruidSql,
+  QueryManager,
+  uniq,
+} from '../../utils';
+import { DateRangeSelector } from '../date-range-selector/date-range-selector';
+import { Loader } from '../loader/loader';
+
+import type { BarUnitData } from './stacked-bar-chart';
+import { StackedBarChart } from './stacked-bar-chart';
 
 import './segment-timeline.scss';
 

web-console/src/components/table-column-selector/table-column-selector.spec.tsx

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-import {render} from '@testing-library/react';
+import { render } from '@testing-library/react';
 import React from 'react';
 
-import {TableColumnSelector} from './table-column-selector';
+import { TableColumnSelector } from './table-column-selector';
 
 describe('TableColumnSelector', () => {
   it('matches snapshot', () => {

web-console/src/components/table-column-selector/table-column-selector.tsx

@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-import {Button, Menu, Position} from '@blueprintjs/core';
-import {IconNames} from '@blueprintjs/icons';
-import {Popover2} from '@blueprintjs/popover2';
-import React, {useState} from 'react';
+import { Button, Menu, Position } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { Popover2 } from '@blueprintjs/popover2';
+import React, { useState } from 'react';
 
-import {MenuCheckbox} from '../menu-checkbox/menu-checkbox';
+import { MenuCheckbox } from '../menu-checkbox/menu-checkbox';
 
 import './table-column-selector.scss';
 

web-console/src/console-application.tsx

@@ -16,23 +16,23 @@
  * limitations under the License.
  */
 
-import {HotkeysProvider, Intent} from '@blueprintjs/core';
-import {IconNames} from '@blueprintjs/icons';
+import { HotkeysProvider, Intent } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
-import type {JSX} from 'react';
+import type { JSX } from 'react';
 import React from 'react';
-import type {RouteComponentProps} from 'react-router';
-import {Redirect} from 'react-router';
-import {HashRouter, Route, Switch} from 'react-router-dom';
-import type {Filter} from 'react-table';
-
-import type {HeaderActiveTab} from './components';
-import {HeaderBar, Loader} from './components';
-import type {DruidEngine, QueryWithContext} from './druid-models';
-import {Capabilities} from './helpers';
-import {stringToTableFilters, tableFiltersToString} from './react-table';
-import {AppToaster} from './singletons';
-import {compact, localStorageGetJson, LocalStorageKeys, QueryManager} from './utils';
+import type { RouteComponentProps } from 'react-router';
+import { Redirect } from 'react-router';
+import { HashRouter, Route, Switch } from 'react-router-dom';
+import type { Filter } from 'react-table';
+
+import type { HeaderActiveTab } from './components';
+import { HeaderBar, Loader } from './components';
+import type { DruidEngine, QueryWithContext } from './druid-models';
+import { Capabilities } from './helpers';
+import { stringToTableFilters, tableFiltersToString } from './react-table';
+import { AppToaster } from './singletons';
+import { compact, localStorageGetJson, LocalStorageKeys, QueryManager } from './utils';
 import {
   DatasourcesView,
   ExploreView,

web-console/src/dialogs/compaction-config-dialog/compaction-config-dialog.tsx

@@ -16,17 +16,27 @@
  * limitations under the License.
  */
 
-import {Button, Callout, Classes, Code, Dialog, Intent, Switch} from '@blueprintjs/core';
-import {Tooltip2} from '@blueprintjs/popover2';
-import React, {useState} from 'react';
+import { Button, Callout, Classes, Code, Dialog, Intent, Switch } from '@blueprintjs/core';
+import { Tooltip2 } from '@blueprintjs/popover2';
+import React, { useState } from 'react';
 
-import type {FormJsonTabs} from '../../components';
-import {AutoForm, ExternalLink, FormGroupWithInfo, FormJsonSelector, JsonInput, PopoverText,} from '../../components';
-import type {CompactionConfig} from '../../druid-models';
-import {COMPACTION_CONFIG_FIELDS, compactionConfigHasLegacyInputSegmentSizeBytesSet,} from '../../druid-models';
-import {getLink} from '../../links';
-import {deepDelete, deepGet, deepSet, formatBytesCompact} from '../../utils';
-import {CompactionHistoryDialog} from '../compaction-history-dialog/compaction-history-dialog';
+import type { FormJsonTabs } from '../../components';
+import {
+  AutoForm,
+  ExternalLink,
+  FormGroupWithInfo,
+  FormJsonSelector,
+  JsonInput,
+  PopoverText,
+} from '../../components';
+import type { CompactionConfig } from '../../druid-models';
+import {
+  COMPACTION_CONFIG_FIELDS,
+  compactionConfigHasLegacyInputSegmentSizeBytesSet,
+} from '../../druid-models';
+import { getLink } from '../../links';
+import { deepDelete, deepGet, deepSet, formatBytesCompact } from '../../utils';
+import { CompactionHistoryDialog } from '../compaction-history-dialog/compaction-history-dialog';
 
 import './compaction-config-dialog.scss';
 

web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx

@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-import {Button, Callout, Classes, Dialog, Tab, Tabs, Tag} from '@blueprintjs/core';
+import { Button, Callout, Classes, Dialog, Tab, Tabs, Tag } from '@blueprintjs/core';
 import * as JSONBig from 'json-bigint-native';
-import React, {useState} from 'react';
+import React, { useState } from 'react';
 
-import {Loader, ShowValue} from '../../components';
-import type {CompactionConfig} from '../../druid-models';
-import {useQueryManager} from '../../hooks';
-import {Api} from '../../singletons';
-import {formatInteger, formatPercent} from '../../utils';
-import {DiffDialog} from '../diff-dialog/diff-dialog';
+import { Loader, ShowValue } from '../../components';
+import type { CompactionConfig } from '../../druid-models';
+import { useQueryManager } from '../../hooks';
+import { Api } from '../../singletons';
+import { formatInteger, formatPercent } from '../../utils';
+import { DiffDialog } from '../diff-dialog/diff-dialog';
 
 import './compaction-history-dialog.scss';
 

web-console/src/dialogs/doctor-dialog/doctor-checks.tsx

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import {Api} from '../../singletons';
-import {deepGet, pluralIfNeeded, queryDruidSql} from '../../utils';
-import {postToSampler} from '../../utils/sampler';
+import { Api } from '../../singletons';
+import { deepGet, pluralIfNeeded, queryDruidSql } from '../../utils';
+import { postToSampler } from '../../utils/sampler';
 
 export interface CheckControls {
   addSuggestion: (message: string) => void;