Merge branch 'main' into wreck-cert

Author: zengyan-amazon

.github/workflows/cd.yml

@@ -29,6 +29,10 @@ jobs:
         id: kbn_version
         run: |
           echo "::set-output name=kbn_version::$(jq -r '.kibana.version' ./kibana/plugins/opendistro_security/package.json)"
+      - name: Get plugin version
+        id: plugin_version
+        run: |
+          echo "::set-output name=plugin_version::$(jq -r .version ./kibana/plugins/opendistro_security/kibana.json)"
       - name: Use kibana release commit
         run: |
           cd ./kibana
@@ -52,16 +56,12 @@ jobs:
         run: |
           cd ./kibana
           yarn kbn bootstrap --oss
-      - name: Hack step to update kibana source to unblock tsc
-        run: |
-          cd ./kibana
-          sed -i '170d' src/core/server/http/router/request.ts
       - name: build security plugin
         id: build_zip
         run: |
           cd ./kibana/plugins/opendistro_security
-          node build_tools/build_plugin.js
-          artifact_path=`ls $(pwd)/build/opendistro_security_kibana_plugin-*.zip`
+          yarn build --kibana-version ${{ steps.kbn_version.outputs.kbn_version }}
+          artifact_path=`ls $(pwd)/build/opendistroSecurity*.zip`
           artifact_name=`basename $artifact_path`
           echo "::set-output name=ARTIFACT_PATH::$artifact_path"
           echo "::set-output name=ARTIFACT_NAME::$artifact_name"
@@ -74,5 +74,5 @@ jobs:
       - name: Upload Artifacts to S3
         run: |
           s3_path=s3://artifacts.opendistroforelasticsearch.amazon.com/downloads
-          aws s3 cp ${{ steps.build_zip.outputs.ARTIFACT_PATH }} $s3_path/kibana-plugins/opendistro-security/
+          aws s3 cp ${{ steps.build_zip.outputs.ARTIFACT_PATH }} $s3_path/kibana-plugins/opendistro-security/opendistroSecurityKibana-${{ steps.plugin_version.outputs.plugin_version }}.zip
           aws cloudfront create-invalidation --distribution-id ${{ secrets.DISTRIBUTION_ID }} --paths '/downloads/*'

.github/workflows/ci.yml

@@ -59,14 +59,6 @@ jobs:
         run: |
           cd ./kibana/plugins/opendistro_security
           yarn lint
-      - name: Hack step to update kibana source to unblock tsc
-        run: |
-          cd ./kibana
-          sed -i '170d' src/core/server/http/router/request.ts
-      - name: Run check
-        run: |
-          cd ./kibana/plugins/opendistro_security
-          yarn tsc
       - name: Run unit test
         run: |
           cd ./kibana/plugins/opendistro_security
@@ -79,8 +71,8 @@ jobs:
         id: build_zip
         run: |
           cd ./kibana/plugins/opendistro_security
-          node build_tools/build_plugin.js
-          artifact_path=`ls $(pwd)/build/opendistro_security_kibana_plugin-*.zip`
+          yarn build --kibana-version ${{ steps.kbn_version.outputs.kbn_version }}
+          artifact_path=`ls $(pwd)/build/opendistroSecurityKibana-*.zip`
           artifact_name=`basename $artifact_path`
           echo "::set-output name=ARTIFACT_PATH::$artifact_path"
           echo "::set-output name=ARTIFACT_NAME::$artifact_name"

.github/workflows/integration-test.yml

@@ -13,12 +13,11 @@ jobs:
     name: Run integration tests
     runs-on: ubuntu-latest
     steps:
-
       - name: Set up JDK 14
         uses: actions/setup-java@v1
         with:
           java-version: 14
-      
+
       - name: Checkout Kibana
         uses: actions/checkout@v2
         with:

.kibana-plugin-helpers.json

@@ -0,0 +1,9 @@
+{
+  "buildSourcePatterns": [
+    "package.json",
+    "yarn.lock",
+    "kibana.json",
+    "{common,lib,server,webpackShims,translations,utils,target}/**/*",
+    "!*test*"
+  ]
+}

README.md

@@ -32,8 +32,7 @@ To build the security-kibana plugin from source follow these instructions:
 │   └── plugins
 │       └── opendistro_security
 ```
-* run the build script to build the plugin inside `kibana/plugins/opendistro_security` directory
-`node build_tools/build_plugin.js`
+* run `yarn build` to build the plugin inside `kibana/plugins/opendistro_security` directory
 
 The above builds the final artifacts in zip format. The artifacts can be found in the `kibana/plugins/opendistro_security/build` directory
 

build_tools/build_plugin.js

@@ -12,7 +12,7 @@
  *   express or implied. See the License for the specific language governing
  *   permissions and limitations under the License.
  */
-require('../../../src/setup_node_env/prebuilt_dev_only_entry');
+require('../../../src/setup_node_env/no_transpilation');
 
 const execa = require('execa');
 const optimizer = require('@kbn/optimizer');

kibana.json

@@ -1,6 +1,6 @@
 {
-  "id": "opendistroSecurity",
-  "version": "1.11.0",
+  "id": "opendistroSecurityKibana",
+  "version": "1.12.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["opendistro_security"],
   "requiredPlugins": ["navigation"],

package.json

@@ -1,15 +1,16 @@
 {
   "name": "opendistro_security",
-  "version": "1.11.0.0",
+  "version": "1.12.0.0",
   "main": "target/plugins/opendistro_security",
   "kibana": {
-    "version": "7.9.1",
+    "version": "7.10.0",
     "templateVersion": "1.0.0"
   },
   "license": "Apache-2.0",
   "scripts": {
-    "kbn": "node ../../scripts/kbn.js",
-    "build": "rm -rf './target' && tsc",
+    "plugin-helpers": "node ../../scripts/plugin_helpers",
+    "kbn": "node ../../scripts/kbn",
+    "build": "yarn plugin-helpers build",
     "start": "node ../../scripts/kibana --dev",
     "lint:es": "node ../../scripts/eslint",
     "lint:sass": "node ../../scripts/sasslint",
@@ -18,12 +19,13 @@
     "test:jest_ui": "node ./test/run_jest_tests.js --config ./test/jest.config.ui.js"
   },
   "devDependencies": {
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "gulp-rename": "2.0.0",
-    "@testing-library/react-hooks": "^3.4.1"
+    "@testing-library/react-hooks": "^3.4.1",
+    "@types/hapi__wreck": "^15.0.1"
   },
   "dependencies": {
-    "@hapi/wreck": "17.0.0",
+    "@hapi/wreck": "^15.0.2",
     "@hapi/cryptiles": "5.0.0",
     "html-entities": "1.3.1"
   }

public/apps/account/account-nav-button.tsx

@@ -139,20 +139,19 @@ export function AccountNavButton(props: {
     </div>
   );
   return (
-    <EuiHeaderSectionItemButton
-      data-test-subj="account-header-section-button"
-      onClick={() => {
-        setPopoverOpen((prevState) => !prevState);
-      }}
-    >
+    <EuiHeaderSectionItemButton>
       <EuiPopover
+        data-test-subj="account-popover"
         id="actionsMenu"
         button={<EuiAvatar name={username} />}
         isOpen={isPopoverOpen}
         closePopover={() => {
           setPopoverOpen(false);
         }}
         panelPaddingSize="s"
+        onClick={() => {
+          setPopoverOpen((prevState) => !prevState);
+        }}
       >
         <EuiContextMenuPanel>{contextMenuPanel}</EuiContextMenuPanel>
       </EuiPopover>

public/apps/account/tenant-switch-panel.tsx

@@ -18,13 +18,14 @@ import {
   EuiButtonEmpty,
   EuiCallOut,
   EuiCheckbox,
+  EuiComboBox,
+  EuiComboBoxOptionOption,
   EuiModal,
   EuiModalBody,
   EuiModalFooter,
   EuiOverlayMask,
   EuiRadioGroup,
   EuiSpacer,
-  EuiSuperSelect,
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
@@ -59,7 +60,9 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) {
   const [username, setUsername] = React.useState<string>('');
   const [errorCallOut, setErrorCallOut] = React.useState<string>('');
   const [tenantSwitchRadioIdSelected, setTenantSwitchRadioIdSelected] = React.useState<string>();
-  const [selectedCustomTenantOption, setSelectedCustomTenantOption] = React.useState<string>('');
+  const [selectedCustomTenantOption, setSelectedCustomTenantOption] = React.useState<
+    EuiComboBoxOptionOption[]
+  >([]);
 
   // If saved tenant is present, set remember option to true
   const [rememberSelection, setRememberSelection] = React.useState<boolean>(
@@ -75,7 +78,7 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) {
       setTenantSwitchRadioIdSelected(PRIVATE_TENANT_RADIO_ID);
     } else {
       setTenantSwitchRadioIdSelected(CUSTOM_TENANT_RADIO_ID);
-      setSelectedCustomTenantOption(resolvedTenantName);
+      setSelectedCustomTenantOption([{ label: resolvedTenantName }]);
     }
   };
 
@@ -102,14 +105,19 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) {
   }, [props.coreStart.http]);
 
   // Custom tenant super select related.
-  const onCustomTenantChange = (selectedOption: string) => {
+  const onCustomTenantChange = (selectedOption: EuiComboBoxOptionOption[]) => {
     setSelectedCustomTenantOption(selectedOption);
     setTenantSwitchRadioIdSelected(CUSTOM_TENANT_RADIO_ID);
     setErrorCallOut('');
   };
-  const customTenantOptions = tenants.filter((tenant) => {
-    return tenant !== GLOBAL_TENANT_KEY_NAME && tenant !== username;
-  });
+  const customTenantOptions = tenants
+    .filter((tenant) => {
+      return tenant !== GLOBAL_TENANT_KEY_NAME && tenant !== username;
+    })
+    .sort()
+    .map((option: string) => ({
+      label: option,
+    }));
 
   const isMultiTenancyEnabled = props.config.multitenancy.enabled;
   const isGlobalEnabled = props.config.multitenancy.tenants.enable_global;
@@ -169,20 +177,7 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) {
     },
     {
       id: CUSTOM_TENANT_RADIO_ID,
-      label: (
-        <>
-          Choose from custom
-          <EuiSuperSelect
-            options={customTenantOptions.map((option: string) => ({
-              value: option,
-              inputDisplay: option,
-            }))}
-            valueOfSelected={selectedCustomTenantOption}
-            onChange={onCustomTenantChange}
-            style={{ width: 400 }}
-          />
-        </>
-      ),
+      label: <>Choose from custom</>,
       disabled: customTenantOptions.length === 0,
     },
   ];
@@ -208,7 +203,7 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) {
       tenantName = '__user__';
     } else if (tenantSwitchRadioIdSelected === CUSTOM_TENANT_RADIO_ID) {
       if (selectedCustomTenantOption) {
-        tenantName = selectedCustomTenantOption;
+        tenantName = selectedCustomTenantOption[0].label;
       }
     }
 
@@ -244,6 +239,18 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) {
           name="tenantSwitchRadios"
         />
 
+        {/* This combo box has to be outside the radio group.
+          In current EUI if put into the child of radio option, clicking in the combo box will not
+          show the drop down list since the radio option consumes the click event. */}
+        <EuiComboBox
+          options={customTenantOptions}
+          singleSelection={{ asPlainText: true }}
+          selectedOptions={selectedCustomTenantOption}
+          onChange={onCustomTenantChange}
+          // For vertical alignment with the radio option.
+          style={{ marginLeft: '24px' }}
+        />
+
         <EuiSpacer />
 
         {errorCallOut && (

public/apps/account/test/__snapshots__/account-nav-button.test.tsx.snap

@@ -1,10 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Account navigation button renders 1`] = `
-<EuiHeaderSectionItemButton
-  data-test-subj="account-header-section-button"
-  onClick={[Function]}
->
+<EuiHeaderSectionItemButton>
   <EuiPopover
     anchorPosition="downCenter"
     button={
@@ -13,10 +10,12 @@ exports[`Account navigation button renders 1`] = `
       />
     }
     closePopover={[Function]}
+    data-test-subj="account-popover"
     display="inlineBlock"
     hasArrow={true}
     id="actionsMenu"
     isOpen={false}
+    onClick={[Function]}
     ownFocus={false}
     panelPaddingSize="s"
   >