Bug fixes after 2-7-0-rc (#1785)

### Feature or Bugfix
- Bugfix

### Detail

- Fixes for maintenance window -
#1778
- Importing a glue db with "-" in it -
#1776


### Security
Please answer the questions below briefly where applicable, or write
`N/A`. Based on
[OWASP 10](https://owasp.org/Top10/en/).

- Does this PR introduce or modify any input fields or queries - this
includes
fetching data from storage outside the application (e.g. a database, an
S3 bucket)? N/A
  - Is the input sanitized?
- What precautions are you taking before deserializing the data you
consume?
  - Is injection prevented by parametrizing queries?
  - Have you ensured no `eval` or similar functions are used?
- Does this PR introduce any functionality or component that requires
authorization? N/A
- How have you ensured it respects the existing AuthN/AuthZ mechanisms?
  - Are you logging failed auth attempts?
- Are you using or adding any cryptographic features? N/A
  - Do you use a standard proven implementations?
  - Are the used keys controlled by the customer? Where are they stored?
- Are you introducing any new policies/roles/users? N/A
  - Have you used the least-privilege principle? How?


By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

---------

Co-authored-by: trajopadhye <[email protected]>

Author: TejasRGitHub

backend/dataall/base/aws/parameter_store.py

@@ -1,4 +1,5 @@
 import logging
+from typing import List
 
 from botocore.exceptions import ClientError
 
@@ -39,15 +40,16 @@ def get_parameter_value(AwsAccountId=None, region=None, parameter_path=None):
 
     @staticmethod
     def get_parameters_by_path(AwsAccountId=None, region=None, parameter_path=None):
+        parameter_value_list: List[str] = []
         if not parameter_path:
             raise Exception('Parameter name is None')
         try:
-            parameter_values = ParameterStoreManager.client(AwsAccountId, region).get_parameters_by_path(
-                Path=parameter_path
-            )['Parameters']
+            paginator = ParameterStoreManager.client(AwsAccountId, region).get_paginator('get_parameters_by_path')
+            for page in paginator.paginate(Path=parameter_path):
+                parameter_value_list.extend(page['Parameters'])
         except ClientError as e:
             raise Exception(e)
-        return parameter_values
+        return parameter_value_list
 
     @staticmethod
     def update_parameter(AwsAccountId, region, parameter_name, parameter_value):

backend/dataall/base/utils/naming_convention.py

@@ -14,10 +14,10 @@ class NamingConventionPattern(Enum):
     IAM = {'regex': '[^a-zA-Z0-9-_]', 'separator': '-', 'max_length': 63}  # Role names up to 64 chars
     IAM_POLICY = {'regex': '[^a-zA-Z0-9-_]', 'separator': '-', 'max_length': 128}  # Policy names up to 128 chars
     GLUE = {
-        'regex': '[^a-zA-Z0-9_]',
+        'regex': '[^a-zA-Z0-9_-]',
         'separator': '_',
         'max_length': 240,
-        'valid_external_regex': '^[a-zA-Z0-9_]+$',
+        'valid_external_regex': '^[a-zA-Z0-9_-]+$',
     }  # Limit 255 - 15 extra chars buffer
     GLUE_ETL = {'regex': '[^a-zA-Z0-9-]', 'separator': '-', 'max_length': 52}
     NOTEBOOK = {'regex': '[^a-zA-Z0-9-]', 'separator': '-', 'max_length': 63}

backend/dataall/modules/s3_datasets/cdk/assets/glueprofilingjob/glue_script.py

@@ -100,7 +100,7 @@ def run_table_profiling(
         logger.debug('Profiling table for %s %s ', database, table)
         logger.debug('using %s', database)
         spark.sql('use `{}`'.format(database))
-        df = spark.sql('select * from {}'.format(table))
+        df = spark.sql('select * from `{}`'.format(table))
         total = df.count()
         logger.debug('Retrieved count for %s %s', table, total)
 

deploy/stacks/pipeline.py

@@ -475,7 +475,6 @@ def validate_deployment_params(self, source, repo_connection_arn, git_branch, re
                     or 'client_id' not in custom_auth_configs
                     or 'response_types' not in custom_auth_configs
                     or 'scopes' not in custom_auth_configs
-                    or 'jwks_url' not in custom_auth_configs
                     or 'claims_mapping' not in custom_auth_configs
                     or 'user_id' not in custom_auth_configs['claims_mapping']
                     or 'email' not in custom_auth_configs['claims_mapping']
@@ -491,7 +490,6 @@ def validate_deployment_params(self, source, repo_connection_arn, git_branch, re
                     or not isinstance(custom_auth_configs['client_id'], str)
                     or not isinstance(custom_auth_configs['response_types'], str)
                     or not isinstance(custom_auth_configs['scopes'], str)
-                    or not isinstance(custom_auth_configs['jwks_url'], str)
                     or not isinstance(custom_auth_configs['claims_mapping']['user_id'], str)
                     or not isinstance(custom_auth_configs['claims_mapping']['email'], str)
                 ):

frontend/src/authentication/components/MaintenanceGuard.js

@@ -34,11 +34,11 @@ export const MaintenanceGuard = (props) => {
     }
   };
 
-  useEffect(async () => {
+  useEffect(() => {
     // Check if the maintenance window is enabled and has NO-ACCESS Status
     // If yes then display a blank screen with a message that data.all is in maintenance mode ( Check use of isNoAccessMaintenance state )
     if (isModuleEnabled(ModuleNames.MAINTENANCE) === true) {
-      if (client) {
+      if (client && groups) {
         checkMaintenanceMode().catch((e) => dispatch({ type: SET_ERROR, e }));
       }
     }

frontend/src/modules/Administration/views/AdministrationView.js

@@ -16,7 +16,7 @@ import {
 import { useState } from 'react';
 import { Helmet } from 'react-helmet-async';
 import { Link as RouterLink } from 'react-router-dom';
-import { ChevronRightIcon, useSettings } from 'design';
+import { ChevronRightIcon, LoadingScreen, useSettings } from 'design';
 import { AdministrationTeams, DashboardViewer } from '../components';
 import { MaintenanceViewer } from '../../Maintenance/components/MaintenanceViewer';
 import { isModuleEnabled, ModuleNames, isTenantUser } from 'utils';
@@ -42,6 +42,10 @@ const AdministrationView = () => {
     setCurrentTab(value);
   };
 
+  if (!groups) {
+    return <LoadingScreen />;
+  }
+
   return !isTenantUser(groups) ? (
     <Box
       sx={{

frontend/src/modules/Maintenance/components/MaintenanceViewer.js

@@ -298,7 +298,7 @@ export const ReIndexConfirmationPopUp = (props) => {
 
 export const MaintenanceViewer = () => {
   const client = useClient();
-  const [refreshing, setRefreshing] = useState(false);
+  const [refreshing, setRefreshing] = useState(true);
   const refreshingReIndex = false;
   const [updatingReIndex, setUpdatingReIndex] = useState(false);
   const [updating, setUpdating] = useState(false);
@@ -443,7 +443,6 @@ export const MaintenanceViewer = () => {
   };
 
   const initializeMaintenanceView = useCallback(async () => {
-    setRefreshing(true);
     const response = await client.query(getMaintenanceStatus());
     if (!response.errors && response.data.getMaintenanceWindowStatus !== null) {
       const maintenanceStatusData = response.data.getMaintenanceWindowStatus;
@@ -471,13 +470,10 @@ export const MaintenanceViewer = () => {
       dispatch({ type: SET_ERROR, error });
     }
     setRefreshing(false);
-  }, [client]);
+  }, [client, maintenanceModes]);
 
   useEffect(() => {
     if (client) {
-      initializeMaintenanceView().catch((e) =>
-        dispatch({ type: SET_ERROR, e })
-      );
       fetchMaintenanceModes().catch((e) =>
         dispatch({ type: SET_ERROR, error: e.message })
       );
@@ -491,6 +487,14 @@ export const MaintenanceViewer = () => {
     }
   }, [client]);
 
+  useEffect(() => {
+    if (maintenanceModes.length > 0) {
+      initializeMaintenanceView().catch((e) =>
+        dispatch({ type: SET_ERROR, e })
+      );
+    }
+  }, [maintenanceModes]);
+
   return (
     <Box>
       {refreshingReIndex ? (

template_cdk.json

@@ -54,7 +54,6 @@
           "client_id": "string_EXTERNAL_IDP_CLIENT_ID|DEFAULT=None",
           "response_types": "string_EXTERNAL_RESPONSE_TYPES_USED_IN_OIDC_FLOW|DEFAULT=None",
           "scopes": "string_EXTERNAL_IDP_SCOPES_SPACE_SEPARATED|DEFAULT=None",
-          "jwks_url" : "string_EXTERNAL_IDP_JWKS_URL|DEFAULT=None",
           "claims_mapping": {
             "user_id": "string_USER_ID_CLAIM_NAME_MAPPING_FOR_EXTERNAL_IDP|DEFAULT=None",
             "email": "string_EMAIL_ID_CLAIM_NAME_MAPPING_FOR_EXTERNAL_IDP|DEFAULT=None"