This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a change to branch DLAB-384
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from 62eb77e  [DLAB-384]: Grouped roles
     add dcf62cb  DLAB-24 defined function to get index from service account 
name and changed all functions that use service account email
     add 56f218f  DLAB-24 added unique index to ssn service account id and role 
when creating and terminating ssn
     add b50d2f6  DLAB-24 added sbn argument to create instance script
     add a45188f  DLAB-24 updated get_index_by_service_account_name function
     add 4d1a702  DLAB-24 removed excessive sbn
     add 3f6abc7  DLAB-24 added print statement for testing
     add 6cedabe  DLAB-24 changed get index function to use sbn, accountID is 
not in format sbnindex instead of sbn-index, as when index is not defined sbn- 
is not a valid accountID
     add f6dd83a  DLAB-24 added print statement for testing
     add fc94a86  DLAB-24 removed print statement for testing
     add f059e53  DLAB-24 added page size for request in 
get_index_by_service_account_name
     add f2cc806  DLAB-24 updated get_index_by_service_account_name function to 
use page token
     add 5f6587e  DLAB-24 added print statement for testing
     add f5b6405  DLAB-24 made index for ssn to include "-" .e.g. -5354s
     add 0d732ab  DLAB-24 added unique index for project creation and 
termination
     add 73b6798  DLAB-24 removed -
     add 662cf2e  DLAB-24 replaced - with _
     add f64ff69  DLAB-24 removed "_" from the index
     add ecaf70c  DLAB-24 removed print in meta.lib, changed print in action lib
     add 541c47c  DLAB-24 added check for get_service_account if unique_index 
exists and added "-" before the index
     add 25b561c  DLAB-24 get_index_by_service_account_name doesnt need service 
base name anymore
     add 11f7e69  DLAB-24 to generate service account email new variable is used
     add ae55d2c  DLAB-24 added '-' before index in ssn-role name
     add 992804f  DLAB-24 rearranged structure of edge and ps role names
     add 3eac3b6  DLAB-24 added prints for testing
     add 7d1d9d7  DLAB-24 moved some variable definition, removed testing 
prints, removed unused lines
     add dc78929  DLAB-24 fixed error
     add 9356de7  DLAB-24 fixed error
     add c7d72d2  DLAB-24 fixed error
     add a4ef0e8  DLAB-24 added print statements in 
get_index_by_service_account_name function
     add fc3d5c7  DLAB-24 defined necessary variable
     add 0dfcb2b  DLAB-24 changed necessary variable
     add df26a38  DLAB-24 added variable, removed uuid generation from fabfile
     add 61440c3  DLAB-24 changed print in get_index_by_service_name
     add b0b0489  DLAB-24 changed print in get_index_by_service_name
     add d774cca  DLAB-24 returned deleted lines
     add 593b21f  DLAB-24 replaced service_id_variable with service_base_name
     add a938391  DLAB-24 distinguished ssn_unique_index
     add 512926e  DLAB-24 changed print in get_index... function
     add a38e329  DLAB-24 fixed error
     add 002b33c  DLAB-24 removed unnecessary lib
     add 75a0636  Merge pull request #603 from leonidfrolov/DLAB-24
     add abae905  DLAB-24 fixed mistake
     add e342f01  Merge pull request #604 from leonidfrolov/DLAB-24
     add 134fe6e  [Dlab-1422] The endpoint URL verification (#588)
     add 5e25a7d  [DLAB-1527]: Rarely notebook is not created successful from 
the first attempt fixed
     add 6b0c738  [DLAB-1527]: fixes for RedHat implemented
     add 44d2823  [DLAB-1527]: fixes for RedHat updated
     add 0a9f4f6  Merge pull request #605 from apache/DLAB-1527
     add 5fe0f7c  [DLAB-1527]: function for apt-get/yum fixed
     add 1fed9bd  [DLAB-1527]: function for apt-get/yum fixed
     add 4e2365a  Merge pull request #606 from apache/DLAB-1527
     add 0ebbb5c  [DLAB-1549]: Prevented lib_groups requests if library 
managements popup is not opened (#607)
     add 52a8af1  [DLAB-1567]: Removed 'Refresh'/'Export' buttons from Billing 
if user is not admin (#608)
     add bf0f249  [DLAB-1527]: function for apt fixed and Unattended Upgrades 
disabled
     add afc0214  Merge pull request #609 from apache/DLAB-1527
     add 44b932e  [DLAB-1567]: billing issues for user who has not 
administrative role (#610)
     add 7581c97  DLAB-1531 added endpoint tag to azure shared storage account
     add 376ed8e  DLAB-1531 corrected additional tags for shared bucket
     add fee98e6  DLAB-1531 remade add_bucket_label function for gcp a bit and 
added some labels to gcp buckets after creation
     add 2f3dbdf  DLAB-1531 added some prints for testing
     add 1e4fe85  DLAB-1531 changed add_bucket_labels function, updated code 
according to changed function
     add 1595440  DLAB-1531 changed some variables
     add 87b2781  DLAB-1531 add_bucket_labels is now called from 
common_create_bucket.py
     add ef58d74  DLAB-1531 tag set is now passed to create_s3_bucket function
     add 47a6c8f7 DLAB-1531 fixed typo
     add 27f91b6  DLAB-1531 fixed errors
     add bd48194  DLAB-1531 changed for testing
     add 9d3e854  DLAB-1531 fixed creation in aws
     add 03b6694  Merged
     add 933c100  DLAB-1531 updated code
     add 3b18859  DLAB-1531 changed one of gcp bucket tags
     add 2c82d6a  DLAB-1531 changed name bucket tags in azure and fixed typo
     add 8cad8cf  Merge pull request #612 from apache/DLAB-1531
     add 33cdf54  [DLAB-37]: SSO supporting for RedHat implemented
     add 65aab78  [DLAB-37]: SSO supporting for RedHat fixed
     add 3660e72  Merge pull request #613 from apache/DLAB-37
     add 3bc642d  [DLAB-1573]: Billing is not available in marketpalce fixed
     add 29af917  Merge pull request #614 from apache/DLAB-1573
     add 89efe59  [DLAB-1567]: billing issues for user who has not 
administrative role (#615)
     add f20f25d  [DLAB-1553]: [GCP] project local backet termination fixed
     add fbcfdb9  Merge pull request #616 from apache/DLAB-1553
     add d03b40b  DLAB-1531 returned Name tag to azure service_account
     add 8db78f5  Merge pull request #617 from apache/DLAB-1531
     add d02f4c0  [DLAB-1587]: Added value of service (#618)
     add 4e8eae2  DLAB-1517 added usage of ssn_nginx.conf file
     add 1345909  DLAB-1517 added nginx user creation
     add 2239cca  DLAB-1517 changed cp path for nginx.conf
     add 7ce3069  Merge pull request #619 from apache/DLAB-1517
     add 868e4b0  [DLAB-625] Created Jupyterlab template for Azure
     add acd8932  [DLAB-625] Bugfix
     add 04399b8  [DLAB-625] Fixed minor bug and updated jupyterlab version
     add 0e8c625  Merge pull request #620 from apache/DLAB-625
     add 5ac08a0  small style fix (#622)
     add b214927  [DLAB-1570]: Rarely notebook creation fails on stage of 'npm' 
installation fixed
     add f67b8b1  [DLAB-1570]: Rarely notebook creation fails on stage of 'npm' 
installation fixed
     add 68b9825  Merge pull request #623 from apache/DLAB-1570
     add bb069fe  [DLAB-1570]: returned name of the function
     add 8eb6f29  Merge pull request #624 from apache/DLAB-1570
     add 31b5cc2  [DLAB-1570]: 'npm' fixes updated
     add 8c2548f  Merge pull request #625 from apache/DLAB-1570
     add 5a644ac  'npm' install fixes
     add c031f1a  [DLAB-1468]: disables shared image enabled variable in 
dlab.ini and deploy dlab script
     add 1e5e8cc  [DLAB-1468]: disables shared image enabled variable in 
ssn_configure
     add 88572a5  [DLAB-1468]: removed usage of shared_image_enabled during ssn 
creation
     add 5b55d74  [DLAB-1468]: removed shared_image_enabled from README.md
     add e9400ca  Merge pull request #627 from apache/DLAB-1468
     add 76a0970  [DLAB-1595]: added features block
     add fd8506d  [DLAB-1595]: added endpoint network interface to security 
group association
     add dcbb778  [DLAB-1595]: added dependency for nif-sg association
     add 32f4456  [DLAB-1595]: changed nif-sg dependency
     add 8fb14dd  [DLAB-1595]: added additional dependencies for testing
     add 87cd4da3 [DLAB-1595]: removed dependencies
     add ec72a18  [DLAB-1595]: added dependency for testing
     add 6975cf0  Merge pull request #628 from apache/DLAB-1595
     add d2eb326  [DLAB-11485]: test commit for ssn fail
     add f51318f  [DLAB-11485]: test commit for ssn fail
     add e1a5989  [DLAB-11485]: [GCP] - SSN creation deletes predefined 
VPC/subnet in case of SSN creation fails fixed
     add 3b14af2  [DLAB-11485]: [GCP] - SSN fail for test
     add 01780c1  [DLAB-11485]: [GCP] - SSN fail for test 1
     add e3e9ace  [DLAB-11485]: [GCP] - SSN fail for test 2
     add 55a99a2  [DLAB-11485]: [GCP] - SSN fail for test 2
     add 017ddd0  [DLAB-11485]: [GCP] - SSN fail for test 3
     add 132ea90  [DLAB-11485]: [GCP] - SSN creation deletes predefined 
VPC/subnet in case of SSN creation fails fixed
     add 99adcb0  [DLAB-11485]: final changes
     add 8e734ea  Merge pull request #629 from apache/DLAB-1485
     add cfff604  [DLAB-1579]: Added confirmation dialog with information about 
termina… (#630)
     add 6129baf  [DLAB-1539]: changed user tag for notebooks
     add 907fcd6  [DLAB-1539]: added user tag and custom tag to notebook labels
     add ccdb2f6  [DLAB-1539]: removed prints from get_index... function in gcp 
meta_lib
     add c3a6c49  [DLAB-1539]: added user_tag for dataengine
     add 51afde3  Merge pull request #631 from apache/DLAB-1539
     add 14f0044  [DLAB-1599]: Adjusted billing acording to multicloud support 
(#632)
     add 79ca168  [DLAB-1510] All resources are stopped with project (#611)
     add 532573c  [DLAB-1606]: Fixed small css bugs (#634)
     add 30045cd  [DLAB-1609]: Conveyed 'Resource Type' value to UI (#635)
     add f778f0c  [DlAB-1520] Filter the projects with terminated nodes (#633)
     add a7c9a81  DLAB-1539 added check if custom tag is defined
     add 1a0355b  [DLAB-1539]: changed if statement for custom tag
     add 96f901f  [DLAB-1539]: changed how additional labels are assigned
     add 1e1d4fa  Merge pull request #636 from apache/DLAB-1539
     add 29ba942  [DLAB-1612]: added replacement of uppercase letters and 
underscores in additional tags
     add da9034c  [DLAB-1612]: changed formatting
     add 30887f7  [DLAB-1612]: changed formatting and removed unnecessary if 
statement
     add 64c9828  Merge pull request #637 from apache/DLAB-1612
     add c6d35ee  [DLAB-1615]: Added some billing values on UI (#640)
     add 71c38dc  [DLAB-1524] The endpoints field verification (#639)
     add 01927e5  [DLAB-1541] Added project name as a unique part of the 
exploratory
     add 349897e  [DLAB-1541]: Changed routes on UI
     add 08f1dc3  [DLAB-1541] Fixed bugs with libs and comp resource statuses
     add 6695fe7  [DLAB-1586] Stopping/starting/terminating statuses of 
notebook conveyed to DLab UI
     add b04499f  [DLAB-1585]: Fixed creation computational resources with the 
same name for second project
     add 082e5f4  Merge remote-tracking branch 'origin/DLAB-1541' into DLAB-1541
     add 37f9cdf  Merge branch 'DLAB-1541' into develop
     add 6c04b0d  Fixed tests
     add 147c40a  Merge branch 'develop' into DLAB-384

No new revisions were added by this update.

Summary of changes:
 README.md                                          |   3 -
 .../scripts/POST_DEPLOYMENT.md                     |   2 +
 infrastructure-provisioning/scripts/deploy_dlab.py |   1 -
 .../src/general/conf/dlab.ini                      |   4 +-
 .../{jupyter_Dockerfile => jupyterlab_Dockerfile}  |   4 +-
 ...escription.json => jupyterlab_description.json} |   6 +-
 .../general/files/gcp/jupyterlab_description.json  |   2 +-
 .../src/general/lib/aws/actions_lib.py             |  19 +-
 .../src/general/lib/gcp/actions_lib.py             |  46 +-
 .../src/general/lib/gcp/meta_lib.py                |  52 +-
 .../src/general/lib/os/debian/common_lib.py        |  45 +-
 .../src/general/lib/os/debian/edge_lib.py          |   7 +-
 .../src/general/lib/os/debian/notebook_lib.py      |  64 +-
 .../src/general/lib/os/debian/ssn_lib.py           |  23 +-
 .../src/general/lib/os/fab.py                      |  30 +-
 .../src/general/lib/os/redhat/common_lib.py        |  44 +-
 .../src/general/lib/os/redhat/edge_lib.py          |  73 +-
 .../src/general/lib/os/redhat/notebook_lib.py      |  60 +-
 .../src/general/lib/os/redhat/ssn_lib.py           |  34 +-
 .../general/scripts/aws/common_create_bucket.py    |  10 +-
 .../src/general/scripts/aws/project_prepare.py     |  19 +-
 .../src/general/scripts/aws/ssn_configure.py       |   4 -
 ...upyter_configure.py => jupyterlab_configure.py} |  77 +-
 .../src/general/scripts/azure/project_prepare.py   |   8 +-
 .../src/general/scripts/azure/ssn_configure.py     |   5 +-
 .../general/scripts/gcp/common_create_bucket.py    |   3 +-
 .../general/scripts/gcp/common_create_instance.py  |   3 +-
 .../scripts/gcp/common_create_service_account.py   |  10 +-
 ...common_notebook_configure_dataengine-service.py |  15 +-
 .../general/scripts/gcp/common_prepare_notebook.py |  23 +-
 .../scripts/gcp/dataengine-service_configure.py    |   6 +-
 .../scripts/gcp/dataengine-service_prepare.py      |  22 +-
 .../src/general/scripts/gcp/dataengine_prepare.py  |  27 +-
 .../src/general/scripts/gcp/edge_configure.py      |  30 +-
 .../src/general/scripts/gcp/edge_terminate.py      |   2 +-
 .../src/general/scripts/gcp/project_prepare.py     |  73 +-
 .../src/general/scripts/gcp/project_terminate.py   |  17 +-
 .../src/general/scripts/gcp/ssn_configure.py       |  90 +-
 .../src/general/scripts/gcp/ssn_prepare.py         |  60 +-
 .../scripts/gcp/ssn_terminate_gcp_resources.py     |   2 +-
 .../jenkins_jobs/create_notebook_image/config.xml  |   1 +
 .../jenkins_jobs/create_notebook_server/config.xml |   1 +
 .../jenkins_jobs/manage_git_credentials/config.xml |   1 +
 .../jenkins_jobs/start_notebook_server/config.xml  |   1 +
 .../jenkins_jobs/stop_notebook_server/config.xml   |   1 +
 .../terminate_notebook_image/config.xml            |   1 +
 .../terminate_notebook_server/config.xml           |   1 +
 .../src/jupyterlab/Dockerfile_jupyterlab           |   8 +-
 .../scripts/configure_jupyterlab_node.py           |   7 -
 infrastructure-provisioning/src/ssn/fabfile.py     |   7 +-
 .../src/ssn/scripts/configure_ui.py                |   2 +-
 .../terraform/azure/endpoint/main/main.tf          |   1 +
 .../terraform/azure/endpoint/main/network.tf       |   7 +-
 .../java/com/epam/dlab/dto/StatusEnvBaseDTO.java   |  14 +
 .../handlers/ComputationalCallbackHandler.java     |   5 +-
 .../ComputationalConfigureCallbackHandler.java     |   1 +
 .../handlers/ExploratoryCallbackHandler.java       |   8 +-
 .../handlers/LibInstallCallbackHandler.java        |   5 +-
 .../resources/base/ExploratoryService.java         |   2 +-
 .../core/commands/CommandExecutorMockTest.java     |   2 +-
 .../epam/dlab/backendapi/dao/ComputationalDAO.java | 182 ++--
 .../java/com/epam/dlab/backendapi/dao/EnvDAO.java  |  74 +-
 .../epam/dlab/backendapi/dao/ExploratoryDAO.java   | 158 +---
 .../dlab/backendapi/dao/ExploratoryLibDAO.java     |  60 +-
 .../com/epam/dlab/backendapi/dao/IndexCreator.java |   7 +-
 .../epam/dlab/backendapi/dao/SchedulerJobDAO.java  |  36 +-
 .../epam/dlab/backendapi/domain/EndpointDTO.java   |  10 +-
 .../backendapi/resources/EndpointResource.java     |   3 +-
 .../backendapi/resources/EnvironmentResource.java  |  64 +-
 .../backendapi/resources/ExploratoryResource.java  |  29 +-
 .../resources/ImageExploratoryResource.java        |  18 +-
 .../resources/LibExploratoryResource.java          |  31 +-
 .../dlab/backendapi/resources/ProjectResource.java |  23 +-
 .../backendapi/resources/SchedulerJobResource.java |  31 +-
 .../resources/aws/ComputationalResourceAws.java    |  29 +-
 .../azure/ComputationalResourceAzure.java          |  28 +-
 .../callback/CheckInactivityCallback.java          |   5 +-
 .../resources/callback/ComputationalCallback.java  |  15 +-
 .../callback/EnvironmentStatusCallback.java        |   4 +-
 .../resources/callback/ExploratoryCallback.java    |  26 +-
 .../dto/ExploratoryImageCreateFormDTO.java         |  16 +-
 .../resources/dto/LibInstallFormDTO.java           |   3 +
 .../resources/dto/SearchLibsFormDTO.java           |   4 +
 .../resources/gcp/ComputationalResourceGcp.java    |  28 +-
 .../backendapi/service/ComputationalService.java   |  18 +-
 .../backendapi/service/EnvironmentService.java     |  11 -
 .../backendapi/service/ExploratoryService.java     |  26 +-
 .../service/ImageExploratoryService.java           |  10 +-
 .../dlab/backendapi/service/InactivityService.java |   8 +-
 .../dlab/backendapi/service/LibraryService.java    |  10 +-
 .../backendapi/service/SchedulerJobService.java    | 106 +--
 .../service/impl/ComputationalServiceImpl.java     |  88 +-
 .../service/impl/EndpointServiceImpl.java          |   1 +
 .../service/impl/EnvironmentServiceImpl.java       |  32 +-
 .../service/impl/ExploratoryServiceImpl.java       | 115 +--
 .../service/impl/ImageExploratoryServiceImpl.java  |  10 +-
 .../service/impl/InactivityServiceImpl.java        |   4 +-
 .../service/impl/LibraryServiceImpl.java           |  50 +-
 .../service/impl/ProjectServiceImpl.java           |  16 +-
 .../service/impl/ReuploadKeyServiceImpl.java       |  66 +-
 .../service/impl/SchedulerJobServiceImpl.java      |  81 +-
 .../management-grid/management-grid.component.html |   4 +-
 .../management-grid/management-grid.component.scss |  26 +-
 .../administration/project/project-data.service.ts |  11 +-
 .../project-list/project-list.component.html       |   6 +-
 .../project-list/project-list.component.scss       |   8 +-
 .../app/administration/roles/roles.component.ts    |  43 +-
 .../services/dataengineConfiguration.service.ts    |  16 +-
 .../core/services/librariesInstallation.service.ts |  12 +-
 .../src/app/core/services/scheduler.service.ts     |   8 +-
 .../src/app/core/services/userResource.service.ts  |   6 +-
 .../reporting-grid/reporting-grid.component.html   |  14 +-
 .../reporting-grid/reporting-grid.component.scss   |  29 +-
 .../src/app/reporting/reporting.component.ts       |  34 +-
 .../app/reporting/toolbar/toolbar.component.html   |   1 -
 .../app/reporting/toolbar/toolbar.component.scss   |   1 +
 .../src/app/reporting/toolbar/toolbar.component.ts |  14 +-
 .../cluster-details/cluster-details.component.ts   |   4 +-
 .../computational-resources-list.component.scss    |  19 +
 .../computational-resources-list.component.ts      |   2 +-
 .../ami-create-dialog.component.ts                 |   3 +-
 .../detail-dialog/detail-dialog.component.ts       |   4 +-
 .../install-libraries.component.ts                 |   6 +-
 .../install-libraries/install-libraries.model.ts   |   9 +-
 .../resources-grid/resources-grid.component.html   |   4 +-
 .../resources-grid/resources-grid.component.scss   |  13 +
 .../resources-grid/resources-grid.component.ts     |   8 +-
 .../app/resources/scheduler/scheduler.component.ts |  23 +-
 .../src/app/resources/scheduler/scheduler.model.ts |  12 +-
 .../confirmation-dialog-type.enum.ts               |   3 +-
 .../confirmation-dialog.component.html             |   9 +-
 .../webapp/src/assets/styles/_dialogs.scss         |   8 +-
 .../resources/webapp/src/assets/styles/_theme.scss |   2 -
 .../webapp/src/dictionary/azure.dictionary.ts      |   6 +-
 .../resources/EnvironmentResourceTest.java         | 256 +-----
 .../resources/ExploratoryResourceTest.java         |  57 +-
 .../resources/ImageExploratoryResourceTest.java    |  25 +-
 .../resources/LibExploratoryResourceTest.java      | 602 +++++++------
 .../backendapi/resources/ProjectResourceTest.java  |  30 +-
 .../resources/SchedulerJobResourceTest.java        | 383 ++++----
 .../service/impl/ComputationalServiceImplTest.java | 993 +++++++++++----------
 .../service/impl/EnvironmentServiceImplTest.java   | 124 +--
 .../service/impl/ExploratoryServiceImplTest.java   | 586 ++++++------
 .../impl/ImageExploratoryServiceImplTest.java      |  61 +-
 .../service/impl/LibraryServiceImplTest.java       | 464 +++++-----
 .../service/impl/ReuploadKeyServiceImplTest.java   |  49 +-
 .../service/impl/SchedulerJobServiceImplTest.java  | 250 +++---
 147 files changed, 3428 insertions(+), 3457 deletions(-)
 copy infrastructure-provisioning/src/general/files/azure/{jupyter_Dockerfile 
=> jupyterlab_Dockerfile} (96%)
 copy 
infrastructure-provisioning/src/general/files/azure/{rstudio_description.json 
=> jupyterlab_description.json} (84%)
 copy 
infrastructure-provisioning/src/general/scripts/azure/{jupyter_configure.py => 
jupyterlab_configure.py} (90%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to