You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2020/04/01 07:16:05 UTC
[incubator-dlab] branch DLAB-1565-aws updated (91224cc -> ad23468)
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a change to branch DLAB-1565-aws
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 91224cc [DLAB-1565]: billing on local endpoint fixed
add a72d83d [DLAB-1546]: added name convention changes
add d1d33c1 [DLAB-1546]: added name convention changes
add 1a91f08 [DLAB-1546]: added name convention changes
add 438ef06 [DLAB-1546]: added name convention changes
add 4eccb95 [DLAB-1546]: added name convention changes
add d43e92f [DLAB-1546]: added name convention changes
add a319ef9 [DLAB-1546]: added name convention changes
add 88b7c21 [DLAB-1546]: added name convention changes
add e22fed8 [DLAB-1546]: added name convention changes
add 054af0f [DLAB-1546]: added name convention changes
add dcef057 [DLAB-1546]: added name convention changes
add e8dc4ad [DLAB-1546]: added name convention changes
add a4798b1 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add 4bf39e9 [DLAB-1546]: added name convention changes
add faa4f12 [DLAB-1546]: added name convention changes
add feba37c [DLAB-1546]: added name convention changes
add c098a7a [DLAB-1546]: added name convention changes
add 2ef159f [DLAB-1546]: added name convention changes
add 52b6642 [DLAB-1546]: added name convention changes
add 30389c9 [DLAB-1546]: added name convention changes
add 881bb4e [DLAB-1546]: added name convention changes
add defd3d5 [DLAB-1546]: added name convention changes
add eb4f7f7 [DLAB-1546]: added name convention changes
add d609425 [DLAB-1546]: added name convention changes
add 812c8c8 [DLAB-1546]: added name convention changes
add 5375125 [DLAB-1546]: added name convention changes
add 0d58ec2 [DLAB-1546]: added name convention changes
add 1cf6c14 [DLAB-1546]: added name convention changes
add e7399ab [DLAB-1546]: added name convention changes
add 7465e6d [DLAB-1546]: added name convention changes
add 66778c7 [DLAB-1546]: added name convention changes
add 0742f2c [DLAB-1546]: added name convention changes
add 40fdff7 [DLAB-1546]: added name convention changes
add bbea296 [DLAB-1546]: added name convention changes
add 749b31d [DLAB-1546]: added name convention changes
add fa9bafb [DLAB-1546]: added name convention changes
add bdda302 [DLAB-1546]: added name convention changes
add 5c64fa1 Added endpoint name while stopping dataengine
add 77ac1ef Added endpoint name for some action
add d37f095 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add dbd4a08 [DLAB-1546]: added name convention changes
add 866c6d9 Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 71520e1 [DLAB-1546]: added name convention changes
add 78ee925 [DLAB-1546]: added name convention changes
add 93d85d0 [DLAB-1546]: added name convention changes
add ee708a2 [DLAB-1546]: added name convention changes
add 790de25 [DLAB-1546]: added name convention changes
add 8dca3f4 [DLAB-1546]: added name convention changes
add 557ac99 [DLAB-1546]: added name convention changes
add 323087b [DLAB-1546]: added name convention changes
add e7aeca5 [DLAB-1546]: added name convention changes
add a3112d0 [DLAB-1546]: added name convention changes
add 8f04434 [DLAB-1546]: added name convention changes
add 87d4897 [DLAB-1546]: added name convention changes
add cad6bee [DLAB-1546]: added name convention changes
add e7b0448 [DLAB-1546]: added name convention changes
add 1910739 [DLAB-1546]: added name convention changes
add 8b2f231 [DLAB-1546]: added name convention changes
add 538862f [DLAB-1546]: added name convention changes
add a946003 [DLAB-1546]: added name convention changes
add a1c7dc9 [DLAB-1546]: added name convention changes
add 1bfc7b6 [DLAB-1604] Make Cluster name unique per project
add 865f70e Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 7bfdc29 [DLAB-1546]: added name convention changes
add 21e893b Made cluster name unique per project
add 3819859 Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 3e5b854 Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
add 6ebf686 [DLAB-1546]: added name convention changes
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 23ec629 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add 4d38f8a [DLAB-1546]: added name convention changes
add a01a871 [DLAB-1546]: added name convention changes
add 83eda03 [DLAB-1546]: added name convention changes
add cce0632 [DLAB-1546]: added name convention changes
add 908dde5 [DLAB-1546]: added name convention changes
add ab54d3d [DLAB-1546]: added name convention changes
add 5f36ea7 [DLAB-1546]: added name convention changes
add 5b16989 [DLAB-1546]: added name convention changes
add bfd561e [DLAB-1546]: added name convention changes
add 1127431 [DLAB-1546]: added name convention changes
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 e2aa6f9 [DLAB-384]: Grouped roles (#642)
add df0024a Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1546
add d2ba8b7 Merge pull request #643 from apache/DLAB-1546
add cfe31ee fixed issue with edge node creation
add b875ef8 Merge pull request #644 from apache/azure-edge-fix
add c320d80 [DLAB-1555] The warning message is adjusted (#641)
add d8dda87 [DLAB-1622]: Fixed issue with storage and container name in Azure
add c532673 Merge pull request #645 from apache/DLAB-1622
add b214643 Dlab 1618 (#646)
add 152dde0 [DLAB-1618]: Adjusted role page according to requirements (#648)
add 7918b69 [DLAB-1615]: Added service value to billing Azure (#650)
add 40e15a2 [DLAB-1627]: changed shared images names
add 726456d Merge pull request #651 from apache/DLAB-1627
add ad6958e [DLAB-1524] Endpoints fields verification (#647)
add 809881c [DLAB-384]: Add category names for roles (#652)
add 8799340 [DLAB-1629]: Luarocks version updated
add b58da76 [DLAB-1629]: Project creation fails fixed
add 307879c Merge pull request #653 from apache/DLAB-1629
add c583287 [DLAB-1631]: fixed bug
add 3b09e5e Merge pull request #654 from apache/DLAB-1631
add 48bcba2 [DLAB-1630]: made bucket name lover case for FE
add 09a0504 [DLAB-1630]: fixed typo
add 60aaf85 [DLAB-1630]: returned typo
add e908b6a Merge pull request #656 from apache/DLAB-1630
add 60bb073 [DLAB-1632]: Fixed 'Cancel'/'Install' buttons are cut on 'Library management' popup (#658)
add 944fe1a [DLAB-1629]: Project creation fails fixed
add 6ef7249 Merge pull request #660 from apache/DLAB-1629
add d379e6a [DLAB-1628]: made bucket name lover case when prep emr
add a4ea0d8 [DLAB-1628]: made variable lower-case
add 2180e7f [DLAB-1628]: made variable lower-case
add 34d156c [DLAB-1628]: made bucket name variable lower-case everywhere for aws
add d1c862c [DLAB-1628]: changed for testing
add 02f647f [DLAB-1628]: added replace _ - for bucket names
add 2d1b9b4 Merge pull request #661 from apache/DLAB-1628
add 08b1d87 [DLAB-1624]: fixed bug
add 0fcde11 Merge pull request #662 from apache/DLAB-1624
add 064ed88 [DLAB-1625]: fixed starting edge node
add 326aad1 Merge pull request #663 from apache/DLAB-1625
add b82af34 [DLAB-1635] Fixed issue with notebook stopping by scheduler
add 904c6cb Dlab 1633 (#664)
add 75a07fd [DLAB-1623] Stopping of the Edge node (#659)
add 3639d24 [DLAB-1642]: added removal of project specific image during project termination
add 952268d [DLAB-1642]: made some changes
add 93008a9 Merge pull request #665 from apache/DLAB-1642
add a8c09c6 [DLAB-1643]: changed SA and roles termination during project termination
add f704965 [DLAB-1643]: made some changes
add 8e24787 [DLAB-1643]: made some changes
add 2ed3dff Merge pull request #666 from apache/DLAB-1643
add 4d3aefd [DLAB-1457] Removed 'Allow to' from 'Roles' drop down list
add d0c7fdb [DLAB-1641] made redirectUris lower-case
add 144def1 Merge pull request #667 from apache/DLAB-1641
add b8ef951 Merge remote-tracking branch 'origin/develop' into develop
add 3f5451e [DLAB-1638]: Done set of tasks after improvement for roles (#668)
add 8feb625 Merge branch 'develop' into DLAB-1571
add 2566f24 Fixed merge conflicts
add 280922b [DLAB-1649]: Added possibility to sort by project/user/charges
add bf314b8 Fixed issue with displaying list of resources
add a12ef67 Merge pull request #676 from apache/DLAB-1565-aws
add eae5b35 Remote billing
add 5ebb9c8 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 4b7abeb Refactoring local billing
add 475a95f Refactoring billing
add 740dbbe Changed cron
add bd944de Remote billing
add 6f616a6 Merge pull request #678 from apache/DLAB-1565-aws
add c7c5acf Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 3fb67c3 Remote billing
add 8151f52 Remote billing
add 8232671 Remote billing
add 435d3a1 Remote billing
add 5e03cd4 [DLAB-1647]: Action for notebook depend on edge node status. (#669)
add 0e3d531 [DLAB-1648]: Conveyed all resources which will be terminated during edge deletion (#670)
add bf0e539 [DLAB-1657]: added endpoint name to notebook image name
add 0f5b520 [DLAB-1657]: formatted code
add c5fb923 Merge pull request #671 from apache/DLAB-1657
add 658dfef [Dlab 1661]: Grouped Compute/Notebook shapes by clouds (#673)
add 239eb05 [DLAB-1654]: Made modal windows static if user is not assigned to a project (#674)
add b9dc738 [DLAB-1590] Admin per project
add e7ab0d7 Merge branch 'DLAB-1590' of github.com:apache/incubator-dlab into DLAB-1590
add 3befbd18 Deleted requests which was not used
add 555a485 Admin per project
add e4bcf7c Admin per project
add 8fed687 Admin per project
add ca73d94 Admin per project
add 9729f01 Admin per project
add d753b18 [DLAB-1591]: Add parameters for admin per project
add a6aa0d2 Merge remote-tracking branch 'origin/DLAB-1590' into DLAB-1590
add bdaf53b Admin per project refactoring
add e266731 Admin per project refactoring
add b190bca Merge branch 'DLAB-1590' into DLAB-1571
add d96075e Admin per project
add d797b19 [DLAB-1591]: Update roles for admin per project
add bde44ac [DLAB-384]: Add category names for roles
add 1b229fb Remote billing
add b557d00 Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add 760f769 Remote billing
add 95911ca Remote billing
add 09ffe7c Admin per project
add 41480c4 Added standard image format
add a424388 Added custom image format
add b6b4dfb Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
add ad23468 Merge branch 'DLAB-1571' into DLAB-1565-aws
No new revisions were added by this update.
Summary of changes:
.../scripts/deploy_repository/deploy_repository.py | 2 +-
.../scripts/configure_deep_learning_node.py | 4 +-
infrastructure-provisioning/src/edge/fabfile.py | 76 --
.../src/general/lib/aws/actions_lib.py | 60 +-
.../src/general/lib/azure/actions_lib.py | 45 +-
.../src/general/lib/gcp/actions_lib.py | 14 +-
.../src/general/lib/gcp/meta_lib.py | 19 +-
.../src/general/lib/os/debian/edge_lib.py | 27 +-
.../src/general/lib/os/fab.py | 15 +-
.../scripts/aws/common_create_notebook_image.py | 48 +-
.../general/scripts/aws/common_create_policy.py | 14 +-
.../general/scripts/aws/common_create_subnet.py | 2 +-
.../scripts/aws/common_download_git_certfile.py | 2 +-
...common_notebook_configure_dataengine-service.py | 110 ++-
.../aws/common_notebook_configure_dataengine.py | 73 +-
.../general/scripts/aws/common_prepare_notebook.py | 173 ++--
.../general/scripts/aws/common_start_notebook.py | 39 +-
.../general/scripts/aws/common_stop_notebook.py | 47 +-
.../scripts/aws/common_terminate_notebook.py | 38 +-
.../scripts/aws/common_terminate_notebook_image.py | 17 +-
.../scripts/aws/dataengine-service_configure.py | 198 ++--
.../scripts/aws/dataengine-service_prepare.py | 257 +++---
.../scripts/aws/dataengine-service_terminate.py | 37 +-
.../general/scripts/aws/dataengine_configure.py | 254 +++---
.../src/general/scripts/aws/dataengine_prepare.py | 156 ++--
.../src/general/scripts/aws/dataengine_start.py | 44 +-
.../src/general/scripts/aws/dataengine_stop.py | 28 +-
.../general/scripts/aws/dataengine_terminate.py | 39 +-
.../general/scripts/aws/deeplearning_configure.py | 318 +++----
.../src/general/scripts/aws/edge_configure.py | 279 +++---
.../src/general/scripts/aws/edge_start.py | 31 +-
.../src/general/scripts/aws/edge_status.py | 23 +-
.../src/general/scripts/aws/edge_stop.py | 26 +-
.../src/general/scripts/aws/jupyter_configure.py | 316 +++----
.../general/scripts/aws/jupyterlab_configure.py | 306 ++++---
.../src/general/scripts/aws/project_prepare.py | 432 ++++-----
.../src/general/scripts/aws/project_terminate.py | 111 ++-
.../src/general/scripts/aws/rstudio_configure.py | 314 +++----
.../src/general/scripts/aws/ssn_configure.py | 428 ++++-----
.../src/general/scripts/aws/ssn_prepare.py | 713 ++++++++-------
.../src/general/scripts/aws/ssn_terminate.py | 33 +-
.../scripts/aws/ssn_terminate_aws_resources.py | 100 ++-
.../scripts/aws/tensor-rstudio_configure.py | 338 +++----
.../src/general/scripts/aws/tensor_configure.py | 324 +++----
.../src/general/scripts/aws/zeppelin_configure.py | 326 +++----
.../scripts/azure/common_create_instance.py | 2 +-
.../scripts/azure/common_create_notebook_image.py | 78 +-
.../scripts/azure/common_download_git_certfile.py | 6 +-
.../azure/common_notebook_configure_dataengine.py | 84 +-
.../scripts/azure/common_prepare_notebook.py | 103 ++-
.../general/scripts/azure/common_start_notebook.py | 53 +-
.../general/scripts/azure/common_stop_notebook.py | 43 +-
.../scripts/azure/common_terminate_notebook.py | 41 +-
.../azure/common_terminate_notebook_image.py | 18 +-
.../general/scripts/azure/dataengine_configure.py | 224 ++---
.../general/scripts/azure/dataengine_prepare.py | 103 +--
.../src/general/scripts/azure/dataengine_start.py | 52 +-
.../src/general/scripts/azure/dataengine_stop.py | 44 +-
.../general/scripts/azure/dataengine_terminate.py | 48 +-
.../scripts/azure/deeplearning_configure.py | 173 ++--
.../src/general/scripts/azure/edge_configure.py | 357 +++-----
.../src/general/scripts/azure/edge_prepare.py | 6 +-
.../src/general/scripts/azure/edge_start.py | 36 +-
.../src/general/scripts/azure/edge_status.py | 23 +-
.../src/general/scripts/azure/edge_stop.py | 26 +-
.../src/general/scripts/azure/edge_terminate.py | 86 +-
.../src/general/scripts/azure/jupyter_configure.py | 204 ++---
.../general/scripts/azure/jupyterlab_configure.py | 185 ++--
.../src/general/scripts/azure/project_prepare.py | 364 ++++----
.../src/general/scripts/azure/project_terminate.py | 93 +-
.../src/general/scripts/azure/rstudio_configure.py | 183 ++--
.../src/general/scripts/azure/ssn_configure.py | 200 +++--
.../src/general/scripts/azure/ssn_prepare.py | 170 ++--
.../src/general/scripts/azure/ssn_terminate.py | 93 +-
.../src/general/scripts/azure/tensor_configure.py | 181 ++--
.../general/scripts/azure/zeppelin_configure.py | 187 ++--
...common_notebook_configure_dataengine-service.py | 93 +-
.../gcp/common_notebook_configure_dataengine.py | 84 +-
.../general/scripts/gcp/common_prepare_notebook.py | 274 +++---
.../general/scripts/gcp/common_start_notebook.py | 30 +-
.../general/scripts/gcp/common_stop_notebook.py | 52 +-
.../scripts/gcp/common_terminate_notebook.py | 42 +-
.../scripts/gcp/dataengine-service_configure.py | 142 +--
.../scripts/gcp/dataengine-service_create.py | 2 +-
.../scripts/gcp/dataengine-service_prepare.py | 172 ++--
.../scripts/gcp/dataengine-service_terminate.py | 43 +-
.../general/scripts/gcp/dataengine_configure.py | 199 ++---
.../src/general/scripts/gcp/dataengine_prepare.py | 297 +++---
.../src/general/scripts/gcp/dataengine_start.py | 57 +-
.../src/general/scripts/gcp/dataengine_stop.py | 47 +-
.../general/scripts/gcp/dataengine_terminate.py | 53 +-
.../general/scripts/gcp/deeplearning_configure.py | 288 +++---
.../src/general/scripts/gcp/edge_configure.py | 331 ++++---
.../src/general/scripts/gcp/edge_start.py | 35 +-
.../src/general/scripts/gcp/edge_stop.py | 28 +-
.../src/general/scripts/gcp/edge_terminate.py | 92 +-
.../src/general/scripts/gcp/jupyter_configure.py | 262 +++---
.../general/scripts/gcp/jupyterlab_configure.py | 299 +++----
.../src/general/scripts/gcp/project_prepare.py | 442 ++++-----
.../src/general/scripts/gcp/project_terminate.py | 121 ++-
.../src/general/scripts/gcp/rstudio_configure.py | 275 +++---
.../src/general/scripts/gcp/ssn_configure.py | 206 ++---
.../src/general/scripts/gcp/ssn_prepare.py | 229 ++---
.../src/general/scripts/gcp/ssn_terminate.py | 28 +-
.../src/general/scripts/gcp/superset_configure.py | 303 ++++---
.../scripts/gcp/tensor-rstudio_configure.py | 287 +++---
.../src/general/scripts/gcp/tensor_configure.py | 277 +++---
.../src/general/scripts/gcp/zeppelin_configure.py | 261 +++---
.../general/scripts/os/common_clean_instance.py | 24 +-
.../general/scripts/os/dataengine_install_libs.py | 2 +-
.../src/general/scripts/os/dataengine_list_libs.py | 2 +-
.../scripts/os/dataengine_reconfigure_spark.py | 2 +-
.../src/general/scripts/os/notebook_git_creds.py | 4 +-
.../scripts/os/notebook_inactivity_check.py | 4 +-
.../general/scripts/os/notebook_install_libs.py | 4 +-
.../src/general/scripts/os/notebook_list_libs.py | 4 +-
.../scripts/os/notebook_reconfigure_spark.py | 2 +-
.../src/general/templates/os/renew_certificates.sh | 2 +-
.../src/jupyter/scripts/configure_jupyter_node.py | 4 +-
.../scripts/configure_jupyterlab_node.py | 4 +-
infrastructure-provisioning/src/project/fabfile.py | 7 -
.../src/project/scripts/configure_keycloak.py | 5 +-
.../src/rstudio/scripts/configure_rstudio_node.py | 4 +-
.../src/ssn/files/azure/mongo_roles.json | 2 +-
.../superset/scripts/configure_superset_node.py | 4 +-
.../scripts/configure_tensor-rstudio_node.py | 4 +-
.../src/tensor/scripts/configure_tensor_node.py | 4 +-
.../zeppelin/scripts/configure_zeppelin_node.py | 4 +-
.../aws/computational_resources/modules/ami/ami.tf | 2 +-
.../computational_resources/modules/common/iam.tf | 2 +-
.../modules/common/network.tf | 4 +-
.../modules/data_engine/instance.tf | 4 +-
.../modules/emr/instance.tf | 2 +-
.../modules/notebook/instance.tf | 2 +-
.../terraform/aws/endpoint/main/bucket.tf | 37 +
.../terraform/aws/endpoint/main/iam.tf | 2 +-
.../terraform/aws/endpoint/main/instance.tf | 2 +-
.../terraform/aws/endpoint/main/network.tf | 18 +-
.../terraform/aws/project/main/iam.tf | 4 +-
.../terraform/aws/project/main/instance.tf | 2 +-
.../terraform/aws/project/main/network.tf | 8 +-
.../aws/ssn-k8s/main/auto_scaling_groups.tf | 8 +-
.../terraform/aws/ssn-k8s/main/lb.tf | 6 +-
.../terraform/aws/ssn-k8s/main/role_policy.tf | 2 +-
.../terraform/aws/ssn-k8s/main/s3.tf | 2 +-
.../terraform/aws/ssn-k8s/main/security_groups.tf | 2 +-
.../terraform/aws/ssn-k8s/main/vpc.tf | 18 +-
.../modules/data_engine/instance.tf | 4 +-
.../modules/notebook/instance.tf | 4 +-
.../terraform/azure/endpoint/main/bucket.tf | 53 ++
.../terraform/azure/endpoint/main/instance.tf | 4 +-
.../terraform/azure/endpoint/main/main.tf | 7 +-
.../terraform/azure/endpoint/main/network.tf | 10 +-
.../terraform/azure/endpoint/main/outputs.tf | 8 +
.../terraform/azure/project/main/instance.tf | 2 +-
.../terraform/bin/deploy/endpoint_fab.py | 3 +-
infrastructure-provisioning/terraform/bin/dlab.py | 4 +-
.../terraform/gcp/endpoint/main/bucket.tf | 36 +
.../terraform/gcp/endpoint/main/network.tf | 4 +-
.../terraform/gcp/ssn-gke/main/modules/gke/gke.tf | 2 +-
.../terraform/gcp/ssn-gke/main/modules/gke/vpc.tf | 4 +-
.../dlab/automation/cloud/aws/AmazonHelper.java | 2 +-
.../epam/dlab/controller/BillingController.java | 7 +-
.../main/java/com/epam/dlab/dao/BillingDAO.java | 2 +-
.../com/epam/dlab/dao/impl/BillingDAOImpl.java | 25 +-
.../java/com/epam/dlab/mongo/AdapterMongoDb.java | 23 +
.../azure/controller/BillingController.java | 7 +-
.../epam/dlab/billing/azure/dao/BillingDAO.java | 2 +-
.../billing/azure/dao/impl/BillingDAOImpl.java | 25 +-
.../src/main/resources/application.yml | 2 +-
services/billing-gcp/pom.xml | 5 +
.../billing/gcp/controller/BillingController.java | 7 +-
.../com/epam/dlab/billing/gcp/dao/BillingDAO.java | 2 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 32 +-
.../dlab/billing/gcp/model/GcpBillingData.java | 3 +-
.../billing-gcp/src/main/resources/application.yml | 2 +-
.../gcp/service/BillingServiceImplTest.java | 3 +-
.../com/epam/dlab/billing/DlabResourceType.java | 86 --
.../java/com/epam/dlab/dto/StatusEnvBaseDTO.java | 14 +
.../epam/dlab/dto/billing/BillingResourceType.java | 4 +-
.../handlers/ComputationalCallbackHandler.java | 5 +-
.../ComputationalConfigureCallbackHandler.java | 1 +
.../handlers/ExploratoryCallbackHandler.java | 8 +-
.../handlers/LibInstallCallbackHandler.java | 5 +-
.../resources/base/ExploratoryService.java | 2 +-
.../aws/dataengine-service_configure.json | 2 +-
.../resources/mock_response/aws/edge_create.json | 2 +-
.../mock_response/aws/notebook_start.json | 2 +-
.../resources/mock_response/aws/notebook_stop.json | 2 +-
.../mock_response/aws/notebook_terminate.json | 2 +-
.../azure/dataengine-service_configure.json | 2 +-
.../resources/mock_response/azure/edge_create.json | 2 +-
.../mock_response/azure/notebook_start.json | 2 +-
.../mock_response/azure/notebook_stop.json | 2 +-
.../mock_response/azure/notebook_terminate.json | 2 +-
.../gcp/dataengine-service_configure.json | 2 +-
.../core/commands/CommandExecutorMockTest.java | 2 +-
.../dlab/backendapi/annotation/ProjectAdmin.java | 7 +-
.../com/epam/dlab/backendapi/annotation/User.java | 7 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 363 +-------
.../com/epam/dlab/backendapi/dao/BillingDAO.java | 6 -
.../epam/dlab/backendapi/dao/ComputationalDAO.java | 182 ++--
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 93 +-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 155 +---
.../dlab/backendapi/dao/ExploratoryLibDAO.java | 60 +-
.../com/epam/dlab/backendapi/dao/IndexCreator.java | 7 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 -
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 11 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 38 +-
.../com/epam/dlab/backendapi/dao/UserGroupDao.java | 2 -
.../epam/dlab/backendapi/dao/UserGroupDaoImpl.java | 5 -
.../com/epam/dlab/backendapi/dao/UserRoleDao.java | 4 +-
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 22 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 74 --
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 121 ---
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 65 --
.../com/epam/dlab/backendapi/domain/BaseShape.java | 23 -
.../dlab/backendapi/domain/CreateProjectDTO.java | 2 +-
.../backendapi/domain/DataEngineServiceShape.java | 37 -
.../dlab/backendapi/domain/DataEngineShape.java | 34 -
.../epam/dlab/backendapi/domain/EndpointDTO.java | 6 +-
.../epam/dlab/backendapi/domain/EndpointShape.java | 14 -
.../dlab/backendapi/domain/ExploratoryShape.java | 14 -
.../epam/dlab/backendapi/domain/ProjectDTO.java | 2 +-
.../dlab/backendapi/domain/ProjectManagingDTO.java | 16 -
.../com/epam/dlab/backendapi/domain/SsnShape.java | 14 -
.../interceptor/ProjectAdminInterceptor.java | 74 ++
.../backendapi/modules/AwsSelfServiceModule.java | 83 --
.../backendapi/modules/AzureSelfServiceModule.java | 81 --
.../backendapi/modules/CloudProviderModule.java | 37 +-
.../epam/dlab/backendapi/modules/DevModule.java | 64 +-
.../backendapi/modules/GcpSelfServiceModule.java | 84 --
.../dlab/backendapi/modules/ModuleFactory.java | 13 -
.../dlab/backendapi/modules/ProductionModule.java | 66 +-
.../dlab/backendapi/resources/BillingResource.java | 26 +-
.../backendapi/resources/EnvironmentResource.java | 48 +-
.../backendapi/resources/ExploratoryResource.java | 29 +-
.../resources/ImageExploratoryResource.java | 18 +-
.../resources/InfrastructureInfoResource.java | 4 +-
.../resources/LibExploratoryResource.java | 31 +-
.../dlab/backendapi/resources/ProjectResource.java | 75 +-
.../backendapi/resources/SchedulerJobResource.java | 31 +-
.../backendapi/resources/UserGroupResource.java | 67 +-
.../backendapi/resources/UserRoleResource.java | 8 +-
.../resources/aws/ComputationalResourceAws.java | 36 +-
.../azure/ComputationalResourceAzure.java | 58 +-
.../callback/CheckInactivityCallback.java | 5 +-
.../resources/callback/ComputationalCallback.java | 15 +-
.../callback/EnvironmentStatusCallback.java | 4 +-
.../resources/callback/ExploratoryCallback.java | 26 +-
...tePopUp.java => ComputationalTemplatesDTO.java} | 14 +-
.../dto/ExploratoryImageCreateFormDTO.java | 16 +-
.../resources/dto/HealthStatusPageDTO.java | 129 +--
.../resources/dto/LibInstallFormDTO.java | 3 +
.../resources/dto/SearchLibsFormDTO.java | 4 +
.../dlab/backendapi/resources/dto/UserRoleDto.java | 12 +-
.../resources/gcp/ComputationalResourceGcp.java | 44 +-
.../com/epam/dlab/backendapi/roles/UserRole.java | 13 +-
.../com/epam/dlab/backendapi/roles/UserRoles.java | 58 +-
.../dlab/backendapi/service/BillingService.java | 80 +-
.../dlab/backendapi/service/BillingServiceNew.java | 39 -
.../backendapi/service/ComputationalService.java | 21 +-
.../backendapi/service/EnvironmentService.java | 16 +-
.../backendapi/service/ExploratoryService.java | 30 +-
.../service/ImageExploratoryService.java | 10 +-
.../dlab/backendapi/service/InactivityService.java | 8 +-
.../service/InfrastructureInfoService.java | 2 +-
.../dlab/backendapi/service/LibraryService.java | 10 +-
.../dlab/backendapi/service/ProjectService.java | 15 +-
.../backendapi/service/SchedulerJobService.java | 106 +--
.../epam/dlab/backendapi/service/ShapeFormat.java | 5 -
.../dlab/backendapi/service/UserGroupService.java | 12 +-
.../dlab/backendapi/service/UserRoleService.java | 3 +-
.../backendapi/service/UserRoleServiceImpl.java | 20 +-
.../backendapi/service/aws/AwsBillingService.java | 110 ---
.../service/azure/AzureBillingService.java | 116 ---
.../backendapi/service/gcp/GcpBillingService.java | 104 ---
...ServiceImplNew.java => BillingServiceImpl.java} | 114 ++-
.../service/impl/ComputationalServiceImpl.java | 158 ++--
.../service/impl/EnvironmentServiceImpl.java | 93 +-
.../service/impl/ExploratoryServiceImpl.java | 135 ++-
.../service/impl/ImageExploratoryServiceImpl.java | 10 +-
.../service/impl/InactivityServiceImpl.java | 4 +-
.../impl/InfrastructureInfoServiceImpl.java | 43 +-
.../service/impl/LibraryServiceImpl.java | 50 +-
.../service/impl/ProjectServiceImpl.java | 87 +-
.../service/impl/ReuploadKeyServiceImpl.java | 66 +-
.../service/impl/SchedulerJobServiceImpl.java | 81 +-
.../service/impl/UserGroupServiceImpl.java | 86 +-
.../epam/dlab/backendapi/util/BillingUtils.java | 73 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 35 +-
.../src/main/resources/mongo/aws/mongo_roles.json | 75 ++
.../main/resources/mongo/azure/mongo_roles.json | 67 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 72 ++
.../manage-environment-dilog.component.html | 2 +-
.../management-grid/management-grid.component.html | 7 +-
.../management-grid/management-grid.component.scss | 26 +-
.../management/management.component.html | 2 +-
.../management/management.component.ts | 74 +-
.../administration/management/management.model.ts | 1 +
.../administration/project/project-data.service.ts | 11 +-
.../project-list/project-list.component.html | 4 +-
.../project-list/project-list.component.scss | 8 +-
.../administration/project/project.component.html | 11 +-
.../administration/project/project.component.ts | 37 +-
.../app/administration/roles/roles.component.html | 104 +--
.../app/administration/roles/roles.component.scss | 34 +-
.../app/administration/roles/roles.component.ts | 137 +--
.../services/applicationServiceFacade.service.ts | 25 +-
.../services/dataengineConfiguration.service.ts | 16 +-
.../src/app/core/services/healthStatus.service.ts | 11 +-
.../core/services/librariesInstallation.service.ts | 12 +-
.../services/managementEnvironments.service.ts | 4 +-
.../src/app/core/services/project.service.ts | 27 -
.../src/app/core/services/scheduler.service.ts | 8 +-
.../src/app/core/services/userResource.service.ts | 12 +-
.../reporting-grid/reporting-grid.component.html | 34 +-
.../reporting-grid/reporting-grid.component.scss | 58 +-
.../reporting-grid/reporting-grid.component.ts | 24 +-
.../src/app/reporting/reporting.component.ts | 54 +-
.../cluster-details/cluster-details.component.ts | 4 +-
...utational-resource-create-dialog.component.html | 9 +-
...mputational-resource-create-dialog.component.ts | 30 +-
.../computational-resources-list.component.scss | 25 +-
.../computational-resources-list.component.ts | 2 +-
.../ami-create-dialog.component.html | 4 +-
.../ami-create-dialog.component.ts | 3 +-
.../detail-dialog/detail-dialog.component.ts | 4 +-
.../install-libraries.component.scss | 13 +
.../install-libraries.component.ts | 4 +-
.../install-libraries/install-libraries.model.ts | 9 +-
.../resources-grid/resources-grid.component.html | 10 +-
.../resources-grid/resources-grid.component.scss | 12 +
.../resources-grid/resources-grid.component.ts | 18 +-
.../src/app/resources/resources.component.html | 2 +-
.../app/resources/scheduler/scheduler.component.ts | 23 +-
.../src/app/resources/scheduler/scheduler.model.ts | 12 +-
.../webapp/src/app/shared/form-controls/index.ts | 5 +-
.../multi-level-select-dropdown.component.html | 94 ++
.../multi-level-select-dropdown.component.scss} | 82 +-
.../multi-level-select-dropdown.component.ts | 139 +++
.../confirmation-dialog.component.html | 10 +-
.../confirmation-dialog.component.scss | 3 +
.../confirmation-dialog.model.ts | 6 +-
.../notification-dialog.component.ts | 50 +-
.../src/app/shared/navbar/navbar.component.html | 2 +-
.../webapp/src/assets/styles/_dialogs.scss | 3 +-
.../resources/webapp/src/assets/styles/_theme.scss | 8 +-
.../webapp/src/dictionary/azure.dictionary.ts | 8 +-
.../resources/EnvironmentResourceTest.java | 170 +---
.../resources/ExploratoryResourceTest.java | 57 +-
.../resources/ImageExploratoryResourceTest.java | 25 +-
.../resources/InfrastructureInfoResourceTest.java | 23 +-
.../resources/LibExploratoryResourceTest.java | 602 +++++++------
.../backendapi/resources/ProjectResourceTest.java | 38 +-
.../resources/SchedulerJobResourceTest.java | 383 ++++----
.../resources/UserGroupResourceTest.java | 206 +----
.../backendapi/resources/UserRoleResourceTest.java | 11 +-
.../service/UserRoleServiceImplTest.java | 42 +-
.../service/aws/AwsBillingServiceTest.java | 224 -----
.../service/azure/AzureBillingServiceTest.java | 208 -----
.../service/impl/ComputationalServiceImplTest.java | 993 +++++++++++----------
.../service/impl/EnvironmentServiceImplTest.java | 123 +--
.../service/impl/ExploratoryServiceImplTest.java | 586 ++++++------
.../impl/ImageExploratoryServiceImplTest.java | 61 +-
.../service/impl/LibraryServiceImplTest.java | 464 +++++-----
.../service/impl/ReuploadKeyServiceImplTest.java | 49 +-
.../service/impl/SchedulerJobServiceImplTest.java | 250 +++---
.../service/impl/UserGroupServiceImplTest.java | 156 ++--
369 files changed, 12644 insertions(+), 13717 deletions(-)
create mode 100644 infrastructure-provisioning/terraform/aws/endpoint/main/bucket.tf
create mode 100644 infrastructure-provisioning/terraform/azure/endpoint/main/bucket.tf
create mode 100644 infrastructure-provisioning/terraform/gcp/endpoint/main/bucket.tf
copy integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java => services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/ProjectAdmin.java (88%)
copy integration-tests/src/test/java/com/epam/dlab/automation/test/libs/TestDescription.java => services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/User.java (88%)
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/azure/AzureBillingDAO.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/BaseShape.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineServiceShape.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/DataEngineShape.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/EndpointShape.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryShape.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectManagingDTO.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/domain/SsnShape.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/ProjectAdminInterceptor.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/modules/AwsSelfServiceModule.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/modules/AzureSelfServiceModule.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/modules/GcpSelfServiceModule.java
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{ExploratoryCreatePopUp.java => ComputationalTemplatesDTO.java} (73%)
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/BillingServiceNew.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/ShapeFormat.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsBillingService.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/azure/AzureBillingService.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpBillingService.java
rename services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/{BillingServiceImplNew.java => BillingServiceImpl.java} (77%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.html
copy services/self-service/src/main/resources/webapp/src/app/shared/form-controls/{dropdowns.component.scss => multi-level-select-dropdown/multi-level-select-dropdown.component.scss} (78%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.ts
delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java
delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/azure/AzureBillingServiceTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org