This is an automated email from the ASF dual-hosted git repository. mykolabodnar pushed a change to branch DLAB-515 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from dc8e24c [DLAB-515] - [GCP] EDGE node as NAT implemented, [GCP] Dataproc kernels connection via sparkmagic/livy implemented, [AWS] [GCP] [Azure] Sprk Cluster connection via sparkmagic/livy implemented add cb39e05 Fixed issue with default permission add a528ecf Merge branch 'DLAB-1774' into develop add 845aed5 [DLAB-1836]: Implemented set of improvements for bucket browser (#763) add a1bb261 Added file size to upload model add 54d19cd [DLAB-1552, DLAB-1803] Azure bucket browser add 7e4d3d9 Added logs add 78847d2 Merge branch 'bucket-browser-azure' into develop add d7cbb91 [DLAB-1744] Conveyed notebook links of other users to administrator (#764) add 8a90f9e [DLAB-1817]: Fixed token issue (#765) add 98cf3b1 small fix add 1230329 changed token limit (#766) add 701dccf Merge branch 'develop' of github.com:apache/incubator-dlab into develop add de8abf1 [DLAB-1781]: Prevent applying if user has not changed anything for quotas (#767) add f731c4c [DLAB-1840]: Implemented set tasks concerning download (#768) add 9369600 Small fix add cc361c8 Change file upload position (#769) add d54ff87 [DLAB-1844]: Fixed set of issues with folder creation (#772) add 9311b4c Fixed merge bug add 605879c [DLAB-1845]: Limitation for notebook popup (#773) add a1a14e0 [DLAB-1815] Improve performance of bucket browser add 68ec345 [DLAB-1804]: Added hint if user have not any active project (#774) add c0fe765 [DLAB-1754]: Removed category name if there isn't any instance size in such category (#775) add 099c803 [DLAB-1848] Fixed issue with stopping notebook add 2020dc2 [DLAB-1703]: Fixed billing on Safari (#776) add 2e0b478 [DLAB-1849] Fixed issue with computational shapes add 49172e0 [DLAB-1815] Increased proxy_read_timeout add c552d23 [DLAB-1852] Fixed issue with creation of data engine add 6d181e8 [DLAB-1722] Fixed issue with disappearing permissions after endpoint disconnection add 6b1ed78 [DLAB-1873] Fixed issue with bucket service config add eb23e22 [DLAB-1737]: Fixed all resources disappear after the last endpoint disconnection (#779) add 4ff2725 [DLAB-1853]: Fixed filtered data are changes in some seconds and added scrollbar for error message in library page (#780) add 8f85f9b [DLAB-1737]: For notebook based on GPU allowed only GPU computational resource and vice-versa (#781) add d14b322 [DLAB-1737]: Alter information messages if remove user from group and if remove group from the project (#782) add 8926f92 [DLAB-1742] Billing report bug fix (#770) add 729bef9 [DLAB-1861]: Added checkboxes to environment management (#785) add 7e60054 grid fix add b7314d6 Merge remote-tracking branch 'origin/develop' into develop add 9eab69a [DLAB-54]: added script to terminate custom notebook image add cd0415e [DLAB-54]: added script to create custom notebook image add 9e74e03 [DLAB-54]: changed to terminate both primary and secondary images add a7d8ebb Allowed creation images on gcp from UI add db5483c Added mock file for dev mode for creating image add 6212366 [DLAB-54]: changed code to create use and delete custom images add 9c14667 Merge pull request #786 from apache/DLAB-54-dev add 6c1871a [DLAB-1858]: Added hint for library in library grid (#787) add 7f19cd9 [DLAB-1875]: Passed correct endpoint (#789) add d9d04e4 [DLAB-1674] Take instance statuses into consideration while terminating edge node add e396ea3 [DLAB-1874]: Fixed set of tasks for 'Environment management' page (#790) add fc2f9af [DLAB-1876] Fixed bug with creating folders in bucket browser add 29cb8d7 [DLAB-1881]: Updated folder creation in bucket-browser, Changed refresh token time to 25min (#791) add 5fdfa71 [DLAB-1877]: Fixed set of tasks on "Environment management" (#792) add 26cb3ae Fixed endpoint disconnecting issue add c493306 [DLAB-1882]: made names of images lower case add 5e18a2f [DLAB-1882]: changed image creation add 2795ac8 Merge pull request #793 from apache/DLAB-1882 add 315ee25 Merge remote-tracking branch 'origin/develop' into develop add db10cec Bump DLab version add 153a0cf [DLAB-1884]: Fixed set of tasks for 'Environment management' page (#794) add f30a38f [DLAB-1777] Fixed issue with content type for objects while uploading via DLab UI add b41ded7 Added validation for folder creation add cdaac51 [DLAB-1890]: Removed repeated request for lib groups add 4e15862 Increased -Xmx java option add 16ae6ac Added audit support for projects add 809fa37 Added audit support for notebooks add b4291ee Added audit endpoint add 2c5c0f7 Added endpoint to retrieve audit add e688b73 Added audit support for projects add 28ed0cb Added audit support for projects add 8032353 Merge remote-tracking branch 'origin/audit' into audit add e6d4e5d [DLAB-1758]: Merge audit UI (#784) add 66f49da Merge remote-tracking branch 'origin/audit' into audit add 6560b6c Added audit for computational resources add 0a423f7 Change endpoint disconnecting settings add c66d6c4 Added audit for computational resources add f8b8b37 Merge remote-tracking branch 'origin/audit' into audit add 7250f2f Audit changes add a8f4877 Merge with develop add 8689a88 fixed bug with audit for while updating budget add 9d94469 Added audit for endpoint add 840d811 Merge remote-tracking branch 'origin/audit' into audit add 40e9e5f added 'project' field to audit add ea69832 Merge remote-tracking branch 'origin/audit' into audit add da7cdbe Refactoring of project audit add 5973a0e Code refactoring add 3a9e635 Changed data type add de9ea30 Added audit for bucket browser add 6c533bd Added audit for creating images add 28302a4 Added audit for managing git accounts add 3a6e8ec Added audit for user log in action add 1eeffc2 Added audit for installing libs add cebfbd4 Added audit for schedulers add 72844e9 [DLAB-1873] Fixed issue with bucket service config add fceb546 Added audit for groups add 1506b6b roles data structure changed add 72c6c7f Added audit computational while managing notebook/project add abb6979 Added pagination for audit records add 92bfdbf Update audit actions, other small fixes add 13b73bd Merge remote-tracking branch 'origin/audit' into audit add 4a47ae1 Added custom pagination add 8d0ffca Added table for audit info dialog add 815daaa Added pagination and filtering for audit records add 03714a9 Merge branch 'audit' of github.com:apache/incubator-dlab into audit add c62d259 Added delimiters for action with group add 8f6229e Merge branch 'audit' of github.com:apache/incubator-dlab into audit add 4628520 Added filters for audit add 4959110 Merge branch 'audit' of github.com:apache/incubator-dlab into audit add e044d81 Connected UI pagination, filtration with BA add 32c8727 Fixed bugs, refactored code add 01dc553 fixed typo add 4d0e7da Fixed issue with 'List of Resources' page add f32a31d Changed audit columns positions, add 84ba176 [DLAB-1888] Divide action one two columns add c2c59a6 Added resource type filter add 05d7f50 [DLAB-1889]: Added resource-type column and filter add cd374d8 added resource-types filter add 1f51bf7 Merge branch 'audit' into develop add 167c626 Fixed merge conflicts add 202e6f2 [DLAB-1734] Conveyed amount of nodes for computational resources add 28e8774 [develop]: changed dlab-version in jar files add 158f42e [DLAB-1887]: Made the same behaviour for refresh buttons on all pages (#799) add f7a70da [DLAB-1893] - MongoDB version updated to 4.2 add 115172b Merge pull request #800 from apache/DLAB-1893 add 25f1808 [DLAB-1894]: Fixed set of UI style tasks (#801) add 2a57d03 Fix upload file quantity in Bucket browser add 4cf5db4 [DLAB-1896]: make audit hidden if value of 'auditEnabled' is false (#802) add 25a0dea [DLAB-1897] Fixed issue with scheduler add ea91f7d [DLAB-1899] Added folder creation to audit add a6e65fb [DLAB-1898]: Made possible to delete empty folder via bucket browser and Fixed audit for bucket-browser (#803) add c747d7c Resolved merge conflicts add 1aba72b Append stacktrace for billing error add 0282232 [DLAB-1883]: Disabled access to bucket if endpoint is stopped or terminated (#804) add bbe8bb5 [DLAB-1910]: Fixed button size of log out action (#805) add 815548c [DLAB-1907] Support retrieving schedulers for stop for specific duration(now() - minuteOffset) add fef0019 [DLAB-1914] Fixed issue with number of slaves for data engine service add a9b1781 [DLAB-1720] Exploratory Billing report fix (#806) add 67ae0ff [DLAB-1913]: Fixed set of UI tasks for 'Billing report' and 'List of resource' pages (#807) add 6af8bce [DLAB-1720] Minor fix for exploratory report (#808) add 6546373 [DLAB-1901] Added support for quota per month add dffcbb0 [DLAB-1917]: Fixed set of UI tasks in Audit (#809) add 37bca01 [DLAB-1902]: Support quota per month(UI) (#810) add 934173e monthly budget fix add 2111c06 [DLAB-1917]: Fixed set of UI Audit tasks (#811) add 9d5dbc5 [DLAB-1919]First part of audit changes add 4ef5ba3 [DLAB-1919] Second part of changes add 6e39da5 [DLAB-1917]: Fixed follow link action for AUDIT (#812) add c03a9c1 Added log for opening terminal(UI) add 9c1384b [DLAB-1924]:Implemented UI changes for scheduler (#814) add c873985 Merge remote-tracking branch 'origin/develop' into develop add 70f2594 [DLAB-1925] Change total instance number for EMR, fixed billing on resource (#815) add 1d9fc97 [DLAB-1921] Fixed creation Group defect (#813) add ca3f908 [DLAB-1929] Allowed only one active Data Engine Service per notebook (#816) add 7a9efff [DLAB-1934] Implemented set of UI tasks in Audit(part2) (#818) add f2cb252 [DLAB-1918] Empty Budget values (#817) add 1e7757d [DLAB-1934] Fixed audit issues (#819) add b6436e0 [DLAB-1749] Fixed set of UI tasks in audit(Part3) (#821) add 6c7a0cf [DLAB-1940]: added check of endpoint name during AMI deregistering add db3e688 Merge pull request #820 from apache/DLAB-1940 add f0b97c7 [DLAB-1945]: Allowed only one cluster for notebook (#822) add 7ff249d Compute copy hint fix add 1759f9e [DLAB-1714] BE created notification in case project quota is exceeded add 011f939 [DLAB-1748]: added installation of specific debian os pkg and dependencies to response file add 03f6e24 [DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file add 246b2e6 [DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file for other group add b7afe51 [DLAB-1748]: added installation of specific pip lib and list of versions and dependencies to response file for other group add d0899c4 [DLAB-1748]: made dependencies a list add a4895c1 [DLAB-1748]: made dependencies equal 'none' if there are no dependencies for pip add c2fe8f2 [DLAB-1748]: changed how list of available pip versions is returned add c7913e1 [DLAB-1748]: made list of available pip versions equal none if there are no available versions add 31a9b8b [DLAB-1748]: made changes to apt and pip installation add 23a4cf5 [DLAB-1748]: made changes to apt and pip installation add 5b4c4e5 [DLAB-1748]: made changes to apt and pip installation status add d6c6f67 [DLAB-1748]: made pip dependencies a list add a17e982 [DLAB-1748]: added installaton of specific version for R add 744d146 [DLAB-1748]: changed how new installed dependencies are acquired for pip add 7da2448 [DLAB-1748]: changed how new installed dependencies are acquired for pip add 9ab3b43 [DLAB-1748]: made some changes for r pkg installation add 27eeda8 [DLAB-1940]: changed debian package and r installation add d681f82 [DLAB-1749] BE support library installation of particular version add 88429c0 [DLAB-1751]: Added dependencies info for lib list add 2ff620b upd libs add 03fd607 [DLAB-1750] Added lib versions from UI add a9a4c9d Merge branch 'DLAB-1750' into DLAB-1749 add 6412708 small fix add 18104f0 [DLAB-1750] Added possibility to install lib with different version add e2e5f74 [DLAB-1750] Added validation for existing and installed libs add a4ce996 [DLAB-1749] BE support library installation of particular version add a45f5ac Merge branch 'DLAB-1749' of github.com:apache/incubator-dlab into DLAB-1749 add cdecfd1 [DLAB-1750] Added validation for existing and installed libs add 6737547 [DLAB-1749] BE support library installation of particular version add 507cb3d Merge branch 'develop' into DLAB-1749 add 0bad8ba [DLAB-1749] Added available lib version list dialog add a42782f [DLAB-1749] Updated ordering add fdd45f1 Merge remote-tracking branch 'origin/DLAB-1749' into DLAB-1749 add c2466db Merge remote-tracking branch 'remotes/origin/DLAB-1749' into DLAB-1748 add f96b95a Merge branch 'DLAB-1748' of https://github.com/apache/incubator-dlab into DLAB-1748 add 2ce666f [DLAB-1748]: added new error status when invalid version add 0746872 [DLAB-1748]: added new error status when invalid version for R and apt add f3546d5 [DLAB-1748]: added versions for apt dependencies add c807071 [DLAB-1748]: added versions for pip dependencies add ac62c96 [DLAB-1748]: added versions for pip dependencies add 45e328d [DLAB-1748]: added versions for R dependencies add 4cf9e1b [DLAB-1750] Added lib igo message for other group, status version invalid add 43cd662 [DLAB-1947] Implemented additional changes for lib management add 3b8ac2b Merge branch 'DLAB-1748' of github.com:apache/incubator-dlab into DLAB-1748 add 1e09940 [DLAB-1750] fix status color add 2295bde [DLAB-1750] small fix add 84d7c1f [DLAB-1748]: Fixed bug with autocomplete add 2a7864c Merge branch 'DLAB-1748' of https://github.com/apache/incubator-dlab into DLAB-1748 add 7e35bde [DLAB-1748]: fixed error R in pkg install add 60ac231 [DLAB-1748]: fix for redhat ssn deployment add 0001a8f [DLAB-1748]: changed apt and pip dependencies list add 911966a Merge pull request #824 from apache/DLAB-1748 add 6c5c086 [DLAB-1552] Updated auth for azure bucket browser add 83105e1 Added mock for azure auth file add 3a7efcc Merge branch 'develop' into bucket-browser-azure add 4965fef [DLAB-1786]: Added changes for bucket browser on azure(UI) add bb63a14 Fix import add 5b2fe03 [DLAB-1714] BE created notification in case project quota is exceeded add f58aeb1 [DLAB-1944]: added AZURE_AUTH_FILE_PATH to ssn_configure add 9d1560b [DLAB-1944]: added Storage Blob Data Contributor to azure prerequisites add 209d416 Merge pull request #825 from apache/DLAB-1944 add 282641f [DLAB-1959] Fixed issue with pagination on Audit page add 88a8d47 [DLAB-1926] Billing report sorting (#823) add 40f90e4 [DLAB-1963] Fixed issue with creating notebook from image add 8ac13fd [DLAB-1750]: Changed library search, fixed issues for library page (#827) add e5fd885 [DLAB-1943]: Small library fix add e4ab8f7 [DLAB-1965]: Fixed bucket browser issue (#828) add ef0a28a [DLAB-1594]: fixed for apt packages add 20a154e [DLAB-1594]: fixed for pip libs add bb8214d [DLAB-1594]: fixed for pip libs add 81daea6 [DLAB-1594]: if failed to install, returns version N/A for apt and pip add 46445d9 [DLAB-1961]: made changes for R package installation add bef18ec [DLAB-1961]: pip now upgrades lib if version is not specified and new version is available add bf9cce3 [DLAB-1961]: changed status 'invalid version' to 'invalid_version' add 126bbdd [DLAB-1961]: made dataengine-service to only run pip3 during 'others' packages installation add a866f0a [DLAB-1961]: some changes to additional apt package installation add 440c433 [DLAB-1961]: changed 'failed' status to 'installation_error' add 237e738 Merge pull request #826 from apache/DLAB-1961 add 8eb2e1f Changed library status add ef44530 [DLAB-1961]: changed error message for java add c27dd4e [DLAB-1962]: made new response in case of exception for apt yum pip R and java add 12c9a5c [DLAB-1962]: changed status in response add faea35e Merge pull request #829 from apache/DLAB-1961 add 0f31d59 [DLAB-1960]: Fixed library issues (#830) add c4f72c4 [DLAB-1967]: Fixed additional packages are not shown (#832) add 765eddb [DLAB-1968] - Jenkins installing suspended add 4d58043 Merge pull request #833 from apache/DLAB-1968 new 0c997c2 [DLAB-515]: Changed Ubuntu AMI to 18.04 new d3db17b [DLAB-515]: fixed issue with Ubuntu version change new 7f777c6 [DLAB-515]: fixed issue with Ubuntu version change new 909b117 [DLAB-515]: fixed issue with Ubuntu version change new b6ea36f [DLAB-515]: fixed issue with Ubuntu version change new 0738b69 [DLAB-515]: fixed issue with Ubuntu version change new eefcfeb [DLAB-515]: fixed issue with Ubuntu version change new 9395093 [DLAB-515]: [AWS] OpenResty implemented new 8ad1aa2 [DLAB-515]: [AWS] Notebook creation fixed new 197d78e [DLAB-515]: [AWS] Notebook creation fixed new 46bd2f8 [DLAB-515]: [GCP] Ubuntuversion changed to 18.04 new 22f21bb [DLAB-515]: [GCP] Ubuntu version changed new 015903d [DLAB-515]: [Azure] Ubuntu version updated new 6c9a325 [DLAB-515]: Notebooks deploing fixed/Hrrps_proxy added new b74c4a8 [DLAB-515]: Notebooks deploing fixed/Hrrps_proxy added new 6e1b85b [DLAB-515]: EDGE as NAT configuration implemented new 01002f2 [DLAB-515]: EDGE as NAT configuration fixed / EMR version updated new 746afef [DLAB-515]: EDGE as NAT configuration fixed new 098c95e [DLAB-515] - nftables.conf fixed new 13ec57c DLAB-1799 added parameter in tensorboard.service, changed numpy version for python 2.7, added setuptools version to dlab.ini that is necessary for tensorboard new 360838b [DLAB-515]: Dataengine creation fixed new 85d6533 [DLAB-1799]: fixed typo new 94dad59 [DLAB-1799]: fixed error new 9c27826 [DLAB-515]: Toree version updated new 01594c1 [DLAB-515]: Toree version fixed/ Docker ubuntu version updated/ Docker pip version updated new b9cb267 [DLAB-515]- Jupyter kernels connection fixed new f9424d8 [DLAB-515]- Jupyter remote kernels fixed new a6bb453 [DLAB-515]- Rstudio fixed new e55e6bc [DLAB-515]- Rstudio fixed new 0892292 [DLAB-515]- Rstudio fixed new 219564b [DLAB-515]- Rstudio fixed new bbd95aa [DLAB-515]- Ubuntu 18.04 for container updated/ pip v20.1 for containers updated/ toree v0.3.0 for all clouds updated new 881b2dc [DLAB-1850]: added arg to jupyterlab docker build command new 2e177e6 [DLAB-1827]: increased primary disk size to 14G as with 12 tensorflow with jupyter creation failed new 20f5e9b [DLAB-1827]: increased primary disk size to 16G new 2377860 [DLAB-515] - [GCP] Dataproc version updated new 7b972e3 [DLAB-1825]: added possibility to enable warn_only for manage_pkg new d8561cb [DLAB-515] - [GCP] Dataproc on Jupyter and Zeppelin creation fixed new 012ff0f [DLAB-515] - Python version 3.5 changed for 3.6 for library packages new 7c1730a [DLAB-515] - Dataproc version fixed new b3a9f2c [DLAB-515] - GPG update disabled/HTTPS proxy for apt added new 717c402 [DLAB-515] - dataproc fixed new 17101bb [DLAB-515] - GPG key renewal changed new 5d9b574 [DLAB-1855]: changed pip install new 07de2c9 [DLAB-1855]: changed pip2 installation new fd31c7c [DLAB-1855]: added pip3 pip2 upgrade new cae7158 [DLAB-515] - dataengine-service libs installing fixed new 0339fb3 [DLAB-1856]: added R-devel package installation during cluster creation new 995b1de [DLAB-1855]: changed pip update during dataengine service creation new 163c8b7 [DLAB-515] - [AWS] EMR kernels connection via sparkmagic/livy implemented new 8bed136 Update fab.py new 4dcf89c [DLAB-515] - [AWS] EMR kernels connection via sparkmagic/livy fixed new 02aa350 [DLAB-515] - [GCP] EDGE node as NAT implemented, [GCP] Dataproc kernels connection via sparkmagic/livy implemented, [AWS] [GCP] [Azure] Sprk Cluster connection via sparkmagic/livy implemented new ef0d07a [DLAB-515] [AWS] [GCP] Dataengine/Dataengine-service kernel removing fixed new e7eeec5 Merge remote-tracking branch 'origin/DLAB-515' into DLAB-515 The 55 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 3 +- build.properties | 2 +- .../src/general/conf/dlab.ini | 2 +- .../src/general/lib/os/debian/common_lib.py | 4 +- .../src/general/lib/os/debian/notebook_lib.py | 52 ++- .../src/general/lib/os/fab.py | 127 ++++-- .../src/general/lib/os/redhat/notebook_lib.py | 10 +- .../src/general/lib/os/redhat/ssn_lib.py | 13 +- .../jupyter_dataengine-service_create_configs.py | 6 + .../src/general/scripts/aws/project_terminate.py | 6 +- .../src/general/scripts/azure/project_terminate.py | 8 +- .../src/general/scripts/azure/ssn_configure.py | 2 +- .../scripts/gcp/common_create_notebook_image.py | 92 ++++ .../general/scripts/gcp/common_prepare_notebook.py | 24 +- .../common_terminate_notebook_image.py | 30 +- .../src/general/scripts/gcp/project_terminate.py | 2 +- .../general/scripts/os/install_additional_libs.py | 17 +- .../os/jupyter_dataengine_create_configs.py | 6 + .../src/ssn/scripts/configure_ssn_node.py | 8 +- .../templates/proxy_location_webapp_template.conf | 2 +- .../src/ssn/templates/supervisor_svc.conf | 4 +- .../terraform/bin/deploy/endpoint_fab.py | 8 +- .../terraform/bin/deploy/provisioning.yml | 5 + .../terraform/bin/deploy/supervisor_svc.conf | 2 +- pom.xml | 1 + services/billing-aws/Dockerfile | 4 +- services/billing-azure/Dockerfile | 4 +- .../billing/azure/CalculateBillingServiceImpl.java | 2 +- services/billing-gcp/Dockerfile | 4 +- .../computational/AwsComputationalResource.java | 5 +- .../com/epam/dlab/dto/bucket/FolderUploadDTO.java} | 8 +- .../SparkStandaloneClusterResource.java | 5 +- .../computational/UserComputationalResource.java | 4 +- .../epam/dlab/dto/exploratory/LibInstallDTO.java | 8 + .../com/epam/dlab/dto/exploratory/LibStatus.java | 3 +- .../computational/GcpComputationalResource.java | 4 +- .../ImageType.java => model/StringList.java} | 40 +- .../com/epam/dlab/model/azure}/AzureAuthFile.java | 2 +- .../java/com/epam/dlab/util/UsernameUtils.java | 2 +- .../epam/dlab/rest/contracts/ComputationalAPI.java | 1 + services/provisioning-service/pom.xml | 21 +- .../core/commands/CommandExecutorMockAsync.java | 11 +- .../dlab/backendapi/resources/BucketResource.java | 64 ++- .../azure/ComputationalResourceAzure.java | 2 +- .../dlab/backendapi/service/BucketService.java | 5 +- .../service/impl/aws/BucketServiceAwsImpl.java | 33 +- .../service/impl/azure/BucketServiceAzureImpl.java | 133 +++++- .../service/impl/gcp/BucketServiceGcpImpl.java | 23 +- .../src/main/resources/mock_file/azure/auth.json | 5 + .../{aws => gcp}/notebook_create_image.json | 3 +- services/self-service/Dockerfile | 2 +- services/self-service/entrypoint.sh | 2 +- services/self-service/pom.xml | 5 + services/self-service/self-service.yml | 6 +- .../dlab/backendapi/SelfServiceApplication.java | 39 +- .../annotation/{ProjectAdmin.java => Audit.java} | 8 +- .../backendapi/annotation/{User.java => Info.java} | 2 +- .../annotation/{User.java => ResourceName.java} | 2 +- .../conf/SelfServiceApplicationConfiguration.java | 7 + .../dao/{UserGroupDao.java => AuditDAO.java} | 15 +- .../com/epam/dlab/backendapi/dao/AuditDAOImpl.java | 169 +++++++ .../epam/dlab/backendapi/dao/BaseBillingDAO.java | 37 +- .../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 2 + .../com/epam/dlab/backendapi/dao/BillingDAO.java | 9 +- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 12 +- .../dlab/backendapi/dao/ExploratoryLibDAO.java | 38 +- .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +- .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 15 +- .../com/epam/dlab/backendapi/dao/UserGroupDao.java | 1 + .../epam/dlab/backendapi/dao/UserGroupDaoImpl.java | 28 +- .../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 20 +- ...ConfigurationData.java => AuditActionEnum.java} | 11 +- .../AuditCreateDTO.java} | 14 +- .../com/epam/dlab/backendapi/domain/AuditDTO.java} | 17 +- ...{BillingReport.java => AuditPaginationDTO.java} | 28 +- ...urationData.java => AuditResourceTypeEnum.java} | 11 +- .../epam/dlab/backendapi/domain/BillingReport.java | 2 +- .../epam/dlab/backendapi/domain/BudgetDTO.java} | 16 +- .../dlab/backendapi/domain/CreateProjectDTO.java | 3 +- .../backendapi/domain/ExploratoryLibCache.java | 21 +- .../epam/dlab/backendapi/domain/ProjectDTO.java | 2 +- .../backendapi/domain/UpdateProjectBudgetDTO.java | 1 + .../backendapi/interceptor/AuditInterceptor.java | 127 ++++++ .../interceptor/BudgetLimitInterceptor.java | 5 +- .../backendapi/modules/CloudProviderModule.java | 11 +- .../epam/dlab/backendapi/modules/DevModule.java | 6 + .../dlab/backendapi/modules/ProductionModule.java | 6 + .../dlab/backendapi/resources/AuditResource.java | 70 +++ .../dlab/backendapi/resources/BillingResource.java | 8 + .../dlab/backendapi/resources/BucketResource.java | 74 +++- .../backendapi/resources/EndpointResource.java | 16 +- .../backendapi/resources/ExploratoryResource.java | 11 +- .../backendapi/resources/GitCredsResource.java | 41 +- .../resources/ImageExploratoryResource.java | 7 +- .../backendapi/resources/KeycloakResource.java | 27 +- .../resources/LibExploratoryResource.java | 26 +- .../dlab/backendapi/resources/ProjectResource.java | 21 +- .../backendapi/resources/SchedulerJobResource.java | 7 +- .../backendapi/resources/UserGroupResource.java | 9 +- .../resources/aws/ComputationalResourceAws.java | 68 +-- .../azure/ComputationalResourceAzure.java | 76 ++-- ...BucketDownloadDTO.java => FolderUploadDTO.java} | 4 +- .../dlab/backendapi/resources/dto/GroupDTO.java | 3 +- .../resources/dto/HealthStatusPageDTO.java | 6 +- .../backendapi/resources/dto/LibraryStatus.java | 6 + .../resources/dto/ProjectInfrastructureInfo.java | 4 +- .../dto/{LibraryDTO.java => QuotaUsageDTO.java} | 18 +- .../dto/{GroupDTO.java => UpdateGroupDTO.java} | 14 +- .../backendapi/resources/dto/UserResourceInfo.java | 70 +-- .../dlab/backendapi/resources/dto/UserRoleDto.java | 8 + .../resources/gcp/ComputationalResourceGcp.java | 104 ++--- .../schedulers/CheckProjectQuoteScheduler.java | 6 +- .../{BackupService.java => AuditService.java} | 17 +- .../dlab/backendapi/service/BillingService.java | 15 +- .../dlab/backendapi/service/BucketService.java | 8 +- .../backendapi/service/ComputationalService.java | 59 +-- .../dlab/backendapi/service/EndpointService.java | 6 +- .../backendapi/service/ExploratoryService.java | 10 +- .../service/ImageExploratoryService.java | 2 +- .../dlab/backendapi/service/LibraryService.java | 4 +- .../dlab/backendapi/service/ProjectService.java | 25 +- .../backendapi/service/SchedulerJobService.java | 5 +- .../backendapi/service/SecurityServiceImpl.java | 15 +- .../dlab/backendapi/service/UserGroupService.java | 9 +- .../backendapi/service/impl/AuditServiceImpl.java | 63 +++ .../service/impl/BillingServiceImpl.java | 84 +++- .../backendapi/service/impl/BucketServiceImpl.java | 47 +- .../service/impl/ComputationalServiceImpl.java | 148 ++++--- .../service/impl/EndpointServiceImpl.java | 89 ++-- .../service/impl/EnvironmentServiceImpl.java | 73 ++-- .../service/impl/ExploratoryServiceImpl.java | 180 +++++--- .../service/impl/GitCredentialServiceImpl.java | 71 +-- .../service/impl/ImageExploratoryServiceImpl.java | 88 ++-- .../impl/InfrastructureInfoServiceImpl.java | 37 +- .../impl/InfrastructureTemplateServiceImpl.java | 35 +- .../service/impl/LibraryServiceImpl.java | 81 ++-- .../service/impl/ProjectServiceImpl.java | 204 ++++++--- .../service/impl/SchedulerJobServiceImpl.java | 231 +++++----- .../service/impl/UserGroupServiceImpl.java | 122 +++++- .../epam/dlab/backendapi/util/BillingUtils.java | 48 +- .../epam/dlab/backendapi/util/RequestBuilder.java | 154 +++---- .../management/endpoints/endpoints.component.ts | 9 +- .../manage-environment-dilog.component.html | 40 +- .../manage-environment-dilog.component.scss | 8 +- .../manage-environment-dilog.component.ts | 15 +- .../management-grid/management-grid.component.html | 94 +++- .../management-grid/management-grid.component.scss | 27 +- .../management-grid/management-grid.component.ts | 204 ++++++--- .../management/management.component.html | 37 +- .../management/management.component.ts | 108 ++++- .../administration/management/management.model.ts | 7 +- .../administration/project/project-data.service.ts | 13 +- .../project/project-form/project-form.component.ts | 50 ++- .../project-list/project-list.component.html | 6 +- .../project-list/project-list.component.scss | 6 +- .../app/administration/roles/roles.component.ts | 40 +- .../main/resources/webapp/src/app/app.module.ts | 10 +- .../resources/webapp/src/app/app.routing.module.ts | 14 +- .../resources/webapp/src/app/core/core.module.ts | 2 + .../convert-action.pipe.ts} | 8 +- .../index.ts | 8 +- .../convert-file-size/convert-file-size.pipe.ts | 7 +- .../resources/webapp/src/app/core/pipes/index.ts | 1 + .../app/core/pipes/lib-sort-pipe/lib-sort.pipe.ts | 6 +- .../services/applicationServiceFacade.service.ts | 22 + .../services/{admin.guard.ts => audit.guard.ts} | 4 +- .../webapp/src/app/core/services/audit.service.ts | 47 ++ .../app/core/services/bucket-browser.service.ts | 8 + .../src/app/core/services/healthStatus.service.ts | 4 + .../webapp/src/app/core/services/index.ts | 1 + .../webapp/src/app/core/util/sortUtils.ts | 8 +- .../audit/audit-grid/audit-grid.component.html | 232 ++++++++++ .../audit/audit-grid/audit-grid.component.scss | 291 +++++++++++++ .../audit/audit-grid/audit-grid.component.ts | 308 +++++++++++++ .../audit-toolbar/audit-toolbar.component.html} | 7 +- .../audit-toolbar/audit-toolbar.component.scss} | 2 +- .../audit-toolbar/audit-toolbar.component.ts} | 40 +- .../src/app/reports/audit/audit.component.ts | 101 +++++ .../audit/audit.module.ts} | 27 +- .../src/app/reports/audit/filter-audit.model.ts | 27 ++ .../reporting-grid/reporting-grid.component.html | 6 +- .../reporting-grid/reporting-grid.component.scss | 0 .../reporting-grid/reporting-grid.component.ts | 17 +- .../{ => reports}/reporting/reporting.component.ts | 31 +- .../{ => reports}/reporting/reporting.module.ts | 6 +- .../reporting/toolbar/toolbar.component.html | 8 +- .../reporting/toolbar/toolbar.component.scss | 0 .../reporting/toolbar/toolbar.component.ts | 10 +- .../index.ts => reports/reports.module.ts} | 13 +- .../bucket-browser/bucket-browser.component.html | 47 +- .../bucket-browser/bucket-browser.component.scss | 21 +- .../bucket-browser/bucket-browser.component.ts | 122 ++++-- .../bucket-browser.module.ts} | 37 +- .../bucket-browser/bucket-data.service.ts | 48 +- .../buckets-tree/bucket-tree.component.ts | 1 - .../folder-tree/folder-tree.component.html | 11 +- .../folder-tree/folder-tree.component.scss | 3 + .../folder-tree/folder-tree.component.ts | 60 ++- .../cluster-details/cluster-details.component.html | 31 +- .../cluster-details/cluster-details.component.scss | 11 + .../cluster-details/cluster-details.component.ts | 34 +- ...utational-resource-create-dialog.component.html | 6 +- ...mputational-resource-create-dialog.component.ts | 20 +- .../computational-resources-list.component.scss | 10 +- .../cost-details-dialog.component.html | 4 +- .../create-environment.component.ts | 20 +- .../detail-dialog/detail-dialog.component.html | 62 ++- .../detail-dialog/detail-dialog.component.scss | 6 + .../detail-dialog/detail-dialog.component.ts | 31 +- .../exploratory/install-libraries/index.ts | 6 +- .../install-libraries.component.html | 260 +++++++++-- .../install-libraries.component.scss | 170 +++++++- .../install-libraries.component.ts | 266 ++++++++--- .../resources-grid/resources-grid.component.html | 66 ++- .../resources-grid/resources-grid.component.scss | 34 +- .../resources-grid/resources-grid.component.ts | 123 ++++-- .../resources-grid/resources-grid.model.ts | 6 +- .../src/app/resources/resources.component.html | 11 +- .../src/app/resources/resources.component.ts | 1 - .../webapp/src/app/resources/resources.module.ts | 15 +- .../resources/scheduler/scheduler.component.html | 13 +- .../app/resources/scheduler/scheduler.component.ts | 9 +- .../dropdown-list/dropdown-list.component.html | 4 +- .../dropdown-list/dropdown-list.component.ts | 5 + .../webapp/src/app/shared/form-controls/index.ts | 17 +- .../multi-select-dropdown.component.html | 13 +- .../confirmation-dialog-type.enum.ts | 1 + .../confirmation-dialog.component.html | 14 +- .../confirmation-dialog.component.ts | 30 +- .../confirmation-dialog.model.ts | 3 + .../notification-dialog.component.ts | 27 +- .../webapp/src/app/shared/navbar/index.ts | 2 +- .../src/app/shared/navbar/navbar.component.html | 50 ++- .../src/app/shared/navbar/navbar.component.scss | 8 +- .../src/app/shared/navbar/navbar.component.ts | 2 +- .../webapp/src/assets/styles/_dialogs.scss | 26 +- .../webapp/src/assets/styles/_general.scss | 2 + .../resources/webapp/src/assets/styles/_theme.scss | 134 +++++- .../webapp/src/assets/styles/_variables.scss | 1 + .../src/main/resources/webapp/src/styles.scss | 17 +- .../resources/ExploratoryResourceTest.java | 229 +++++----- .../resources/ImageExploratoryResourceTest.java | 14 +- .../resources/LibExploratoryResourceTest.java | 46 +- .../resources/SchedulerJobResourceTest.java | 25 +- .../resources/UserGroupResourceTest.java | 45 +- .../service/impl/ComputationalServiceImplTest.java | 75 ++-- .../service/impl/EnvironmentServiceImplTest.java | 110 ++--- .../service/impl/ExploratoryServiceImplTest.java | 164 +++---- .../impl/ImageExploratoryServiceImplTest.java | 10 +- .../service/impl/LibraryServiceImplTest.java | 19 +- .../service/impl/SchedulerJobServiceImplTest.java | 485 +++++++++++---------- .../service/impl/UserGroupServiceImplTest.java | 14 +- 252 files changed, 6597 insertions(+), 2668 deletions(-) create mode 100644 infrastructure-provisioning/src/general/scripts/gcp/common_create_notebook_image.py copy infrastructure-provisioning/src/general/scripts/{azure => gcp}/common_terminate_notebook_image.py (53%) copy services/{self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/BucketDownloadDTO.java => dlab-model/src/main/java/com/epam/dlab/dto/bucket/FolderUploadDTO.java} (85%) copy services/dlab-model/src/main/java/com/epam/dlab/{dto/imagemetadata/ImageType.java => model/StringList.java} (60%) rename services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/config => dlab-model/src/main/java/com/epam/dlab/model/azure}/AzureAuthFile.java (96%) create mode 100644 services/provisioning-service/src/main/resources/mock_file/azure/auth.json copy services/provisioning-service/src/main/resources/mock_response/{aws => gcp}/notebook_create_image.json (90%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/{ProjectAdmin.java => Audit.java} (83%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/{User.java => Info.java} (97%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/{User.java => ResourceName.java} (97%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/dao/{UserGroupDao.java => AuditDAO.java} (68%) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java copy services/self-service/src/main/java/com/epam/dlab/backendapi/domain/{SchedulerConfigurationData.java => AuditActionEnum.java} (82%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/{resources/dto/BucketDownloadDTO.java => domain/AuditCreateDTO.java} (79%) copy services/{dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java => self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditDTO.java} (74%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/domain/{BillingReport.java => AuditPaginationDTO.java} (66%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/domain/{SchedulerConfigurationData.java => AuditResourceTypeEnum.java} (82%) copy services/{dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java => self-service/src/main/java/com/epam/dlab/backendapi/domain/BudgetDTO.java} (80%) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/AuditInterceptor.java create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/AuditResource.java copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{BucketDownloadDTO.java => FolderUploadDTO.java} (95%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{LibraryDTO.java => QuotaUsageDTO.java} (80%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{GroupDTO.java => UpdateGroupDTO.java} (83%) copy services/self-service/src/main/java/com/epam/dlab/backendapi/service/{BackupService.java => AuditService.java} (64%) create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/AuditServiceImpl.java copy services/self-service/src/main/resources/webapp/src/app/core/pipes/{underscoreless-pipe/underscoreless.pipe.ts => convert-action-pipe/convert-action.pipe.ts} (81%) copy services/self-service/src/main/resources/webapp/src/app/core/pipes/{replace-breaks-pipe => convert-action-pipe}/index.ts (85%) copy services/self-service/src/main/resources/webapp/src/app/core/services/{admin.guard.ts => audit.guard.ts} (91%) create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts create mode 100644 services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html create mode 100644 services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss create mode 100644 services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts copy services/self-service/src/main/resources/webapp/src/app/{reporting/toolbar/toolbar.component.html => reports/audit/audit-toolbar/audit-toolbar.component.html} (87%) copy services/self-service/src/main/resources/webapp/src/app/{reporting/toolbar/toolbar.component.scss => reports/audit/audit-toolbar/audit-toolbar.component.scss} (99%) copy services/self-service/src/main/resources/webapp/src/app/{reporting/toolbar/toolbar.component.ts => reports/audit/audit-toolbar/audit-toolbar.component.ts} (75%) create mode 100644 services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts copy services/self-service/src/main/resources/webapp/src/app/{reporting/reporting.module.ts => reports/audit/audit.module.ts} (64%) create mode 100644 services/self-service/src/main/resources/webapp/src/app/reports/audit/filter-audit.model.ts rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/reporting-grid/reporting-grid.component.html (98%) rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/reporting-grid/reporting-grid.component.scss (100%) rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/reporting-grid/reporting-grid.component.ts (86%) rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/reporting.component.ts (89%) rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/reporting.module.ts (88%) rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/toolbar/toolbar.component.html (89%) rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/toolbar/toolbar.component.scss (100%) rename services/self-service/src/main/resources/webapp/src/app/{ => reports}/reporting/toolbar/toolbar.component.ts (93%) copy services/self-service/src/main/resources/webapp/src/app/{core/pipes/lib-sort-pipe/index.ts => reports/reports.module.ts} (77%) copy services/self-service/src/main/resources/webapp/src/app/resources/{scheduler/index.ts => bucket-browser/bucket-browser.module.ts} (50%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org