You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/12/09 10:22:03 UTC
[incubator-dlab] branch DLAB-1158 updated (4ed71df -> 0ba60be)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 4ed71df added step-ca
add c63bd1a [DLAB-1232] Temporary removed jar, which is missing in official maven repo
add dc69e17 Merge pull request #380 from apache/DLAB-1232
add 7bf9cde [DLAB-1237] Added AMI parameters to ssn_configure script
add f2822df Merge pull request #381 from apache/DLAB-1237
add ea9265f [DLAB-1233] Fixed bug with disconnecting project endpoint[Quota]
add b9d16fa Changed type of some boolean parameters to String
add c0aa6ea Removed stepCerts
add 3dc952d Merge branch 'develop' of /Users/bohdan.hliva/IdeaProjects/incubator-dlab with conflicts.
add 0dca866 DLAB-000 remove swagger 1.x and replace it with openapi
add f085fd6 DLAB-000 moved API description to assets folder
add 8fa3240 DLAB-000 removed unnecessary swagger resource
add 53555f2 added label 'name:{sbn}-{project_name}-{endpoint_name}-bucket' to gcp buckets
add 7491f51 Merge pull request #383 from apache/DLAB-1238
add aaf05ee Merge branch 'develop' into DLAB-1233
add 7a90f86 Added test for method
add e9f444a Merge pull request #382 from apache/DLAB-1233
add 2922393 [DLAB-1237] Fixing bug image_enabled parameter bug
add 84e4a28 [DLAB-1237] Fixing bug image_enabled parameter bug
add f7a7ece Merge pull request #384 from apache/DLAB-1237
add d70bb8d Added imageEnabled parameter to provisioning.yml
add 978007c [DLAB-433] Created Containerized Jupyter templete(aws/debian)
add 4fb6bad [DLAB-433] Fixed syntax error in fab.py
add 0f26131 [DLAB-433] Fixed syntax error in fab.py
add 79da5b5 [DLAB-433] Fixed syntax error in fab.py
add 6fe85e0 [DLAB-433] Fixed syntax error in fab.py
add af60865 [DLAB-433] Added Jupyter-Docker template to config.xml files(aws)
add b1f05a1 [DLAB-433] Added Jupyter-Docker template to ssn_configure and mongo_roles(aws)
add b1af9c0 [DLAB-433] Fixed path to jupyter-docker files(aws)
add f369fa5 [DLAB-433] Fixed path to jupyter-docker files(aws)
add a6937f6 [DLAB-623] Bugfixing
add 85b4efd [DLAB-623] Added function to start container after instance being stopped and fixed different bugs
add 0fc37e9 [DLAB-623] Deleted previously added function which starts container after instance being stopped and configured /etc/rc.local file to start jupyter container instead and also fixed different bugs
add 89a3b5d [DLAB-623] Removed Spark installation and added it to Dockerfile_jupyter
add d066bdc [DLAB-623] Removed Spark installation and added it to Dockerfile_jupyter [bugfixing]
add b08f43a [DLAB-623] Removed Spark installation and added it to Dockerfile_jupyter [bugfixing and refactoring]
add 5349834 [DLAB-623] Added Legion source files for installation in jupyter container and fixed some bugs
add f60dc49 [DLAB-623] Parametrized Dockerfile_jupyter
add 2b7b342 [DLAB-623] Parametrized Dockerfile_jupyter(Bugfixing)
add 79d547e [DLAB-623] Demo-version
add d1d37a9 [DLAB-623] Demo-version(bugfix)
add 80e37c4 Revert "[DLAB-623] Demo-version(bugfix)"
add 9a076b4 Revert "[DLAB-623] Demo-version"
add 1e07736 [DLAB-433] Demo-version
add cd75a65 [DLAB-433] Demo-version(bugfix)
add cb018ee [DLAB-433] Demo-version(bugfix[2])
add 87388c8 [DLAB-433] Demo-version(bugfix[3])
add e76f3e1 [DLAB-433] Demo-version(bugfix[3])
add 09963c8 [DLAB-433] Demo-version; changed source docker image to a new one with jupyter exstension and added start command for the exstension
add 98410a3 [terraform] Updated legion image version
add 418cf91 Merge pull request #156 from apache/develop
add db4ee8b [DLAB-433] Configured container to use proxy for SSH
add 40c771a [DLAB-433] Bugfix
add 24b335d [DLAB-433] Updated jupyterlab image id
add 81dda0e [DLAB-433] Updated image ID
add 22202c4 [DLAB-627] Created jupyter-docker templete form GCP
add a89e7ab [DLAB-627] Bugfix
add 00f687f [DLAB-627] Bugfix
add 24b3904 [DLAB-627] Bugfixing
add aad2b93 Merge pull request #168 from apache/DLAB-627
add 07c081f [DLAB-433] Added missing inactivity-files
add d40d3ce [DLAB-433] Added inactivity checker installation
add 6315946 [DLAB-433] Bugfix[inactivity]
add 0947ed1 Merge branch 'develop' into DLAB-433
add b96aa47 [DLAB-433] Docker image update
add 0646711 [DLAB-433] Updated ubuntu image id
add 001898b Merge pull request #13 from apache/DLAB-433
add 218af67 [GCP]: jupyter lab and projects adjusted
add 19f1fb3 Merge pull request #255 from bodnarmykola/DLAB-433
add efa12a5 Merge branch 'develop' into DLAB-433
add 394e56b Merge pull request #262 from bodnarmykola/DLAB-748
add 57ad1b9 GCloud for notebooks install added
add bfd284a Merge pull request #261 from bodnarmykola/DLAB-433
add fff767e Merge remote-tracking branch 'origin/DLAB-433' into DLAB-433
add db94dbc [DLAB-433] bugfixing after merging develop branch
add 7cbff09 Merge branch 'develop' into DLAB-433
add 8afa1cd [DLAB-433] Fixing bugs after branch update
add 715e936 [DLAB-433] Refactored jupyter-docker name to jupyterlab completely
add 86e978f [DLAB-433] Removed gcloud instalation
add 7e14188 Merge pull request #386 from apache/DLAB-433
add 8614e1b fixed issue with large files in nginx;
add eb536f5 fixed issue with permissions for provisioning service;
add 625c6f6 fixed issue with permissions for provisioning service;
add 0137152 fixed issue with permissions for provisioning service;
add dd26ad6 Merge pull request #387 from apache/DLAB-1240
add 893b2c0 [DLAB-1249] Fixed notebook secondary image creation
add 1114806 Merge pull request #388 from apache/DLAB-1249
add a7cd13e DLAB-1246 error message changed in case when endpoint is not accessible
add 032493c DLAB-000 unit test fixed
add e3af06d [DLAB-433] Moved jupyterlab image reference to dlab.ini
add be0d8d9 [DLAB-433] Fixed instance name bug
add b792fcd Merge pull request #390 from apache/DLAB-433
add 3997898 [DLAB-433] Added missing coma
add 8f575c6 Added service account parameter to Keycloak client configuration;
add 3408845 Merge pull request #393 from apache/DLAB-1234
add 296a667 [DLAB-1242] Fixed predefined VPC and Subnet issue
add 6a627fb [DLAB-1242] Fixed predefined VPC and Subnet issue
add 23b80cc [DLAB-1242] Fixed predefined VPC and Subnet issue[GCP]
add 4dd9fae Merge pull request #394 from apache/DLAB-1242
add 4e96d9c [DLAB-1230] Fixed billing issues [Azure]
add b945660 [DLAB-1230] Fixed billing issues with edges [Azure]
add adcaa4b Code review
add 91332dd Code review
add 49470b1 Merge pull request #22 from apache/develop
add 62bb4f7 [DLAB-1137] - Superset notebook template
add 7f8a9cb [DLAB-1105] - Superset docker image build implemented
add f046df0 [DLAB-1105] - Superset fab.py fixed
add 01283c6 [DLAB-1105] - Superset service implemented
add 5260e15 [DLAB-1105] - Superset service implemented
add b086942 [DLAB-1105] - Superset template added
add 059563f [DLAB-1105] - Superset service fixed
add eda5401 Merge pull request #354 from bodnarmykola/superset
add dd6e341 fixed superset-notebook as systemctl service
add 70c56bf fix typo
add ff319cb fix typo
add de874ed added OIDC_VALID_ISSUERS in superset_config.py
add 1f08df8 increased stop timeout for superset-service
add 812dc41 fixed reverse-proxy for superset
add 4a192cb added validation for keycloak client. minor fixes
add c056be8 Merge pull request #23 from apache/adum-superset
add b1dc6fc EDGE config for Superset fixed
add d31bed3 [GCP] overwrite.ini for Superset creation fixed
add e429dca [GCP] docker version for Superset creation fixed
add f72ac5e KEYCLOAK_USER and KEYCLOAK_USER_PASSWORD parameters added
add 41e8fbc KEYCLOAK_USER and KEYCLOAK_USER_PASSWORD parameters added
add 3c09c3c [GCP] Keycloak redirect parameters for superset fixed
add da7dc33 Merge pull request #396 from bodnarmykola/adum-superset
add 2076924 Fixed issue with custom ami;
add 95a5d9c Merge pull request #397 from apache/custom-ami-fix-dev
add 015e069 [DLAB-77] Temporarily removed tensor-rstudio template
add f79861a [DLAB-1213]: added endpoint for admin project management
add 59fffa2 [DLAB-1268]: added extra class for correct roles selection list
add 9971e35 Merge pull request #403 from apache/DLAB-1213
add 9a4fe73 [DLAB-1216]: fixed login redirect in case bad request error
add 09cc6cd Merge pull request #402 from apache/DLAB-1216
add 8a85789 [DLAB-1253] Fixed jupyterlab creation from custom ami
add aa5079d Merge pull request #405 from apache/DLAB-1253
add be27602 [DLAB-1260] Fixed bug with export billing report
add 5b7ab42 [DLAB-1256] Fixed issue with stopping notebook
add 2e71e68 added global parameter pre_defined_vpc for gcp ssn_terminate
add 54bcd31 Merge pull request #406 from apache/DLAB-1270
add 2a0804b added lowercase replacement for SBN gcp ssn_terminate
add eb97a3e Merge pull request #407 from apache/DLAB-1270
add a49a1c6 Fixed issue with supervisor conf file;
add cdbb183 Merge pull request #408 from apache/redhat-fix-dev
add cf18eef fixed issue with supervisor extension;
add 49c2c99 Merge pull request #410 from apache/redhat-fix-dev
add f386f6b [DLAB-1266] Fixed issue with switching between project for user (not admin)
add 7d48040 Code review
add 6b2d2cf DLAB-000 fixed issue with unauthorized for web terminal
add 5e3cd74 [DLAB-1214]: added request parameters to get project list per user (#412)
add 98ca15c fix validation DLabDLAB-1258
add 7a519af Merge pull request #416 from DG1202/DLAB-1258
add 7d60688 [DLAB-1265] Fixed bug with managing git credentials
add 0a13005 [DLAB-1261] Custom image is unique per project
add 0dc62b7 Fixed issue with scheduler and quote
add 9a15293 [DLAB-1249] Fixed notebook secondary image creation
add 1ff587f [DLAB-1262]: image validation extention; unique per project images
add e5b3ce5 [DLAB-1278]: prevent logout at all bad requests
add 65b0cd6 [DLAB-1274]: extended timezone list; added zones per uniqueoffset
add 572c47b Merge pull request #417 from apache/DLAB-1262
add bd2e84f [DLAB-1235]: reset images list on project selection switch
add 5caa44f eject moment locales from vendor; added parameters to compilerOptions
add 31ca62b Merge pull request #418 from apache/DLAB-1235
add 3fb3318 Fix endpoint url field
add 1a5d64c Merge pull request #419 from DG1202/DLAB-1259
add 856d7a7 DLAB-1208
add a83bc87 Merge pull request #420 from DG1202/DLAB-1208
add 3aa86f3 [DLAB-1291]: Fixed issue with removing network interfaces on Azure;
add 2e7f31d Merge pull request #426 from apache/DLAB-terminate-fix-dev
add f7c1c2f DLAB-1244
add 0240ff9 DLAB-1245
add aaa84f4 Merge pull request #423 from DG1202/DLAB-1244
add fecf71e [DLAB-1289] Added 'Create Notebook JupyterLab' role (#427)
add 1775ea6 [DLAB-1284, DLAB-1276] Fixed issues with managing the resource of another user (#428)
add c376cb8 [DLAB-1269] Added sbn tag to images and snapshots so they could be deleted during SSN termination
add 4211ecd Merge pull request #429 from apache/DLAB-1269
add d20cac4 DLAB-1231
add 9b72ed9 DLAB-1245 Added tooltip delay
add 9ae166e DLAB-1245:added tooltip delay
add 9d9e968 Merge pull request #422 from DG1202/DLAB-1231
add 0512941 Add hint for link of notebook/computational resource.
add 8b8890f DLAB-1252: Added delay
add 5cac7af Merge pull request #424 from DG1202/DLAB-1252
add 9a35920 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1235
add 5ff0ab9 [DLAB-1274]: extended timezone list; added zones per uniqueoffset
add 058b40d changed DeepLearning version;
add 0f603e8 Merge pull request #430 from apache/deep-version-fix-dev
add 299bec2 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1235
add 4892924 Merge pull request #432 from apache/DLAB-1235
add d99c604 [DLAB-851] Sorted instance shapes in ascending order of size in the dropdown list.
add b3ca464 Merge pull request #433 from DG1202/DLAB851
add cf6e019 [DLAB-931] Added resource list wich be deleted on confirmation dialog
add 1dfde4e Merge pull request #434 from DG1202/DLAB-931
add a0985b9 [DLAB-1288] Fixed bug with detailed billing
add 6c5a38a [Azure] Reconfiguration spark on Data Engine fails fixed
add 7af89e2 Merge pull request #435 from bodnarmykola/Azure_DLAB-1177
add c585b47 [DLAB-1299] Fixed Jupyterlab creation
add 8265f90 Merge pull request #438 from apache/DLAB-1299
add fb78526 [DLAB-1267] Fixed bug with status of computational resource while terminating env
add 7dde7ba [DLAB-739] Fixed dropdowns positions
add 7cb9e78 [DLAB-851] Sorted for computational resources.
add 3983a7c [fixed actions prevention on notebooks for resources in progress
add d0bfee2 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1279
add 18f74ae Merge pull request #439 from apache/DLAB-1279
add e2a9042 [DLAB-1301] Added A-z sorting for notebook templates
add ada0530 Merge pull request #436 from DG1202/DLAB-1301
add bea573a [DLAB-1252] Removed tooltip delay
add 24b5f24 Merge pull request #437 from DG1202/DLAB-1252
add 05057ae [DLAB-1248] Fixed bottom header line is not drawn for all grid on FireFox
add f12b049 Merge pull request #440 from DG1202/DLAB-1248
add a8a3895 [DLAB-1300]: extended validation for projrct stopping/termination]
add 8adbcb1 [DLAB-1304]: added project parameter while starting notebook
add 7bfd05a [DLAB-1263] Fixed issue with starting notebook when project quota is depleted
add 7c96f46 [DLAB-1304]: added project parameter while starting notebook
add 0589b4c Merge remote-tracking branch 'origin/DLAB-1300' into DLAB-1300
add 5be4576 Merge pull request #441 from apache/DLAB-1300
add df6776d Reverted self-service.yml
add ca054e6 Fixed test
add 393eb1b Fixed test
add 6cdb19a [DLAB-1280] Fixed bug with starting spark cluster by scheduler
add 3f4627f [DLAB-1290] Fixed after pressing 'Esc' DLab menu disappears
add c336871 Merge pull request #442 from DG1202/DLAB-1290
add 2a8dcf8 [DLAB-1272] Removed extra scrollbar during login in Chrome browser
add 1db5a36 Merge pull request #443 from DG1202/DLAB-1272
add d7d21c3 [DLAB-1294]: added list statuses check on active filtering
add bfdd404 [DLAB-1279]: added original notebook as resource for checks on creation clusters
add 29e57e7 Merge pull request #444 from apache/DLAB-1294
add 6c7e1f7 [DLAB-1299] Fixed Jupyterlab creation
add 4b4e0a0 Merge pull request #445 from apache/DLAB-1299
add 3dde11d [DLAB-1285]: Fixed issue with custom notebook image creation;
add 84d6f56 Merge pull request #447 from apache/DLAB-1285
add b69e91e [DLAB-1293] Fixed bug with status of custom image (#446)
add 663da9a [DLAB-1311] In drop down list computational resources value start changed to upper case
add c169521 Merge pull request #448 from DG1202/DLAB-1311
add cc3b417 typo fixes
add 4762405 [DLAB-1317]: fixed issue with stop/terminate projects on management dialog
add 55e9cb5 Merge pull request #450 from apache/DLAB-1294
add 75acaa6 [DLAB-1308] Removed authentication from Rstudio
add b96925a Merge pull request #451 from apache/DLAB-1308
add a40b288 Changed copyright
add 43bb906 Updated link to promotion page in readme file
add cd90c5a Merge branch 'develop' into DLAB-739
add fe41df4 Merge pull request #452 from DG1202/DLAB-739
add 93379fc [DLAB-1303] Fixed dataengine creation from AMI
add 9c7c51b Merge pull request #453 from apache/DLAB-1303
add 2124bae updated active statuses list
add 148026d updated active statuses list
add 839cd74 Merge pull request #455 from apache/DLAB-846
add 8f3aa6a [DLAB-1322] - Fixed issue with creating notebook from custom image which contains dependency
add 237bd26 [DLAB-1323] Fixed data labels delay on modal dialogs
add 9f55038 Merge pull request #457 from DG1202/DLAB-1323
add 1ce5c1f [DLAB-1297]: fixed initial login issue
add 2036c26 Merge branch 'develop' of C:\Users\Mykola_Bodnar1\Documents\DLab\incubator-dlab with conflicts.
add cde3403 Merge pull request #27 from apache/develop
add bdac58d Merge remote-tracking branch 'origin/develop' into develop
add 8f0a7a9 SSO implementing
add d11e5a3 SSO implementing
add 9cd0f2d SSO bugs fixing
add b6455d5 SSO bugs fixed
add cb52717 SSO nginx config fixed
add 6af33db SSO nginx config fixed
add d497551 SSO added for Azure and AWS
add 8b77cc1 SSO for notebooks implemented
add 6a4a7af merge conflict fixed
add bf50025 Merge pull request #28 from apache/develop
add 85afc5b Merge remote-tracking branch 'origin/notebooks-sso' into notebook-sso
add f207298 Merge pull request #458 from bodnarmykola/notebooks-sso
add 12f3845 [DLAB-1316, DLAB-1314] Fixed issues with stopping/terminating actions on manage environment popup
add 5f11c8e merge conflict fixed
add 707e47f Merge pull request #459 from bodnarmykola/notebooks-sso
add 94520fb Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1297
add 2bc5e6f Merge pull request #460 from apache/DLAB-1297
add 69bac8d [DLAB-1294]: list statuses check on active filtering extended
add 0e888a9 [DLAB-1312]: info messages changed
add 2770760 [DLAB-1112]: added shared image usage parameter on project creation
add 6bb3dac [DLAB-1112][ON HOLD]: shared image usage parameter on project creation
add 03fefb5 [AWS] SSO configuretion fixed and keycloak clients for project removing added
add 5082c87 [AWS] SSO configuretion fixed and keycloak clients for project removing added
add 525835a Merge pull request #461 from bodnarmykola/notebooks-sso
add e3533d6 [DLAB-1332] Fixed minor links altering and data labels delay on modal dialogs
add 1692c19 Merge pull request #462 from DG1202/DLAB-1332
add 9884f19 [DLAB-1319, 1257] Fixed alignment on Environment Management and padding in billing grid
add bb436eb Merge pull request #463 from DG1202/Dlab-1319,1257
add d2f5905 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1112
add 7b746c9 Merge pull request #465 from apache/DLAB-1112
add 29c2395 SSO keycloak clients for project removing implemented for all clouds
add 3da9ea8 Merge pull request #464 from bodnarmykola/notebooks-sso
add 1bed993 Jupyter/DeepLearnin/TensorFlow creation fails fixed
add cf7da7d Merge pull request #466 from bodnarmykola/DLAB-1327
add ff77076 [DLAB-1341]: changed edge node statuses on project
add 97c896c [DLAB-1341]: changed endpoint actions confirmation
add f1ea462 [DLAB-1339] - Superset starting fails (previous it was stopped) fixed
add 9bdd6f1 Merge pull request #469 from apache/DLAB-1339
add f37710f Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1341
add 5d91479 Merge pull request #470 from apache/DLAB-1341
add 7f27f1a [DLAB-1215]: added tags to billing report data grid
add d198d51 Updated link in README
add f0c39f3 [DLAB-1331] Remove credentials from RStudio/Rstudio with TensorFlow
add 49e111f [DLAB-1334] Error handling improvement for project actions
add 55b9922 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1215
add d6544cb Merge pull request #472 from apache/DLAB-1215
add 0f237dc [DLAB-1347] Added Superset in dev mode
add fcd4915 [DLAB-1271] Added PROJECT column to billing export
add c8300ef [DLAB-1305]: prevent actions for superset template
add a42d403 [DLAB-1305]: prevent spark configuration for superset
add 167e9ec [DLAB-1305]: prevent actions and spark configuration for JupyterLab template
add c7411d4 Merge pull request #473 from apache/DLAB-1305
add 1fe7bba [DLAB-1358]: adjusted confirmation messages for edge node on projects list
add 81c86ed Merge pull request #474 from apache/DLAB-1358
add e0bedd7 [DLAB-1359] - Superset creation fails fixed
add 7af76f3 [DLAB-1359] - Superset version changed
add 425dca7 Merge pull request #475 from apache/DLAB-1339
add fe8acf2 [DLAB-1366]: bucket labels changed
add d35cf2b [DLAB-1366]: cleanup tags on billing page
add 89623b1 [DLAB-1366]: cleanup tags on billing page
add e3805ed Merge pull request #478 from apache/DLAB-1366
add eb1b99e [DLAB-1368] Added Superset in 'Roles' dropdown list
add 5fc1d4e [DLAB-1337] Enhancement for 'List of resource pages' and other small fixes
add efcb046 Merge pull request #479 from apache/DLAB-1337
add 0497150 Merge remote-tracking branch 'origin/develop' into develop
add 754107e [DLAB-1223] Fixed billing values according to updates on billing page
add 332d52b [DLAB-1334] Error handling improvement for project actions
add c62ad1e [DLAB-1363] - SSO on AWS fixed
add 4bdfcc1 Merge pull request #480 from apache/DLAB-1363
new 0ba60be Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1158
The 1 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 +-
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/conf/dlab.ini | 14 +-
.../src/general/files/aws/base_Dockerfile | 2 +-
.../files/aws/deeplearning_description.json | 4 +-
.../{jupyter_Dockerfile => jupyterlab_Dockerfile} | 11 +-
...escription.json => jupyterlab_description.json} | 6 +-
.../src/general/files/azure/base_Dockerfile | 2 +-
.../files/azure/deeplearning_description.json | 4 +-
.../files/gcp/deeplearning_description.json | 4 +-
.../jupyterlab_Dockerfile} | 11 +-
...escription.json => jupyterlab_description.json} | 6 +-
.../{rstudio_Dockerfile => superset_Dockerfile} | 12 +-
..._description.json => superset_description.json} | 11 +-
.../files/gcp/tensor-rstudio_description.json | 4 +-
.../src/general/lib/aws/actions_lib.py | 6 +-
.../src/general/lib/gcp/actions_lib.py | 17 +
.../src/general/lib/os/debian/edge_lib.py | 63 +-
.../src/general/lib/os/debian/notebook_lib.py | 16 +-
.../src/general/lib/os/fab.py | 184 +++-
.../src/general/lib/os/redhat/notebook_lib.py | 10 +-
.../src/general/lib/os/redhat/ssn_lib.py | 6 +-
.../general/scripts/aws/common_prepare_notebook.py | 2 +-
.../src/general/scripts/aws/edge_configure.py | 14 +-
...upyter_configure.py => jupyterlab_configure.py} | 135 +--
.../src/general/scripts/aws/project_prepare.py | 7 +
.../src/general/scripts/aws/project_terminate.py | 37 +
.../src/general/scripts/aws/ssn_configure.py | 1 +
.../scripts/azure/common_create_notebook_image.py | 2 +-
.../azure/common_notebook_configure_dataengine.py | 2 +-
.../scripts/azure/common_prepare_notebook.py | 2 +-
.../src/general/scripts/azure/edge_configure.py | 19 +-
.../src/general/scripts/azure/project_prepare.py | 2 +-
.../src/general/scripts/azure/project_terminate.py | 36 +
.../general/scripts/gcp/common_create_bucket.py | 1 +
.../src/general/scripts/gcp/edge_configure.py | 17 +-
.../src/general/scripts/gcp/jupyter_configure.py | 2 +-
...upyter_configure.py => jupyterlab_configure.py} | 86 +-
.../src/general/scripts/gcp/project_terminate.py | 36 +
.../src/general/scripts/gcp/rstudio_configure.py | 2 +-
.../src/general/scripts/gcp/ssn_configure.py | 45 +-
.../src/general/scripts/gcp/ssn_terminate.py | 15 +-
.../scripts/gcp/ssn_terminate_gcp_resources.py | 20 +-
...{jupyter_configure.py => superset_configure.py} | 140 +--
.../scripts/gcp/tensor-rstudio_configure.py | 2 +-
.../src/general/scripts/gcp/tensor_configure.py | 2 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 2 +-
.../general/scripts/os/get_list_available_pkgs.py | 4 +-
.../jupyterlab_container_start.py} | 32 +-
.../aws/jenkins_jobs/create_data_engine/config.xml | 1 +
.../jenkins_jobs/create_notebook_image/config.xml | 1 +
.../jenkins_jobs/create_notebook_server/config.xml | 1 +
.../jenkins_jobs/manage_git_credentials/config.xml | 1 +
.../notebook_list_available_libs/config.xml | 1 +
.../notebook_reconfigure_spark/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 +
.../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_server/config.xml | 1 +
.../templates/os/debian/superset-notebook.service} | 12 +-
.../jupyterlab/Dockerfile_jupyterlab} | 39 +-
.../src/{rstudio => jupyterlab}/fabfile.py | 23 +-
.../jupyterlab/scripts/build.sh} | 8 +-
.../scripts/configure_jupyterlab_node.py} | 68 +-
.../jupyterlab/scripts/jupyterlab_run.sh} | 13 +-
.../main.tf => src/jupyterlab/scripts/start.sh} | 12 +-
.../src/project/scripts/configure_keycloak.py | 83 ++
.../scripts/configure_nginx_reverse_proxy.py | 12 +-
.../src/project/templates/conf.d/proxy.conf | 47 +-
.../src/project/templates/locations/superset.conf | 62 ++
.../src/project/templates/nginx.conf | 18 +-
.../src/ssn/files/aws/mongo_roles.json | 10 +
.../src/ssn/files/gcp/mongo_roles.json | 20 +
.../src/ssn/scripts/docker_build.py | 1 +
.../src/{tensor-rstudio => superset}/fabfile.py | 69 +-
.../superset/scripts/configure_superset_node.py | 94 ++
.../src/superset/templates/.env | 18 +
.../src/superset/templates/docker-compose.yml | 77 ++
.../src/superset/templates/docker-init.sh | 33 +
.../src/superset/templates/id_provider.json | 12 +
.../src/superset/templates/requirements-extra.txt | 19 +
.../src/superset/templates/superset_config.py | 69 ++
.../ssn-helm-charts/main/dlab-ui-chart/values.yaml | 1 +
.../main/files/configure_keycloak.sh | 3 +-
.../modules/helm_charts/dlab-ui-chart/values.yaml | 1 +
.../helm_charts/files/configure_keycloak.sh | 3 +-
.../deeplearning/deeplearning-notebook.json | 4 +-
.../deeplearning/deeplearning-notebook.json | 4 +-
.../test_templates/deeplearning/conv.prototxt | 28 +-
pom.xml | 5 -
.../com/epam/dlab/mongo/DlabResourceTypeDAO.java | 6 +-
.../azure/AzureBillableResourcesService.java | 88 +-
.../billing/azure/AzureBillingDetailsService.java | 29 +-
.../azure/model/AzureDailyResourceInvoice.java | 3 +
.../azure/model/AzureDlabBillableResource.java | 1 +
.../dlab/dto/exploratory/ImageCreateStatusDTO.java | 3 +-
.../java/com/epam/dlab/model/aws/ReportLine.java | 1 +
.../com/epam/dlab/rest/client/RESTService.java | 24 +-
services/provisioning-service/provisioning.yml | 33 +-
.../epam/dlab/backendapi/CloudConfiguration.java | 29 +-
.../backendapi/core/commands/CommandBuilder.java | 16 +-
.../core/commands/CommandExecutorMock.java | 2 +
.../handlers/ImageCreateCallbackHandler.java | 17 +-
services/self-service/pom.xml | 27 +-
services/self-service/self-service.yml | 11 -
.../dlab/backendapi/SelfServiceApplication.java | 13 +-
.../conf/SelfServiceApplicationConfiguration.java | 8 -
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 11 +-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 5 +-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 9 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 41 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 15 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 4 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 4 +-
.../resources/ApplicationSettingResource.java | 17 +-
.../dlab/backendapi/resources/BackupResource.java | 20 +-
.../dlab/backendapi/resources/EdgeResource.java | 12 +-
.../backendapi/resources/EnvironmentResource.java | 38 +-
.../backendapi/resources/ExploratoryResource.java | 38 +-
.../backendapi/resources/GitCredsResource.java | 12 +-
.../resources/ImageExploratoryResource.java | 40 +-
.../resources/InfrastructureInfoResource.java | 15 +-
.../resources/InfrastructureTemplateResource.java | 14 +-
.../backendapi/resources/KeyUploaderResource.java | 28 +-
.../resources/LibExploratoryResource.java | 32 +-
.../dlab/backendapi/resources/ProjectResource.java | 7 +-
.../backendapi/resources/SchedulerJobResource.java | 46 +-
.../backendapi/resources/SecurityResource.java | 24 +-
.../dlab/backendapi/resources/SwaggerResource.java | 25 -
.../backendapi/resources/SystemInfoResource.java | 8 +-
.../backendapi/resources/UserGroupResource.java | 77 +-
.../backendapi/resources/UserRoleResource.java | 12 +-
.../backendapi/resources/UserSettingsResource.java | 17 +-
.../resources/aws/ComputationalResourceAws.java | 67 +-
.../azure/ComputationalResourceAzure.java | 51 +-
.../resources/callback/ImageCallback.java | 7 +-
.../resources/dto/ExploratoryActionFormDTO.java | 29 +-
.../resources/gcp/ComputationalResourceGcp.java | 64 +-
.../resources/swagger/SwaggerSecurityInfo.java | 38 -
.../schedulers/CheckUserQuoteScheduler.java | 2 +-
.../backendapi/service/EnvironmentService.java | 17 +-
.../service/ImageExploratoryService.java | 4 +-
.../dlab/backendapi/service/ProjectService.java | 2 +-
.../dlab/backendapi/service/SecurityService.java | 2 +
.../backendapi/service/aws/AwsBillingService.java | 5 +-
.../service/azure/AzureBillingService.java | 3 +
.../backendapi/service/gcp/GcpBillingService.java | 2 +
.../service/impl/EnvironmentServiceImpl.java | 68 +-
.../service/impl/ExploratoryServiceImpl.java | 26 +-
.../service/impl/ImageExploratoryServiceImpl.java | 17 +-
.../service/impl/ProjectServiceImpl.java | 57 +-
.../service/impl/SchedulerJobServiceImpl.java | 2 +-
.../servlet/guacamole/GuacamoleSecurityFilter.java | 52 --
.../servlet/guacamole/GuacamoleServlet.java | 30 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 1 +
.../src/main/resources/endpoint-api.yml | 635 -------------
.../src/main/resources/mongo/aws/mongo_roles.json | 10 +
.../src/main/resources/mongo/gcp/mongo_roles.json | 20 +
.../src/main/resources/webapp/.editorconfig | 28 +-
.../management/endpoints/endpoints.component.html | 2 +-
.../management/endpoints/endpoints.component.scss | 3 +
.../manage-environment-dilog.component.html | 24 +-
.../manage-environment-dilog.component.scss | 6 +
.../manage-environment-dilog.component.ts | 5 +-
.../management-grid/management-grid.component.scss | 2 +-
.../management-grid/management-grid.component.ts | 4 +-
.../management/management.component.ts | 6 +-
.../project-form/project-form.component.html | 14 +-
.../project/project-form/project-form.component.ts | 8 +-
.../project-list/project-list.component.html | 9 +-
.../project/project-list/project-list.component.ts | 4 +-
.../administration/project/project.component.ts | 5 +-
.../app/administration/roles/roles.component.html | 14 +-
.../app/administration/roles/roles.component.ts | 6 +-
.../src/app/core/interceptors/error.interceptor.ts | 8 +-
.../core/services/applicationSecurity.service.ts | 4 +-
.../services/applicationServiceFacade.service.ts | 10 +-
.../src/app/core/services/project.service.ts | 23 +-
.../src/app/core/services/userResource.service.ts | 5 +-
.../webapp/src/app/core/util/sortUtils.ts | 4 +
.../reporting-grid/reporting-grid.component.html | 4 +-
.../reporting-grid/reporting-grid.component.scss | 50 +-
.../cluster-details/cluster-details.component.html | 11 +-
...utational-resource-create-dialog.component.html | 6 +-
...mputational-resource-create-dialog.component.ts | 12 +-
.../computational-resources-list.component.scss | 9 +-
.../computational-resources-list.component.ts | 13 +-
.../ami-create-dialog.component.html | 11 +-
.../ami-create-dialog.component.ts | 21 +-
.../create-environment.component.html | 30 +-
.../create-environment.component.ts | 20 +-
.../detail-dialog/detail-dialog.component.html | 37 +-
.../detail-dialog/detail-dialog.component.scss | 23 +-
.../install-libraries.component.html | 2 +-
.../install-libraries.component.scss | 5 +-
.../manage-ungit/manage-ungit.component.ts | 4 +-
.../resources-grid/resources-grid.component.html | 182 +---
.../resources-grid/resources-grid.component.scss | 16 +-
.../resources-grid/resources-grid.component.ts | 137 ++-
.../src/app/resources/resources.component.ts | 3 +-
.../webapp/src/app/resources/scheduler/index.ts | 6 +-
.../resources/scheduler/scheduler.component.html | 35 +-
.../app/resources/scheduler/scheduler.component.ts | 32 +-
.../shared/form-controls/dropdowns.component.scss | 8 +
.../webapp/src/app/shared/material.module.ts | 14 +-
.../confirmation-dialog.component.html | 4 +-
.../notification-dialog.component.ts | 47 +-
.../src/app/shared/navbar/navbar.component.html | 2 +-
.../src/app/webterminal/webterminal.component.scss | 2 +-
.../src/app/webterminal/webterminal.component.ts | 12 +-
.../resources/webapp/src/assets/endpoint-api.json | 980 +++++++++++++++++++++
.../webapp/src/assets/styles/_dialogs.scss | 40 +
.../resources/webapp/src/assets/styles/_theme.scss | 3 +
.../webapp/src/assets/styles/_variables.scss | 6 +-
.../webapp/src/assets/styles/app-loading.scss | 8 +-
.../webapp/src/dictionary/aws.dictionary.ts | 6 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../src/main/resources/webapp/src/styles.scss | 12 +
.../main/resources/webapp/src/tsconfig.app.json | 10 +-
.../resources/EnvironmentResourceTest.java | 61 +-
.../resources/ExploratoryResourceTest.java | 31 +-
.../resources/ImageExploratoryResourceTest.java | 52 +-
.../backendapi/resources/ProjectResourceTest.java | 2 +-
.../schedulers/CheckUserQuoteSchedulerTest.java | 4 +-
.../service/aws/AwsBillingServiceTest.java | 20 +-
.../service/azure/AzureBillingServiceTest.java | 20 +-
.../service/impl/EnvironmentServiceImplTest.java | 155 ++--
.../service/impl/ExploratoryServiceImplTest.java | 28 +-
.../impl/ImageExploratoryServiceImplTest.java | 28 +-
236 files changed, 3774 insertions(+), 2695 deletions(-)
copy infrastructure-provisioning/src/general/files/aws/{jupyter_Dockerfile => jupyterlab_Dockerfile} (94%)
copy infrastructure-provisioning/src/general/files/aws/{rstudio_description.json => jupyterlab_description.json} (86%)
copy infrastructure-provisioning/src/general/files/{aws/jupyter_Dockerfile => gcp/jupyterlab_Dockerfile} (94%)
copy infrastructure-provisioning/src/general/files/gcp/{rstudio_description.json => jupyterlab_description.json} (89%)
copy infrastructure-provisioning/src/general/files/gcp/{rstudio_Dockerfile => superset_Dockerfile} (87%)
copy infrastructure-provisioning/src/general/files/gcp/{rstudio_description.json => superset_description.json} (66%)
copy infrastructure-provisioning/src/general/scripts/aws/{jupyter_configure.py => jupyterlab_configure.py} (77%)
copy infrastructure-provisioning/src/general/scripts/gcp/{jupyter_configure.py => jupyterlab_configure.py} (82%)
copy infrastructure-provisioning/src/general/scripts/gcp/{jupyter_configure.py => superset_configure.py} (68%)
copy infrastructure-provisioning/src/general/scripts/{azure/rstudio_change_pass.py => os/jupyterlab_container_start.py} (59%)
copy infrastructure-provisioning/src/{zeppelin/templates/livy-server-cluster.service => general/templates/os/debian/superset-notebook.service} (79%)
copy infrastructure-provisioning/{terraform/aws/computational_resources/modules/data_engine/variables.tf => src/jupyterlab/Dockerfile_jupyterlab} (56%)
copy infrastructure-provisioning/src/{rstudio => jupyterlab}/fabfile.py (92%)
copy infrastructure-provisioning/{terraform/aws/ssn-helm-charts/main/step-issuer-chart/values.yaml => src/jupyterlab/scripts/build.sh} (93%)
copy infrastructure-provisioning/src/{jupyter/scripts/configure_jupyter_node.py => jupyterlab/scripts/configure_jupyterlab_node.py} (64%)
copy infrastructure-provisioning/{terraform/aws/ssn-helm-charts/main/step-ca-issuer-chart/templates/NOTES.txt => src/jupyterlab/scripts/jupyterlab_run.sh} (85%)
copy infrastructure-provisioning/{terraform/aws/project/main/main.tf => src/jupyterlab/scripts/start.sh} (84%)
create mode 100644 infrastructure-provisioning/src/project/scripts/configure_keycloak.py
create mode 100644 infrastructure-provisioning/src/project/templates/locations/superset.conf
copy infrastructure-provisioning/src/{tensor-rstudio => superset}/fabfile.py (69%)
create mode 100644 infrastructure-provisioning/src/superset/scripts/configure_superset_node.py
create mode 100644 infrastructure-provisioning/src/superset/templates/.env
create mode 100644 infrastructure-provisioning/src/superset/templates/docker-compose.yml
create mode 100644 infrastructure-provisioning/src/superset/templates/docker-init.sh
create mode 100644 infrastructure-provisioning/src/superset/templates/id_provider.json
create mode 100644 infrastructure-provisioning/src/superset/templates/requirements-extra.txt
create mode 100644 infrastructure-provisioning/src/superset/templates/superset_config.py
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/SwaggerResource.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/resources/swagger/SwaggerSecurityInfo.java
delete mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/servlet/guacamole/GuacamoleSecurityFilter.java
delete mode 100644 services/self-service/src/main/resources/endpoint-api.yml
create mode 100644 services/self-service/src/main/resources/webapp/src/assets/endpoint-api.json
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1158
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0ba60bef68692e6f61c5f484438e8edc41450f96
Merge: 4ed71df 4bdfcc1
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Mon Dec 9 12:19:52 2019 +0200
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1158
Conflicts:
infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
infrastructure-provisioning/src/general/lib/aws/actions_lib.py
infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/configure_keycloak.sh
services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
README.md | 3 +-
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/conf/dlab.ini | 14 +-
.../src/general/files/aws/base_Dockerfile | 2 +-
.../files/aws/deeplearning_description.json | 4 +-
.../src/general/files/aws/jupyterlab_Dockerfile | 51 ++
.../general/files/aws/jupyterlab_description.json | 29 +
.../src/general/files/azure/base_Dockerfile | 2 +-
.../files/azure/deeplearning_description.json | 4 +-
.../files/gcp/deeplearning_description.json | 4 +-
.../src/general/files/gcp/jupyterlab_Dockerfile | 51 ++
.../general/files/gcp/jupyterlab_description.json | 33 +
.../gcp/superset_Dockerfile} | 41 +-
.../general/files/gcp/superset_description.json | 28 +
.../files/gcp/tensor-rstudio_description.json | 4 +-
.../src/general/lib/aws/actions_lib.py | 6 +-
.../src/general/lib/gcp/actions_lib.py | 17 +
.../src/general/lib/os/debian/edge_lib.py | 63 +-
.../src/general/lib/os/debian/notebook_lib.py | 16 +-
.../src/general/lib/os/fab.py | 184 +++-
.../src/general/lib/os/redhat/notebook_lib.py | 10 +-
.../src/general/lib/os/redhat/ssn_lib.py | 6 +-
.../general/scripts/aws/common_prepare_notebook.py | 2 +-
.../src/general/scripts/aws/edge_configure.py | 14 +-
.../general/scripts/aws/jupyterlab_configure.py | 360 ++++++++
.../src/general/scripts/aws/project_prepare.py | 7 +
.../src/general/scripts/aws/project_terminate.py | 37 +
.../src/general/scripts/aws/ssn_configure.py | 1 +
.../scripts/azure/common_create_notebook_image.py | 2 +-
.../azure/common_notebook_configure_dataengine.py | 2 +-
.../scripts/azure/common_prepare_notebook.py | 2 +-
.../src/general/scripts/azure/edge_configure.py | 19 +-
.../src/general/scripts/azure/project_prepare.py | 2 +-
.../src/general/scripts/azure/project_terminate.py | 36 +
.../general/scripts/gcp/common_create_bucket.py | 1 +
.../src/general/scripts/gcp/edge_configure.py | 17 +-
.../src/general/scripts/gcp/jupyter_configure.py | 2 +-
...upyter_configure.py => jupyterlab_configure.py} | 86 +-
.../src/general/scripts/gcp/project_terminate.py | 36 +
.../src/general/scripts/gcp/rstudio_configure.py | 2 +-
.../src/general/scripts/gcp/ssn_configure.py | 45 +-
.../src/general/scripts/gcp/ssn_terminate.py | 15 +-
.../scripts/gcp/ssn_terminate_gcp_resources.py | 20 +-
...{jupyter_configure.py => superset_configure.py} | 140 +--
.../scripts/gcp/tensor-rstudio_configure.py | 2 +-
.../src/general/scripts/gcp/tensor_configure.py | 2 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 2 +-
.../general/scripts/os/get_list_available_pkgs.py | 4 +-
.../scripts/os/jupyterlab_container_start.py | 64 ++
.../aws/jenkins_jobs/create_data_engine/config.xml | 1 +
.../jenkins_jobs/create_notebook_image/config.xml | 1 +
.../jenkins_jobs/create_notebook_server/config.xml | 1 +
.../jenkins_jobs/manage_git_credentials/config.xml | 1 +
.../notebook_list_available_libs/config.xml | 1 +
.../notebook_reconfigure_spark/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 +
.../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_server/config.xml | 1 +
.../os/debian/superset-notebook.service} | 40 +-
.../Dockerfile_jupyterlab} | 48 +-
.../src/jupyterlab/fabfile.py | 226 +++++
.../scripts/build.sh} | 29 +-
.../scripts/configure_jupyterlab_node.py | 123 +++
.../scripts/jupyterlab_run.sh} | 33 +-
.../scripts/start.sh} | 32 +-
.../src/project/scripts/configure_keycloak.py | 83 ++
.../scripts/configure_nginx_reverse_proxy.py | 12 +-
.../src/project/templates/conf.d/proxy.conf | 47 +-
.../src/project/templates/locations/superset.conf | 62 ++
.../src/project/templates/nginx.conf | 18 +-
.../src/ssn/files/aws/mongo_roles.json | 10 +
.../src/ssn/files/gcp/mongo_roles.json | 20 +
.../src/ssn/scripts/docker_build.py | 1 +
.../src/superset/fabfile.py | 174 ++++
.../superset/scripts/configure_superset_node.py | 94 ++
.../src/superset/templates/.env | 18 +
.../src/superset/templates/docker-compose.yml | 77 ++
.../src/superset/templates/docker-init.sh | 33 +
.../src/superset/templates/id_provider.json | 12 +
.../src/superset/templates/requirements-extra.txt | 19 +
.../src/superset/templates/superset_config.py | 69 ++
.../ssn-helm-charts/main/dlab-ui-chart/values.yaml | 1 +
.../main/files/configure_keycloak.sh | 3 +-
.../modules/helm_charts/dlab-ui-chart/values.yaml | 1 +
.../helm_charts/files/configure_keycloak.sh | 3 +-
.../deeplearning/deeplearning-notebook.json | 4 +-
.../deeplearning/deeplearning-notebook.json | 4 +-
.../test_templates/deeplearning/conv.prototxt | 28 +-
pom.xml | 5 -
.../com/epam/dlab/mongo/DlabResourceTypeDAO.java | 6 +-
.../azure/AzureBillableResourcesService.java | 88 +-
.../billing/azure/AzureBillingDetailsService.java | 29 +-
.../azure/model/AzureDailyResourceInvoice.java | 3 +
.../azure/model/AzureDlabBillableResource.java | 1 +
.../dlab/dto/exploratory/ImageCreateStatusDTO.java | 3 +-
.../java/com/epam/dlab/model/aws/ReportLine.java | 1 +
.../com/epam/dlab/rest/client/RESTService.java | 24 +-
services/provisioning-service/provisioning.yml | 33 +-
.../epam/dlab/backendapi/CloudConfiguration.java | 29 +-
.../backendapi/core/commands/CommandBuilder.java | 16 +-
.../core/commands/CommandExecutorMock.java | 2 +
.../handlers/ImageCreateCallbackHandler.java | 17 +-
services/self-service/pom.xml | 27 +-
services/self-service/self-service.yml | 11 -
.../dlab/backendapi/SelfServiceApplication.java | 13 +-
.../conf/SelfServiceApplicationConfiguration.java | 8 -
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 11 +-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 5 +-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 9 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 41 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 15 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 4 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 4 +-
.../resources/ApplicationSettingResource.java | 17 +-
.../dlab/backendapi/resources/BackupResource.java | 20 +-
.../dlab/backendapi/resources/EdgeResource.java | 12 +-
.../backendapi/resources/EnvironmentResource.java | 38 +-
.../backendapi/resources/ExploratoryResource.java | 38 +-
.../backendapi/resources/GitCredsResource.java | 12 +-
.../resources/ImageExploratoryResource.java | 40 +-
.../resources/InfrastructureInfoResource.java | 15 +-
.../resources/InfrastructureTemplateResource.java | 14 +-
.../backendapi/resources/KeyUploaderResource.java | 28 +-
.../resources/LibExploratoryResource.java | 32 +-
.../dlab/backendapi/resources/ProjectResource.java | 7 +-
.../backendapi/resources/SchedulerJobResource.java | 46 +-
.../backendapi/resources/SecurityResource.java | 24 +-
.../dlab/backendapi/resources/SwaggerResource.java | 25 -
.../backendapi/resources/SystemInfoResource.java | 8 +-
.../backendapi/resources/UserGroupResource.java | 77 +-
.../backendapi/resources/UserRoleResource.java | 12 +-
.../backendapi/resources/UserSettingsResource.java | 17 +-
.../resources/aws/ComputationalResourceAws.java | 67 +-
.../azure/ComputationalResourceAzure.java | 51 +-
.../resources/callback/ImageCallback.java | 7 +-
.../resources/dto/ExploratoryActionFormDTO.java | 29 +-
.../resources/gcp/ComputationalResourceGcp.java | 64 +-
.../resources/swagger/SwaggerSecurityInfo.java | 38 -
.../schedulers/CheckUserQuoteScheduler.java | 2 +-
.../backendapi/service/EnvironmentService.java | 17 +-
.../service/ImageExploratoryService.java | 4 +-
.../dlab/backendapi/service/ProjectService.java | 2 +-
.../dlab/backendapi/service/SecurityService.java | 2 +
.../backendapi/service/aws/AwsBillingService.java | 5 +-
.../service/azure/AzureBillingService.java | 3 +
.../backendapi/service/gcp/GcpBillingService.java | 2 +
.../service/impl/EnvironmentServiceImpl.java | 68 +-
.../service/impl/ExploratoryServiceImpl.java | 26 +-
.../service/impl/ImageExploratoryServiceImpl.java | 17 +-
.../service/impl/ProjectServiceImpl.java | 57 +-
.../service/impl/SchedulerJobServiceImpl.java | 2 +-
.../servlet/guacamole/GuacamoleSecurityFilter.java | 52 --
.../servlet/guacamole/GuacamoleServlet.java | 30 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 1 +
.../src/main/resources/endpoint-api.yml | 635 -------------
.../src/main/resources/mongo/aws/mongo_roles.json | 10 +
.../src/main/resources/mongo/gcp/mongo_roles.json | 20 +
.../src/main/resources/webapp/.editorconfig | 28 +-
.../management/endpoints/endpoints.component.html | 2 +-
.../management/endpoints/endpoints.component.scss | 3 +
.../manage-environment-dilog.component.html | 24 +-
.../manage-environment-dilog.component.scss | 6 +
.../manage-environment-dilog.component.ts | 5 +-
.../management-grid/management-grid.component.scss | 2 +-
.../management-grid/management-grid.component.ts | 4 +-
.../management/management.component.ts | 6 +-
.../project-form/project-form.component.html | 14 +-
.../project/project-form/project-form.component.ts | 8 +-
.../project-list/project-list.component.html | 9 +-
.../project/project-list/project-list.component.ts | 4 +-
.../administration/project/project.component.ts | 5 +-
.../app/administration/roles/roles.component.html | 14 +-
.../app/administration/roles/roles.component.ts | 6 +-
.../src/app/core/interceptors/error.interceptor.ts | 8 +-
.../core/services/applicationSecurity.service.ts | 4 +-
.../services/applicationServiceFacade.service.ts | 10 +-
.../src/app/core/services/project.service.ts | 23 +-
.../src/app/core/services/userResource.service.ts | 5 +-
.../webapp/src/app/core/util/sortUtils.ts | 4 +
.../reporting-grid/reporting-grid.component.html | 4 +-
.../reporting-grid/reporting-grid.component.scss | 50 +-
.../cluster-details/cluster-details.component.html | 11 +-
...utational-resource-create-dialog.component.html | 6 +-
...mputational-resource-create-dialog.component.ts | 12 +-
.../computational-resources-list.component.scss | 9 +-
.../computational-resources-list.component.ts | 13 +-
.../ami-create-dialog.component.html | 11 +-
.../ami-create-dialog.component.ts | 21 +-
.../create-environment.component.html | 30 +-
.../create-environment.component.ts | 20 +-
.../detail-dialog/detail-dialog.component.html | 37 +-
.../detail-dialog/detail-dialog.component.scss | 23 +-
.../install-libraries.component.html | 2 +-
.../install-libraries.component.scss | 5 +-
.../manage-ungit/manage-ungit.component.ts | 4 +-
.../resources-grid/resources-grid.component.html | 182 +---
.../resources-grid/resources-grid.component.scss | 16 +-
.../resources-grid/resources-grid.component.ts | 137 ++-
.../src/app/resources/resources.component.ts | 3 +-
.../webapp/src/app/resources/scheduler/index.ts | 6 +-
.../resources/scheduler/scheduler.component.html | 35 +-
.../app/resources/scheduler/scheduler.component.ts | 32 +-
.../shared/form-controls/dropdowns.component.scss | 8 +
.../webapp/src/app/shared/material.module.ts | 14 +-
.../confirmation-dialog.component.html | 4 +-
.../notification-dialog.component.ts | 47 +-
.../src/app/shared/navbar/navbar.component.html | 2 +-
.../src/app/webterminal/webterminal.component.scss | 2 +-
.../src/app/webterminal/webterminal.component.ts | 12 +-
.../resources/webapp/src/assets/endpoint-api.json | 980 +++++++++++++++++++++
.../webapp/src/assets/styles/_dialogs.scss | 40 +
.../resources/webapp/src/assets/styles/_theme.scss | 3 +
.../webapp/src/assets/styles/_variables.scss | 6 +-
.../webapp/src/assets/styles/app-loading.scss | 8 +-
.../webapp/src/dictionary/aws.dictionary.ts | 6 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../src/main/resources/webapp/src/styles.scss | 12 +
.../main/resources/webapp/src/tsconfig.app.json | 10 +-
.../resources/EnvironmentResourceTest.java | 61 +-
.../resources/ExploratoryResourceTest.java | 31 +-
.../resources/ImageExploratoryResourceTest.java | 52 +-
.../backendapi/resources/ProjectResourceTest.java | 2 +-
.../schedulers/CheckUserQuoteSchedulerTest.java | 4 +-
.../service/aws/AwsBillingServiceTest.java | 20 +-
.../service/azure/AzureBillingServiceTest.java | 20 +-
.../service/impl/EnvironmentServiceImplTest.java | 155 ++--
.../service/impl/ExploratoryServiceImplTest.java | 28 +-
.../impl/ImageExploratoryServiceImplTest.java | 28 +-
236 files changed, 4809 insertions(+), 2554 deletions(-)
diff --cc infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
index f53b1dd,7d40b1e..48419e8
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@@ -58,44 -59,12 +59,42 @@@ def configure_http_proxy_server(config)
sys.exit(1)
- def install_nginx_ldap(edge_ip, nginx_version, ldap_ip, ldap_dn, ldap_ou, ldap_service_pass, ldap_service_username,
- user, hostname, step_cert_sans):
-def install_nginx_lua(edge_ip, nginx_version, keycloak_auth_server_url, keycloak_realm_name, keycloak_client_id, keycloak_client_secret):
++def install_nginx_lua(edge_ip, nginx_version, keycloak_auth_server_url, keycloak_realm_name, keycloak_client_id,
++ keycloak_client_secret, user, hostname, step_cert_sans):
try:
if not os.path.exists('/tmp/nginx_installed'):
sudo('apt-get install -y wget')
- sudo('apt-get -y install gcc build-essential make zlib1g-dev libpcre++-dev libssl-dev git libldap2-dev')
+ sudo('apt-get -y install gcc build-essential make automake zlib1g-dev libpcre++-dev libssl-dev git libldap2-dev libc6-dev libgd-dev libgeoip-dev libpcre3-dev apt-utils autoconf liblmdb-dev libtool libxml2-dev libyajl-dev pkgconf liblua5.1-0 liblua5.1-0-dev libreadline-dev libreadline6-dev libtinfo-dev libtool-bin lua5.1 zip readline-doc')
+ if os.environ['conf_stepcerts_enabled'] == 'true':
+ sudo('mkdir -p /home/{0}/keys'.format(user))
+ sudo('echo "{0}" | base64 --decode > /home/{1}/keys/root_ca.crt'.format(
+ os.environ['conf_stepcerts_root_ca'], user))
+ fingerprint = sudo('step certificate fingerprint /home/{0}/keys/root_ca.crt'.format(
+ user))
+ sudo('step ca bootstrap --fingerprint {0} --ca-url "{1}"'.format(fingerprint,
+ os.environ['conf_stepcerts_ca_url']))
+ sudo('echo "{0}" > /home/{1}/keys/provisioner_password'.format(
+ os.environ['conf_stepcerts_kid_password'], user))
+ sans = "--san localhost --san 127.0.0.1 {0}".format(step_cert_sans)
+ cn = edge_ip
+ sudo('step ca token {3} --kid {0} --ca-url "{1}" --root /home/{2}/keys/root_ca.crt '
+ '--password-file /home/{2}/keys/provisioner_password {4} --output-file /tmp/step_token'.format(
+ os.environ['conf_stepcerts_kid'], os.environ['conf_stepcerts_ca_url'], user, cn, sans))
+ token = sudo('cat /tmp/step_token')
+ sudo('step ca certificate "{0}" /home/{2}/keys/dlab.crt /home/{2}/keys/dlab.key '
+ '--token "{1}" --kty=RSA --size 2048 --provisioner {3} '.format(cn, token, user,
+ os.environ['conf_stepcerts_kid']))
+ sudo('cp /home/{0}/keys/dlab.crt /etc/ssl/certs/'.format(user))
+ sudo('cp /home/{0}/keys/dlab.key /etc/ssl/certs/'.format(user))
+ sudo('touch /var/log/renew_certificates.log')
+ sudo('bash -c \'echo "0 */3 * * * root /usr/bin/step ca renew /etc/ssl/certs/dlab.crt '
+ '/etc/ssl/certs/dlab.key --exec "nginx -s reload" --ca-url "{1}" '
+ '--root /home/{0}/keys/root_ca.crt --force --expires-in 8h >> /var/log/renew_certificates.log '
+ '2>&1" >> /etc/crontab \''.format(user, os.environ['conf_stepcerts_ca_url']))
+ else:
+ sudo('openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout /etc/ssl/certs/dlab.key \
+ -out /etc/ssl/certs/dlab.crt -subj "/C=US/ST=US/L=US/O=dlab/CN={}"'.format(hostname))
- sudo('mkdir -p /tmp/nginx_auth_ldap')
- with cd('/tmp/nginx_auth_ldap'):
- sudo('git clone https://github.com/kvspb/nginx-auth-ldap.git')
+ sudo('mkdir -p /tmp/lua')
sudo('mkdir -p /tmp/src')
with cd('/tmp/src/'):
sudo('wget http://nginx.org/download/nginx-{}.tar.gz'.format(nginx_version))
diff --cc infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 95d93e2,fbf6cd0..1f1345e
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@@ -210,8 -202,18 +210,18 @@@ if __name__ == "__main__"
try:
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
- params = "--hostname {} --keyfile {} --user {} --step_cert_sans '{}' " \
- .format(instance_hostname, keyfile_name, edge_conf['dlab_ssh_user'], step_cert_sans)
+ keycloak_client_secret = str(uuid.uuid4())
- keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} --keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} --edge_public_ip {} --project_name {}" \
++ keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} --keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} --edge_public_ip {} --project_name {} --step_cert_sans '{}' " \
+ .format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'], os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
+ os.environ['keycloak_user_password'],
- keycloak_client_secret, edge_conf['edge_public_ip'], os.environ['project_name'])
++ keycloak_client_secret, edge_conf['edge_public_ip'], os.environ['project_name'], step_cert_sans)
+ try:
+ local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
+ except:
+ traceback.print_exc()
+ raise Exception
+ params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} --keycloak_client_secret {}" \
+ .format(instance_hostname, keyfile_name, edge_conf['dlab_ssh_user'], edge_conf['service_base_name'] + '-' + os.environ['project_name'], keycloak_client_secret)
try:
local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy', params))
except:
diff --cc infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index 7c96cec,9b734a3..c0f156d
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@@ -279,8 -268,23 +279,23 @@@ if __name__ == "__main__"
try:
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
- params = "--hostname {} --keyfile {} --user {} --step_cert_sans '{}'" \
- .format(instance_hostname, keyfile_name, edge_conf['dlab_ssh_user'], step_cert_sans)
+
+ keycloak_client_secret = str(uuid.uuid4())
- keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} --keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} --edge_public_ip {} --project_name {}" \
++ keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} --keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} --edge_public_ip {} --project_name {} --step_cert_sans '{}'" \
+ .format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
+ os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
+ os.environ['keycloak_user_password'],
- keycloak_client_secret, instance_hostname, os.environ['project_name'])
++ keycloak_client_secret, instance_hostname, os.environ['project_name'], step_cert_sans)
+ try:
+ local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
+ except:
+ traceback.print_exc()
+ raise Exception
+
+ params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} --keycloak_client_secret {}" \
+ .format(instance_hostname, keyfile_name, edge_conf['dlab_ssh_user'],
+ edge_conf['service_base_name'] + '-' + os.environ['project_name'], keycloak_client_secret)
+
try:
local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy', params))
except:
diff --cc infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 0bb9be4,e9b1f99..50d9f26
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@@ -247,8 -240,21 +247,21 @@@ if __name__ == "__main__"
try:
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
- params = "--hostname {} --keyfile {} --user {} --step_cert_sans '{}'" \
- .format(instance_hostname, edge_conf['ssh_key_path'], edge_conf['dlab_ssh_user'], step_cert_sans)
+
+ keycloak_client_secret = str(uuid.uuid4())
- keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} --keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} --edge_public_ip {} --project_name {}" \
++ keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} --keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} --edge_public_ip {} --project_name {} --step_cert_sans '{}'" \
+ .format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'], os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
+ os.environ['keycloak_user_password'],
- keycloak_client_secret, instance_hostname, os.environ['project_name'])
++ keycloak_client_secret, instance_hostname, os.environ['project_name'], step_cert_sans)
+ try:
+ local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
+ except:
+ traceback.print_exc()
+ raise Exception
+
+ params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} --keycloak_client_secret {}" \
+ .format(instance_hostname, edge_conf['ssh_key_path'], edge_conf['dlab_ssh_user'], edge_conf['service_base_name'] + '-' + os.environ['project_name'], keycloak_client_secret)
+
try:
local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy', params))
except:
diff --cc infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
index 74d0138,dce9755..a4f0825
--- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
@@@ -26,14 -26,14 +26,16 @@@ from fabric.api import
import argparse
import sys
import os
+from dlab.common_lib import ensure_step
- from dlab.edge_lib import install_nginx_ldap
+ from dlab.edge_lib import install_nginx_lua
parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
parser.add_argument('--keyfile', type=str, default='')
parser.add_argument('--user', type=str, default='')
+ parser.add_argument('--keycloak_client_id', type=str, default='')
+ parser.add_argument('--keycloak_client_secret', type=str, default='')
+parser.add_argument('--step_cert_sans', type=str, default='')
args = parser.parse_args()
if __name__ == "__main__":
@@@ -53,18 -53,11 +55,18 @@@
except Exception as err:
print("Failed establish connection. Excpeption: " + str(err))
sys.exit(1)
+ if os.environ['conf_stepcerts_enabled'] == 'true':
+ try:
+ ensure_step(args.user)
+ except Exception as err:
+ print("Failed install step: " + str(err))
+ sys.exit(1)
try:
- install_nginx_ldap(args.hostname, os.environ['reverse_proxy_nginx_version'],
- os.environ['ldap_hostname'], os.environ['ldap_dn'],
- os.environ['ldap_ou'], os.environ['ldap_service_password'],
- os.environ['ldap_service_username'], args.user, args.hostname, args.step_cert_sans)
+ install_nginx_lua(args.hostname, os.environ['reverse_proxy_nginx_version'],
- os.environ['keycloak_auth_server_url'], os.environ['keycloak_realm_name'],
- args.keycloak_client_id, args.keycloak_client_secret)
++ os.environ['keycloak_auth_server_url'], os.environ['keycloak_realm_name'],
++ args.keycloak_client_id, args.keycloak_client_secret, args.user, args.hostname,
++ args.step_cert_sans)
except Exception as err:
print("Failed install nginx reverse proxy: " + str(err))
sys.exit(1)
diff --cc infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
index 72bcd8a,b166519..ba12164
--- a/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
+++ b/infrastructure-provisioning/src/project/templates/conf.d/proxy.conf
@@@ -21,27 -21,26 +21,68 @@@
server {
listen 80;
server_name EDGE_IP;
- auth_ldap "Forbidden";
- auth_ldap_servers ldap1;
+
+ access_by_lua '
+ local opts = {
+ redirect_uri_path = "/*",
+ accept_none_alg = true,
+ discovery = "http://KEYCLOAK_SERVER_IP/auth/realms/KEYCLOAK_REALM_NAME/.well-known/openid-configuration",
+ client_id = "KEYCLOAK_CLIENT_ID",
+ client_secret = "KEYCLOAK_CLIENT_SECRET",
+ ssl_verify = "no",
+ redirect_uri_scheme = "http",
+ session_contents = {id_token=true}
+ }
+ local res, err = require("resty.openidc").authenticate(opts)
+
+ if err then
+ ngx.status = 403
+ ngx.say(err)
+ ngx.exit(ngx.HTTP_FORBIDDEN)
+ end
+ ';
include locations/*.conf;
+ rewrite ^/(.*)$ https://$server_name/$1 permanent;
+}
+
+server {
+ listen 443 ssl;
+ server_name EDGE_IP;
+ # SSL section
+ proxy_buffering off;
+ ssl on;
+ ssl_certificate /etc/ssl/certs/dlab.crt;
+ ssl_certificate_key /etc/ssl/certs/dlab.key;
+ ssl_session_timeout 5m;
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA2 [...]
+ ssl_prefer_server_ciphers on;
+ # ssl_dhparam /etc/ssl/certs/dhparam.pem;
+ auth_ldap "Forbidden";
+ auth_ldap_servers ldap1;
- include locations/*.conf;
++
++ access_by_lua '
++ local opts = {
++ redirect_uri_path = "/*",
++ accept_none_alg = true,
++ discovery = "http://KEYCLOAK_SERVER_IP/auth/realms/KEYCLOAK_REALM_NAME/.well-known/openid-configuration",
++ client_id = "KEYCLOAK_CLIENT_ID",
++ client_secret = "KEYCLOAK_CLIENT_SECRET",
++ ssl_verify = "no",
++ redirect_uri_scheme = "http",
++ session_contents = {id_token=true}
++ }
++ local res, err = require("resty.openidc").authenticate(opts)
++
++ if err then
++ ngx.status = 403
++ ngx.say(err)
++ ngx.exit(ngx.HTTP_FORBIDDEN)
++ end
++ ';
++
++ include locations/*.conf;
++
++
}
diff --cc infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
index 6d8f903,27cb3a4..bba8f87
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/values.yaml
@@@ -44,12 -44,13 +44,13 @@@ ui
host: ${ssn_k8s_alb_dns_name}
annotations:
kubernetes.io/ingress.class: nginx
- nginx.ingress.kubernetes.io/ssl-redirect: "false"
+ nginx.ingress.kubernetes.io/ssl-redirect: "true"
+ nginx.ingress.kubernetes.io/proxy-body-size: "50m"
- tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
+ tls:
+ - secretName: dlab-ui-tls
+ hosts:
+ - ${ssn_k8s_alb_dns_name}
mongo:
host: ${mongo_service_name}
port: ${mongo_port}
diff --cc infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
index 92e5ead,0c4802c..40039a1
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/files/configure_keycloak.sh
@@@ -68,7 -68,8 +68,8 @@@
-s 'config."mapped.group.attributes"=[]' -s 'config."drop.non.existing.groups.during.sync"=["false"]'
# Create client
/opt/jboss/keycloak/bin/kcadm.sh create clients -r dlab -s clientId=dlab-ui -s enabled=true -s \
- 'redirectUris=["https://${ssn_k8s_alb_dns_name}/"]' -s secret=${keycloak_client_secret}
- 'redirectUris=["http://${ssn_k8s_alb_dns_name}/"]' -s secret=${keycloak_client_secret} -s \
++ 'redirectUris=["https://${ssn_k8s_alb_dns_name}/"]' -s secret=${keycloak_client_secret} -s \
+ serviceAccountsEnabled=true
# Get clint ID
client_id=$(/opt/jboss/keycloak/bin/kcadm.sh get clients -r dlab --query clientId=dlab-ui | /usr/bin/jq -er '.[].id')
# Create client mapper
diff --cc infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
index a75d1ab,8f72cd8..2d12be7
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/values.yaml
@@@ -44,9 -43,13 +44,10 @@@ ui
host: ${ssn_k8s_alb_dns_name}
annotations:
kubernetes.io/ingress.class: nginx
- nginx.ingress.kubernetes.io/ssl-redirect: "false"
+ nginx.ingress.kubernetes.io/ssl-redirect: "true"
+ nginx.ingress.kubernetes.io/proxy-body-size: "50m"
-
- tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
+ tls:
+ - secretName: dlab-ui-tls
mongo:
host: ${mongo_service_name}
port: ${mongo_port}
diff --cc infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/configure_keycloak.sh
index 92e5ead,0c4802c..40039a1
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/configure_keycloak.sh
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/files/configure_keycloak.sh
@@@ -68,7 -68,8 +68,8 @@@
-s 'config."mapped.group.attributes"=[]' -s 'config."drop.non.existing.groups.during.sync"=["false"]'
# Create client
/opt/jboss/keycloak/bin/kcadm.sh create clients -r dlab -s clientId=dlab-ui -s enabled=true -s \
- 'redirectUris=["https://${ssn_k8s_alb_dns_name}/"]' -s secret=${keycloak_client_secret}
- 'redirectUris=["http://${ssn_k8s_alb_dns_name}/"]' -s secret=${keycloak_client_secret} -s \
++ 'redirectUris=["https://${ssn_k8s_alb_dns_name}/"]' -s secret=${keycloak_client_secret} -s \
+ serviceAccountsEnabled=true
# Get clint ID
client_id=$(/opt/jboss/keycloak/bin/kcadm.sh get clients -r dlab --query clientId=dlab-ui | /usr/bin/jq -er '.[].id')
# Create client mapper
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org