This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 809881c [DLAB-384]: Add category names for roles (#652)
809881c is described below
commit 809881ce7152016ae57984cc2ee2761db3ffddc0
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Mon Mar 16 14:08:10 2020 +0200
[DLAB-384]: Add category names for roles (#652)
---
.../src/main/resources/mongo/aws/mongo_roles.json | 28 ++++++++++++++++++++++
.../main/resources/mongo/azure/mongo_roles.json | 23 ++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git
a/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
b/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
index 54d2cd6..0a566f4 100644
--- a/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
+++ b/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
@@ -2,6 +2,7 @@
{
"_id": "nbShapes_p2.xlarge_fetching",
"description": "Use p2.xlarge instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"p2.xlarge"
],
@@ -12,6 +13,7 @@
{
"_id": "nbShapes_t2.medium_fetching",
"description": "Use t2.medium instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"t2.medium"
],
@@ -22,6 +24,7 @@
{
"_id": "nbShapes_r3.xlarge_fetching",
"description": "Use r3.xlarge instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"r3.xlarge"
],
@@ -32,6 +35,7 @@
{
"_id": "nbShapes_r4.2xlarge_fetching",
"description": "Use r4.2xlarge instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"r4.2xlarge"
],
@@ -42,6 +46,7 @@
{
"_id": "nbShapes_r3.4xlarge_fetching",
"description": "Use r3.4xlarge instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"r3.4xlarge"
],
@@ -52,6 +57,7 @@
{
"_id": "nbShapes_r3.8xlarge_fetching",
"description": "Use r3.8xlarge instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"r3.8xlarge"
],
@@ -62,6 +68,7 @@
{
"_id": "nbShapes_c4.large_fetching",
"description": "Use c4.large instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"c4.large"
],
@@ -72,6 +79,7 @@
{
"_id": "nbShapes_c4.2xlarge_fetching",
"description": "Use c4.2xlarge instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"c4.2xlarge"
],
@@ -82,6 +90,7 @@
{
"_id": "nbShapes_c4.8xlarge_fetching",
"description": "Use c4.8xlarge instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"c4.8xlarge"
],
@@ -92,6 +101,7 @@
{
"_id": "nbCreateDeeplearning",
"description": "Create Notebook Deep Learning",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-deeplearning"
],
@@ -102,6 +112,7 @@
{
"_id": "nbCreateJupyter",
"description": "Create Notebook Jupyter",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-jupyter"
],
@@ -112,6 +123,7 @@
{
"_id": "nbCreateJupyterLab",
"description": "Create Notebook JupyterLab",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-jupyterlab"
],
@@ -122,6 +134,7 @@
{
"_id": "nbCreateRstudio",
"description": "Create Notebook RStudio",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-rstudio"
],
@@ -132,6 +145,7 @@
{
"_id": "nbCreateTensor",
"description": "Create Notebook Jupyter with TensorFlow",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-tensor"
],
@@ -142,6 +156,7 @@
{
"_id": "nbCreateZeppelin",
"description": "Create Notebook Apache Zeppelin",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-zeppelin"
],
@@ -152,6 +167,7 @@
{
"_id": "nbCreateTensorRstudio",
"description": "Create Notebook RStudio with TensorFlow",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-tensor-rstudio"
],
@@ -162,6 +178,7 @@
{
"_id": "nbCreateDataEngine",
"description": "Create Data Engine",
+ "type": "COMPUTATIONAL",
"computationals": [
"docker.dlab-dataengine"
],
@@ -172,6 +189,7 @@
{
"_id": "nbCreateDataEngineService",
"description": "Create Data Engine Service",
+ "type": "COMPUTATIONAL",
"computationals": [
"docker.dlab-dataengine-service"
],
@@ -182,6 +200,7 @@
{
"_id": "compShapes_c4.xlarge_fetching",
"description": "Use c4.xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"c4.xlarge"
],
@@ -192,6 +211,7 @@
{
"_id": "compShapes_r3.xlarge_fetching",
"description": "Use r3.xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"r3.xlarge"
],
@@ -202,6 +222,7 @@
{
"_id": "compShapes_r4.2xlarge_fetching",
"description": "Use r4.2xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"r4.2xlarge"
],
@@ -212,6 +233,7 @@
{
"_id": "compShapes_r3.4xlarge_fetching",
"description": "Use r3.4xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"r3.4xlarge"
],
@@ -222,6 +244,7 @@
{
"_id": "compShapes_r3.8xlarge_fetching",
"description": "Use r3.8xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"r3.8xlarge"
],
@@ -232,6 +255,7 @@
{
"_id": "compShapes_c4.2xlarge_fetching",
"description": "Use c4.2xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"c4.2xlarge"
],
@@ -242,6 +266,7 @@
{
"_id": "compShapes_c4.8xlarge_fetching",
"description": "Use c4.8xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"c4.8xlarge"
],
@@ -252,6 +277,7 @@
{
"_id": "compShapes_p2.xlarge_fetching",
"description": "Use p2.xlarge instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"p2.xlarge"
],
@@ -262,6 +288,7 @@
{
"_id": "nbBillingReportFull",
"description": "View full billing report for all users",
+ "type": "BILLING",
"pages": [
"/api/infrastructure_provision/billing"
],
@@ -272,6 +299,7 @@
{
"_id": "admin",
"description": "Allow to execute administration operation",
+ "type": "ADMINISTRATION",
"pages": [
"environment/*",
"/api/infrastructure/backup",
diff --git
a/services/self-service/src/main/resources/mongo/azure/mongo_roles.json
b/services/self-service/src/main/resources/mongo/azure/mongo_roles.json
index 58cadb3..261f7b2 100644
--- a/services/self-service/src/main/resources/mongo/azure/mongo_roles.json
+++ b/services/self-service/src/main/resources/mongo/azure/mongo_roles.json
@@ -2,6 +2,7 @@
{
"_id": "nbShapes_Standard_NC6_fetching",
"description": "Allow to use Standard_NC6 instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_NC6"
],
@@ -12,6 +13,7 @@
{
"_id": "nbShapes_Standard_E4s_v3_fetching",
"description": "Use Standard_E4s_v3 instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_E4s_v3"
],
@@ -22,6 +24,7 @@
{
"_id": "nbShapes_Standard_E16s_v3_fetching",
"description": "Use Standard_E16s_v3 instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_E16s_v3"
],
@@ -32,6 +35,7 @@
{
"_id": "nbShapes_Standard_E32s_v3_fetching",
"description": "Use Standard_E32s_v3 instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_E32s_v3"
],
@@ -42,6 +46,7 @@
{
"_id": "nbShapes_Standard_F2s_fetching",
"description": "Use Standard_F2s instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_F2s"
],
@@ -52,6 +57,7 @@
{
"_id": "nbShapes_Standard_F4s_fetching",
"description": "Use Standard_F4s instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_F4s"
],
@@ -62,6 +68,7 @@
{
"_id": "nbShapes_Standard_F8s_fetching",
"description": "Use Standard_F8s instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_F8s"
],
@@ -72,6 +79,7 @@
{
"_id": "nbShapes_Standard_F16s_fetching",
"description": "Use Standard_F16s instance shape for notebook",
+ "type": "NOTEBOOK_SHAPE",
"exploratory_shapes": [
"Standard_F16s"
],
@@ -82,6 +90,7 @@
{
"_id": "nbCreateDeeplearning",
"description": "Create Notebook Deep Learning",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-deeplearning"
],
@@ -92,6 +101,7 @@
{
"_id": "nbCreateJupyter",
"description": "Create Notebook Jupyter",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-jupyter"
],
@@ -102,6 +112,7 @@
{
"_id": "nbCreateRstudio",
"description": "Create Notebook RStudio",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-rstudio"
],
@@ -112,6 +123,7 @@
{
"_id": "nbCreateTensor",
"description": "Create Notebook Jupyter with TensorFlow",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-tensor"
],
@@ -122,6 +134,7 @@
{
"_id": "nbCreateZeppelin",
"description": "Create Notebook Apache Zeppelin",
+ "type": "NOTEBOOK",
"exploratories": [
"docker.dlab-zeppelin"
],
@@ -132,6 +145,7 @@
{
"_id": "nbCreateDataEngine",
"description": "Create Data Engine",
+ "type": "COMPUTATIONAL",
"computationals": [
"docker.dlab-dataengine"
],
@@ -142,6 +156,7 @@
{
"_id": "compShapes_Standard_F4s_fetching",
"description": "Use Standard_F4s instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"Standard_F4s"
],
@@ -152,6 +167,7 @@
{
"_id": "compShapes_Standard_E4s_v3_fetching",
"description": "Use Standard_E4s_v3 instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"Standard_E4s_v3"
],
@@ -162,6 +178,7 @@
{
"_id": "compShapes_Standard_E16s_v3_fetching",
"description": "Use Standard_E16s_v3 instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"Standard_E16s_v3"
],
@@ -172,6 +189,7 @@
{
"_id": "compShapes_Standard_E32s_v3_fetching",
"description": "Use Standard_E32s_v3 instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"Standard_E32s_v3"
],
@@ -182,6 +200,7 @@
{
"_id": "compShapes_Standard_F8s_fetching",
"description": "Use Standard_F8s instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"Standard_F8s"
],
@@ -192,6 +211,7 @@
{
"_id": "compShapes_Standard_F16s_fetching",
"description": "Use Standard_F16s instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"Standard_F16s"
],
@@ -202,6 +222,7 @@
{
"_id": "compShapes_Standard_NC6_fetching",
"description": "Use Standard_NC6 instance shape for cluster",
+ "type": "COMPUTATIONAL_SHAPE",
"computational_shapes": [
"Standard_NC6"
],
@@ -212,6 +233,7 @@
{
"_id": "nbBillingReportFull",
"description": "View full billing report for all users",
+ "type": "BILLING",
"pages": [
"/api/infrastructure_provision/billing"
],
@@ -222,6 +244,7 @@
{
"_id": "admin",
"description": "Allow to execute administration operation",
+ "type": "ADMINISTRATION",
"pages": [
"environment/*",
"/api/infrastructure/backup",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]